Author: deepak Date: Sat Mar 19 06:24:29 2016 New Revision: 1735732 URL: http://svn.apache.org/viewvc?rev=1735732&view=rev Log: Applied fix from trunk for revision: 1735731 ===
(OFBIZ-6937) Applied patch from jira issue. ============================================================ Company Check payment method should be shown when issuing chek ============================================================ Thanks Akash Jain for reporting the issue and Mohammad Rehan Khan for patch. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/widget/ap/InvoiceScreens.xml Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 19 06:24:29 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731 Modified: ofbiz/branches/release15.12/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1735732&r1=1735731&r2=1735732&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/branches/release15.12/applications/accounting/widget/ap/InvoiceScreens.xml Sat Mar 19 06:24:29 2016 @@ -111,6 +111,7 @@ under the License. <set field="paymentPartyId" from-field="parameters.partyIdFrom" default-value="${parameters.organizationPartyId}"/> <entity-and entity-name="PaymentMethod" list="paymentMethods"> <field-map field-name="partyId" from-field="paymentPartyId"/> + <field-map field-name="paymentMethodTypeId" value="COMPANY_CHECK"/> </entity-and> <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions>