You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/04 10:35:23 UTC
svn commit: r1547745 -
/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy
Author: jleroux
Date: Wed Dec 4 09:35:22 2013
New Revision: 1547745
URL: http://svn.apache.org/r1547745
Log:
Missed to commit GetAccountOrganizationAndClass.groovy in previous commit
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy
- copied, changed from r1547711, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy
Copied: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy (from r1547711, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy?p2=ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy&p1=ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy&r1=1547711&r2=1547745&rev=1547745&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy Wed Dec 4 09:35:22 2013
@@ -40,7 +40,6 @@ if ("SALES_INVOICE".equals(invoice.invoi
EQUALS(invoiceItemTypeId: "INV_PROD_ITEM")
EQUALS(parentTypeId: "INV_PROD_ITEM")
}
- invoiceItemTypes = delegator.findList("InvoiceItemType", itemTypesCond, null, ["parentTypeId", "invoiceItemTypeId"], null, false);
glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", [organizationPartyId : invoice.partyIdFrom], null, false);
} else if ("PURCHASE_INVOICE".equals(invoice.invoiceTypeId)) {
itemTypesCond = exprBldr.OR() {
@@ -51,7 +50,6 @@ if ("SALES_INVOICE".equals(invoice.invoi
EQUALS(invoiceItemTypeId: "PINV_PROD_ITEM")
EQUALS(parentTypeId: "PINV_PROD_ITEM")
}
- invoiceItemTypes = delegator.findList("InvoiceItemType", itemTypesCond, null, ["parentTypeId", "invoiceItemTypeId"], null, false);
glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", [organizationPartyId : invoice.partyId], null, false);
} else if ("PAYROL_INVOICE".equals(invoice.invoiceTypeId)) {
itemTypesCond = exprBldr.OR() {
@@ -62,7 +60,6 @@ if ("SALES_INVOICE".equals(invoice.invoi
EQUALS(invoiceItemTypeId: "PAYROL_TAXES")
EQUALS(parentTypeId: "PAYROL_TAXES")
}
- invoiceItemTypes = delegator.findList("InvoiceItemType", itemTypesCond, null, ["parentTypeId", "invoiceItemTypeId"], null, false);
glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", [organizationPartyId : invoice.partyId], null, false);
} else if ("COMMISSION_INVOICE".equals(invoice.invoiceTypeId)) {
itemTypesCond = exprBldr.OR() {
@@ -71,12 +68,6 @@ if ("SALES_INVOICE".equals(invoice.invoi
EQUALS(invoiceItemTypeId: "COMM_INV_ADJ")
EQUALS(parentTypeId: "COMM_INV_ADJ")
}
- invoiceItemTypes = delegator.findList("InvoiceItemType", itemTypesCond, null, ["parentTypeId", "invoiceItemTypeId"], null, false);
glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", [organizationPartyId : invoice.partyId], null, false);
-} else {
- map = delegator.findByAnd("InvoiceItemTypeMap", [invoiceTypeId : invoice.invoiceTypeId], null, true);
- invoiceItemTypes = EntityUtil.getRelated("InvoiceItemType", map, null, false);
}
-context.invoiceItemTypes = invoiceItemTypes;
-
context.glAccountOrganizationAndClassList = glAccountOrganizationAndClassList;