[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6874] branches/1.3

Subject: SF.net SVN: ledger-smb:[6874] branches/1.3
From: ..hidden..
Date: Wed, 19 Feb 2014 08:43:49 +0000
Revision: 6874
          http://sourceforge.net/p/ledger-smb/code/6874
Author:   pongracz
Date:     2014-02-19 08:43:48 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
Include customer's/vendor's tax id in the AR/AP transaction and sales invoice forms. This is necessary (pull this tax id from the DB) to be able to include it in the printed invoice. There are rules, where the tax id must be on the invoice. Now, if one need this info in the invoice, it is easy to include, like this: <?lsmb tax_id ?>  that's all. Note: it seems the sales/purchase invoice form a little bit different from AR/AP transactions, where customer/vendor details displayed, need some polish, maybe later.

Modified Paths:
--------------
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/bin/aa.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl

Property Changed:
----------------
    branches/1.3/LedgerSMB/
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/bin/
    branches/1.3/bin/aa.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl

Index: branches/1.3/LedgerSMB
===================================================================
--- branches/1.3/LedgerSMB	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/LedgerSMB	2014-02-19 08:43:48 UTC (rev 6874)

Property changes on: branches/1.3/LedgerSMB
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2014-02-19T08:30:14.313154Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0700
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+0 root
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+0 root
\ No newline at end of property
Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/LedgerSMB/AA.pm	2014-02-19 08:43:48 UTC (rev 6874)
@@ -1310,7 +1310,8 @@
 		          c.language_code, $duedate AS duedate, 
 			  b.discount AS tradediscount, 
 		          b.description AS business, 
-			  entity.control_code as entity_control_code,
+			  entity.control_code AS entity_control_code,
+                          co.tax_id AS tax_id,
 			  c.meta_number, ecl.*, ctf.default_reportable,
                           c.cash_account_id, ca.accno as cash_accno
 		     FROM entity_credit_account c
@@ -1318,6 +1319,7 @@
                 LEFT JOIN account ca ON c.cash_account_id = ca.id
 		LEFT JOIN business b ON (b.id = c.business_id)
                 LEFT JOIN country_tax_form ctf ON ctf.id = c.taxform_id
+                LEFT JOIN company co ON co.entity_id = c.entity_id
                 LEFT JOIN (SELECT coalesce(line_one, '')
                                || ' ' || coalesce(line_two, '') as address,
                                l.city, etl.credit_id


Property changes on: branches/1.3/LedgerSMB/AA.pm
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-09-20T13:22:45.000000Z
+2014-02-19T08:30:14.245159Z
\ No newline at end of property
Modified: svn:owner
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Modified: svn:group
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Index: branches/1.3/bin
===================================================================
--- branches/1.3/bin	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/bin	2014-02-19 08:43:48 UTC (rev 6874)

Property changes on: branches/1.3/bin
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2014-02-06T19:50:14.395355Z
+2014-02-19T08:36:37.508271Z
\ No newline at end of property
Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/bin/aa.pl	2014-02-19 08:43:48 UTC (rev 6874)
@@ -579,7 +579,7 @@
     $form->hide_form(
         qw(batch_id approved id printed emailed sort closedto locked 
            oldtransdate audittrail recurring checktax reverse batch_id subtype
-           entity_control_code meta_number default_reportable address city)
+           entity_control_code tax_id meta_number default_reportable address city)
     );
 
     if ( $form->{vc} eq 'customer' ) {
@@ -660,6 +660,11 @@
 	      </tr>
 	        <tr>
 		<th align="right" nowrap>| . 
+			$locale->text('Tax ID') . qq|</th>
+		<td colspan=3>$form->{tax_id}</td>
+	      </tr>
+	        <tr>
+		<th align="right" nowrap>| . 
 			$locale->text('Account') . qq|</th>
 		<td colspan=3>$form->{meta_number}</td>
 	      </tr>


Property changes on: branches/1.3/bin/aa.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2014-02-07T23:54:01.822341Z
+2014-02-19T08:34:33.948584Z
\ No newline at end of property
Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/bin/ir.pl	2014-02-19 08:43:48 UTC (rev 6874)
@@ -460,8 +460,7 @@
 
 	      </tr>
 	      <tr>
-	        <td></td>
-		<td colspan=3>
+		<td colspan=4>
 		  <table class="creditlimit">
 		    <tr>
 		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
@@ -480,11 +479,16 @@
 	        <tr>
 		<th align="right" nowrap>| . 
 			$locale->text('Entity Code') . qq|</th>
-		<td colspan="2">$form->{entity_control_code}</td>
+		<td colspan="2" nowrap>$form->{entity_control_code}</td>
 		<th align="right" nowrap>| . 
 			$locale->text('Account') . qq|</th>
 		<td colspan=3>$form->{meta_number}</td>
 	      </tr>
+              <tr>
+                <th align="right" nowrap>| .
+                        $locale->text('Tax ID'). qq|</th>
+                <td colspan=3>$form->{tax_id}</td>
+              </tr>
               <tr class="address_row">
                 <th align="right" nowrap>| .
                         $locale->text('Address'). qq|</th>


Property changes on: branches/1.3/bin/ir.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-08-31T15:44:49.000000Z
+2014-02-19T08:35:43.277358Z
\ No newline at end of property
Modified: svn:owner
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Modified: svn:group
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2014-02-19 08:27:11 UTC (rev 6873)
+++ branches/1.3/bin/is.pl	2014-02-19 08:43:48 UTC (rev 6874)
@@ -470,7 +470,7 @@
     $form->hide_form(
         qw(form_id id type printed emailed queued title vc terms discount 
            creditlimit creditremaining tradediscount business closedto locked 
-           shipped oldtransdate recurring reverse batch_id subtype 
+           shipped oldtransdate recurring reverse batch_id subtype tax_id 
            meta_number nextsub default_reportable address city lock_description)
     );
 
@@ -512,8 +512,7 @@
 		<input type=hidden name="oldcustomer" value="$form->{oldcustomer}"> 
 	      </tr>
 	      <tr>
-		<td></td>
-		<td colspan=3>
+		<td colspan=4>
 		  <table class="creditlimit">
 		    <tr>
 		      <th align=right nowrap>| . $locale->text('Credit Limit') . qq|</th>
@@ -532,11 +531,16 @@
 	        <tr>
 		<th align="right" nowrap>| . 
 			$locale->text('Entity Code') . qq|</th>
-		<td colspan="2">$form->{entity_control_code}</td>
+		<td colspan="2" nowrap>$form->{entity_control_code}</td>
 		<th align="right" nowrap>| . 
 			$locale->text('Account') . qq|</th>
 		<td colspan=3>$form->{meta_number}</td>
 	      </tr>
+              <tr>
+                <th align="right" nowrap>| .
+                        $locale->text('Tax ID'). qq|</th>
+                <td colspan=3>$form->{tax_id}</td>
+              </tr>
               <tr class="address_row">
                 <th align="right" nowrap>| .
                         $locale->text('Address'). qq|</th>


Property changes on: branches/1.3/bin/is.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-09-20T14:40:14.000000Z
+2014-02-19T08:36:37.429277Z
\ No newline at end of property
Modified: svn:owner
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Modified: svn:group
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
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=121054471&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits
Prev by Date: SF.net SVN: ledger-smb:[6873] tags/1.3.38/
Next by Date: SF.net SVN: ledger-smb:[6875] trunk
Previous by thread: SF.net SVN: ledger-smb:[6873] tags/1.3.38/
Next by thread: SF.net SVN: ledger-smb:[6875] trunk
Index(es):
- Date
- Thread