Re: svn commit: r1752972 - in /ofbiz/trunk/applications: accounting/config/AccountingUiLabels.xml order/template/return/QuickReturn.ftl party/template/party/EditGiftCard.ftl party/template/party/profileblocks/PaymentMethods.ftl

Mon, 18 Jul 2016 13:15:40 -0700 

At least, AccountingCreateNewCreditCard was used in ReturnForms.xml

Jacques


Le 18/07/2016 à 21:45, Michael Brohl a écrit :

HI Vikas,

the comments in Jira https://issues.apache.org/jira/browse/OFBIZ-7707 say that 
these labels are obsolete, have you checked this?

Regards,

Michael Brohl
ecomify GmbH
www.ecomify.de


Am 18.07.16 um 20:24 schrieb Vikas Mayur:

Just for a cosmetic and trivial (JIRA issue indicates that) change loosing
the translation to 15 odd languages, is it desirable? It might be years
effort to have the label defined in those languages.


Regards
Vikas

On Sat, Jul 16, 2016 at 9:22 AM, <[email protected]> wrote:


Author: pranayp
Date: Sat Jul 16 14:22:18 2016
New Revision: 1752972

URL: http://svn.apache.org/viewvc?rev=1752972&view=rev
Log:
[OFBIZ-7707] Improved payment method information UI on party profile
screen for creating new payment methods. Thanks Chandan Khandelwal for the
contribution.

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/order/template/return/QuickReturn.ftl
ofbiz/trunk/applications/party/template/party/EditGiftCard.ftl

ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1752972&r1=1752971&r2=1752972&view=diff

