svn commit: r1858291 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/config
Locked
svn commit: r1858291 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/config
 
|
Author: jleroux
Date: Sat Apr 27 17:56:44 2019 New Revision: 1858291 URL: http://svn.apache.org/viewvc?rev=1858291&view=rev Log: Improved: Use "Create" instead of "Create New" on the various screens of all components (OFBIZ-9905) As the title says + removes now useless labels Thanks: Aayush Jain for report, Sourabh Jain for the fix, Pierre Smits and Rishi Solanki for comments Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BudgetScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGroupScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TaxAuthorityScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/ApScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/InvoiceScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentMenus.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/MyTasks.ftl ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/product/testdef/ProductTest.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityMenus.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/template/task/MyTasks.ftl ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Apr 27 17:56:44 2019 @@ -3651,20 +3651,6 @@ <value xml:lang="zh">为财å¡è´¦æ·æ°å»ºå款åï¼${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="zh-TW">çºè²¡å帳æ¶æ°å»ºå款å®:${finAccount.finAccountName} [${finAccountId}]</value> </property> - <property key="AccountingCreateNewFinAccount"> - <value xml:lang="ar">Ø®ÙÙ Øساب ٠اÙ٠جدÙد</value> - <value xml:lang="de">Neues Finanzkonto erstellen</value> - <value xml:lang="en">Create New Financial Account</value> - <value xml:lang="es">Crear nueva cuenta financiera</value> - <value xml:lang="es-CL">Crear Cuenta Financiera</value> - <value xml:lang="fr">Créer un nouveau compte financier</value> - <value xml:lang="hi-IN">नया वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ बनाà¤à¤</value> - <value xml:lang="ja">æ°è¦éèã¢ã«ã¦ã³ããä½æ</value> - <value xml:lang="pt">Crie uma nova conta financeira</value> - <value xml:lang="vi">Tạo má»i tà i khoản tà i chÃnh</value> - <value xml:lang="zh">æ°å»ºè´¢å¡è´¦ç®</value> - <value xml:lang="zh-TW">æ°å»ºè²¡å帳ç®</value> - </property> <property key="AccountingCreateNewFinAccountReconciliations"> <value xml:lang="ar">Ø®Ù٠تسÙÙات جدÙدة ÙÙØساب اÙ٠اÙÙ</value> <value xml:lang="de">Neue Finanzkonto-Abstimmung erstellen</value> @@ -3697,22 +3683,6 @@ <value xml:lang="zh">æ°å»ºå票</value> <value xml:lang="zh-TW">æ°å»ºç¼ç¥¨</value> </property> - <property key="AccountingCreateNewPaymentGroup"> - <value xml:lang="ar">Ø®Ù٠٠ج٠Ùعة دÙعات جدÙدة</value> - <value xml:lang="cs">Nová platebnà skupina</value> - <value xml:lang="de">Neue Zahlungsgruppe erstellen</value> - <value xml:lang="en">Create New Payment Group</value> - <value xml:lang="es">Crear nuevo grupo de pago</value> - <value xml:lang="es-CL">Crear nuevo Grupo de Pago</value> - <value xml:lang="fr">Créer un groupe de paiement</value> - <value xml:lang="hi-IN">नया à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ बनाà¤à¤</value> - <value xml:lang="ja">æ°è¦æ¯æã°ã«ã¼ããä½æ</value> - <value xml:lang="nl">Nieuwe betalingsgroep</value> - <value xml:lang="pt">Criar um novo grupo de pagamento</value> - <value xml:lang="vi">Tạo má»i nhóm thanh toán</value> - <value xml:lang="zh">æ°å»ºæ¯ä»ç»</value> - <value xml:lang="zh-TW">建ç«æ°çæ¯ä»ç¾¤çµ</value> - </property> <property key="AccountingCreateNewPurchaseInvoice"> <value xml:lang="ar">ÙاتÙرة شراء جدÙدة</value> <value xml:lang="cs">Nová nákupnà faktura</value> @@ -9935,25 +9905,6 @@ <value xml:lang="zh">æ°å»ºè´¦æ·</value> <value xml:lang="zh-TW">æ°å»ºå¸³æ¶</value> </property> - <property key="AccountingNewAgreement"> - <value xml:lang="ar">Ø®Ù٠اتÙاÙÙØ©</value> - <value xml:lang="de">Vereinbarung erstellen</value> - <value xml:lang="en">Create Agreement</value> - <value xml:lang="es">Crear acuerdo</value> - <value xml:lang="es-CL">Crear Contrato</value> - <value xml:lang="fr">Nouvel accord</value> - <value xml:lang="hi-IN">ठनà¥à¤¬à¤à¤§ बनाà¤à¤</value> - <value xml:lang="it">Nuovo contratto</value> - <value xml:lang="ja">æ°è¦å¥ç´</value> - <value xml:lang="nl">Overeenkomst aanmaken</value> - <value xml:lang="pt">Criar Acordo</value> - <value xml:lang="ro">Creaza Contract</value> - <value xml:lang="ru">СоздаÑÑ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ</value> - <value xml:lang="th">สรà¹à¸²à¸à¸ªà¸±à¸à¸à¸²</value> - <value xml:lang="vi">Thêm Bản hợp Äá»ng</value> - <value xml:lang="zh">æ°å»ºåå</value> - <value xml:lang="zh-TW">æ°å»ºåç´</value> - </property> <property key="AccountingNewAgreementItem"> <value xml:lang="ar">Ø®Ù٠بÙد اتÙاÙÙØ©</value> <value xml:lang="de">Vereinbarungsposition erstellen</value> @@ -10044,12 +9995,6 @@ <value xml:lang="zh">æ°å»ºååæ¡ä»¶</value> <value xml:lang="zh-TW">æ°å»ºåç´æ¢ä»¶</value> </property> - <property key="AccountingNewBudget"> - <value xml:lang="de">Neues Budget erstellen</value> - <value xml:lang="en">Create New Budget</value> - <value xml:lang="es">Crear nuevo Presupuesto</value> - <value xml:lang="zh">æ°å»ºé¢ç®</value> - </property> <property key="AccountingNewCompany"> <value xml:lang="de">Neues Buchhaltungs Unternehmen erstellen</value> <value xml:lang="en">Create new accounting company</value> @@ -10075,24 +10020,6 @@ <value xml:lang="zh">æ°å»ºè´¦åè´¦æ·</value> <value xml:lang="zh-TW">æ°å»ºå¸³å®å¸³æ¶</value> </property> - <property key="AccountingNewFixedAsset"> - <value xml:lang="ar">أص٠ثابت جدÙد</value> - <value xml:lang="de">Neue Anlage</value> - <value xml:lang="en">New Fixed Asset</value> - <value xml:lang="es">Nuevo Activo fijo</value> - <value xml:lang="fr">Nouvelle immobilisation</value> - <value xml:lang="hi-IN">नठठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿</value> - <value xml:lang="it">Nuovo Cespite</value> - <value xml:lang="ja">æ°è¦åºå®è³ç£</value> - <value xml:lang="nl">Nieuwe vaste activa</value> - <value xml:lang="pt">Novo Ativo Fixo</value> - <value xml:lang="ro">Nou Mijloc Fix</value> - <value xml:lang="ru">Ðовое оÑновное ÑÑедÑÑво</value> - <value xml:lang="th">à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">Thêm Tà i sản cá» Äá»nh</value> - <value xml:lang="zh">æ°å»ºåºå®èµäº§</value> - <value xml:lang="zh-TW">æ°å»ºåºå®è³ç¢</value> - </property> <property key="AccountingNewFixedAssetIdents"> <value xml:lang="ar">Ø®ÙÙ ÙÙÙØ© ÙÙأص٠اÙثابت</value> <value xml:lang="de">Anlagen-Idenfikation erstellen</value> @@ -10236,25 +10163,6 @@ <value xml:lang="zh">æ°å»ºæ°ä»æ¬¾</value> <value xml:lang="zh-TW">æ°å»ºæ°ä»æ¬¾</value> </property> - <property key="AccountingNewTaxAuthority"> - <value xml:lang="ar">سÙطة ضرÙبÙØ© جدÙدة</value> - <value xml:lang="de">Neue Steuerbehörde</value> - <value xml:lang="en">New Tax Authority</value> - <value xml:lang="es">Nueva Autoridad Fiscal</value> - <value xml:lang="es-CL">Nueva Autoridad Tributaria</value> - <value xml:lang="fr">Créer une administration fiscale</value> - <value xml:lang="hi-IN">नया à¤à¥à¤à¥à¤¸ पà¥à¤°à¤¾à¤§à¤¿à¤à¤°à¤£</value> - <value xml:lang="it">Nuova Autorità Tasse</value> - <value xml:lang="ja">æ°è¦ç¨åæ©é¢</value> - <value xml:lang="nl">Nieuwe belastinginstantie</value> - <value xml:lang="pt">Nova Autoridade Tributária</value> - <value xml:lang="ro">Noua Autoritate Taxa</value> - <value xml:lang="ru">ÐовÑй налоговÑй оÑган</value> - <value xml:lang="th">à¹à¸ªà¸µà¸¢à¸ าษีสำà¸à¸±à¸à¸à¸²à¸à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">Thêm CÆ¡ quan thuế</value> - <value xml:lang="zh">æ°å»ºç¨å¡æºå ³</value> - <value xml:lang="zh-TW">æ°å»ºç¨ åæ©é</value> - </property> <property key="AccountingNewTaxAuthorityPartyInfo"> <value xml:lang="ar">٠عÙÙ٠ات جدÙدة Ùطر٠اÙسÙطة اÙضرÙبÙØ©</value> <value xml:lang="de">Neue Akteursinformation zu Steuerbehörde</value> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml Sat Apr 27 17:56:44 2019 @@ -174,7 +174,7 @@ under the License. </menu> <menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewInvoice}" widget-style="buttontext create"> + <menu-item name="createNew" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create"> <link target="newInvoice"/> </menu-item> <menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}"> @@ -422,7 +422,7 @@ under the License. <actions> <set field="isDisbursement" value="${groovy:if(context.payment != null) return org.apache.ofbiz.accounting.util.UtilAccounting.isDisbursement(context.payment)}"/> </actions> - <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create" > + <menu-item name="createNew" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create" > <condition> <not><if-empty field="payment.paymentId"/></not> </condition> @@ -544,7 +544,7 @@ under the License. <menu name="PaymentGroupSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2"> - <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewPaymentGroup}" widget-style="buttontext create"> + <menu-item name="createNew" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create"> <condition> <not><if-empty field="paymentGroup"/></not> </condition> @@ -1393,7 +1393,7 @@ under the License. </menu-item> </menu> <menu name="FinAccountSubTabBar" menu-container-style="button-bar button-style-2" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}"> + <menu-item name="createNew" title="${uiLabelMap.CommonCreate} ${uiLabelMap.AccountingFinAccount}"> <link target="EditFinAccount"/> </menu-item> <menu-item name="advancedFinAccountSearch" title="${uiLabelMap.CommonAdvancedSearch}"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AgreementScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AgreementScreens.xml Sat Apr 27 17:56:44 2019 @@ -67,7 +67,7 @@ under the License. </section> <label style="h1">${agreement.description} [${agreement.agreementId}] </label> <container style="button-bar"> - <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext create"/> + <link target="EditAgreement" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </widgets> </section> @@ -100,7 +100,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext create"/> + <link target="EditAgreement" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml Sat Apr 27 17:56:44 2019 @@ -52,7 +52,7 @@ under the License. </condition> <widgets> <container style="button-bar"> - <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link target="EditBillingAccount" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> <decorator-section-include name="body"/> </widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BudgetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BudgetScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BudgetScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BudgetScreens.xml Sat Apr 27 17:56:44 2019 @@ -39,7 +39,7 @@ under the License. </condition> <widgets> <container style="button-bar"> - <link target="EditBudget" text="${uiLabelMap.AccountingNewBudget}" style="buttontext create"/> + <link target="EditBudget" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </widgets> </section> @@ -142,7 +142,7 @@ under the License. </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.AccountingNewBudget}"> + <screenlet title="${uiLabelMap.CommonCreate}"> <include-form name="EditBudget" location="component://accounting/widget/BudgetForms.xml"/> </screenlet> </fail-widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml Sat Apr 27 17:56:44 2019 @@ -205,6 +205,7 @@ under the License. <not><if-empty field="organizationPartyId"/></not> </condition> <widgets> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label> <include-menu name="PartyTopTabBar" location="component://accounting/widget/AccountingMenus.xml"/> </widgets> </section> @@ -237,7 +238,6 @@ under the License. <decorator-section name="body"> <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/> <include-menu name="OrganizationAccountingReportsTabBar" location="component://accounting/widget/AccountingMenus.xml"/> - <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label> <decorator-section-include name="body"/> </decorator-section> </decorator-screen> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Apr 27 17:56:44 2019 @@ -59,7 +59,7 @@ under the License. </widgets> </section> <container style="button-bar"> - <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext create"/> + <link target="EditFinAccount" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> <decorator-section-include name="body"/> </decorator-section> @@ -137,7 +137,7 @@ under the License. </screenlet> </widgets> <fail-widgets> - <label style="h1" text="${uiLabelMap.AccountingCreateNewFinAccount}"></label> + <label style="h1" text="${uiLabelMap.CommonCreate}"></label> <screenlet id="CreateFinAccountPanel" collapsible="true"> <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/> </screenlet> @@ -437,7 +437,7 @@ under the License. <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <link target="EditFinAccountTrans" text="${uiLabelMap.CommonCreateNew}" style="buttontext"> + <link target="EditFinAccountTrans" text="${uiLabelMap.CommonCreate}" style="buttontext"> <parameter param-name="finAccountId" from-field="finAccountId"/> </link> <section> @@ -477,7 +477,7 @@ under the License. <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <link target="EditFinAccountTrans" text="${uiLabelMap.CommonCreateNew}" style="buttontext"> + <link target="EditFinAccountTrans" text="${uiLabelMap.CommonCreate}" style="buttontext"> <parameter param-name="finAccountId" from-field="finAccountId"/> </link> <label style="h1" text="${uiLabelMap.AccountingReconcileFinAccountTransFor}"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FixedAssetScreens.xml Sat Apr 27 17:56:44 2019 @@ -40,7 +40,7 @@ under the License. </condition> <widgets> <container style="button-bar"> - <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/> + <link target="EditFixedAsset" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </widgets> </section> @@ -110,7 +110,7 @@ under the License. <label style="h1" text="${uiLabelMap[titleProperty]}"/> </fail-widgets> </section> - <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/></container> + <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.CommonCreate}" style="buttontext create"/></container> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -353,7 +353,7 @@ under the License. <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> <container style="button-bar"> - <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create"> + <link target="EditFixedAssetMaint" text="${uiLabelMap.CommonCreate}" style="buttontext create"> <parameter param-name="fixedAssetId"/> </link> </container> @@ -392,7 +392,7 @@ under the License. </condition> <widgets> <container style="button-bar"> - <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"> + <link target="EditFixedAssetMaint" text="${uiLabelMap.CommonCreate}" style="buttontext"> <parameter param-name="fixedAssetId"/> </link> </container> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGroupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGroupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGroupScreens.xml Sat Apr 27 17:56:44 2019 @@ -39,7 +39,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="EditPaymentGroup" text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext create"/> + <link target="EditPaymentGroup" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml Sat Apr 27 17:56:44 2019 @@ -75,7 +75,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext create"/> + <link target="newPayment" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext search"/> <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext search"/> </container> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TaxAuthorityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Sat Apr 27 17:56:44 2019 @@ -53,7 +53,7 @@ under the License. </condition> <widgets> <include-menu name="TaxAuthorityTabBar" location="component://accounting/widget/TaxAuthorityMenus.xml"/> - <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container> + <container><link target="EditTaxAuthority" text="${uiLabelMap.CommonCreate}" style="buttontext"/></container> <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName} ${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}" [${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo} "${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}] ${${extraFunctionName}}"/> </widgets> </section> @@ -79,7 +79,7 @@ under the License. <decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}"> <decorator-section name="body"> <container style="button-bar"> - <link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext create"/> + <link target="EditTaxAuthority" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> <screenlet title="${uiLabelMap.PageTitleFindTaxAuthority}"> <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/ApScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/ApScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/ApScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/ApScreens.xml Sat Apr 27 17:56:44 2019 @@ -33,7 +33,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="newPayment" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link target="newPayment" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml Sat Apr 27 17:56:44 2019 @@ -126,7 +126,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="editVendor" text="${uiLabelMap.CommonNew} ${uiLabelMap.PartyVendor}" style="buttontext create"/> + <link target="editVendor" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Sat Apr 27 17:56:44 2019 @@ -73,7 +73,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="NewPurchaseInvoice" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/> + <link target="NewPurchaseInvoice" text="${uiLabelMap.CommonCreate}" style="buttontext"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Sat Apr 27 17:56:44 2019 @@ -35,7 +35,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="newPayment" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link target="newPayment" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Sat Apr 27 17:56:44 2019 @@ -78,7 +78,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="newInvoice" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link target="newInvoice" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/config/ContentUiLabels.xml Sat Apr 27 17:56:44 2019 @@ -1156,18 +1156,6 @@ <value xml:lang="zh">æ°å»ºæ ¹åææ档模æ¿</value> <value xml:lang="zh-TW">æ°å»ºæ ¹è¤åæªæ¨¡æ¿</value> </property> - <property key="ContentCreateNewWebSite"> - <value xml:lang="da">Opret ny Webside</value> - <value xml:lang="en">Create New WebSite</value> - <value xml:lang="fr">Créer un nouveau Site Web</value> - <value xml:lang="it">Nuovo sito web</value> - <value xml:lang="ja">æ°è¦Webãµã¤ããä½æ</value> - <value xml:lang="nl">Aanmaken nieuwe website</value> - <value xml:lang="pt">Criar novo site</value> - <value xml:lang="vi">Tạo má»i trang thông tin</value> - <value xml:lang="zh">å建æ°ç½ç«</value> - <value xml:lang="zh-TW">æ°å»ºç¶²ç«</value> - </property> <property key="ContentDataBaseText"> <value xml:lang="da">Database tekst</value> <value xml:lang="en">DataBase Text</value> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml Sat Apr 27 17:56:44 2019 @@ -199,7 +199,7 @@ under the License. </condition> <widgets> <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/> - <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container> + <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreate}" style="buttontext create"/></container> <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}] ${${extraFunctionName}}"/> </widgets> </section> @@ -333,7 +333,7 @@ under the License. </condition> <widgets> <!--<container style="button-bar"> - <link text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/> + <link text="${uiLabelMap.CommonCreate}" target="EditWebSite" style="buttontext create"/> </container>--> <container> <include-menu name="websiteMenu" location="component://content/widget/content/ContentMenus.xml"/> @@ -378,7 +378,7 @@ under the License. </condition> <widgets> <!--<container style="button-bar"> - <link text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/> + <link text="${uiLabelMap.CommonCreate}" target="EditWebSite" style="buttontext create"/> </container>--> <container> <include-menu name="websitePathAliasMenu" location="component://content/widget/content/ContentMenus.xml"/> @@ -413,7 +413,7 @@ under the License. </widgets> </section> <container> - <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"> + <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreate}" style="buttontext"> <parameter param-name="mode" value="add"/> <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/> </link> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/WebSiteScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/WebSiteScreens.xml Sat Apr 27 17:56:44 2019 @@ -37,7 +37,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.PageTitleListWebSite}"> <container style="button-bar"> - <link text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/> + <link text="${uiLabelMap.CommonCreate}" target="EditWebSite" style="buttontext create"/> </container> <include-form name="ListWebSites" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentMenus.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentMenus.xml Sat Apr 27 17:56:44 2019 @@ -125,13 +125,13 @@ under the License. default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> - <menu-item name="NewContent" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="NewContent" title="${uiLabelMap.CommonCreate}"> <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> <link target="EditContent"/> </menu-item> - <menu-item name="NewContentAssoc" title="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentAssociation}"> + <menu-item name="NewContentAssoc" title="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentAssociation}"> <condition> <if-compare field="tabButtonItem" operator="equals" value="association"/> </condition> @@ -276,7 +276,7 @@ under the License. </menu-item> </menu> <menu name="contentMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="EditContent" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create"> + <menu-item name="EditContent" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create"> <link target="EditContent"/> </menu-item> <menu-item name="ContentSearchOptions" title="${uiLabelMap.CommonAdvancedSearch}" widget-style="buttontext"> @@ -287,7 +287,7 @@ under the License. </menu-item> </menu> <menu name="websiteMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="EditWebSite" title="${uiLabelMap.ContentCreateNewWebSite}" widget-style="buttontext create"> + <menu-item name="EditWebSite" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create"> <link target="EditWebSite"/> </menu-item> </menu> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml Sat Apr 27 17:56:44 2019 @@ -43,7 +43,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <!--<link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <!--<link target="EditContent" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> <link target="ContentSearchOptions" text="${uiLabelMap.CommonAdvancedSearch}" style="buttontext"/>--> <include-menu name="contentMenu" location="component://content/widget/content/ContentMenus.xml"/> </container> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Apr 27 17:56:44 2019 @@ -34,7 +34,7 @@ under the License. <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> - <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container> + <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreate}" style="buttontext create"/></container> </decorator-section> <decorator-section name="search-options"> <include-form name="FindDataResource" location="component://content/widget/content/DataResourceForms.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml Sat Apr 27 17:56:44 2019 @@ -94,7 +94,7 @@ under the License. <submit button-type="button"/> </field> <field name="createLink" title=" " widget-style="buttontext" position="1"> - <hyperlink description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER" also-hidden="false"/> + <hyperlink description="${uiLabelMap.CommonCreate}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER" also-hidden="false"/> </field> --> </form> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Sat Apr 27 17:56:44 2019 @@ -39,7 +39,7 @@ under the License. <label style="h1">[${uiLabelMap.CommonId} ${productionRunId}]</label> </container> <container style="button-bar"> - <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/> + <link target="CreateProductionRun" text="${uiLabelMap.CommonCreate}" style="buttontext"/> </container> <decorator-section-include name="body"/> </widgets> @@ -58,7 +58,7 @@ under the License. <widgets> <decorator-screen name="CommonManufacturingDecorator" location="${parameters.commonManufacturingDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.ManufacturingCreateProductionRun}"> + <screenlet title="${uiLabelMap.CommonCreate}"> <include-form name="CreateProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> @@ -691,7 +691,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext create"/> + <link target="CreateProductionRun" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Sat Apr 27 17:56:44 2019 @@ -35,7 +35,7 @@ under the License. <decorator-section name="body"> <container style="no-clear"> <screenlet title="${uiLabelMap.SfaFindOpportunities}"> - <container><link target="EditSalesOpportunity" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> + <container><link target="EditSalesOpportunity" text="${uiLabelMap.CommonCreate}" style="buttontext"/></container> <include-form name="FindSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.SfaFindResults}"> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml Sat Apr 27 17:56:44 2019 @@ -224,7 +224,7 @@ under the License. <menu name="LeadSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2 no-clear"> - <menu-item name="NewLead" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="NewLead" title="${uiLabelMap.CommonCreate}"> <link target="NewLead"/> </menu-item> <menu-item name="NewLeadFromVCard" title="${uiLabelMap.PageTitleCreateLeadFromVCard}"> @@ -296,7 +296,7 @@ under the License. </menu> <menu name="ContactSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2 no-clear"> - <menu-item name="NewContact" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="NewContact" title="${uiLabelMap.CommonCreate}"> <link target="NewContact"/> </menu-item> <menu-item name="NewContactFromVCard" title="${uiLabelMap.SfaCreateContactFromVCard}"> @@ -350,6 +350,6 @@ under the License. </menu> <menu name="EventSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2 no-clear"> - <menu-item name="NewEvent" title="${uiLabelMap.CommonCreateNew}"><link target="EditEvent"/></menu-item> + <menu-item name="NewEvent" title="${uiLabelMap.CommonCreate}"><link target="EditEvent"/></menu-item> </menu> </menus> Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/MyTasks.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/MyTasks.ftl?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/MyTasks.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/MyTasks.ftl Sat Apr 27 17:56:44 2019 @@ -23,7 +23,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.WorkEffortMyCurrentTaskList}</li> - <li><a href="<@ofbizContentUrl>/workeffort/control/EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizContentUrl>">${uiLabelMap.WorkEffortNewTask}</a></li> + <li><a href="<@ofbizContentUrl>/workeffort/control/EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizContentUrl>">${uiLabelMap.CommonCreate}</a></li> </ul> <br class="clear"/> </div> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Apr 27 17:56:44 2019 @@ -327,7 +327,7 @@ </menu> <menu name="AddShipper" menu-container-style="basic-nav"> - <menu-item name="new" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="new" title="${uiLabelMap.CommonCreate}"> <condition> <if-has-permission permission="PARTYMGR" action="_CREATE"/> </condition> @@ -733,7 +733,7 @@ </menu> <menu name="AddRelContactAccounts" menu-container-style="basic-nav"> - <menu-item name="add" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="add" title="${uiLabelMap.CommonCreate}"> <link target="AddPartyRelatedAccount"> <parameter param-name="partyId"/> <parameter param-name="portalPageId"/> @@ -743,7 +743,7 @@ </menu> <menu name="AddRelAccountContacts" menu-container-style="basic-nav"> - <menu-item name="add" title="${uiLabelMap.CommonCreateNew}"> + <menu-item name="add" title="${uiLabelMap.CommonCreate}"> <link target="AddAccountRelatedContact"> <parameter param-name="partyId"/> <parameter param-name="portalPageId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Apr 27 17:56:44 2019 @@ -915,7 +915,7 @@ under the License. <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="button-bar"> - <link target="EditPartyContent" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"> + <link target="EditPartyContent" text="${uiLabelMap.CommonCreate}" style="smallSubmit"> <parameter param-name="partyId"/> </link> </container> @@ -942,7 +942,7 @@ under the License. <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="button-bar"> - <link target="EditPartyContent" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"> + <link target="EditPartyContent" text="${uiLabelMap.CommonCreate}" style="smallSubmit"> <parameter param-name="partyId"/> </link> </container> @@ -1230,7 +1230,7 @@ under the License. </widgets> <fail-widgets> <container style="button-bar"> - <link target="addGeoLocation" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"> + <link target="addGeoLocation" text="${uiLabelMap.CommonCreate}" style="buttontext create"> <parameter param-name="partyId" from-field="parameters.partyId"/> </link> </container> Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml Sat Apr 27 17:56:44 2019 @@ -16575,22 +16575,6 @@ <value xml:lang="zh">æ°å»ºé ç½®é项</value> <value xml:lang="zh-TW">æ°å»ºé ç½®é¸é </value> </property> - <property key="ProductCreateNewFacility"> - <value xml:lang="de">Neue Einrichtung erstellen</value> - <value xml:lang="en">Create New Facility</value> - <value xml:lang="es">Crear nuevo Almacén</value> - <value xml:lang="es-CL">Crear nueva Bodega</value> - <value xml:lang="fr">Création d'un nouveau lieu de stockage</value> - <value xml:lang="it">Nuovo stabilimento</value> - <value xml:lang="ja">æ°è¦æ ç¹ãä½æ</value> - <value xml:lang="nl">Nieuwe faciliteit</value> - <value xml:lang="ro">Creare Nou Compartiment</value> - <value xml:lang="ru">СоздаÑÑ Ð½Ð¾Ð²Ñй обÑекÑ</value> - <value xml:lang="th">สรà¹à¸²à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">Tạo má»i Chi nhánh / CÆ¡ sá»</value> - <value xml:lang="zh">æ°å»ºåºæ</value> - <value xml:lang="zh-TW">æ°å»ºå ´æ</value> - </property> <property key="ProductCreateNewFeature"> <value xml:lang="de">Neues Merkmal erstellen</value> <value xml:lang="en">Create New Feature</value> Modified: ofbiz/ofbiz-framework/trunk/applications/product/testdef/ProductTest.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/testdef/ProductTest.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/testdef/ProductTest.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/testdef/ProductTest.xml Sat Apr 27 17:56:44 2019 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> + <?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Apr 27 17:56:44 2019 @@ -69,7 +69,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link target="EditProductConfigItem" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Apr 27 17:56:44 2019 @@ -228,7 +228,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="/accounting/control/EditAgreement" url-mode="inter-app" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext"> + <link target="/accounting/control/EditAgreement" url-mode="inter-app" text="${uiLabelMap.CommonCreate}" style="buttontext"> <parameter param-name="productId"/> </link> <link target="CreateSalesAgreement" text="${uiLabelMap.CreateSalesAgreement}" style="buttontext"> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityMenus.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityMenus.xml Sat Apr 27 17:56:44 2019 @@ -43,11 +43,11 @@ under the License. </menu> <menu name="FacilityActionBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="createNewFacility" title="${uiLabelMap.ProductCreateNewFacility}"> + <menu-item name="createNewFacility" title="${uiLabelMap.CommonCreate}"> <condition> <if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/> </condition> - <link target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}" style="buttontext create"/> + <link target="EditFacility" text="${uiLabelMap.CommonCreate}" style="buttontext create"/> </menu-item> <menu-item name="calendar" title="${uiLabelMap.CommonViewCalendar}"> <condition> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sat Apr 27 17:56:44 2019 @@ -3461,21 +3461,6 @@ <value xml:lang="zh">æ°éæ±</value> <value xml:lang="zh-TW">æ°éæ±</value> </property> - <property key="WorkEffortNewTask"> - <value xml:lang="de">Neue Aufgabe</value> - <value xml:lang="en">New Task</value> - <value xml:lang="es">Nueva tarea</value> - <value xml:lang="fr">Nouvelle tâche</value> - <value xml:lang="it">Nuovo compito</value> - <value xml:lang="ja">æ°è¦ã¿ã¹ã¯</value> - <value xml:lang="nl">New Task</value> - <value xml:lang="ro">Noua Sarcina</value> - <value xml:lang="ru">Ðовое задание</value> - <value xml:lang="th">ภารà¸à¸´à¸à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">Thêm Tác vụ - Äầu viá»c</value> - <value xml:lang="zh">æ°ä»»å¡</value> - <value xml:lang="zh-TW">æ°ä»»å</value> - </property> <property key="WorkEffortNextDay"> <value xml:lang="de">Nächster Tag</value> <value xml:lang="en">Next Day</value> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/template/task/MyTasks.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/template/task/MyTasks.ftl?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/template/task/MyTasks.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/template/task/MyTasks.ftl Sat Apr 27 17:56:44 2019 @@ -18,7 +18,7 @@ under the License. --> <h1>${uiLabelMap.PageTitleViewActivityAndTaskList}</h1> <div class="button-bar"> - <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="buttontext create">${uiLabelMap.WorkEffortNewTask}</a> + <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="buttontext create">${uiLabelMap.CommonCreate}</a> </div> <h2>${uiLabelMap.WorkEffortAssignedTasks}</h2> <br /> Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml Sat Apr 27 17:56:44 2019 @@ -2516,28 +2516,6 @@ <value xml:lang="zh-CN">å建</value> <value xml:lang="zh-TW">æ°å»º</value> </property> - <property key="CommonCreateNew"> - <value xml:lang="ar">استØداث جدÙد</value> - <value xml:lang="cs">Založit nový</value> - <value xml:lang="de">Neu Anlegen</value> - <value xml:lang="en">Create New</value> - <value xml:lang="es">Crear nuevo</value> - <value xml:lang="es-CL">Crear Nuevo</value> - <value xml:lang="fr">Nouveau</value> - <value xml:lang="hi-IN">नया बनाà¤à¤</value> - <value xml:lang="it">Creare nuovo</value> - <value xml:lang="ja">æ°è¦ä½æ</value> - <value xml:lang="nl">Nieuwe aanvraag</value> - <value xml:lang="pt">Criar Novo</value> - <value xml:lang="pt-BR">Criar um Novo</value> - <value xml:lang="ro">Creare Nou</value> - <value xml:lang="ru">СоздаÑÑ Ð½Ð¾Ð²Ñй</value> - <value xml:lang="th">สรà¹à¸²à¸à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">Tạo má»i</value> - <value xml:lang="zh">æ°å»º</value> - <value xml:lang="zh-CN">å建æ°ç</value> - <value xml:lang="zh-TW">æ°å»º</value> - </property> <property key="CommonCreated"> <value xml:lang="ar">استØدث</value> <value xml:lang="cs">VytvoÅeno</value> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml Sat Apr 27 17:56:44 2019 @@ -271,7 +271,7 @@ under the License. <label text="${uiLabelMap.PageTitleFindSecurityGroup}"/> </container> <container style="button-bar"> - <link target="CreateNewSecurityGroup" style="buttontext create" text="${uiLabelMap.CommonCreateNew}"/> + <link target="CreateNewSecurityGroup" style="buttontext create" text="${uiLabelMap.CommonCreate}"/> </container> <screenlet> <include-form name="ListSecurityGroups" location="component://common/widget/SecurityForms.xml"/> @@ -298,7 +298,7 @@ under the License. <label text="${uiLabelMap.FindUserLogin}"/> </container> <container style="button-bar"> - <link target="createnewlogin" style="buttontext create" text="${uiLabelMap.CommonCreateNew}"/> + <link target="createnewlogin" style="buttontext create" text="${uiLabelMap.CommonCreate}"/> </container> <screenlet> <include-form name="ListUserLogins" location="component://common/widget/SecurityForms.xml"/> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml?rev=1858291&r1=1858290&r2=1858291&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml Sat Apr 27 17:56:44 2019 @@ -216,7 +216,7 @@ under the License. <link target="ViewRelations" text="${uiLabelMap.WebtoolsViewRelations}"> <parameter param-name="entityName"/> </link> - <link target="ViewGeneric" text="${uiLabelMap.CommonCreateNew}" style="create"> + <link target="ViewGeneric" text="${uiLabelMap.CommonCreate}" style="create"> <parameter param-name="entityName"/> <parameter param-name="enableEdit" value="true"/> </link> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |