Author: sichen Date: Fri Oct 20 15:25:02 2006 New Revision: 466280 URL: http://svn.apache.org/viewvc?view=rev&rev=466280 Log: Fix bug where invoice terms were not created correctly while invoices were created
Modified: incubator/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Modified: incubator/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml?view=diff&rev=466280&r1=466279&r2=466280 ============================================================================== --- incubator/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml (original) +++ incubator/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml Fri Oct 20 15:25:02 2006 @@ -139,8 +139,7 @@ location="org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="createInvoiceTerm"> <description>Create Invoice (Item) Term Record</description> <auto-attributes mode="OUT" include="pk" optional="false"/> - <auto-attributes mode="IN" include="nonpk" optional="false"/> - <override name="uomId" optional="true"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> <service name="createInvoiceForOrderAllItems" engine="java" location="org.ofbiz.accounting.invoice.InvoiceServices" invoke="createInvoiceForOrderAllItems"> Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?view=diff&rev=466280&r1=466279&r2=466280 ============================================================================== --- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Oct 20 15:25:02 2006 @@ -1603,7 +1603,7 @@ createInvoiceTermContext.put("termTypeId", term.get("termTypeId")); createInvoiceTermContext.put("termValue", term.get("termValue")); createInvoiceTermContext.put("termDays", term.get("termDays")); - createInvoiceTermContext.put("uomId", term.get("termDays")); + createInvoiceTermContext.put("uomId", term.get("uomId")); createInvoiceTermContext.put("userLogin", userLogin); Map createInvoiceTermResult = null;