From da3bc3868d535c393390b1d55386592fbf8ec35b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 11:46:21 +0100 Subject: [PATCH] Fixed: Duplicated lang key --- htdocs/admin/compta.php | 3 ++- htdocs/langs/en_US/compta.lang | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 610bf371f29fe..b5aed0c683e09 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -31,6 +31,7 @@ $langs->load('admin'); $langs->load('compta'); +$langs->load('accountancy'); if (!$user->admin) accessforbidden(); @@ -153,7 +154,7 @@ print ''; // Param - $libelle = $langs->trans($key); + $libelle = $langs->trans($key); print ''; // Value diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 770cb6d25bf60..89a32876dc3af 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties