[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4860] trunk
- Subject: SF.net SVN: ledger-smb:[4860] trunk
- From: ..hidden..
- Date: Thu, 07 Jun 2012 12:13:19 +0000
Revision: 4860
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4860&view=rev
Author: einhverfr
Date: 2012-06-07 12:13:19 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Correcting errors saving customers using hte colombia general addon
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Scripts/file.pm
trunk/bin/is.pl
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/contact.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4851
+ /branches/1.3:3711-4859
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-06-07 09:57:54 UTC (rev 4859)
+++ trunk/Changelog 2012-06-07 12:13:19 UTC (rev 4860)
@@ -55,6 +55,8 @@
Changelog for 1.3.19
* New link for customer/vendor when not a dropdown (Chris T)
+* Removed file debugging code from file.pl (Chris T)
+* fixed can void voids. (Chris T, h/t Erik Huelsmann, item 3515561)
Changelog for 1.3.18
* Fixed missing template for CSV pricelists (Chris T)
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4851
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4859
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4851
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4859
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/contact.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4851
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4859
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4851
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4859
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Modified: trunk/LedgerSMB/Scripts/file.pm
===================================================================
--- trunk/LedgerSMB/Scripts/file.pm 2012-06-07 09:57:54 UTC (rev 4859)
+++ trunk/LedgerSMB/Scripts/file.pm 2012-06-07 12:13:19 UTC (rev 4860)
@@ -111,7 +111,6 @@
$file->content($fdata);
}
$request->{content} = $file->content;
- $request->debug({file => '/tmp/file'});
$file->attach;
my $cgi = CGI::Simple->new;
print $cgi->redirect($request->{callback});
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4851
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4859
/branches/1.3/scripts/file.pl:3711-4859
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4851
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4859
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4851
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4859
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4851
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4859
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4851
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4859
/branches/1.3/scripts/payment.pl:3711-4680
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4851
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4859
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4851
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4859
/branches/1.3/scripts/setup.pl:3711-4550
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4851
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4859
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl 2012-06-07 09:57:54 UTC (rev 4859)
+++ trunk/bin/is.pl 2012-06-07 12:13:19 UTC (rev 4860)
@@ -591,6 +591,11 @@
}
sub void {
+ if ($form->{invnumber} =~ /-VOID$/){
+ $form->error($locale->text(
+ "Can't void a voided invoice!"
+ ));
+ }
for my $i (1 .. $form->{rowcount}){
$form->{"qty_$_"} *= -1;
}
@@ -953,11 +958,11 @@
'on_hold' =>
{ ndx => 12, key => 'O', value => $locale->text('On Hold') },
'void' =>
- { ndx => 12, key => 'V', value => $locale->text('Void') },
+ { ndx => 13, key => 'V', value => $locale->text('Void') },
'save_info' =>
- { ndx => 13, key => 'I', value => $locale->text('Save Info') },
+ { ndx => 14, key => 'I', value => $locale->text('Save Info') },
'new_screen' => # Create a blank ar/ap invoice.
- { ndx => 14, key=> 'N', value => $locale->text('New') }
+ { ndx => 15, key=> 'N', value => $locale->text('New') }
);
@@ -965,6 +970,7 @@
if ($from->{separate_duties}){
$button{'post'}->{value} = $locale->text('Save') unless $form->{id};
}
+ delete $button{void} if $form->{invnumber} =~ /-VOID/;
if ( $form->{id} ) {
@@ -1019,7 +1025,6 @@
%button = ();
}
}
-
for ( sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button )
{
$form->print_button( \%button, $_ );
@@ -1532,4 +1537,3 @@
}
-
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4851
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4859
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.