Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Regis Houssin
2014-09-29 20:43:34 +02:00
parent ba95251ea2 bbf07641ed
commit f0551fe6d2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/facture.php
View File

@@ -865,7 +865,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
$object->origin_id = $originid; $object->origin_id = $originid;
// Possibility to add external linked objects with hooks // Possibility to add external linked objects with hooks
$object->linked_objects [$object->origin] = $object->origin_id; $object->linked_objects[$object->origin] = $object->origin_id;
// link with order if it is a shipping invoice // link with order if it is a shipping invoice
if ($object->origin == 'shipping') if ($object->origin == 'shipping')
{ {
@@ -873,10 +873,11 @@ else if ($action == 'add' && $user->rights->facture->creer)
$exp = new Expedition($db); $exp = new Expedition($db);
$exp->fetch($object->origin_id); $exp->fetch($object->origin_id);
$exp->fetchObjectLinked(); $exp->fetchObjectLinked();
if (count ($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0]; if (count($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0];
} }
if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) { if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
{
$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']); $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
} }