From a88dcfd1e4e4d107792e74b338b6ffa9a5e3e942 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 28 Sep 2018 02:24:11 +0200 Subject: [PATCH] Fix phpcs --- htdocs/compta/facture/card.php | 6 +++--- htdocs/core/modules/modProduct.class.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 5131d18a43f..3c206b517ef 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -954,7 +954,7 @@ if (empty($reshook)) if($facture_source->type == Facture::TYPE_SITUATION) { - $source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id + $source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id $line->fk_prev_id = $line->id; // Credit note line need to be linked to the situation invoice it is create from if(!empty($facture_source->tab_previous_situation_invoice)) @@ -1537,8 +1537,8 @@ if (empty($reshook)) $line->origin = $object->origin; $line->origin_id = $line->id; $line->fetch_optionals($line->id); - $line->situation_percent = $line->get_prev_progress($object->id); // get good progress including credit note - + $line->situation_percent = $line->get_prev_progress($object->id); // get good progress including credit note + // Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée if ($line->fk_remise_except) { diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 7157f98e765..15b34dfbeac 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -132,8 +132,8 @@ class modProduct extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'export'; $r++; - - $this->rights[$r][0] = 39; + + $this->rights[$r][0] = 39; $this->rights[$r][1] = 'Ignore minimum price'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0;