From a814e02d5349528199fc7c0f41209e60352b8394 Mon Sep 17 00:00:00 2001 From: gauthier Date: Fri, 21 Oct 2016 12:40:19 +0200 Subject: [PATCH 1/4] FIX : margin tab on customer card must filter on current entity invoices --- htdocs/margin/tabs/thirdpartyMargins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 0a0239f0bf2..48d230070c9 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -152,7 +152,7 @@ if ($socid > 0) $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.fk_statut > 0"; - $sql.= " AND s.entity = ".$conf->entity; + $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND d.fk_facture = f.rowid"; $sql.= " AND f.fk_soc = $socid"; $sql.= " AND d.buy_price_ht IS NOT NULL"; From 2a4517e1bcd8f9830eec9b562b61a2e74cd16966 Mon Sep 17 00:00:00 2001 From: Sergio Sanchis Climent Date: Mon, 24 Oct 2016 19:21:41 +0200 Subject: [PATCH 2/4] FIX: #5907 --- htdocs/langs/en_US/main.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index aaa1085e377..25095ce0a9e 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -576,6 +576,7 @@ MailSentBy=Email sent by TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send Ack. by email NoEMail=No email +Email=Email NoMobilePhone=No mobile phone Owner=Owner DetectedVersion=Detected version From be493fcf09747b37c69c9124736e025c727904de Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 28 Oct 2016 10:16:58 +0200 Subject: [PATCH 3/4] Fix bad parameter in hook call --- htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 16338efc225..bb9d4b1be1e 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -211,7 +211,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $hookmanager->initHooks(array('pdfgeneration')); $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs); global $action; - $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $nblignes = count($object->lines); From 3dbab863a77dc8b78ea876d8ebcdf4f0300853ef Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 28 Oct 2016 10:24:31 +0200 Subject: [PATCH 4/4] Fix : vars were not set after commande function --- htdocs/fourn/class/fournisseur.commande.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 523f89862c8..c5020e8fa33 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -950,6 +950,8 @@ class CommandeFournisseur extends CommonOrder { $result = 1; $this->log($user, 3, $date, $comment); + $this->date_commande = $date; + $this->methode_commande = $methode; } else {