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

Merge pull request #15297 from Dolibarr/revert-15285-patch-14

Browse Source 
Revert "remove deprecated"
This commit is contained in:
Laurent Destailleur 2020-11-04 18:46:02 +01:00 committed by GitHub
commit ac271ef45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -347,7 +347,7 @@ class FactureRec extends CommonInvoice
{
// Extrafields
if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->id);
$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
$objectline->array_options = $facsrc->lines[$i]->array_options;
}
@ -360,8 +360,8 @@ class FactureRec extends CommonInvoice
}
}
if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {
// To use new linkedObjectsIds instead of old linked_objects
if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) // To use new linkedObjectsIds instead of old linked_objects
{
$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
}
@ -381,8 +381,8 @@ class FactureRec extends CommonInvoice
$error++;
}
}
} 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;
$ret = $this->add_object_linked($origin, $origin_id);
if (!$ret)