==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
(original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat
Jul 16 14:22:18 2016
@@ -3555,6 +3555,18 @@
          <value xml:lang="zh">æ–°å»ºæˆ æœ¬ç»„ä»¶è®¡ç®—</value>
          <value xml:lang="zh-TW">æ–°å»ºæˆ æœ¬å…ƒä»¶è¨ˆç®—</value>
      </property>
+    <property key="AccountingCreateCreditCard">
+        <value xml:lang="en">Create Credit Card</value>
+        <value xml:lang="hi-IN">कॠरेडिट कारॠड
बनाठठ</value>
+    </property>
+    <property key="AccountingCreateEftAccount">
+        <value xml:lang="en">Create EFT Account</value>
+        <value xml:lang="hi-IN">ईठफ़टी(EFT) खाता
बनाठठ</value>
+    </property>
+    <property key="AccountingCreateGiftCard">
+        <value xml:lang="en">Create Gift Card</value>
+        <value xml:lang="hi-IN">उपहार कारॠड
बनाठठ</value>
+    </property>
      <property key="AccountingCreateFixedAssetMaintOrderPermissionError">
          <value xml:lang="de">Berechtigungsfehler: Um
'createFixedAssetMaintOrder' auszuführen muss man ACCOUNTING_CREATEUPDATE
or ACCOUNTING_ADMIN Berechtigungen haben</value>
          <value xml:lang="en">Security Error: to run
createFixedAssetMaintOrder you must have the ACCOUNTING_CREATEUPDATE or
ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_CREATE
permission</value>
@@ -3570,25 +3582,6 @@
          <value xml:lang="zh">å®‰å…¨é”™è¯¯ï¼šè¦ è¿
è¡Œæ–°å»ºå›ºå®šèµ„äº§ç»´ä¿®ä¿ å…»è®¢å
•(createFixedAssetMaintOrder)ï¼Œä½ 
必须有ACCOUNTING_CREATEUPDATE或ACCOUNTING_ADMINæ
ƒé™ ï¼Œæˆ–è€…å —é™ åˆ¶çš„ACCOUNTING_ROLE_CREATEæ ƒé™ </value>
          <value xml:lang="zh-TW">安全錯誤:è¦
執行新建固定資產維修ä¿
養訂單(createFixedAssetMaintOrder),ä½ å¿…é 
ˆæœ‰ACCOUNTING_CREATEUPDATE或ACCOUNTING_ADMIN權é™
,æˆ–è€…å —é™ åˆ¶çš„ACCOUNTING_ROLE_CREATEæ¬Šé™ </value>
      </property>
-    <property key="AccountingCreateNewCreditCard">
-        <value xml:lang="ar">خلق بطاقة ائتمان
جديدة</value>
-        <value xml:lang="de">Neue Kreditkarte erstellen</value>
-        <value xml:lang="en">Create New Credit Card</value>
-        <value xml:lang="es">Crear nueva tarjeta de crédito</value>
-        <value xml:lang="fr">Enregistrer une nouvelle carte de
crédit</value>
-        <value xml:lang="hi-IN">नया कॠरेडिट
कारॠड बनाठठ</value>
-        <value xml:lang="it">Creare Nuova Carta Credito</value>
-        <value xml:lang="ja">æ–°è¦ ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚«ãƒ¼ãƒ‰ã‚’ä½œæˆ
</value>
-        <value xml:lang="nl">Nieuwe kredietkaart aanmaken</value>
-        <value xml:lang="pt-BR">Criar Novo Cartão de Crédito</value>
-        <value xml:lang="pt-PT">&gt;Criar Novo Cartão de Crédito</value>
-        <value xml:lang="ro">Creaza Noua Carte de Credit</value>
-        <value xml:lang="ru">Создать новую кредитную
карту</value>
-        <value
xml:lang="th">สร้างบัตรเครดิตใหม่</value>
-        <value xml:lang="vi">Thêm mới Thẻ tín dụng</value>
-        <value xml:lang="zh">åˆ›å»ºæ–°ä¿¡ç”¨å ¡</value>
-        <value xml:lang="zh-TW">æ–°å»ºæ–°ä¿¡ç”¨å ¡</value>
-    </property>
      <property key="AccountingCreateNewDepositPayment">
          <value xml:lang="ar">خلق د٠عة ايداع جديدة</value>
          <value xml:lang="de">Neue Einzahlung</value>
@@ -3637,25 +3630,6 @@
          <value xml:lang="zh">为财务账户新建存款å
•ï¼š${finAccount.finAccountName} [${finAccountId}]</value>
          <value
xml:lang="zh-TW">為財務帳戶新建存款單:${finAccount.finAccountName}
[${finAccountId}]</value>
      </property>
-    <property key="AccountingCreateNewEftAccount">
-        <value xml:lang="ar">خلق حساب EFT جديد</value>
-        <value xml:lang="de">Neue Bankverbindung erstellen</value>
-        <value xml:lang="en">Create New EFT Account</value>
-        <value xml:lang="es">Crear una nueva cuenta EFT</value>
-        <value xml:lang="fr">Enregistrer un nouveau compte de virement
électronique</value>
-        <value xml:lang="hi-IN">नया  ईठफ़टी(EFT)
खाता बनाठठ</value>
-        <value xml:lang="it">Creare Nuovo Conto EFT</value>
-        <value xml:lang="ja">æ–°è¦ é›»å­ å
–引(EFT)ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ä½œæˆ </value>
-        <value xml:lang="nl">Nieuwe bankrekening aanmaken</value>
-        <value xml:lang="pt-BR">Criar Nova Conta EFT</value>
-        <value xml:lang="pt-PT">&gt;Criar Nova Conta EFT</value>
-        <value xml:lang="ro">Creaza un Cont nou EFT</value>
-        <value xml:lang="ru">Создать новый банковÑ
кий Ñ Ñ‡ÐµÑ‚</value>
-        <value xml:lang="th">สร้างบัà¸
ชีธนาคารใหม่</value>
-        <value xml:lang="vi">Tạo mới tà i khoản EFT</value>
-        <value xml:lang="zh">åˆ›å»ºæ–°ç”µå­ èµ„é‡‘è½¬è´¦</value>
-        <value xml:lang="zh-TW">æ–°å»ºæ–°é›»å­ è³‡é‡‘è½‰å¸³</value>
-    </property>
      <property key="AccountingCreateNewFinAccount">
          <value xml:lang="ar">خلق حساب مالي جديد</value>
          <value xml:lang="de">Neues Finanzkonto erstellen</value>
@@ -3679,24 +3653,6 @@
          <value xml:lang="zh">新建财务账目对账</value>
          <value xml:lang="zh-TW">æ–°å»ºè²¡å‹™å¸³ç›®å° å¸³</value>
      </property>
-    <property key="AccountingCreateNewGiftCard">
-        <value xml:lang="ar">خلق بطاقة هدية جديدة</value>
-        <value xml:lang="de">Neuen Gutschein erstellen</value>
-        <value xml:lang="en">Create New Gift Card</value>
-        <value xml:lang="es">Crear nuevo certificado de regalo</value>
-        <value xml:lang="fr">Créer une nouvelle carte cadeau</value>
-        <value xml:lang="hi-IN">नया उपहार कारà¥
ड बनाठठ</value>
-        <value xml:lang="it">Creare Nuova Carta Omaggio</value>
-        <value xml:lang="ja">æ–°è¦ ã‚®ãƒ•ãƒˆã‚«ãƒ¼ãƒ‰ã‚’ä½œæˆ </value>
-        <value xml:lang="nl">Nieuwe cadeaubon aanmaken</value>
-        <value xml:lang="pt">Criar Novo Cartão de Presente</value>
-        <value xml:lang="ro">Creare Noua Carte Omagiu</value>
-        <value xml:lang="ru">Создать новую диÑ
контную карту</value>
-        <value
xml:lang="th">สร้างบัตรของขวัà¸
ใหม่</value>
-        <value xml:lang="vi">Tạo mới thẻ quà tặng</value>
-        <value xml:lang="zh">æ–°å»ºç¤¼å“ å ¡</value>
-        <value xml:lang="zh-TW">æ–°å»ºç¦®ç‰©å ¡</value>
-    </property>
      <property key="AccountingCreateNewInvoice">
          <value xml:lang="ar">خلق ٠اتورة جديدة</value>
          <value xml:lang="cs">Nová faktura</value>

Modified: ofbiz/trunk/applications/order/template/return/QuickReturn.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/QuickReturn.ftl?rev=1752972&r1=1752971&r2=1752972&view=diff

==============================================================================
--- ofbiz/trunk/applications/order/template/return/QuickReturn.ftl
(original)
+++ ofbiz/trunk/applications/order/template/return/QuickReturn.ftl Sat Jul
16 14:22:18 2016
@@ -61,7 +61,7 @@ under the License.
                  <input type='text' size='20' name='paymentMethodId' />
                </#if>
                <#if (party.partyId)?has_content>
-                <a
href="/partymgr/control/editcreditcard?partyId=${party.partyId}${StringUtil.wrapString(externalKeyParam)}"
target="partymgr"
class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a>
+                <a
href="/partymgr/control/editcreditcard?partyId=${party.partyId}${StringUtil.wrapString(externalKeyParam)}"
target="partymgr"
class="smallSubmit">${uiLabelMap.AccountingCreateCreditCard}</a>
                </#if>
              </td></tr>
            </table>

Modified: ofbiz/trunk/applications/party/template/party/EditGiftCard.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/EditGiftCard.ftl?rev=1752972&r1=1752971&r2=1752972&view=diff

==============================================================================
--- ofbiz/trunk/applications/party/template/party/EditGiftCard.ftl
(original)
+++ ofbiz/trunk/applications/party/template/party/EditGiftCard.ftl Sat Jul
16 14:22:18 2016
@@ -21,7 +21,7 @@ under the License.
  <div class="screenlet">
    <div class="screenlet-title-bar">
      <#if !giftCard??>
- <h3>${uiLabelMap.AccountingCreateNewGiftCard}</h3>
+ <h3>${uiLabelMap.AccountingCreateGiftCard}</h3>
      <#else>
<h3>${uiLabelMap.AccountingEditGiftCard}</h3>
      </#if>
@@ -101,4 +101,4 @@ under the License.
        </div>
    </div>
  </div>
-<!-- end EditGiftCard.ftl -->
\ No newline at end of file
+<!-- end EditGiftCard.ftl -->

Modified:
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl?rev=1752972&r1=1752971&r2=1752972&view=diff 

==============================================================================
---
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
(original)
+++
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
Sat Jul 16 14:22:18 2016
@@ -37,11 +37,11 @@ under the License.
    <div id="partyPaymentMethod" class="screenlet">
      <div class="screenlet-title-bar">
        <ul>
-        <li class="h3">${uiLabelMap.PartyPaymentMethodInformation}</li>
+        <li class="h3">${uiLabelMap.AccountingPaymentMethod}</li>
          <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)
|| security.hasEntityPermission("ACCOUNTING", "_CREATE", session)>
-          <li><a
href="<@ofbizUrl>editeftaccount?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
-          <li><a
href="<@ofbizUrl>editgiftcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
-          <li><a
href="<@ofbizUrl>editcreditcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
+          <li><a
href="<@ofbizUrl>editeftaccount?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateEftAccount}</a></li>
+          <li><a
href="<@ofbizUrl>editgiftcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateGiftCard}</a></li>
+          <li><a
href="<@ofbizUrl>editcreditcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateCreditCard}</a></li>
            <li><a
href="<@ofbizUrl>EditBillingAccount?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateBillingAccount}</a></li>
          </#if>
        </ul>

Reply via email to