diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index efdde08cd29..5286e000387 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -180,6 +180,12 @@ if ($action == 'update') {
$error++;
}
+ $constname = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT';
+ $constvalue = GETPOSTINT($constname);
+ if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
+
$constname = 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT';
$constvalue = GETPOSTINT($constname);
if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -342,6 +348,18 @@ print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_CUS
print '';
print '';
+// customer deposit account for VAT
+print '
';
+// Param
+print '| ';
+print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT');
+print ' | ';
+// Value
+print ''; // Do not force class=right, or it align also the content of the select box
+print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT'), 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT', 1, [], 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+print ' | ';
+print '
';
+
if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') {
print '';
print '| ' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . ' | ';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 68ab1e4ee95..47698f9b1a5 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -93,8 +93,16 @@ $tabwarranty = array();
$tabttc = array();
$tablocaltax1 = array();
$tablocaltax2 = array();
+$tabCustomerDiscountHT = array();
+$tabCustomerDiscountVAT = array();
+$tabCustomerDiscountTTC = array();
+
+$manageCustomerDepositInInvoice = getDolGlobalInt('ACCOUNTING_MANAGE_CUSTOMER_DEPOSIT_IN_INVOICE');
+$labelCustomerDiscountExtension = ' (AC)';
$cptcli = 'NotDefined';
+$accountCustomerDeposit = getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT', 'NotDefined');
+$accountCustomerDepositVAT = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT', 'NotDefined');
/*
* Actions
@@ -204,6 +212,9 @@ if ($in_bookkeeping == 'notyet') {
$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')"; // Useless, we save one line for all products with same account
}
+if ($manageCustomerDepositInInvoice) {
+ $sql .= " AND (fd.description != '(DEPOSIT)' OR COALESCE(fd.fk_remise_except, 0) = 0)";
+}
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
@@ -222,6 +233,9 @@ $tablocaltax1 = array();
$tablocaltax2 = array();
$tabcompany = array();
$vatdata_cache = array();
+$tabCustomerDiscountHT = array();
+$tabCustomerDiscountVAT = array();
+$tabCustomerDiscountTTC = array();
// Variables
$cptcli = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER', 'NotDefined');
@@ -273,7 +287,12 @@ if ($result) {
$vatdata = getTaxesFromId($tax_id, $buyer, $seller, 0);
$vatdata_cache[$vatdata_cache_key] = $vatdata;
}
- $compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+ if (!empty(length_accountg($accountCustomerDepositVAT)) && $accountCustomerDepositVAT != 'NotDefined' && $obj->type == Facture::TYPE_DEPOSIT) {
+ // customer deposit account for VAT
+ $compta_tva = $accountCustomerDepositVAT;
+ } else {
+ $compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+ }
$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cptlocaltax1);
$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cptlocaltax2);
@@ -309,6 +328,41 @@ if ($result) {
$revenuestamp = (float) price2num($obj->revenuestamp, 'MT');
+ if ($manageCustomerDepositInInvoice && $obj->type == Facture::TYPE_STANDARD && !isset($tabfac[$obj->rowid])) {
+ // Get all linked invoice deposit consumed by this invoice
+ $sql2 = "SELECT re.rowid";
+ $sql2 .= " FROM " . $db->prefix() . "societe_remise_except as re";
+ $sql2 .= " WHERE (re.fk_facture = " . ((int) $obj->rowid);
+ $sql2 .= " OR re.fk_facture_line IN (SELECT rowid FROM " . $db->prefix() . "facturedet WHERE fk_facture = " . ((int) $obj->rowid) . ")";
+ $sql2 .= ")";
+
+ $resql2 = $db->query($sql2);
+ if ($resql2) {
+ if ($db->num_rows($resql2) > 0) {
+ if (!isset($tabCustomerDiscountHT[$obj->rowid][$accountCustomerDeposit])) {
+ $tabCustomerDiscountHT[$obj->rowid][$accountCustomerDeposit] = 0;
+ }
+ if (!isset($tabCustomerDiscountVAT[$obj->rowid][$accountCustomerDepositVAT])) {
+ $tabCustomerDiscountVAT[$obj->rowid][$accountCustomerDepositVAT] = 0;
+ }
+ if (!isset($tabCustomerDiscountTTC[$obj->rowid][$compta_soc])) {
+ $tabCustomerDiscountTTC[$obj->rowid][$compta_soc] = 0;
+ }
+
+ while ($obj2 = $db->fetch_object($resql2)) {
+ $customerDiscount = new DiscountAbsolute($db);
+ $customerDiscount->fetch($obj2->rowid);
+ $tabCustomerDiscountHT[$obj->rowid][$accountCustomerDeposit] = -$customerDiscount->total_ht;
+ $tabCustomerDiscountVAT[$obj->rowid][$accountCustomerDepositVAT] = -$customerDiscount->total_tva;
+ $tabCustomerDiscountTTC[$obj->rowid][$compta_soc] = -$customerDiscount->total_ttc;
+ }
+ }
+ $db->free($resql2);
+ } else {
+ dol_syslog(__FUNCTION__ . ' Error :' . $db->lasterror(), LOG_ERR);
+ }
+ }
+
// Invoice lines
$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
$tabfac[$obj->rowid]["datereg"] = $db->jdate($obj->dlr);
@@ -882,6 +936,196 @@ if ($action == 'writebookkeeping' && !$error && $user->hasRight('accounting', 'b
}
}
+ if ($manageCustomerDepositInInvoice) {
+ // customer discount consumed TTC amount (like Third-party section)
+ if (!$errorforline && isset($tabCustomerDiscountTTC[$key])) {
+ foreach ($tabCustomerDiscountTTC[$key] as $k => $mt) {
+ $bookkeeping = new BookKeeping($db);
+ $bookkeeping->doc_date = $val["date"];
+ $bookkeeping->date_lim_reglement = $val["datereg"];
+ $bookkeeping->doc_ref = $val["ref"];
+ $bookkeeping->date_creation = $now;
+ $bookkeeping->doc_type = 'customer_invoice';
+ $bookkeeping->fk_doc = $key;
+ $bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+ $bookkeeping->thirdparty_code = $companystatic->code_client;
+
+ $bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+ $bookkeeping->subledger_label = $tabcompany[$key]['name'];
+
+ $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
+
+ $bookkeeping->label_compte = $accountingaccountcustomer->label;
+
+ $bookkeeping->label_operation = $bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $langs->trans("SubledgerAccount") . $labelCustomerDiscountExtension);
+ $bookkeeping->montant = $mt;
+ $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+ $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+ $bookkeeping->credit = ($mt < 0) ? -$mt : 0;
+ $bookkeeping->code_journal = $journal;
+ $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+ $bookkeeping->fk_user_author = $user->id;
+ $bookkeeping->entity = $conf->entity;
+
+ $totaldebit += $bookkeeping->debit;
+ $totalcredit += $bookkeeping->credit;
+
+ $result = $bookkeeping->create($user);
+ if ($result < 0) {
+ if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') { // Already exists
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'alreadyjournalized';
+ } else {
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'other';
+ setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+ }
+ } else {
+ if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
+ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+ $lettering_static = new Lettering($db);
+
+ $nb_lettering = $lettering_static->bookkeepingLettering(array($bookkeeping->id));
+ }
+ }
+ }
+ }
+
+ // customer discount consumed HT (like Product / Service section)
+ if (!$errorforline && isset($tabCustomerDiscountHT[$key])) {
+ foreach ($tabCustomerDiscountHT[$key] as $k => $mt) {
+ if (empty($conf->cache['accountingaccountincurrententity'][$k])) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch(0, $k, true);
+ $conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount;
+ } else {
+ $accountingaccount = $conf->cache['accountingaccountincurrententity'][$k];
+ }
+
+ $label_account = $accountingaccount->label;
+
+ // get compte id and label
+ if ($accountingaccount->id > 0) {
+ $bookkeeping = new BookKeeping($db);
+ $bookkeeping->doc_date = $val["date"];
+ $bookkeeping->date_lim_reglement = $val["datereg"];
+ $bookkeeping->doc_ref = $val["ref"];
+ $bookkeeping->date_creation = $now;
+ $bookkeeping->doc_type = 'customer_invoice';
+ $bookkeeping->fk_doc = $key;
+ $bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+ $bookkeeping->thirdparty_code = $companystatic->code_client;
+
+ if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
+ if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+ $bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+ $bookkeeping->subledger_label = $tabcompany[$key]['name'];
+ } else {
+ $bookkeeping->subledger_account = '';
+ $bookkeeping->subledger_label = '';
+ }
+ } else {
+ $bookkeeping->subledger_account = '';
+ $bookkeeping->subledger_label = '';
+ }
+
+ $bookkeeping->numero_compte = $k;
+ $bookkeeping->label_compte = $label_account;
+
+ $bookkeeping->label_operation = $bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $label_account) . $labelCustomerDiscountExtension;
+ $bookkeeping->montant = $mt;
+ $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+ $bookkeeping->debit = ($mt < 0) ? -$mt : 0;
+ $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+ $bookkeeping->code_journal = $journal;
+ $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+ $bookkeeping->fk_user_author = $user->id;
+ $bookkeeping->entity = $conf->entity;
+
+ $totaldebit += $bookkeeping->debit;
+ $totalcredit += $bookkeeping->credit;
+
+ $result = $bookkeeping->create($user);
+ if ($result < 0) {
+ if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') { // Already exists
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'alreadyjournalized';
+ } else {
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'other';
+ setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+ }
+ }
+ }
+ }
+ }
+
+ // customer discount consumed VAT amount (like VAT section)
+ if (!$errorforline && isset($tabCustomerDiscountVAT[$key])) {
+ foreach ($tabCustomerDiscountVAT[$key] as $k => $mt) {
+ if (empty($conf->cache['accountingaccountincurrententity_vat'][$k])) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch(0, $k, true);
+ $conf->cache['accountingaccountincurrententity_vat'][$k] = $accountingaccount;
+ } else {
+ $accountingaccount = $conf->cache['accountingaccountincurrententity_vat'][$k];
+ }
+
+ $label_account = $accountingaccount->label;
+
+ $bookkeeping = new BookKeeping($db);
+ $bookkeeping->doc_date = $val["date"];
+ $bookkeeping->date_lim_reglement = $val["datereg"];
+ $bookkeeping->doc_ref = $val["ref"];
+ $bookkeeping->date_creation = $now;
+ $bookkeeping->doc_type = 'customer_invoice';
+ $bookkeeping->fk_doc = $key;
+ $bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+ $bookkeeping->thirdparty_code = $companystatic->code_client;
+
+ $bookkeeping->subledger_account = '';
+ $bookkeeping->subledger_label = '';
+
+ $bookkeeping->numero_compte = $k;
+ $bookkeeping->label_compte = $label_account;
+
+ $tmpvatrate = (empty($def_tva[$key][$k]) ? (empty($arrayofvat[$key][$k]) ? '' : $arrayofvat[$key][$k]) : implode(', ', $def_tva[$key][$k]));
+ $labelvataccount = $langs->trans("Taxes") . ' ' . $tmpvatrate . ' %';
+ $bookkeeping->label_operation = $bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $labelvataccount) . $labelCustomerDiscountExtension;
+
+ $bookkeeping->montant = $mt;
+ $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+ $bookkeeping->debit = ($mt < 0) ? -$mt : 0;
+ $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+ $bookkeeping->code_journal = $journal;
+ $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+ $bookkeeping->fk_user_author = $user->id;
+ $bookkeeping->entity = $conf->entity;
+
+ $totaldebit += $bookkeeping->debit;
+ $totalcredit += $bookkeeping->credit;
+
+ $result = $bookkeeping->create($user);
+ if ($result < 0) {
+ if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') { // Already exists
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'alreadyjournalized';
+ } else {
+ $error++;
+ $errorforline++;
+ $errorforinvoice[$key] = 'other';
+ setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+ }
+ }
+ }
+ }
+ }
+
// Protection against a bug on lines before
if (!$errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))) {
$error++;
@@ -1092,6 +1336,73 @@ if ($action == 'exportcsv' && !$error) { // ISO and not UTF8 !
//}
}
}
+
+ if ($manageCustomerDepositInInvoice) {
+ // customer discount consumed TTC amount (like Third-party section)
+ if (isset($tabCustomerDiscountTTC[$key])) {
+ foreach ($tabCustomerDiscountTTC[$key] as $k => $mt) {
+ //if ($mt) {
+ print '"' . $key . '"' . $sep;
+ print '"' . $date . '"' . $sep;
+ print '"' . $val["ref"] . '"' . $sep;
+ print '"' . csvClean(dol_trunc($companystatic->name, 32)) . '"' . $sep;
+ print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+ print '"' . length_accountg($companystatic->accountancy_code_customer_general) . '"' . $sep;
+ print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+ print '"' . $langs->trans("ThirdParty") . '"' . $sep;
+ print '"' . csvClean($bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $langs->trans("ThirdParty")) . $labelCustomerDiscountExtension) . '"' . $sep;
+ print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+ print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+ print '"' . $journal . '"';
+ print "\n";
+ //}
+ }
+ }
+
+ // customer discount consumed HT (like Product / Service section)
+ if (isset($tabCustomerDiscountHT[$key])) {
+ foreach ($tabCustomerDiscountHT[$key] as $k => $mt) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch(0, $k, true);
+ //if ($mt) {
+ print '"' . $key . '"' . $sep;
+ print '"' . $date . '"' . $sep;
+ print '"' . $val["ref"] . '"' . $sep;
+ print '"' . csvClean(dol_trunc($companystatic->name, 32)) . '"' . $sep;
+ print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+ print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+ print '""' . $sep;
+ print '"' . csvClean(dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
+ print '"' . csvClean($bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $accountingaccount->label) . $labelCustomerDiscountExtension) . '"' . $sep;
+ print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+ print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+ print '"' . $journal . '"';
+ print "\n";
+ //}
+ }
+ }
+
+ // customer discount consumed VAT amount (like VAT section)
+ if (isset($tabCustomerDiscountVAT[$key])) {
+ foreach ($tabCustomerDiscountVAT[$key] as $k => $mt) {
+ if ($mt) {
+ print '"' . $key . '"' . $sep;
+ print '"' . $date . '"' . $sep;
+ print '"' . $val["ref"] . '"' . $sep;
+ print '"' . csvClean(dol_trunc($companystatic->name, 32)) . '"' . $sep;
+ print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+ print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+ print '""' . $sep;
+ print '"' . $langs->trans("VAT") . ' - ' . implode(', ', $def_tva[$key][$k]) . ' %"' . $sep;
+ print '"' . csvClean($bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $langs->trans("VAT") . implode($def_tva[$key][$k]) . ' %' . ($numtax ? ' - Localtax ' . $numtax : '')) . $labelCustomerDiscountExtension) . '"' . $sep;
+ print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+ print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+ print '"' . $journal . '"';
+ print "\n";
+ }
+ }
+ }
+ }
}
}
@@ -1450,6 +1761,117 @@ if (empty($action) || $action == 'view') {
print "
";
}
}
+
+ if ($manageCustomerDepositInInvoice) {
+ // customer discount consumed TTC amount (like Third-party section)
+ if (isset($tabCustomerDiscountTTC[$key])) {
+ foreach ($tabCustomerDiscountTTC[$key] as $k => $mt) {
+ print '';
+ print "";
+ print "| " . $date . " | ";
+ print "" . $invoicestatic->getNomUrl(1) . " | ";
+ // Account
+ print "";
+ $accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'));
+ if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+ print '' . $langs->trans("MainAccountForCustomersNotDefined") . '';
+ } else {
+ print $accountoshow;
+ }
+ print ' | ';
+ // Subledger account
+ print "";
+ $accountoshow = length_accounta($k);
+ if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+ print '' . $langs->trans("ThirdpartyAccountNotDefined") . '';
+ } else {
+ print $accountoshow;
+ }
+ print ' | ';
+ print "" . $bookkeepingstatic->accountingLabelForOperation($companystatic->getNomUrl(0, 'customer'), $invoicestatic->ref, $langs->trans("SubledgerAccount") . $labelCustomerDiscountExtension, 1) . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(-$mt) : '') . " | ";
+ print "
";
+
+ $i++;
+ }
+ }
+
+ // customer discount consumed HT (like Product / Service section)
+ if (isset($tabCustomerDiscountHT[$key])) {
+ foreach ($tabCustomerDiscountHT[$key] as $k => $mt) {
+ if (empty($conf->cache['accountingaccountincurrententity'][$k])) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch(0, $k, true);
+ $conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount;
+ } else {
+ $accountingaccount = $conf->cache['accountingaccountincurrententity'][$k];
+ }
+
+ print '';
+ print "";
+ print "| " . $date . " | ";
+ print "" . $invoicestatic->getNomUrl(1) . " | ";
+ // Account
+ print "";
+ $accountoshow = length_accountg($k);
+ if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+ print '' . $langs->trans("ProductNotDefined") . '';
+ } else {
+ print $accountoshow;
+ }
+ print " | ";
+ // Subledger account
+ print "";
+ if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
+ if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+ print length_accounta($tabcompany[$key]['code_compta']);
+ }
+ } elseif (($accountoshow == "") || $accountoshow == 'NotDefined') {
+ print '' . $langs->trans("ThirdpartyAccountNotDefined") . '';
+ }
+ print ' | ';
+ $companystatic->id = $tabcompany[$key]['id'];
+ $companystatic->name = $tabcompany[$key]['name'];
+ print "" . $bookkeepingstatic->accountingLabelForOperation($companystatic->getNomUrl(0, 'customer'), $invoicestatic->ref, $accountingaccount->label, 1) . $labelCustomerDiscountExtension . " | ";
+ print '' . ($mt < 0 ? price(-$mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print "
";
+
+ $i++;
+ }
+ }
+
+ // customer discount consumed VAT amount (like VAT section)
+ if (isset($tabCustomerDiscountVAT[$key])) {
+ foreach ($tabCustomerDiscountVAT[$key] as $k => $mt) {
+ print '';
+ print "";
+ print "| " . $date . " | ";
+ print "" . $invoicestatic->getNomUrl(1) . " | ";
+ // Account
+ print "";
+ $accountoshow = length_accountg($k);
+ if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+ print '' . $langs->trans("VATAccountNotDefined") . ' (' . $langs->trans("AccountingJournalType2") . ')';
+ } else {
+ print $accountoshow;
+ }
+ print " | ";
+ // Subledger account
+ print "";
+ print ' | ';
+ $tmpvatrate = (empty($def_tva[$key][$k]) ? '' : implode(', ', $def_tva[$key][$k]));
+ $labelvatrate = $langs->trans("Taxes") . ' ' . $tmpvatrate . ' %';
+ print "" . $bookkeepingstatic->accountingLabelForOperation($companystatic->getNomUrl(0, 'customer'), $invoicestatic->ref, $labelvatrate, 1) . $labelCustomerDiscountExtension . " | ";
+ print '' . ($mt < 0 ? price(-$mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print "
";
+
+ $i++;
+ }
+ }
+ }
}
if (!$i) {
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3a0f07d1184..2e468b8789b 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -202,6 +202,7 @@ DiscountReceived=Discount received
DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT=Account (from the Chart Of Account) to be used as the default account for VAT on customer deposit used in bindings
UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register supplier deposit
UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 9b66ec840f1..b1626b93428 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -202,6 +202,7 @@ DiscountReceived=Escompte reçu
DONATION_ACCOUNTINGACCOUNT=Compte comptable pour la comptabilisation des dons
ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable par défaut pour les adhésions des adhérents (si l'adhésion est enregistrée sans facture)
ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable par défaut pour enregistrer les acomptes client
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT_FOR_VAT=Compte comptable par défaut pour la TVA sur les acomptes à utiliser dans les liaisons
UseAuxiliaryAccountOnCustomerDeposit=Utiliser le compte comptable auxiliaire client dans le grand livre auxiliaire pour les lignes d'acomptes clients (si désactivé, le compte comptable auxiliaire pour les lignes d'acompte restera vide)
ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte comptable par défaut pour enregistrer l'acompte fournisseur
UseAuxiliaryAccountOnSupplierDeposit=Utiliser le compte comptable auxiliaire fournisseur dans le grand livre auxiliaire pour les lignes d'acomptes fournisseurs (si désactivé, le compte comptable auxiliaire pour les lignes d'acompte restera vide)