Skip to content
Snippets Groups Projects
Commit a6867fef authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

parents 5afc509d dfae42cd
No related branches found
No related tags found
No related merge requests found
......@@ -117,7 +117,7 @@ if ($user->rights->fournisseur->facture->lire)
if ($search_ref)
{
$sql .= " AND f.rowid LIKE '%".$search_ref."%'";
$sql .= " AND f.ref LIKE '%".$search_ref."%'";
}
if ($search_ref_supplier)
{
......@@ -241,7 +241,7 @@ if ($user->rights->fournisseur->facture->lire)
print $facturestatic->getNomUrl(1);
print "</td>\n";
print '<td class="nowrap">'.dol_trunc($objp->ref_supplier,12)."</td>\n";
print '<td class="nowrap">'.dol_trunc($objp->ref_supplier,12).'</td>';
print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day');
......@@ -258,7 +258,7 @@ if ($user->rights->fournisseur->facture->lire)
print "<td align=\"right\">".price($objp->total_ttc)."</td>";
print "<td align=\"right\">".price($objp->am)."</td>";
// Affiche statut de la facture
// Show invoice status
print '<td align="right" class="nowrap">';
print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am);
print '</td>';
......
......@@ -101,6 +101,8 @@ UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT' WHERE name = 'COMPT
UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_SOLD_ACCOUNT';
UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_BUY_ACCOUNT' WHERE name = 'COMPTA_SERVICE_BUY_ACCOUNT';
UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT' WHERE name = 'COMPTA_SERVICE_SOLD_ACCOUNT';
UPDATE llx_const SET name = 'ACCOUNTING_VAT_ACCOUNT' WHERE name = 'COMPTA_VAT_ACCOUNT';
UPDATE llx_const SET name = 'ACCOUNTING_VAT_BUY_ACCOUNT' WHERE name = 'COMPTA_VAT_BUY_ACCOUNT';
-- Compatibility with module Accounting Expert
UPDATE llx_const SET name = 'ACCOUNTING_SEPARATORCSV' WHERE name = 'ACCOUNTINGEX_SEPARATORCSV';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment