lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Duplicated lang key

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-14 11:46:21 +01:00
parent 627e344c78
commit da3bc3868d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/compta.php
View File

@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
$langs->load('admin'); $langs->load('admin');
$langs->load('compta'); $langs->load('compta');
$langs->load('accountancy');
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
@ -153,7 +154,7 @@ foreach ($list as $key)
print '<tr '.$bc[$var].' class="value">'; print '<tr '.$bc[$var].' class="value">';
// Param // Param
$libelle = $langs->trans($key); $libelle = $langs->trans($key);
print '<td><label for="'.$key.'">'.$libelle.'</label></td>'; print '<td><label for="'.$key.'">'.$libelle.'</label></td>';
// Value // Value

4
htdocs/langs/en_US/compta.lang
View File

@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module). TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=Calculation mode CalculationMode=Calculation mode
AccountancyJournal=Accountancy code journal 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_ACCOUNT=Default accountancy code for collecting VAT
ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties