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

Merge remote-tracking branch 'origin/3.7' into 3.8

Browse Source 
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
This commit is contained in:
Laurent Destailleur 2015-11-02 19:25:51 +01:00
commit d8796e4cc7
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/commande/orderstoinvoice.php
View File

@ -44,7 +44,7 @@ $langs->load('orders');
$langs->load('deliveries'); $langs->load('deliveries');
$langs->load('companies'); $langs->load('companies');
if (! $user->rights->facture->creer) if (! $user->rights->fournisseur->facture->creer)
accessforbidden(); accessforbidden();
$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility $id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility

3
htdocs/product/stats/commande_fournisseur.php
View File

@ -134,7 +134,8 @@ if ($id > 0 || ! empty($ref)) {
print '</div>'; print '</div>';
if ($user->rights->fournisseur->commande->lire) { if ($user->rights->fournisseur->commande->lire)
{
$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,"; $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
$sql .= " c.rowid, d.total_ht as total_ht, c.ref,"; $sql .= " c.rowid, d.total_ht as total_ht, c.ref,";
$sql .= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.rowid, d.qty"; $sql .= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.rowid, d.qty";

3
htdocs/product/stats/propal.php
View File

@ -126,7 +126,8 @@ if ($id > 0 || ! empty($ref))
print '</div>'; print '</div>';
if ($user->rights->propale->lire) { if ($user->rights->propale->lire)
{
$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,"; $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
$sql .= " p.ref_client,"; $sql .= " p.ref_client,";
$sql .= "p.datep, p.fk_statut as statut, d.rowid, d.qty"; $sql .= "p.datep, p.fk_statut as statut, d.rowid, d.qty";