svn commit: r1614734 - in /ofbiz/trunk/applications: accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl party/config/PartyUiLabels.xml

Author: jleroux
Date: Wed Jul 30 18:38:41 2014
New Revision: 1614734

URL: http://svn.apache.org/r1614734
Log:
Better solution for the Party Tax Id, thanks to Adrian and Pierre comments
Now the Party Tax Id is shown under the other parties information
No needs for a differentiation between vendor and client

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=1614734&r1=1614733&r2=1614734&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Wed Jul 30 18:38:41 2014
@@ -39,6 +39,9 @@ under the License.
             <fo:block>${billingAddress.address2}</fo:block>
         </#if>
         <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block>
+        <#if billToPartyTaxId?has_content>
+            <fo:block>${uiLabelMap.PartyTaxId}: ${billToPartyTaxId}</fo:block>
+        </#if>
     <#else>
         <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billToParty.partyId}</fo:block>
     </#if>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=1614734&r1=1614733&r2=1614734&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Wed Jul 30 18:38:41 2014
@@ -37,20 +37,6 @@ under the License.
   <fo:table-cell><fo:block><#if billToParty?has_content>${billToParty.partyId}</#if></fo:block></fo:table-cell>
 </fo:table-row>
 
-<#if sendingPartyTaxId?has_content>
-  <fo:table-row>
-    <fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell>
-    <fo:table-cell><fo:block> ${billToPartyTaxId}</fo:block></fo:table-cell>
-  </fo:table-row>
-</#if>
-
-<#if billToPartyTaxId?has_content>
-  <fo:table-row>
-    <fo:table-cell><fo:block>${uiLabelMap.PartyClientTaxId}:</fo:block></fo:table-cell>
-    <fo:table-cell><fo:block> ${billToPartyTaxId}</fo:block></fo:table-cell>
-  </fo:table-row>
-</#if>
-
 <fo:table-row>
   <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell>
   <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1614734&r1=1614733&r2=1614734&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Jul 30 18:38:41 2014
@@ -11837,9 +11837,10 @@
     </property>
     <property key="PartyTaxId">
         <value xml:lang="de">Steuer ID</value>
-        <value xml:lang="en">Vendor Tax ID</value>
+        <value xml:lang="en">Tax ID</value>
+        <value xml:lang="en_IN">TIN</value>
         <value xml:lang="es">Código de Impuesto</value>
-        <value xml:lang="fr">N° de TVA du vend.</value>
+        <value xml:lang="fr">Id. de TVA</value>
         <value xml:lang="hi_IN">कर(tax) क्रमांक</value>
         <value xml:lang="it">ID Tasse</value>
         <value xml:lang="ja">税務ID</value>
@@ -11852,10 +11853,6 @@
         <value xml:lang="zh">税务标识</value>
         <value xml:lang="zh_TW">稅務ID</value>
     </property>
-    <property key="PartyClientTaxId">
-        <value xml:lang="en">Client Tax ID</value>
-        <value xml:lang="fr">N° de TVA du client</value>
-    </property>
     <property key="PartyTaxIdentification">
         <value xml:lang="de">Steuernummer und Befreiung</value>
         <value xml:lang="en">Tax Identification and Exemption</value>