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

Browse Source 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
This commit is contained in:
Laurent Destailleur
2013-04-27 15:15:31 +02:00
parent 52952c6fce 50dd0ef7ee
commit e29f533b7a
74 changed files with 445 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1339,6 +1339,16 @@ class Commande extends CommonOrder
$this->lines = array();
if ($this->statut == 0) $this->brouillon = 1;
// Retreive all extrafield for invoice
// fetch optionals attributes and labels
if(!class_exists('Extrafields'))
require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
$extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
if (count($extralabels)>0) {
$this->fetch_optionals($this->id,$extralabels);
}
$this->db->free();
@@ -2410,6 +2420,17 @@ class Commande extends CommonOrder
// Delete linked contacts
$res = $this->delete_linked_contact();
if ($res < 0) $error++;
// Remove extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{
$result=$this->deleteExtraFields();
if ($result < 0)
{
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
// On efface le repertoire de pdf provisoire
$comref = dol_sanitizeFileName($this->ref);
@@ -2437,6 +2458,8 @@ class Commande extends CommonOrder
}
}
}
}
if (! $error)