Merge remote-tracking branch 'origin/3.7' into develop

htdocs/admin/compta.php

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

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 <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
 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