diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index 38f7f484dac..a43e4dde82b 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -10,6 +10,7 @@ htdocs/conf.php */nltechno* */htdocs/includes + *.min.css diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 35b22cd8759..825034b87cb 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -119,9 +119,15 @@ class MouvementStock extends CommonObject // Set properties of movement $this->product_id = $fk_product; - $this->entrepot_id = $entrepot_id; + $this->entrepot_id = $entrepot_id; // deprecated + $this->warehouse_id = $entrepot_id; $this->qty = $qty; $this->type = $type; + $this->price = $price; + $this->label = $label; + $this->inventorycode = $inventorycode; + $this->datem = $now; + $this->batch = $batch; $mvid = 0; diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 01f5a13b39f..db88ccee4ce 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -711,7 +711,7 @@ if (empty($reshook)) // Logo/Photo save $dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos"; $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); - if (GETPOST('deletephoto') && $object->photo) + if (GETPOST('deletephoto') && $object->logo) { $fileimg=$dir.'/'.$object->logo; $dirthumbs=$dir.'/thumbs';