svn commit: r1747236 - in /ofbiz/branches/release14.12: ./ applications/accounting/script
Locked
svn commit: r1747236 - in /ofbiz/branches/release14.12: ./ applications/accounting/script
 
|
Author: arunpatidar
Date: Tue Jun 7 13:51:39 2016 New Revision: 1747236 URL: http://svn.apache.org/viewvc?rev=1747236&view=rev Log: Applied fix from trunk for revision: 1747223 === Applying patch from jira ticket OFBIZ-7201. =============================================================================== Fixed different forms, screens and services affected due to removal of parentTypeId from 'PURCHASE_INVOICE' and 'SALES_INVOICE' InvoiceType data. ============================================================================== Thanks Anurag Chandak for your contribution. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/release14.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/LookupForms.xml ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/LookupForms.xml ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 7 13:51:39 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223 Modified: ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Jun 7 13:51:39 2016 @@ -2023,8 +2023,8 @@ under the License. <set field="totalAmountFromInvoice" type="BigDecimal" value="0"/> <entity-one entity-name="Invoice" value-field="invoice"/> - <get-related-one value-field="invoice" relation-name="InvoiceType" to-value-field="invoiceType"/> - <if-compare field="invoiceType.parentTypeId" operator="equals" value="PURCHASE_INVOICE"> + <set field="isPurchaseInvoice" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'PURCHASE_INVOICE')}" type="Boolean"/> + <if-compare field="isPurchaseInvoice" operator="equals" value="true" type="Boolean"> <entity-condition entity-name="InvoiceItem" list="invoiceItems" use-cache="true"> <condition-list> <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="PINV_SALES_TAX"/> Modified: ofbiz/branches/release14.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/release14.12/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Tue Jun 7 13:51:39 2016 @@ -56,6 +56,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityQuery; +import org.ofbiz.entity.util.EntityTypeUtil; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.order.order.OrderReadHelper; @@ -3471,11 +3472,13 @@ public class InvoiceServices { } else if (EntityQuery.use(delegator).from("InvoiceType").where("invoiceTypeId", invoice.get("invoiceTypeId")).queryOne() == null) { newErrMsgs.add("Line number " + rec.getRecordNumber() + ": InvoiceItem type id: " + invoice.get("invoiceTypeId") + " not found for invoice: " + currentInvoiceId); } - GenericValue invoiceType = EntityQuery.use(delegator).from("InvoiceType").where("invoiceTypeId", invoice.get("invoiceTypeId")).queryOne(); - if ("PURCHASE_INVOICE".equals(invoiceType.getString("parentTypeId")) && !invoice.get("partyId").equals(organizationPartyId)) { + + Boolean isPurchaseInvoice = EntityTypeUtil.hasParentType(delegator, "InvoiceType", "invoiceTypeId", (String) invoice.get("invoiceTypeId"), "parentTypeId", "PURCHASE_INVOICE"); + Boolean isSalesInvoice = EntityTypeUtil.hasParentType(delegator, "InvoiceType", "invoiceTypeId", (String) invoice.get("invoiceTypeId"), "parentTypeId", "SALES_INVOICE"); + if (isPurchaseInvoice && !invoice.get("partyId").equals(organizationPartyId)) { newErrMsgs.add("Line number " + rec.getRecordNumber() + ": A purchase type invoice should have the partyId 'To' being the organizationPartyId(=" + organizationPartyId + ")! however is " + invoice.get("partyId") +"! invoice: " + currentInvoiceId); } - if ("SALES_INVOICE".equals(invoiceType.getString("parentTypeId")) && !invoice.get("partyIdFrom").equals(organizationPartyId)) { + if (isSalesInvoice && !invoice.get("partyIdFrom").equals(organizationPartyId)) { newErrMsgs.add("Line number " + rec.getRecordNumber() + ": A sales type invoice should have the partyId 'from' being the organizationPartyId(=" + organizationPartyId + ")! however is " + invoice.get("partyIdFrom") +"! invoice: " + currentInvoiceId); } Modified: ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml Tue Jun 7 13:51:39 2016 @@ -236,14 +236,20 @@ under the License. <form name="NewSalesInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="SALES_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/> + </condition-list> + <order-by field-name="description"/> + </entity-condition> + </actions> <field name="statusId"><hidden value="INVOICE_IN_PROCESS"/></field> <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field> <field position="2" name="invoiceTypeId"> - <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType"> - <entity-constraint name="parentTypeId" value="SALES_INVOICE"/> - <entity-order-by field-name="description"/> - </entity-options> + <drop-down no-current-selected-key="SALES_INVOICE"> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> <field position="1" name="organizationPartyId" parameter-name="partyIdFrom"> @@ -260,14 +266,20 @@ under the License. </form> <form name="NewPurchaseInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="PURCHASE_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="PURCHASE_INVOICE"/> + </condition-list> + <order-by field-name="description"/> + </entity-condition> + </actions> <field name="statusId"><hidden value="INVOICE_IN_PROCESS"/></field> <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field> <field position="2" name="invoiceTypeId"> - <drop-down allow-empty="false" no-current-selected-key="PURCHASE_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType"> - <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/> - <entity-order-by field-name="description"/> - </entity-options> + <drop-down no-current-selected-key="PURCHASE_INVOICE"> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> <field position="1" name="organizationPartyId" parameter-name="partyId"> @@ -300,10 +312,10 @@ under the License. <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field> <field position="1" name="description"><text size="100"/></field> - <field position="1" name="partyIdFrom" use-when="invoiceType.getString("parentTypeId").equals("SALES_INVOICE")"><display description="${invoice.partyIdFrom}"/></field> - <field position="1" name="partyIdFrom" use-when="invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE")"><lookup target-form-name="LookupPartyName"/></field> - <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE")"><display description="${invoice.partyId}"/></field> - <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="invoiceType.getString("parentTypeId").equals("SALES_INVOICE")"><lookup target-form-name="LookupPartyName"/></field> + <field position="1" name="partyIdFrom" use-when="${groovy:invoiceType.getString("parentTypeId").equals("SALES_INVOICE") || invoiceType.getString("invoiceTypeId").equals("SALES_INVOICE")}"><display description="${invoice.partyIdFrom}"/></field> + <field position="1" name="partyIdFrom" use-when="${groovy:invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE") || invoiceType.getString("invoiceTypeId").equals("PURCHASE_INVOICE")}"><lookup target-form-name="LookupPartyName"/></field> + <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="${groovy:invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE") || invoiceType.getString("invoiceTypeId").equals("PURCHASE_INVOICE")}"><display description="${invoice.partyId}"/></field> + <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="${groovy:invoiceType.getString("parentTypeId").equals("SALES_INVOICE") || invoiceType.getString("invoiceTypeId").equals("SALES_INVOICE")}"><lookup target-form-name="LookupPartyName"/></field> <field position="1" name="roleTypeId" use-when="invoice!=null&&invoice.getString("invoiceTypeId").equals("SALES_INVOICE")"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType"> Modified: ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/InvoiceForms.xml Tue Jun 7 13:51:39 2016 @@ -66,12 +66,17 @@ under the License. </form> <form name="FindApInvoices" type="single" target="FindApInvoices" extends="FindInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml"> - <field name="parentTypeId"><hidden value="PURCHASE_INVOICE"/></field> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="PURCHASE_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="PURCHASE_INVOICE"/> + </condition-list> + </entity-condition> + </actions> <field position="1" name="invoiceTypeId"> - <drop-down allow-empty="true"> - <entity-options entity-name="InvoiceType" description="${description}"> - <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/> - </entity-options> + <drop-down> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> </form> @@ -79,6 +84,12 @@ under the License. <form name="FindPurchaseInvoices" type="single" target="FindPurchaseInvoices"> <actions> <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${defaultOrganizationPartyId}"/> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="PURCHASE_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="PURCHASE_INVOICE"/> + </condition-list> + </entity-condition> </actions> <field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> @@ -94,10 +105,8 @@ under the License. <field name="fromDueDate" position="1"><date-time/></field> <field name="thruDueDate" position="2"><date-time/></field> <field name="invoiceTypeId" position="1"> - <drop-down allow-empty="false"> - <entity-options entity-name="InvoiceType" description="${description}"> - <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/> - </entity-options> + <drop-down> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> <field name="search" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/LookupForms.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/LookupForms.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/widget/ap/forms/LookupForms.xml Tue Jun 7 13:51:39 2016 @@ -23,12 +23,18 @@ under the License. <form name="LookupInvoice" target="LookupInvoice" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="PURCHASE_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="PURCHASE_INVOICE"/> + </condition-list> + </entity-condition> + </actions> <field position="1" name="invoiceId"><text-find/></field> <field position="1" name="invoiceTypeId"> - <drop-down allow-empty="true" no-current-selected-key="PURCHASE_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId"> - <entity-constraint name="parentTypeId" operator="equals" value="PURCHASE_INVOICE"/> - </entity-options> + <drop-down no-current-selected-key="PURCHASE_INVOICE"> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> Modified: ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/InvoiceForms.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/InvoiceForms.xml Tue Jun 7 13:51:39 2016 @@ -67,12 +67,17 @@ under the License. </form> <form name="FindArInvoices" type="single" target="FindArInvoices" extends="FindInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml"> - <field name="parentTypeId"><hidden value="SALES_INVOICE"/></field> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="SALES_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/> + </condition-list> + </entity-condition> + </actions> <field name="invoiceTypeId" position="1"> - <drop-down allow-empty="true"> - <entity-options entity-name="InvoiceType" description="${description}"> - <entity-constraint name="parentTypeId" value="SALES_INVOICE"/> - </entity-options> + <drop-down> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> </form> Modified: ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/LookupForms.xml?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/LookupForms.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/widget/ar/forms/LookupForms.xml Tue Jun 7 13:51:39 2016 @@ -23,12 +23,18 @@ under the License. <form name="LookupInvoice" target="LookupInvoice" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <entity-condition entity-name="InvoiceType" list="invoiceTypeList"> + <condition-list combine="or"> + <condition-expr field-name="parentTypeId" value="SALES_INVOICE"/> + <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/> + </condition-list> + </entity-condition> + </actions> <field position="1" name="invoiceId"><text-find/></field> <field position="1" name="invoiceTypeId"> - <drop-down allow-empty="true" no-current-selected-key="SALES_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId"> - <entity-constraint name="parentTypeId" operator="equals" value="SALES_INVOICE"/> - </entity-options> + <drop-down no-current-selected-key="SALES_INVOICE"> + <list-options key-name="invoiceTypeId" list-name="invoiceTypeList" description="${description}"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> Modified: ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy?rev=1747236&r1=1747235&r2=1747236&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (original) +++ ofbiz/branches/release14.12/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy Tue Jun 7 13:51:39 2016 @@ -61,11 +61,13 @@ invExprs = invIterator = from("InvoiceAndType").where(invExprs).cursorScrollInsensitive().distinct().queryIterator(); while (invoice = invIterator.next()) { - if ("PURCHASE_INVOICE".equals(invoice.parentTypeId)) { + Boolean isPurchaseInvoice = EntityTypeUtil.hasParentType(delegator, "InvoiceType", "invoiceTypeId", invoice.getString("invoiceTypeId"), "parentTypeId", "PURCHASE_INVOICE"); + Boolean isSalesInvoice = EntityTypeUtil.hasParentType(delegator, "InvoiceType", "invoiceTypeId", (String) invoice.getString("invoiceTypeId"), "parentTypeId", "SALES_INVOICE"); + if (isPurchaseInvoice) { totalInvPuApplied += InvoiceWorker.getInvoiceApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); totalInvPuNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); } - else if ("SALES_INVOICE".equals(invoice.parentTypeId)) { + else if (isSalesInvoice) { totalInvSaApplied += InvoiceWorker.getInvoiceApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); totalInvSaNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |