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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-08-24 14:48:08 +02:00
commit b6d74be5cd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/list.php
View File

@ -775,7 +775,7 @@ if (!$sall) {
$sql .= ' f.paye, f.fk_statut, f.close_code,';
$sql .= ' f.datec, f.tms, f.date_closing,';
$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht,';
$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
$sql .= ' typent.code,';
@ -1945,7 +1945,7 @@ if ($resql) {
}
// Amount VAT
if (!empty($arrayfields['f.total_tva']['checked'])) {
print '<td class="right nowraponall amount">'.price($obj->total_vat)."</td>\n";
print '<td class="right nowraponall amount">'.price($obj->total_tva)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}

7
htdocs/core/boxes/box_comptes.php
View File

@ -122,7 +122,12 @@ class box_comptes extends ModeleBoxes
$account_static->accountancy_journal = $objp->accountancy_journal;
$solde = $account_static->solde(0);
$solde_total[$objp->currency_code] += $solde;
if (!array_key_exists($objp->currency_code, $solde_total)) {
$solde_total[$objp->currency_code] = $solde;
} else {
$solde_total[$objp->currency_code] += $solde;
}
$this->info_box_contents[$line][] = array(
'td' => '',

1
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -92,6 +92,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$sql .= ", f.tva as total_tva";
$sql .= ", f.total_ttc";
$sql .= ", f.paye, f.fk_statut as status, f.type";
$sql .= ", f.tms";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
if (!$user->rights->societe->client->voir && !$user->socid) {