commit
f93e899c0f
@ -122,7 +122,12 @@ class box_comptes extends ModeleBoxes
|
|||||||
$account_static->accountancy_journal = $objp->accountancy_journal;
|
$account_static->accountancy_journal = $objp->accountancy_journal;
|
||||||
$solde = $account_static->solde(0);
|
$solde = $account_static->solde(0);
|
||||||
|
|
||||||
|
if (!array_key_exists($objp->currency_code, $solde_total)) {
|
||||||
|
$solde_total[$objp->currency_code] = $solde;
|
||||||
|
} else {
|
||||||
$solde_total[$objp->currency_code] += $solde;
|
$solde_total[$objp->currency_code] += $solde;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => '',
|
'td' => '',
|
||||||
|
|||||||
@ -92,6 +92,7 @@ class box_factures_fourn_imp extends ModeleBoxes
|
|||||||
$sql .= ", f.tva as total_tva";
|
$sql .= ", f.tva as total_tva";
|
||||||
$sql .= ", f.total_ttc";
|
$sql .= ", f.total_ttc";
|
||||||
$sql .= ", f.paye, f.fk_statut as status, f.type";
|
$sql .= ", f.paye, f.fk_statut as status, f.type";
|
||||||
|
$sql .= ", f.tms";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
|
||||||
$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
|
$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
|
||||||
if (!$user->rights->societe->client->voir && !$user->socid) {
|
if (!$user->rights->societe->client->voir && !$user->socid) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user