Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 19:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type

Browse Source
This commit is contained in:
florian HENRY
2020-03-12 09:44:43 +01:00
parent dbb80aecd1
commit 29b2ea77d5
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/commande/class/commande.class.php
View File

@@ -927,6 +927,14 @@ class Commande extends CommonOrder
$vatrate = $line->tva_tx;
if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
if(!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
$originid=$line->origin_id;
$origintype=$line->origin;
} else {
$originid=$line->id;
$origintype=$this->element;
}
$result = $this->addline(
$line->desc,
$line->subprice,
@@ -951,8 +959,8 @@ class Commande extends CommonOrder
$line->label,
$line->array_options,
$line->fk_unit,
$line->origin,
$line->origin_id
$origintype,
$originid
);
if ($result < 0)
{
@@ -1355,8 +1363,8 @@ class Commande extends CommonOrder
* @param string $label Label
* @param array $array_options extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param string $origin 'order', ...
* @param int $origin_id Id of origin object
* @param string $origin Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
* @param int $origin_id Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
* @param double $pu_ht_devise Unit price in currency
* @return int >0 if OK, <0 if KO
*