Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	htdocs/user/perms.php
This commit is contained in:
Laurent Destailleur
2020-04-10 12:04:21 +02:00
parent 874cbcefc7 8567001a46
commit 5ff981bf61
1200 changed files with 33162 additions and 33164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,12 +1018,12 @@ 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;
if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
$originid = $line->origin_id;
$origintype = $line->origin;
} else {
$originid=$line->id;
$origintype=$this->element;
$originid = $line->id;
$origintype = $this->element;
}
$result = $this->addline(
@@ -1415,7 +1415,7 @@ class Commande extends CommonOrder
if (!$error)
{
// Validate immediatly the order
if (! empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL))
if (!empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL))
{
$this->fetch($ret);
$this->valid($user);