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

Fix #6037 Bill Orders issue

Browse Source
This commit is contained in:
Juanjo Menent 2016-11-25 23:41:47 +01:00
parent 16ce156631
commit 88e6c203eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,7 +424,7 @@ class Facture extends CommonInvoice
else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
{ {
$origin_id = $tmp_origin_id; $origin_id = $tmp_origin_id;
$ret = $this->add_object_linked($origin, $origin_id); $ret = $this->add_object_linked($this->origin, $origin_id);
if (! $ret) if (! $ret)
{ {
dol_print_error($this->db); dol_print_error($this->db);
@ -434,7 +434,7 @@ class Facture extends CommonInvoice
if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
{ {
$originforcontact = $origin; $originforcontact = $this->origin;
$originidforcontact = $origin_id; $originidforcontact = $origin_id;
if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order
{ {