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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-28 21:48:02 +02:00
commit 70efaa4235
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/facture/list.php
View File

@ -558,7 +558,8 @@ if (!$sall)
$sql .= ' typent.code,'; $sql .= ' typent.code,';
$sql .= ' state.code_departement, state.nom,'; $sql .= ' state.code_departement, state.nom,';
$sql .= ' country.code,'; $sql .= ' country.code,';
$sql .= " p.rowid, p.ref, p.title"; $sql .= " p.rowid, p.ref, p.title,";
$sql .= " u.login";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc"; if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields // Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]['label'])) {

1
htdocs/compta/sociales/list.php
View File

@ -152,6 +152,7 @@ if ($search_typeid) {
$sql .= " AND cs.fk_type=".$db->escape($search_typeid); $sql .= " AND cs.fk_type=".$db->escape($search_typeid);
} }
$sql .= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle"; $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title";
$sql .= $db->order($sortfield, $sortorder); $sql .= $db->order($sortfield, $sortorder);
$totalnboflines = 0; $totalnboflines = 0;

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

@ -407,7 +407,8 @@ if (!$search_all)
$sql .= " typent.code,"; $sql .= " typent.code,";
$sql .= " state.code_departement, state.nom,"; $sql .= " state.code_departement, state.nom,";
$sql .= ' country.code,'; $sql .= ' country.code,';
$sql .= " p.rowid, p.ref, p.title"; $sql .= " p.rowid, p.ref, p.title,";
$sql .= " u.login";
if (!empty($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
//prevent error with sql_mode=only_full_group_by //prevent error with sql_mode=only_full_group_by

1
htdocs/langs/en_US/errors.lang
View File

@ -36,6 +36,7 @@ ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
ErrorSupplierCodeRequired=Vendor code required ErrorSupplierCodeRequired=Vendor code required
ErrorSupplierCodeAlreadyUsed=Vendor code already used ErrorSupplierCodeAlreadyUsed=Vendor code already used
ErrorBadParameters=Bad parameters ErrorBadParameters=Bad parameters
ErrorWrongParameters=Wrong or missing parameters
ErrorBadValueForParameter=Wrong value '%s' for parameter '%s' ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
ErrorBadDateFormat=Value '%s' has wrong date format ErrorBadDateFormat=Value '%s' has wrong date format