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

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

Browse Source 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/notify/card.php
This commit is contained in:
Laurent Destailleur 2021-02-07 20:16:13 +01:00
commit 8bda726619
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/fourn/facture/list.php
View File

@ -498,6 +498,7 @@ if ($search_all || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_P
if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
// We'll need this table joined to the select in order to filter by sale
if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if ($search_user > 0)

10
htdocs/societe/consumption.php
View File

@ -433,15 +433,15 @@ if ($sql_select)
// Status
print '<td class="center">';
if ($type_element == 'contract')
{
print $documentstaticline->getLibStatut(2);
if ($type_element == 'contract') {
print $documentstaticline->getLibStatut(5);
} else {
print $documentstatic->getLibStatut(2);
print $documentstatic->getLibStatut(5);
}
print '</td>';
print '<td>';
// Label
print '<td class="tdoverflowmax300">';
// Define text, description and type
$text = ''; $description = ''; $type = 0;