From b70c6957760d2844c26660781eb875ddaacb6e54 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 16 Jun 2014 18:41:28 +0200 Subject: [PATCH 1/2] Fix: checkstyle --- htdocs/fourn/class/fournisseur.facture.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 278e1099c4f..9b523b2bc60 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1060,8 +1060,6 @@ class FactureFournisseur extends CommonInvoice * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue). * - * FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order. - * * @param string $desc Description de la ligne * @param double $pu Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note) * @param double $txtva Taux de tva force, sinon -1 @@ -1079,6 +1077,8 @@ class FactureFournisseur extends CommonInvoice * @param int $rang Position of line * @param int $notrigger Disable triggers * @return int >0 if OK, <0 if KO + * + * FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order. */ function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false) { From bb9862d6be8f42ddcedda68d61c61deb787392b0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 17 Jun 2014 10:15:53 +0200 Subject: [PATCH 2/2] Fix: When you add a right ended in 0, add all module rights --- htdocs/user/class/usergroup.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index bc8e14aafd1..a9c92c57838 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -3,6 +3,7 @@ * Copyright (c) 2005-2013 Laurent Destailleur * Copyright (c) 2005-2012 Regis Houssin * Copyright (C) 2012 Florian Henry + * Copyright (C) 2014 Juanjo Menent * * 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 @@ -285,7 +286,7 @@ class UserGroup extends CommonObject // Pour compatibilite, si lowid = 0, on est en mode ajout de tout // TODO A virer quand sera gere par l'appelant - if (substr($rid,-1,1) == 0) $whereforadd="module='$module'"; + //if (substr($rid,-1,1) == 0) $whereforadd="module='$module'"; } else { // Where pour la liste des droits a ajouter