svn commit: r1128623 - in /ofbiz/trunk/applications: accounting/config/AccountingUiLabels.xml accounting/widget/AccountingMenus.xml accounting/widget/InvoiceScreens.xml humanres/widget/CommonScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1128623 - in /ofbiz/trunk/applications: accounting/config/AccountingUiLabels.xml accounting/widget/AccountingMenus.xml accounting/widget/InvoiceScreens.xml humanres/widget/CommonScreens.xml

mrisaliti
Author: mrisaliti
Date: Sat May 28 12:24:25 2011
New Revision: 1128623

URL: http://svn.apache.org/viewvc?rev=1128623&view=rev
Log:
accounting has dependency on projectmgr (OFBIZ-3564)

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1128623&r1=1128622&r2=1128623&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat May 28 12:24:25 2011
@@ -6390,6 +6390,10 @@
         <value xml:lang="zh">销售发票</value>
         <value xml:lang="zh_TW">銷售發票</value>
     </property>
+    <property key="AccountingInvoiceSaveAsTemplate">
+        <value xml:lang="en">Save Invoice As Template</value>
+        <value xml:lang="it">Salva fattura come template</value>
+    </property>
     <property key="AccountingInvoiceStatusHistory">
         <value xml:lang="ar">سوابق الوضعيات</value>
         <value xml:lang="de">Statusverlauf</value>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1128623&r1=1128622&r2=1128623&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Sat May 28 12:24:25 2011
@@ -312,7 +312,7 @@ under the License.
                 <parameter param-name="statusId" value="INVOICE_CANCELLED"/>
             </link>
         </menu-item>
-        <menu-item name="saveInvoiceAsTemplate" title="${uiLabelMap.ProjectMgrSaveAsTemplate}">
+        <menu-item name="saveInvoiceAsTemplate" title="${uiLabelMap.AccountingInvoiceSaveAsTemplate}">
             <condition>
                 <and>
                    <not><if-empty field="invoice.invoiceId"/></not>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1128623&r1=1128622&r2=1128623&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat May 28 12:24:25 2011
@@ -26,7 +26,7 @@ under the License.
     <screen name="CommonInvoiceDecorator">
         <section>
             <actions>
-                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="headerItem" value="invoices"/>
             </actions>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1128623&r1=1128622&r2=1128623&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat May 28 12:24:25 2011
@@ -29,7 +29,6 @@ under the License.
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.HumanResCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.HumanResCompanySubtitle" global="true"/>
                 <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,