[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4690] trunk
- Subject: SF.net SVN: ledger-smb:[4690] trunk
- From: ..hidden..
- Date: Tue, 01 May 2012 04:04:09 +0000
Revision: 4690
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4690&view=rev
Author: einhverfr
Date: 2012-05-01 04:04:09 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/AM.pm
trunk/LedgerSMB/Taxes/Simple.pm
trunk/doc/LedgerSMB-manual.pdf
trunk/doc/manual/LedgerSMB-manual.tex
trunk/doc/release_notes
trunk/sql/Pg-database.sql
trunk/sql/modules/Account.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.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/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4685
+ /branches/1.3:3711-4689
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-05-01 03:59:07 UTC (rev 4689)
+++ trunk/Changelog 2012-05-01 04:04:09 UTC (rev 4690)
@@ -61,6 +61,7 @@
* Fixed errors about Concat() not found on Pg 8.4 (Erik H)
* Fixed can't edit templates with absolute templates path (Chris T 3516725)
* Added API for minimum value for taxes for local tax modules (Chris T)
+* Added API (but not UI) for tax max value (Chris T)
John L is John Locke
Michael R is Michael Richardson
Modified: trunk/LedgerSMB/AM.pm
===================================================================
--- trunk/LedgerSMB/AM.pm 2012-05-01 03:59:07 UTC (rev 4689)
+++ trunk/LedgerSMB/AM.pm 2012-05-01 04:04:09 UTC (rev 4690)
@@ -1658,10 +1658,11 @@
$validto = 'infinity' if not $validto;
$form->{"pass_$i"} = 0 if not $form->{"pass_$i"};
delete $form->{"old_validto_$i"} if ! $form->{"old_validto_$i"};
-
- $sth = $dbh->prepare('select account__save_tax(?,?,?,?,?,?,?,?)');
+
+ $sth = $dbh->prepare('select account__save_tax(?,?,?,?,?,?,?,?,?)');
my @queryargs = (
- $chart_id, $validto, $rate, $form->{"minvalue_$i"},
+ $chart_id, $validto, $rate,
+ $form->{"minvalue_$i"}, $form->{"maxvalue_$i"},
$form->{"taxnumber_$i"}, $form->{"pass_$i"},
$form->{"taxmodule_id_$i"}, $form->{"old_validto_$i"}
);
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4685
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4689
/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:3901-4685
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4689
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4685
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4689
/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-4685
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4689
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4685
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4689
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4685
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4689
/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:4193-4685
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4689
/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:4155-4685
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4689
/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:4010-4685
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4689
/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-4685
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4689
/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:3937-4685
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4689
/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:4193-4685
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4689
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4685
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4689
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/LedgerSMB/Taxes/Simple.pm
===================================================================
--- trunk/LedgerSMB/Taxes/Simple.pm 2012-05-01 03:59:07 UTC (rev 4689)
+++ trunk/LedgerSMB/Taxes/Simple.pm 2012-05-01 04:04:09 UTC (rev 4690)
@@ -37,6 +37,7 @@
account => '$',
value => 'Math::BigFloat',
minvalue => 'Math::BigFloat', #Ignored in Simple Tax rules
+ maxvalue => 'Math::BigFloat', #Ignored in Simple Tax rules
pass => '$'
};
Modified: trunk/doc/LedgerSMB-manual.pdf
===================================================================
--- trunk/doc/LedgerSMB-manual.pdf 2012-05-01 03:59:07 UTC (rev 4689)
+++ trunk/doc/LedgerSMB-manual.pdf 2012-05-01 04:04:09 UTC (rev 4690)
@@ -1372,24 +1372,25 @@
<< /S /GoTo /D [918 0 R /Fit ] >>
endobj
933 0 obj <<
-/Length 1912
+/Length 1911
/Filter /FlateDecode
>>
stream
-x\xDA\xEDXKs\xDB6\xBE\xE7Whr 5c1x\xF0!\xB6'J\xA2e\xA6Ô$'\x93\xF4\xC0H\x8C\xCDV]\x91r\x9A\xDF],(S\x8A<u\xDAÉi/\xB0X,\xFB}\xBB\xC4:7\xD6?c\x8F\xB4\x83\xF4\xD9\xCBK);\xDC5\xB7\xADN\xFA\xB1#\x98k\xF6\xFB\xBC\xE3Ø\xC9m\xBB\x93\xAE:\xEF\x8C(_\xDD\xE4\xBBd2\xE8\xF6\x84ÍI\xB6\xDDgk\xEA\xDFw9\xE7\x86\xD9\xEDI\xCEn\xCA\xEE/\xE9+\xB2\xC9MÏ\x85\xB2i\x9B\xB3;=i\x9B\xB8 ZLosZbzXîo\xE8É\xEB #\xCF6h\xB4#\xA5É~\xA7'\xA4\xE9z\x82\xCCL2\xA5\xBE\xBC%}\xCE/\xA8#O<\xD3s\x84\x83\x8E\xF4\xB8ã\xCB\xC1\xC7\xEC;\xDAH\xF0\xC72\xBF\xABa\xA1Ë\x8F\xB0O8\x9EQ+ARl\x97\xEB\xFD*_\x91\xB8Zî\xBA\xA2\xA9\xF7\xCCf\x9Fn\xB5;\xCCe\xD7an],\xF3m\xA5\x96\xC1h\xBF]å\xC7\xF3\x88$\xF7\x82\xCD\xD6\xEB\xAC\xCEw`[ÆV|,\xD7\xEB.7\xCAO\xC5\xF6\x86$w\xB9Ú\xA7\xD4\xE3\x96\xE9Y\xB4*\xF4t\xB8MQUÅ\x8E\xA7v\x8A7\xE5}\xBE\xDBV4\xA8o\xDD\xFBT\xEE~3\x95\xBDs\xE6\x86\xE5\xDD\xE7]qs[7qfvO\x9B\xF0zÕ\xF2\xB2\xFC5_\xD6d\x9Ai\xABY\x8D\xF3UQÕ\xE2Ã.\xCA-pÉ\x8Dl\xBBÂe\xEC\xD1a\x94z\xA6*\xF7\x84zN
..hidden../0\xC5\xEB\x93\xB9j\xFF)\xA4\xE9I`DK+U>Z\xA6e\xB9(\x97R\xBBhy\xDFâ\xF8
-bu\xE2\xF4\x8Be\xB9\xB9+\xD6\xF9\xEAM \xAF6u\xD1\xDDd<\x89.H\xF3*\xD5]Û\x8F.\x91\xF0Í\xAC\xEAD\xD1\xEDB\xC3Û\xE8\xF41 qW\xBAFz qz{! `\xDB\xFA\x96\xDCCñ\xA5 \xC55-)\xF75 7\xE5\xAAxÏXf\xB2O\xB2\xABA\xF8\xB6)\xEAZ\xD1\xDC\xAE\xF7\xE5(Ô\x996F\xAC\xB2\xB6\xA1,È\xE5vU\xA0\xFD\xEA\x88 \xFA8Y;\xFD7y\xFD*\xEAU\x87Ó\xD2\xB0\x84\xF7i 7\x8Fu\xDE\xF5l\xC6N(\xA5\xB8\xED\xE5Gj\xDB\xC2\xF1\xB2\\xE9\xDE\xE3\\xB2L[\x97\xF8\x93\xB8\xC4O\xB9\xE4<\xC2%q\x86K\xE8\xCAf_\xD5Ô\x98\xD4&