Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 19:31:31 +01:00
Code Issues 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
parent 29ee5dffc4 60ce5fb87e
commit eaee252a5d
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
htdocs/societe/card.php
View File

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