From cbb6e4effe97e8b408ce6060a657f37d974cf490 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 22 Oct 2020 19:32:32 +0200 Subject: [PATCH 1/5] FIX sql syntax error --- htdocs/compta/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index cdf5a0e62c4..31352ee1bc9 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -163,7 +163,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) $sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, "; $sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur"; - $sql .= ", cc.rowid as country_id, cc.code as country_code"; + $sql .= ", cc.rowid, cc.code"; // Add Group from hooks $parameters = array(); From f3848dac1e7c55e85af8528f30cbd978d6664843 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 22 Oct 2020 20:06:56 +0200 Subject: [PATCH 2/5] FIX lang to #15055 --- htdocs/langs/en_US/companies.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 98dc451b5bb..ba0246ca45d 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -461,3 +461,4 @@ InEEC=Europe (EEC) RestOfEurope=Rest of Europe (EEC) OutOfEurope=Out of Europe (EEC) CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. From 36ad3bfbc9bcf1d455d664e6723389add0c3bb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 22 Oct 2020 21:11:49 +0200 Subject: [PATCH 3/5] Update product.class.php --- htdocs/product/class/product.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 2427ac74714..ccb81ad03bc 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -14,7 +14,7 @@ * Copyright (C) 2014 Ion agorria * Copyright (C) 2016-2018 Ferran Marcet * Copyright (C) 2017 Gustavo Novaro - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019-2020 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2441,6 +2441,7 @@ class Product extends CommonObject $sql .= " WHERE "; $sql .= " b.entity IN (".getEntity('bom').")"; $sql .= " AND b.fk_product =".$this->id; + $sql .= " GROUP BY b.rowid"; $result = $this->db->query($sql); if ($result) { From 02403ba640af44a44d4196a633b8a5fb43eff205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 22 Oct 2020 21:29:33 +0200 Subject: [PATCH 4/5] add type --- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/line.php | 2 +- htdocs/compta/prelevement/rejets.php | 2 +- htdocs/compta/prelevement/stats.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 7783edd4673..cd426e98f2e 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -151,7 +151,7 @@ if ($prev_id > 0 || $ref) } -$rej = new RejetPrelevement($db, $user); +$rej = new RejetPrelevement($db, $user, $type); /* * List errors diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index f827eb39322..28e189aab4f 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -158,7 +158,7 @@ if ($id) if ($lipre->statut == 3) { - $rej = new RejetPrelevement($db, $user); + $rej = new RejetPrelevement($db, $user, $type); $resf = $rej->fetch($lipre->id); if ($resf == 0) { diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index da2420aed3f..8a16f4ecb76 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -65,7 +65,7 @@ llxHeader('', $title); if ($sortorder == "") $sortorder = "DESC"; if ($sortfield == "") $sortfield = "p.datec"; -$rej = new RejetPrelevement($db, $user); +$rej = new RejetPrelevement($db, $user, $type); $line = new LignePrelevement($db); $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist')); diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 1d6e1c2a183..c046f2f278e 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -214,7 +214,7 @@ if ($resql) print '%'.$langs->trans("Amount").'%'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; - $Rejet = new RejetPrelevement($db, $user); + $Rejet = new RejetPrelevement($db, $user, $type); while ($i < $num) { From f4b42234ece9643cb272b5f002b80968357295f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 22 Oct 2020 21:32:12 +0200 Subject: [PATCH 5/5] add space --- htdocs/compta/prelevement/line.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 28e189aab4f..f46d4b0c2f8 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -95,7 +95,7 @@ if ($action == 'confirm_rejet') if ($lipre->fetch($id) == 0) { - $rej = new RejetPrelevement($db, $user,$type); + $rej = new RejetPrelevement($db, $user, $type); $rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));