diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 692d70f4b68..44225dfca6b 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -644,8 +644,8 @@ if ($action == 'create') { print_liste_field_titre("AccountAccountingShort"); print_liste_field_titre("SubledgerAccount"); print_liste_field_titre("LabelOperation"); - print_liste_field_titre("Debit", "", "", "", "", 'class="right"'); - print_liste_field_titre("Credit", "", "", "", "", 'class="right"'); + print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"'); + print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"'); if (empty($object->date_validation)) { print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center '); } else { diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 1f4580787da..f0e95c3efb7 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -192,8 +192,8 @@ $arrayfields = array( 't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1), 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1), 't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1), - 't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1), - 't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1), + 't.debit'=>array('label'=>$langs->trans("AccountingDebit"), 'checked'=>1), + 't.credit'=>array('label'=>$langs->trans("AccountingCredit"), 'checked'=>1), 't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1), 't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0), 't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0), diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 0ec1a0b1090..06a84af4a97 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -163,8 +163,8 @@ $arrayfields = array( 't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1), 't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1), 't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1), - 't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1), - 't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1), + 't.debit'=>array('label'=>$langs->trans("AccountingDebit"), 'checked'=>1), + 't.credit'=>array('label'=>$langs->trans("AccountingCredit"), 'checked'=>1), 't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1), 't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1), 't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")), diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index ca6ea8cd5e5..4accf66e154 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -987,8 +987,8 @@ class AccountingJournal extends CommonObject $langs->transnoentitiesnoconv("LedgerAccount"), $langs->transnoentitiesnoconv("SubledgerAccount"), $langs->transnoentitiesnoconv("Label"), - $langs->transnoentitiesnoconv("Debit"), - $langs->transnoentitiesnoconv("Credit"), + $langs->transnoentitiesnoconv("AccountingDebit"), + $langs->transnoentitiesnoconv("AccountingCredit"), $langs->transnoentitiesnoconv("Journal"), $langs->transnoentitiesnoconv("Note"), ); @@ -998,8 +998,8 @@ class AccountingJournal extends CommonObject $langs->transnoentitiesnoconv("Piece"), $langs->transnoentitiesnoconv("AccountAccounting"), $langs->transnoentitiesnoconv("LabelOperation"), - $langs->transnoentitiesnoconv("Debit"), - $langs->transnoentitiesnoconv("Credit"), + $langs->transnoentitiesnoconv("AccountingDebit"), + $langs->transnoentitiesnoconv("AccountingCredit"), ); } elseif ($this->nature == 1) { $header = array( @@ -1007,8 +1007,8 @@ class AccountingJournal extends CommonObject $langs->transnoentitiesnoconv("Piece"), $langs->transnoentitiesnoconv("AccountAccounting"), $langs->transnoentitiesnoconv("LabelOperation"), - $langs->transnoentitiesnoconv("Debit"), - $langs->transnoentitiesnoconv("Credit"), + $langs->transnoentitiesnoconv("AccountingDebit"), + $langs->transnoentitiesnoconv("AccountingCredit"), ); } diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 3a2f4c40750..407dbc1aa53 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -912,8 +912,8 @@ if ($action == 'exportcsv') { // ISO and not UTF8 ! print '"'.$langs->transnoentitiesnoconv("LedgerAccount").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("SubledgerAccount").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("Label").'"'.$sep; - print '"'.$langs->transnoentitiesnoconv("Debit").'"'.$sep; - print '"'.$langs->transnoentitiesnoconv("Credit").'"'.$sep; + print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep; + print '"'.$langs->transnoentitiesnoconv("AccountingCredit").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("Journal").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep; print "\n"; @@ -1136,8 +1136,8 @@ if (empty($action) || $action == 'view') { print "".$langs->trans("SubledgerAccount").""; print "".$langs->trans("LabelOperation").""; print ''.$langs->trans("PaymentMode").""; - print ''.$langs->trans("Debit").""; - print ''.$langs->trans("Credit").""; + print ''.$langs->trans("AccountingDebit").""; + print ''.$langs->trans("AccountingCredit").""; print "\n"; $r = ''; diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index 68e7ebda6ae..ffffc21a9f9 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -445,8 +445,8 @@ if ($action == 'exportcsv') { // ISO and not UTF8 ! print '"'.$langs->transnoentitiesnoconv("Piece").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("AccountAccounting").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("LabelOperation").'"'.$sep; - print '"'.$langs->transnoentitiesnoconv("Debit").'"'.$sep; - print '"'.$langs->transnoentitiesnoconv("Credit").'"'.$sep; + print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep; + print '"'.$langs->transnoentitiesnoconv("AccountingCredit").'"'.$sep; print "\n"; foreach ($taber as $key => $val) { @@ -569,8 +569,8 @@ if (empty($action) || $action == 'view') { print "".$langs->trans("AccountAccounting").""; print "".$langs->trans("SubledgerAccount").""; print "".$langs->trans("LabelOperation").""; - print ''.$langs->trans("Debit").""; - print ''.$langs->trans("Credit").""; + print ''.$langs->trans("AccountingDebit").""; + print ''.$langs->trans("AccountingCredit").""; print "\n"; $r = ''; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 248b0e41267..a5b82e7b2d0 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -833,8 +833,8 @@ if (empty($action) || $action == 'view') { print "".$langs->trans("AccountAccounting").""; print "".$langs->trans("SubledgerAccount").""; print "".$langs->trans("LabelOperation").""; - print ''.$langs->trans("Debit").""; - print ''.$langs->trans("Credit").""; + print ''.$langs->trans("AccountingDebit").""; + print ''.$langs->trans("AccountingCredit").""; print "\n"; $r = ''; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 624b5a22335..0519762baef 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -776,8 +776,8 @@ if (empty($action) || $action == 'view') { print "".$langs->trans("AccountAccounting").""; print "".$langs->trans("SubledgerAccount").""; print "".$langs->trans("LabelOperation").""; - print ''.$langs->trans("Debit").""; - print ''.$langs->trans("Credit").""; + print ''.$langs->trans("AccountingDebit").""; + print ''.$langs->trans("AccountingCredit").""; print "\n"; $r = ''; diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php index b58953043ff..cf652a29345 100644 --- a/htdocs/accountancy/journal/variousjournal.php +++ b/htdocs/accountancy/journal/variousjournal.php @@ -286,8 +286,8 @@ print '' . $langs->trans("AccountAccounting") . ''; print '' . $langs->trans("SubledgerAccount") . ''; print '' . $langs->trans("LabelOperation") . ''; if ($object->nature == 4) print '' . $langs->trans("PaymentMode") . ''; // bank -print '' . $langs->trans("Debit") . ''; -print '' . $langs->trans("Credit") . ''; +print '' . $langs->trans("AccountingDebit") . ''; +print '' . $langs->trans("AccountingCredit") . ''; print "\n"; if (is_array($journal_data) && !empty($journal_data)) { diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index e71a85004d1..dee5d8d628e 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -198,7 +198,9 @@ print ""; print "".$langs->trans("Date").""; print "".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")"; print "".$langs->trans("Account").""; -print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; +print "".$langs->trans("Type").""; +print "".$langs->trans("AccountingDebit").""; +print "".$langs->trans("AccountingCredit").""; print "\n"; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 0fc5a192271..c3846280ee3 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -242,7 +242,9 @@ print ''; //print "".$langs->trans("JournalNum").""; print ''.$langs->trans('Date').''.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')'; print ''.$langs->trans('Account').''; -print ''.$langs->trans('Type').''.$langs->trans('Debit').''.$langs->trans('Credit').''; +print ''.$langs->trans('Type').''; +print ''.$langs->trans('AccountingDebit').''; +print ''.$langs->trans('AccountingCredit').''; print "\n"; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index eb76b7a7af7..5fdf7220662 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -1166,7 +1166,7 @@ if ($modecompta == 'BOOKKEEPING') { } print ''; print ' '; - print "".$langs->trans("Debit")."\n"; + print "".$langs->trans("AccountingDebit")."\n"; print ''; if ($modecompta == 'CREANCES-DETTES') { print ''.price(-$obj->amount).''; @@ -1185,7 +1185,7 @@ if ($modecompta == 'BOOKKEEPING') { $total_ttc_income += $obj->amount; } print ' '; - print "".$langs->trans("Credit")."\n"; + print "".$langs->trans("AccountingCredit")."\n"; print ''; if ($modecompta == 'CREANCES-DETTES') { print ''.price($obj->amount).''; diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 82ef7f0be9a..4b623231511 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -29,6 +29,8 @@ BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit +AccountingDebit=Debit +AccountingCredit=Credit Piece=Accounting Doc. AmountHTVATRealReceived=Net collected AmountHTVATRealPaid=Net paid