Author: jleroux Date: Fri Oct 6 10:40:38 2006 New Revision: 453703 URL: http://svn.apache.org/viewvc?view=rev&rev=453703 Log: At Si Chen request I commented out the part that allow to add Tax ID in invoice header
(please see : https://issues.apache.org/jira/browse/OFBIZ-362) Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh?view=diff&rev=453703&r1=453702&r2=453703 ============================================================================== --- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh (original) +++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh Fri Oct 6 10:40:38 2006 @@ -53,29 +53,34 @@ sendingParty = InvoiceWorker.getSendFromParty(invoice); context.put("sendingParty", sendingParty); - sendingTaxInfos=sendingParty.getRelated("PartyTaxAuthInfo"); - billingTaxInfos=billingParty.getRelated("PartyTaxAuthInfo"); - sendingPartyTaxId=null; - billingPartyTaxId=null; + /*________________this snippet was added for adding Tax ID in invoice header if needed _________________ + + sendingTaxInfos=sendingParty.getRelated("PartyTaxAuthInfo"); + billingTaxInfos=billingParty.getRelated("PartyTaxAuthInfo"); + sendingPartyTaxId=null; + billingPartyTaxId=null; + + if (billingAddress != null) { + for (Iterator i=sendingTaxInfos.iterator();i.hasNext();) { + if (i.next().get("taxAuthGeoId").equals(billingAddress.get("countryGeoId"))) { + sendingPartyTaxId=sendingTaxInfos.get(i.previousIndex()).get("partyTaxId"); + } + } + for (i=billingTaxInfos.iterator(); i.hasNext(); ) { + if (i.next().get("taxAuthGeoId").equals(billingAddress.get("countryGeoId"))) { + billingPartyTaxId=billingTaxInfos.get(i.previousIndex()).get("partyTaxId"); + } + } + } + if (sendingPartyTaxId != null ) { + context.put("sendingPartyTaxId",sendingPartyTaxId); + } + if (billingPartyTaxId != null ) { + context.put("billingPartyTaxId",billingPartyTaxId); + } + ________________this snippet was added for adding Tax ID in invoice header if needed _________________*/ + - if (billingAddress != null) { - for (Iterator i=sendingTaxInfos.iterator();i.hasNext();) { - if (i.next().get("taxAuthGeoId").equals(billingAddress.get("countryGeoId"))) { - sendingPartyTaxId=sendingTaxInfos.get(i.previousIndex()).get("partyTaxId"); - } - } - for (i=billingTaxInfos.iterator(); i.hasNext(); ) { - if (i.next().get("taxAuthGeoId").equals(billingAddress.get("countryGeoId"))) { - billingPartyTaxId=billingTaxInfos.get(i.previousIndex()).get("partyTaxId"); - } - } - } - if (sendingPartyTaxId != null ) { - context.put("sendingPartyTaxId",sendingPartyTaxId); - } - if (billingPartyTaxId != null ) { - context.put("billingPartyTaxId",billingPartyTaxId); - } terms = invoice.getRelated("InvoiceTerm"); context.put("terms", terms);
