You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/07/08 20:34:19 UTC
svn commit: r1801321 - in /ofbiz/branches/release16.11/applications/accounting: config/AccountingUiLabels.xml webapp/accounting/WEB-INF/controller.xml widget/PaymentScreens.xml

Author: deepak
Date: Sat Jul  8 20:34:19 2017
New Revision: 1801321

URL: http://svn.apache.org/viewvc?rev=1801321&view=rev
Log:
Fixed: Manually applied fix from trunk r#1801320
Log:
ACCTG TRANS ENTRIES PDF link on invoiceOverview does not work (OFBIZ-6774)
Thanks Morten and Ankit Joshi for your contribution.

Modified:
    ofbiz/branches/release16.11/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/release16.11/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml

Modified: ofbiz/branches/release16.11/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/config/AccountingUiLabels.xml?rev=1801321&r1=1801320&r2=1801321&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/config/AccountingUiLabels.xml Sat Jul  8 20:34:19 2017
@@ -1478,6 +1478,9 @@
         <value xml:lang="zh">æ¯ä»çåç¥¨æç»</value>
         <value xml:lang="zh-TW">æ¯ä»çç¼ç¥¨ç´°é </value>
     </property>
+    <property key="AccountingApprovedBy">
+        <value xml:lang="en">Approved by</value>
+    </property>
     <property key="AccountingApprovedGrandTotal">
         <value xml:lang="ar">Ø§ÙØ¥Ø¬ÙØ§ÙÙ Ø§ÙÙÙÙ Ø§ÙÙÙØ§ÙÙ Ø¹ÙÙÙ</value>
         <value xml:lang="de">Genehmigte Gesamtsumme</value>
@@ -4641,6 +4644,9 @@
         <value xml:lang="zh">åè®°</value>
         <value xml:lang="zh-TW">åè¨</value>
     </property>
+    <property key="AccountingDebitNotEqualCredit">
+        <value xml:lang="en">Debit not equal to credit</value>
+    </property>
     <property key="AccountingDebitOrCreditOfBalance">
         <value xml:lang="ar">Ø§ÙÙØ¯ÙÙ Ø£Ù Ø§ÙØ¯Ø§Ø¦Ù ÙÙØØ³Ø§Ø¨</value>
         <value xml:lang="de">Soll oder Haben der Bilanz</value>
@@ -5463,6 +5469,9 @@
         <value xml:lang="zh">ä»å®ååå»ºå®åæç»è´¦åæ¶åºé</value>
         <value xml:lang="zh-TW">å¾è¨å®æ°å»ºç´°é å¸³å®æåºé¯</value>
     </property>
+    <property key="AccountingExchangeRate">
+        <value xml:lang="en">Exchange Rate</value>
+    </property>
     <property key="AccountingExpEndOfLifeIsEmpty">
         <value xml:lang="ar">Ø§ÙØÙÙ ÙÙØ§ÙØ© Ø§ÙØÙØ§Ø© Ø§ÙÙØªÙÙØ¹Ø© ÙØ§Ø±Øº ÙÙ Ø¨ÙØ§ÙØ§Øª Ø§ÙØ£ØµÙ Ø§ÙØ«Ø§Ø¨Øª</value>
         <value xml:lang="de">Das Feld erwartetes End of Life bei den Anlage-Daten ist leer.</value>
@@ -11185,6 +11194,9 @@
         <value xml:lang="zh">ä¼åå¿é¡»æ¯ä¸ä¸ªåé¨å¢ä½(å¨ä¼åè§è²ä¸è®¾ç½®)</value>
         <value xml:lang="zh-TW">åé«å¿é æ¯ä¸åå®ä½çµç¹(å¨åé«è§è²ä¸è¨ç½®)</value>
     </property>
+    <property key="AccountingPartyName">
+        <value xml:lang="en">Party Name</value>
+    </property>
     <property key="AccountingPartyRoleAdd">
         <value xml:lang="ar">Ø¥Ø¶Ø§ÙØ© Ø¯ÙØ± Ø·Ø±Ù Ø¬Ø¯ÙØ¯</value>
         <value xml:lang="de">Neue Akteurs-Rolle hinzufÃ¼gen</value>
@@ -13425,6 +13437,9 @@
         <value xml:lang="zh">å¡ä¸åç¼</value>
         <value xml:lang="zh-TW">å¡ä¸åé¦</value>
     </property>
+    <property key="AccountingPreparedBy">
+        <value xml:lang="en">Prepared by</value>
+    </property>
     <property key="AccountingPreviousBankReconciliation">
         <value xml:lang="ar">Ø§ÙØªØ³ÙÙØ© Ø§ÙØ¨ÙÙÙØ© Ø§ÙØ³Ø§Ø¨ÙØ©</value>
         <value xml:lang="de">vorherige Kontenabstimmung</value>
@@ -13815,6 +13830,9 @@
         <value xml:lang="zh">ç¨ç</value>
         <value xml:lang="zh-TW">ç¨ç</value>
     </property>
+    <property key="AccountingReceivedBy">
+        <value xml:lang="en">Received by</value>
+    </property>
     <property key="AccountingReceivePayment">
         <value xml:lang="ar">Ø§Ø³ØªÙØ§Ù Ø¯ÙØ¹Ø©</value>
         <value xml:lang="de">Zahlung erhalten</value>

Modified: ofbiz/branches/release16.11/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1801321&r1=1801320&r2=1801321&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Jul  8 20:34:19 2017
@@ -364,6 +364,11 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="PrintChecks"/>
     </request-map>
+    
+    <request-map uri="InvoiceAcctgTransEntriesPdf">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="InvoiceAcctgTransEntriesPdf"/>
+    </request-map>
 
     <request-map uri="quickSendPayment">
         <security https="true" auth="true"/>
@@ -2621,6 +2626,7 @@ under the License.
     <view-map name="editPaymentApplications" type="screen" page="component://accounting/widget/PaymentScreens.xml#EditPaymentApplications"/>
     <view-map name="ManualTransaction" type="screen" page="component://accounting/widget/PaymentScreens.xml#ManualTransaction"/>
     <view-map name="PrintChecks" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#PrintChecks" content-type="application/pdf" encoding="none"/>
+    <view-map name="InvoiceAcctgTransEntriesPdf" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#InvoiceAcctgTransEntry" content-type="application/pdf" encoding="none"/>
     <view-map name="FindSalesInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/>
     <view-map name="FindPurchaseInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/>
 

Modified: ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml?rev=1801321&r1=1801320&r2=1801321&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml Sat Jul  8 20:34:19 2017
@@ -493,6 +493,21 @@ under the License.
         </section>
     </screen>
 
+    <screen name="InvoiceAcctgTransEntry">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/>
+            </actions>
+            <widgets>
+                <platform-specific>
+                    <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/InvoiceAcctgTransEntry.fo.ftl"/></xsl-fo>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="FindSalesInvoicesByDueDate">
         <section>
             <actions>