From 475297b98ba6d106adf3c286d48853537bc020a3 Mon Sep 17 00:00:00 2001
From: areaeuro <30721699+areaeuro@users.noreply.github.com>
Date: Wed, 30 May 2018 12:29:02 +0200
Subject: [PATCH 1/3] Update card.php

Line 714 - conditional to delete thirdparty logos
$object->photo
does not exits, and should read
$object->logo

This appears to be an oversight, as it is correct in the rest of the file
---
 htdocs/societe/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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';

From 03bba4daf008de44a7dcf3ccf490b17984cdfbbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 30 May 2018 13:30:14 +0200
Subject: [PATCH 2/3] do not test *.min.css with phpcs

---
 dev/setup/codesniffer/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

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 @@
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">*.min.css</exclude-pattern>
 
 		<!-- List of all tests -->
 

From e0f960548352bd68a1dd5b2eae80c736db90f4b4 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 3 Jun 2018 11:05:02 +0200
Subject: [PATCH 3/3] Fix add missing properties for trigger

---
 htdocs/product/stock/class/mouvementstock.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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;