lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-28 02:24:11 +02:00
parent 3f3c8aeb26
commit a88dcfd1e4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/facture/card.php
View File

@ -954,7 +954,7 @@ if (empty($reshook))
if($facture_source->type == Facture::TYPE_SITUATION) 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 $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)) if(!empty($facture_source->tab_previous_situation_invoice))
@ -1537,8 +1537,8 @@ if (empty($reshook))
$line->origin = $object->origin; $line->origin = $object->origin;
$line->origin_id = $line->id; $line->origin_id = $line->id;
$line->fetch_optionals($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 // Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
if ($line->fk_remise_except) if ($line->fk_remise_except)
{ {

4
htdocs/core/modules/modProduct.class.php
View File

@ -132,8 +132,8 @@ class modProduct extends DolibarrModules
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'export'; $this->rights[$r][4] = 'export';
$r++; $r++;
$this->rights[$r][0] = 39; $this->rights[$r][0] = 39;
$this->rights[$r][1] = 'Ignore minimum price'; $this->rights[$r][1] = 'Ignore minimum price';
$this->rights[$r][2] = 'r'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;