projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in Record.pm - call ->check **BEFORE** generating @diff for SQL. causing
[freeside.git]
/
FS
/
FS
/
cust_main.pm
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
67b426b
..
cf5bd33
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-512,6
+512,8
@@
and repalce methods.
sub check {
my $self = shift;
sub check {
my $self = shift;
+ #warn "BEFORE: \n". $self->_dump;
+
my $error =
$self->ut_numbern('custnum')
|| $self->ut_number('agentnum')
my $error =
$self->ut_numbern('custnum')
|| $self->ut_number('agentnum')
@@
-553,7
+555,9
@@
sub check {
$self->ss("$1-$2-$3");
}
$self->ss("$1-$2-$3");
}
- unless ( $import ) {
+
+# bad idea to disable, causes billing to fail because of no tax rates later
+# unless ( $import ) {
unless ( qsearchs('cust_main_county', {
'country' => $self->country,
'state' => '',
unless ( qsearchs('cust_main_county', {
'country' => $self->country,
'state' => '',
@@
-566,7
+570,7
@@
sub check {
'country' => $self->country,
} );
}
'country' => $self->country,
} );
}
- }
+
#
}
$error =
$self->ut_phonen('daytime', $self->country)
$error =
$self->ut_phonen('daytime', $self->country)
@@
-583,7
+587,7
@@
sub check {
if ( defined $self->dbdef_table->column('ship_last') ) {
if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
if ( defined $self->dbdef_table->column('ship_last') ) {
if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
- && grep
$self->getfield("ship_$_"), grep $_ ne 'state',
@addfields
+ && grep
{ $self->getfield("ship_$_") ne '' }
@addfields
)
{
my $error =
)
{
my $error =
@@
-694,6
+698,8
@@
sub check {
$self->otaker(getotaker);
$self->otaker(getotaker);
+ #warn "AFTER: \n". $self->_dump;
+
''; #no error
}
''; #no error
}
@@
-1000,7
+1006,8
@@
sub bill {
'state' => $self->state,
'county' => $self->county,
'country' => $self->country,
'state' => $self->state,
'county' => $self->county,
'country' => $self->country,
- } );
+ } ) or die "fatal: can't find tax rate for state/county/country ".
+ $self->state. "/". $self->county. "/". $self->country. "\n";
my $tax = sprintf( "%.2f",
$taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
);
my $tax = sprintf( "%.2f",
$taxable_charged * ( $cust_main_county->getfield('tax') / 100 )
);