From ffaf7068d5d452c6bf282e3f3e3c03570b244851 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Wed, 24 Jun 2020 14:03:16 +0200 Subject: [PATCH 1/5] FIX: SQL Problem in customer invoice list --- htdocs/compta/facture/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 6bb3e0cc5ca..128e0502344 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -558,7 +558,8 @@ if (!$sall) $sql .= ' typent.code,'; $sql .= ' state.code_departement, state.nom,'; $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"; // Add fields from extrafields if (!empty($extrafields->attributes[$object->table_element]['label'])) { From 62f55b85497ec3dc0f899c644db5fddcdb4e2a57 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 25 Jun 2020 20:43:41 +0200 Subject: [PATCH 2/5] FIX: SQL Problem in supplier invoice list --- htdocs/fourn/facture/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 164255d4a61..0ebfd024658 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -407,7 +407,8 @@ if (!$search_all) $sql .= " typent.code,"; $sql .= " state.code_departement, state.nom,"; $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'])) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { //prevent error with sql_mode=only_full_group_by From 0c60c9fd0d9294badb7b06e2dc17fbbe89d01fc5 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 25 Jun 2020 20:53:03 +0200 Subject: [PATCH 3/5] FIX: SQL Problem in social contribution list --- htdocs/compta/sociales/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index 9d210c23d85..b249ed035ed 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -152,6 +152,7 @@ if ($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"; +if (!empty($conf->projet->enabled)) $sql .= ", p.rowid"; $sql .= $db->order($sortfield, $sortorder); $totalnboflines = 0; From f4494db73fb12fd064dd01a6b4897b1758ff532d Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Fri, 26 Jun 2020 17:34:11 +0200 Subject: [PATCH 4/5] Fix missing translate key --- htdocs/langs/en_US/errors.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 520519c3439..75a12d517d0 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -36,6 +36,7 @@ ErrorBadSupplierCodeSyntax=Bad syntax for vendor code ErrorSupplierCodeRequired=Vendor code required ErrorSupplierCodeAlreadyUsed=Vendor code already used ErrorBadParameters=Bad parameters +ErrorWrongParameters=Wrong or missing parameters 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) ErrorBadDateFormat=Value '%s' has wrong date format From a11f7d107000863c519b5d6a74dd844f8af341a3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Jun 2020 21:11:25 +0200 Subject: [PATCH 5/5] Update list.php --- htdocs/compta/sociales/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index b249ed035ed..8ccd8aa35aa 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -152,7 +152,7 @@ if ($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"; -if (!empty($conf->projet->enabled)) $sql .= ", p.rowid"; +if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title"; $sql .= $db->order($sortfield, $sortorder); $totalnboflines = 0;