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

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

Browse Source 
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
This commit is contained in:
Laurent Destailleur 2021-05-11 20:17:15 +02:00
commit 3683461c40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/societe/consumption.php
View File

@ -227,7 +227,7 @@ if ($type_element == 'propal')
$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid; $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
$where .= " AND d.fk_propal = c.rowid"; $where .= " AND d.fk_propal = c.rowid";
$where .= " AND c.entity = ".$conf->entity; $where .= " AND c.entity = ".$conf->entity;
$datePrint = 'c.datep'; $dateprint = 'c.datep';
$doc_number = 'c.ref'; $doc_number = 'c.ref';
$thirdTypeSelect = 'customer'; $thirdTypeSelect = 'customer';
} }