Commit ba292a41fd8c5183f4d3b17f0992a88e4a90c2d5

Authored by Darkjeff
1 parent 065a478c
Exists in 3.5 and in 1 other branch 3.6

bug sales ventilation

ajout du filtre par plan comptable
Showing 1 changed file with 2 additions and 5 deletions   Show diff stats
accountingex/customer/liste.php
... ... @@ -152,7 +152,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product
152 152 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountancy_code_sell = aa.account_number";
153 153 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
154 154 $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation = 0";
155   -//$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL)";
  155 +$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
156 156 if (! empty($conf->multicompany->enabled)) {
157 157 $sql .= " AND f.entity = '" . $conf->entity . "'";
158 158 }
... ... @@ -254,10 +254,7 @@ $objp->code_sell2 = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf
254 254 print price($objp->total_ht);
255 255 print '</td>';
256 256  
257   - print '<td align="right">';
258   - print $objp->type;
259   - print '</td>';
260   -
  257 +
261 258 print '<td align="center" style="' . $code_sell_notset . '">';
262 259 print $objp->code_sell2;
263 260 print '</td>';
... ...