SF.net SVN: ledger-smb:[6744] branches/1.3

[..hidden..]

Revision: 6744
          http://sourceforge.net/p/ledger-smb/code/6744
Author:   einhverfr
Date:     2014-02-04 08:48:34 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
Changelog entry for bug fix for 919

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/UI/accounts/edit.html

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2014-02-04 08:47:04 UTC (rev 6743)
+++ branches/1.3/Changelog	2014-02-04 08:48:34 UTC (rev 6744)
@@ -8,6 +8,7 @@
 * Fixed adding vouchers not checking for locked/approved batches (Chris T 1025)
 * Fixed can't delete pricematrix entries from customer screen (Chris T, 893)
 * Fixed language change on order to invoice conversion (Chris T, 896)
+* Fixed ar/ap tax check inconsistency (Chris T, 919)
 
 Changelog for 1.3.37
 * 1.3-1.2 downgrade now drops extensions (Chris T, 943)

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2014-02-04 08:47:04 UTC (rev 6743)
+++ branches/1.3/LedgerSMB/AA.pm	2014-02-04 08:48:34 UTC (rev 6744)
@@ -1454,7 +1454,7 @@
 		   SELECT c.accno, c.description, t.rate, t.taxnumber
 		     FROM chart c
 		     JOIN tax t ON (c.id = t.chart_id)
-		    WHERE c.link LIKE '%${ARAP}_tax%'
+		    WHERE true
 		          $where
 		 ORDER BY accno, validto|;
 

Modified: branches/1.3/UI/accounts/edit.html
===================================================================
--- branches/1.3/UI/accounts/edit.html	2014-02-04 08:47:04 UTC (rev 6743)
+++ branches/1.3/UI/accounts/edit.html	2014-02-04 08:48:34 UTC (rev 6744)
@@ -183,16 +183,6 @@
      } ?>
    </div>
    <div class="inputgroup">
-      <?lsmb IF form.AR_tax; AR_tax = 'CHECKED'; END;
-          INCLUDE input element_data={
-              name = 'AR_tax',
-              type = 'checkbox',
-             label = text('Tax'),
-           checked = AR_tax,
-             value = 'AR_tax'
-      } ?>
-   </div>
-   <div class="inputgroup">
       <?lsmb IF form.AR_overpayment; AR_overpayment = 'CHECKED'; END;
          INCLUDE input element_data={
               name = 'AR_overpayment',
@@ -234,15 +224,6 @@
              value = 'AP_paid'} ?>
    </div>
    <div class="inputgroup">
-      <?lsmb IF form.AP_tax; AP_tax= 'CHECKED'; END;
-         INCLUDE input element_data={
-              name = 'AP_tax',
-              type = 'checkbox',
-             label = text('Tax'),
-           checked = AP_tax,
-             value = 'AP_tax'} ?>
-   </div>
-   <div class="inputgroup">
       <?lsmb IF form.AP_overpayment; AP_overpayment= 'CHECKED'; END;
          INCLUDE input element_data={
               name = 'AP_overpayment',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits