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

Merge pull request #2805 from marcosgdf/bug-2758

Browse Source 
FIX #2758 Product::update sets product note to "null" when $prod->note is null
This commit is contained in:
Laurent Destailleur 2015-05-11 23:00:25 +02:00
commit 5f594d55ac
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement
Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
***** ChangeLog for 3.5.6 compared to 3.5.5 ***** ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973 Fix: Avoid missing class error for fetch_thirdparty method #1973

2
htdocs/product/class/product.class.php
View File

@ -442,7 +442,7 @@ class Product extends CommonObject
$this->ref = dol_string_nospecial(trim($this->ref)); $this->ref = dol_string_nospecial(trim($this->ref));
$this->libelle = trim($this->libelle); $this->libelle = trim($this->libelle);
$this->description = trim($this->description); $this->description = trim($this->description);
$this->note = (isset($this->note)? trim($this->note):"null"); $this->note = (isset($this->note)? trim($this->note):null);
$this->weight = price2num($this->weight); $this->weight = price2num($this->weight);
$this->weight_units = trim($this->weight_units); $this->weight_units = trim($this->weight_units);
$this->length = price2num($this->length); $this->length = price2num($this->length);