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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-06 11:26:20 +02:00
commit 6c78b930d1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
English Dolibarr ChangeLog English Dolibarr ChangeLog
-------------------------------------------------------------- --------------------------------------------------------------
***** ChangeLog for 3.6.4 compared to 3.6.3 *****
- Fix: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
***** ChangeLog for 3.6.3 compared to 3.6.2 ***** ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
- Fix: ref_ext was not saved when recording a customer order from web service - Fix: ref_ext was not saved when recording a customer order from web service
- Fix: amarok is a bugged theme making dolidroid failed. We switch to eldy automatically with dolidroid. - Fix: amarok is a bugged theme making dolidroid failed. We switch to eldy automatically with dolidroid.

13
htdocs/compta/facture/class/facture.class.php
View File

@ -2558,15 +2558,16 @@ class Facture extends CommonInvoice
$numref = ""; $numref = "";
$numref = $obj->getNextValue($soc,$this,$mode); $numref = $obj->getNextValue($soc,$this,$mode);
if ($numref != "") /**
{ * $numref can be empty in case we ask for the last value because if there is no invoice created with the
return $numref; * set up mask.
} */
else if ($mode != 'last' && !$numref) {
{
dol_print_error($db,"Facture::getNextNumRef ".$obj->error); dol_print_error($db,"Facture::getNextNumRef ".$obj->error);
return ""; return "";
} }
return $numref;
} }
else else
{ {