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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-04 12:56:12 +02:00
commit eaee252a5d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/setup/codesniffer/ruleset.xml
View File

@ -10,6 +10,7 @@
<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern> <exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
<exclude-pattern type="relative">*/nltechno*</exclude-pattern> <exclude-pattern type="relative">*/nltechno*</exclude-pattern>
<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern> <exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
<exclude-pattern type="relative">*.min.css</exclude-pattern>
<!-- List of all tests --> <!-- List of all tests -->

8
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -119,9 +119,15 @@ class MouvementStock extends CommonObject
// Set properties of movement // Set properties of movement
$this->product_id = $fk_product; $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->qty = $qty;
$this->type = $type; $this->type = $type;
$this->price = $price;
$this->label = $label;
$this->inventorycode = $inventorycode;
$this->datem = $now;
$this->batch = $batch;
$mvid = 0; $mvid = 0;

2
htdocs/societe/card.php
View File

@ -711,7 +711,7 @@ if (empty($reshook))
// Logo/Photo save // Logo/Photo save
$dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos"; $dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
if (GETPOST('deletephoto') && $object->photo) if (GETPOST('deletephoto') && $object->logo)
{ {
$fileimg=$dir.'/'.$object->logo; $fileimg=$dir.'/'.$object->logo;
$dirthumbs=$dir.'/thumbs'; $dirthumbs=$dir.'/thumbs';