Skip to content

Commit

Permalink
OFBIZ-12994 correction application du patch incomplete
Browse files Browse the repository at this point in the history
  • Loading branch information
Leila committed Apr 9, 2024
1 parent d41fb9f commit 050d514
Show file tree
Hide file tree
Showing 19 changed files with 1,327 additions and 1,124 deletions.
9 changes: 9 additions & 0 deletions applications/accounting/webapp/accounting/WEB-INF/accounting-controller.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@ under the License.
xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd">

<include location="component://accounting/widget/accounting/AccountingInvoiceCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceApplicationCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceAttributeCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceContactMechCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceContentCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceItemCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceNoteCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceRoleCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceStatusCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceTermCpd.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceTimeEntryCpd.xml"/>

<description>List Accounting compound files</description>

Expand Down
3 changes: 2 additions & 1 deletion applications/accounting/webapp/accounting/WEB-INF/controller.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ under the License.
xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://accounting/widget/accounting/AccountingInvoiceCpd.xml"/>
<include location="component://accounting/webapp/accounting/WEB-INF/accounting-controller.xml"/>

<description>Accounting Manager Module Site Configuration File</description>

<!-- Events to run on every request before security (chains exempt) -->
Expand Down
6 changes: 3 additions & 3 deletions applications/accounting/widget/AccountingMenus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ under the License.
</or>
</condition>
<link target="Accounting/Invoice/New" link-type="layered-modal">
<set-callback area-target="Accounting/Invoice/View" area-id="window">
<set-callback area-target="invoiceOverview" area-id="window">
<parameter param-name="invoiceId" from-event-result="invoiceId"/>
</set-callback>
</link>
Expand Down Expand Up @@ -157,7 +157,7 @@ under the License.
<condition>
<not><if-empty field="invoice.invoiceId"/></not>
</condition>
<link target="Accounting/Invoice/View">
<link target="invoiceOverview">
<parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
</link>
</menu-item>
Expand Down Expand Up @@ -295,7 +295,7 @@ under the License.
</condition>
<link target="Accounting/Invoice/Edit" link-type="layered-modal">
<parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
<set-callback area-target="Accounting/Invoice/View" area-id="window">
<set-callback area-target="invoiceOverview" area-id="window">
<parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
</set-callback>
</link>
Expand Down
1 change: 1 addition & 0 deletions applications/accounting/widget/CommonScreens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingEntityLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<include-screen name="EmbeddedDecorator" location="component://common/widget/CommonScreens.xml"/>
Expand Down
497 changes: 69 additions & 428 deletions applications/accounting/widget/InvoiceForms.xml
View file

Large diffs are not rendered by default.

