OFBiz › OFBiz - Commits

svn commit: r1742365 - in /ofbiz/branches/release14.12: ./ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r1742365 - in /ofbiz/branches/release14.12: ./ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/widget/

Author: jleroux
Date: Thu May 5 07:39:38 2016
New Revision: 1742365

URL: http://svn.apache.org/viewvc?rev=1742365&view=rev
Log:
"Applied fix from trunk for revision: 1727894"
------------------------------------------------------------------------
r1727894 | jleroux | 2016-02-01 08:18:35 +0100 (lun. 01 févr. 2016) | 5 lignes

A patch from Pierre Smits for "Have the ability to add terms to invoices" https://issues.apache.org/jira/browse/OFBIZ-6865

Currently in UI there is no way that terms can be added to an invoice.

jleroux: Works well, links to edit/delete a Term, for instance from the list at "createInvoiceTerm" request would be welcome...
------------------------------------------------------------------------

Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/release14.12/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml
ofbiz/branches/release14.12/applications/accounting/widget/InvoiceScreens.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 5 07:39:38 2016
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/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,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,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097
+/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,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097

Modified: ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1742365&r1=1742364&r2=1742365&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu May 5 07:39:38 2016
@@ -227,7 +227,8 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="invoiceStatus"/>
</request-map>
-
+
+ 
<request-map uri="invoiceRoles">
<security https="true" auth="true"/>
<response name="success" type="view" value="invoiceRoles"/>
@@ -244,13 +245,26 @@ under the License.
<response name="success" type="view" value="invoiceRoles"/>
<response name="error" type="view" value="invoiceRoles"/>
</request-map>
+
<request-map uri="setInvoiceStatus">
<security https="true" auth="true"/>
<event type="service" invoke="setInvoiceStatus"/>
<response name="success" type="view" value="invoiceOverview"/>
<response name="error" type="view" value="invoiceOverview"/>
</request-map>
-
+
+ 
+ <request-map uri="invoiceTerms">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="invoiceTerms"/>
+ </request-map>
+ <request-map uri="createInvoiceTerm">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createInvoiceTerm"/>
+ <response name="success" type="view" value="invoiceTerms"/>
+ <response name="error" type="view" value="invoiceTerms"/>
+ </request-map>
+
<request-map uri="sendPerEmail">
<security https="true" auth="true"/>
<response name="success" type="view" value="sendPerEmail"/>
@@ -2684,6 +2698,7 @@ under the License.
<view-map name="invoiceStatus" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceStatus"/>
<view-map name="editInvoiceApplications" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceApplications"/>
<view-map name="invoiceRoles" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceRoles"/>
+ <view-map name="invoiceTerms" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceTerms"/>
<view-map name="sendPerEmail" type="screen" page="component://accounting/widget/InvoiceScreens.xml#SendPerEmail"/>
<view-map name="EditInvoiceItemType" type="screen" page="component://accounting/widget/InvoiceItemTypeScreens.xml#EditInvoiceItemType"/>

Modified: ofbiz/branches/release14.12/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/AccountingMenus.xml?rev=1742365&r1=1742364&r2=1742365&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/widget/AccountingMenus.xml Thu May 5 07:39:38 2016
@@ -110,7 +110,7 @@ under the License.
<parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
</link>
</menu-item>
-
+
<menu-item name="invoiceRoles" title="${uiLabelMap.AccountingInvoiceRoles}">
<condition>
<and>
@@ -125,7 +125,22 @@ under the License.
<parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
</link>
</menu-item>
-
+
+ <menu-item name="invoiceTerms" title="${uiLabelMap.PartyTerms}">
+ <condition>
+ <and>
+ <not><if-empty field="invoice.invoiceId"/></not>
+ <or>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="invoiceTerms">
+ <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
+ </link>
+ </menu-item>
+
<menu-item name="editInvoiceApplications" title="${uiLabelMap.AccountingApplications}">
<condition>
<and>

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=1742365&r1=1742364&r2=1742365&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/widget/InvoiceForms.xml Thu May 5 07:39:38 2016
@@ -442,12 +442,30 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="InvoiceTerm" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
- <field name="invoiceTermId"><hidden/></field>
+ <field name="invoiceTermId"><display/></field>
<field name="termTypeId">
<display-entity entity-name="TermType"/>
</field>
+ <field name="termDays" widget-area-style="align-right" title-area-style="align-right">
+ <display/>
+ </field>
</form>
-
+
+ <form name="EditInvoiceTerm" type="single" target="createInvoiceTerm" title=""
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="InvoiceTerm"/>
+ <field name="invoiceId"><hidden/></field>
+ <field name="termTypeId">
+ <drop-down>
+ <entity-options entity-name="TermType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="description"><textarea/></field>
+ <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
<form name="EditInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true" target="updateInvoiceApplication" title="Apply payments to invoices" separate-columns="false"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="statusId"><hidden/></field>
@@ -528,6 +546,7 @@ under the License.
</hyperlink>
</field>
</form>
+
<form name="EditInvoiceRole" type="single" target="createInvoiceRole" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="InvoiceRole"/>
@@ -542,6 +561,7 @@ under the License.
</field>
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="SendPerEmail" type="single" target="executeSendPerEmail" title=""
header-row-style="header-row" default-table-style="basic-table">
<actions>

Modified: ofbiz/branches/release14.12/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/InvoiceScreens.xml?rev=1742365&r1=1742364&r2=1742365&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/widget/InvoiceScreens.xml Thu May 5 07:39:38 2016
@@ -242,6 +242,11 @@ under the License.
<include-form name="invoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyTerms}">
+ <container>
+ <link target="invoiceTerms" text="${uiLabelMap.CommonUpdate}" style="buttontext">
+ <parameter param-name="invoiceId"/>
+ </link>
+ </container>
<include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
<include-form name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
@@ -527,6 +532,31 @@ under the License.
</decorator-section>
</decorator-screen>
</widgets>
+ </section>
+ </screen>
+
+ <screen name="InvoiceTerms">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListInvoiceTerms"/>
+ <set field="tabButtonItem" value="invoiceTerms"/>
+ <set field="invoiceId" from-field="parameters.invoiceId"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
+ <entity-and entity-name="InvoiceTerm" list="invoiceTerms">
+ <field-map from-field="invoiceId" field-name="invoiceId"/>
+ <order-by field-name="invoiceTermId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet id="PartyInvoiceTermPanel" title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true">
+ <include-form name="EditInvoiceTerm" location="component://accounting/widget/InvoiceForms.xml"/>
+ </screenlet>
+ <include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
</section>
</screen>