From 9a07f31a8c14ba5f7e5baf70e6d298f480e3363f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Dec 2013 17:36:43 +0100 Subject: [PATCH] Doxygen Bad translation --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/langs/en_US/compta.lang | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8030cd86a3d3c..02934e76ed100 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -777,7 +777,7 @@ function dol_strftime($fmt, $ts=false, $is_gmt=false) * Return charset is always UTF-8, except if encodetoouput is defined. In this case charset is output charset * * @param int $time GM Timestamps date - * @param string $format Output date format + * @param string $format Output date format (tag of strftime function) * "%d %b %Y", * "%d/%m/%Y %H:%M", * "%d/%m/%Y %H:%M:%S", diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 1b93b084f10de..139807eaa20db 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -30,7 +30,7 @@ Profit=Profit Balance=Balance Debit=Debit Credit=Credit -Piece=Voucher +Piece=Accounting Doc. Withdrawal=Withdrawal Withdrawals=Withdrawals AmountHTVATRealReceived=Net collected @@ -168,11 +168,11 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. 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 -COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut des achats de marchandises -COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut des ventes de marchandises -COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut des achats de services -COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut des ventes de services -COMPTA_VAT_ACCOUNT=Code comptable par défaut de la TVA collectée -COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut de la TVA déductible +COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT +COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties