From 91c6d47a60059b5f70bfcd55d9b55a41c7b21629 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Oct 2013 00:06:14 +0200 Subject: [PATCH 1/5] Fix: Clean param Conflicts: htdocs/fourn/class/fournisseur.facture.class.php --- htdocs/fourn/class/fournisseur.facture.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index be2ce721356..dbaf9ac2cea 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1126,6 +1126,7 @@ class FactureFournisseur extends CommonInvoice if ($type < 0) return -1; // Clean parameters + if (empty($vatrate)) $vatrate=0; if (empty($txlocaltax1)) $txlocaltax1=0; if (empty($txlocaltax2)) $txlocaltax2=0; From 8d63c2f9c53b5d1e31473d0649ffd8a27acde715 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Oct 2013 00:44:55 +0200 Subject: [PATCH 2/5] Fix: ref_ext was not loaded Conflicts: htdocs/contact/class/contact.class.php --- htdocs/contact/class/contact.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 036b99f9ae3..4a05f112eba 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -469,7 +469,7 @@ class Contact extends CommonObject /** - * Charge l'objet contact + * Load object contact * * @param int $id id du contact * @param User $user Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact @@ -481,7 +481,7 @@ class Contact extends CommonObject $langs->load("companies"); - $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.lastname, c.firstname,"; + $sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civilite as civilite_id, c.lastname, c.firstname,"; $sql.= " c.address, c.zip, c.town,"; $sql.= " c.fk_pays as country_id,"; $sql.= " c.fk_departement,"; @@ -510,6 +510,7 @@ class Contact extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->rowid; + $this->ref_ext = $obj->ref_ext; $this->civilite_id = $obj->civilite_id; $this->lastname = $obj->lastname; $this->firstname = $obj->firstname; From e343d3bc6ff12ea7536b0de0e382565437904f96 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Oct 2013 21:14:54 +0200 Subject: [PATCH 3/5] Fix: missing property --- htdocs/adherents/fiche.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index d297e6aad81..bca9710c2c7 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -273,6 +273,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) $object->pass = trim($_POST["pass"]); $object->societe = trim($_POST["societe"]); + $object->company = trim($_POST["societe"]); + $object->address = trim($_POST["address"]); $object->zip = trim($_POST["zipcode"]); $object->town = trim($_POST["town"]); From 41bf4d53a84d614d150c4fa12e1667b7f3d312d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Oct 2013 20:44:42 +0200 Subject: [PATCH 4/5] Fix: filter on warehouse Conflicts: htdocs/product/stock/mouvement.php --- htdocs/product/stock/mouvement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index a5de7d9bb3d..4b879e2dd59 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -426,7 +426,7 @@ if ($resql) print ''; print ''; print ''; - print ''; + if (empty($idproduct) || $idproduct < 0) print ''; // We are on a specific warehouse card, no filter on other should be possible print ''; print ''; print ''; From f225b35a909e78e461cbad2cb9e97ce603e7610e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 10 Oct 2013 15:51:59 +0200 Subject: [PATCH 5/5] Fix: filter on warehouse Conflicts: htdocs/product/stock/mouvement.php --- htdocs/product/stock/mouvement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 4b879e2dd59..330fae32f3d 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -42,7 +42,7 @@ $id=GETPOST('id','int'); $product_id=GETPOST("product_id"); $action=GETPOST('action'); $cancel=GETPOST('cancel'); -$idproduct = isset($_GET["idproduct"])?$_GET["idproduct"]:$_PRODUCT["idproduct"]; +$idproduct = GETPOST('idproduct','int'); $year = isset($_GET["year"])?$_GET["year"]:$_POST["year"]; $month = isset($_GET["month"])?$_GET["month"]:$_POST["month"]; $search_movement = isset($_REQUEST["search_movement"])?$_REQUEST["search_movement"]:'';