163 changes: 8 additions & 155 deletions applications/accounting/widget/InvoiceScreens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ under the License.
<widgets>
<section>
<condition><not><if-empty field="parameters.invoiceId"/></not></condition>
<actions>
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice" use-cache="true"/>
</actions>
<widgets>
<label style="h1">${uiLabelMap.CommonInvoice}: ${invoiceId}</label>
<include-menu name="InvoiceTabBar" location="${parameters.mainMenuLocation}"/>
Expand Down Expand Up @@ -69,7 +73,7 @@ under the License.
</screen>
<screen name="FindInvoices">
<section>
<actions>
<actions>
<set field="headerItem" value="invoices"/>
<set field="tabButtonItem" value="find"/>
<set field="titleProperty" value="PageTitleFindInvoice"/>
Expand All @@ -83,27 +87,7 @@ under the License.
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<include-menu name="InvoiceSubTabBar" location="${parameters.mainMenuLocation}"/>
<container style="clear"/>
</decorator-section>
<decorator-section name="search-options">
<platform-specific>
<html>
<html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/>
</html>
</platform-specific>
<include-form name="FindInvoices" location="component://accounting/widget/InvoiceForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-grid name="ListInvoices" location="component://accounting/widget/InvoiceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
<include-screen name="FindInvoices" location="component://accounting/widget/accounting/AccountingInvoiceCpd.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Expand Down Expand Up @@ -159,143 +143,12 @@ under the License.
</widgets>
</section>
</screen>
<screen name="invoiceOverview">
<screen name="InvoiceOverview">
<section>
<actions>
<set field="titleProperty" value="PageTitleInvoiceOverview"/>
<set field="tabButtonItem" value="invoiceOverview"/>
<set field="helpAnchor" value="_help_for_invoice_overview"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
<entity-and entity-name="InvoiceRole" list="invoiceRoles">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="partyId"/>
</entity-and>
<entity-and entity-name="InvoiceStatus" list="invoiceStatus">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="statusDate"/>
</entity-and>
<entity-and entity-name="InvoiceTerm" list="invoiceTerms">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="invoiceTermId"/>
</entity-and>
<entity-and entity-name="TimeEntry" list="timeEntries">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
</entity-and>
<script location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/CreateApplicationList.groovy"/>
<set field="parameters.statusId" from-field="invoice.statusId"/>
<set field="invoiceAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/>
<set field="notAppliedAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
<set field="appliedAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/>
<entity-condition entity-name="InvItemAndOrdItem" list="invItemAndOrdItems">
<condition-expr field-name="invoiceId" operator="equals" from-field="invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
</entity-condition>
<entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries">
<condition-expr field-name="invoiceId" operator="equals" from-field="invoiceId"/>
<order-by field-name="acctgTransId"/>
<order-by field-name="acctgTransEntrySeqId"/>
</entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
<not><if-empty field="invoice"/></not>
</condition>
<widgets>
<section>
<condition>
<if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
</condition>
<widgets>
<screenlet title="${uiLabelMap.AccountingInvoiceHeader}">
<include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<container style="lefthalf">
<screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus">
<include-grid name="ListInvoiceStatus" location="component://accounting/widget/accounting/AccountingInvoiceStatusCpd.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
navigation-form-name="ListInvoiceApplications">
<include-grid name="ListInvoiceApplications" location="component://accounting/widget/accounting/AccountingInvoiceApplicationCpd.xml"/>
</screenlet>
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="InvoiceRoles">
<include-grid name="InvoiceRoles" location="component://accounting/widget/accounting/AccountingInvoiceRoleCpd.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyTerms}">
<include-grid name="InvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
<include-grid name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</container>
<container style="clear"/>
<screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="InvoiceItems">
<include-grid name="InvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<section>
<condition>
<not><if-empty field="timeEntries"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}" navigation-form-name="ListTimeEntries">
<include-grid name="ListTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</widgets>
</section>
<screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
<include-grid name="AcctgTransAndEntries" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.AccountingInvoiceHeader}">
<include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<container style="lefthalf">
<screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus">
<include-grid name="ListInvoiceStatus" location="component://accounting/widget/accounting/AccountingInvoiceStatusCpd.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
navigation-form-name="ListInvoiceApplications">
<include-grid name="ListInvoiceApplications" location="component://accounting/widget/accounting/AccountingInvoiceApplicationCpd.xml"/>
</screenlet>
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="InvoiceRoles">
<include-grid name="InvoiceRoles" location="component://accounting/widget/accounting/AccountingInvoiceRoleCpd.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyTerms}">
<include-grid name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
<include-grid name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</container>
<container style="clear"/>
<screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="InvoiceItems">
<include-grid name="InvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<section>
<condition>
<not><if-empty field="timeEntries"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}" navigation-form-name="ListTimeEntries">
<include-form name="ListTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</widgets>
</section>
<screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
<include-grid name="AcctgTransAndEntries" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</fail-widgets>
</section>
</widgets>
<fail-widgets>
<label text="${uiLabelMap.AccountingInvoiceDoesNotExists}"></label>
</fail-widgets>
</section>
<include-screen name="ViewInvoice" location="component://accounting/widget/accounting/AccountingInvoiceCpd.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Expand Down
Loading

0 comments on commit 050d514

Please sign in to comment.