diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 68f45f7e12e..2a7be254fd8 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -42,116 +42,116 @@ require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
*/
class Commande extends CommonOrder
{
- /**
+ /**
* @var string ID to identify managed object
*/
public $element='commande';
-
- /**
+
+ /**
* @var string Name of table without prefix where object is stored
*/
public $table_element='commande';
-
- public $table_element_line = 'commandedet';
- public $class_element_line = 'OrderLine';
- public $fk_element = 'fk_commande';
- public $picto = 'order';
- /**
- * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- * @var int
- */
- public $ismultientitymanaged = 1;
- /**
- * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
- * @var integer
- */
- public $restrictiononfksoc = 1;
- /**
- * {@inheritdoc}
- */
- protected $table_ref_field = 'ref';
+ public $table_element_line = 'commandedet';
+ public $class_element_line = 'OrderLine';
+ public $fk_element = 'fk_commande';
+ public $picto = 'order';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * @var integer
+ */
+ public $restrictiononfksoc = 1;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
/**
* Client ID
* @var int
*/
- public $socid;
+ public $socid;
- public $ref_client;
- public $ref_int;
- public $contactid;
+ public $ref_client;
+ public $ref_int;
+ public $contactid;
/**
* Status of the order
* @var int
*/
- public $statut;
+ public $statut;
/**
* Billed
* @var int
*/
- public $billed; // billed or not
+ public $billed; // billed or not
- public $brouillon;
- public $cond_reglement_code;
+ public $brouillon;
+ public $cond_reglement_code;
- public $fk_account;
+ public $fk_account;
- /**
- * It holds the label of the payment mode. Use it in case translation cannot be found.
- * @var string
- */
- public $mode_reglement;
+ /**
+ * It holds the label of the payment mode. Use it in case translation cannot be found.
+ * @var string
+ */
+ public $mode_reglement;
- /**
- * Payment mode id
- * @var int
- */
- public $mode_reglement_id;
- /**
- * Payment mode code
- * @var string
- */
- public $mode_reglement_code;
- /**
- * Availability delivery time id
- * @var int
- */
- public $availability_id;
- /**
- * Availability delivery time code
- * @var string
- */
- public $availability_code;
- /**
- * Label of availability delivery time. Use it in case translation cannot be found.
- * @var string
- */
- public $availability;
+ /**
+ * Payment mode id
+ * @var int
+ */
+ public $mode_reglement_id;
+ /**
+ * Payment mode code
+ * @var string
+ */
+ public $mode_reglement_code;
+ /**
+ * Availability delivery time id
+ * @var int
+ */
+ public $availability_id;
+ /**
+ * Availability delivery time code
+ * @var string
+ */
+ public $availability_code;
+ /**
+ * Label of availability delivery time. Use it in case translation cannot be found.
+ * @var string
+ */
+ public $availability;
- public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
- public $demand_reason_code;
- public $date; // Date commande
+ public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
+ public $demand_reason_code;
+ public $date; // Date commande
/**
* @deprecated
* @see date
*/
- public $date_commande;
- public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
- public $fk_remise_except;
- public $remise_percent;
- public $remise_absolue;
- public $info_bits;
- public $rang;
- public $special_code;
- public $source; // Order mode. How we received order (by phone, by email, ...)
- public $extraparams=array();
+ public $date_commande;
+ public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+ public $fk_remise_except;
+ public $remise_percent;
+ public $remise_absolue;
+ public $info_bits;
+ public $rang;
+ public $special_code;
+ public $source; // Order mode. How we received order (by phone, by email, ...)
+ public $extraparams=array();
- public $linked_objects=array();
+ public $linked_objects=array();
- public $user_author_id;
- public $user_valid;
+ public $user_author_id;
+ public $user_valid;
/**
* @var OrderLine[]
@@ -168,10 +168,10 @@ class Commande extends CommonOrder
public $oldcopy;
- /**
- * ERR Not enough stock
- */
- const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
+ /**
+ * ERR Not enough stock
+ */
+ const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
/**
* Canceled status
@@ -197,445 +197,445 @@ class Commande extends CommonOrder
const STATUS_CLOSED = 3;
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- function __construct($db)
- {
- $this->db = $db;
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
- $this->remise = 0;
- $this->remise_percent = 0;
+ $this->remise = 0;
+ $this->remise_percent = 0;
- $this->products = array();
- }
+ $this->products = array();
+ }
- /**
+ /**
* Returns the reference to the following non used Order depending on the active numbering module
* defined into COMMANDE_ADDON
*
* @param Societe $soc Object thirdparty
* @return string Order free reference
*/
- function getNextNumRef($soc)
- {
- global $langs, $conf;
- $langs->load("order");
+ function getNextNumRef($soc)
+ {
+ global $langs, $conf;
+ $langs->load("order");
- if (! empty($conf->global->COMMANDE_ADDON))
- {
- $mybool=false;
+ if (! empty($conf->global->COMMANDE_ADDON))
+ {
+ $mybool=false;
- $file = $conf->global->COMMANDE_ADDON.".php";
+ $file = $conf->global->COMMANDE_ADDON.".php";
$classname = $conf->global->COMMANDE_ADDON;
// Include file with class
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
foreach ($dirmodels as $reldir)
{
- $dir = dol_buildpath($reldir."core/modules/commande/");
+ $dir = dol_buildpath($reldir."core/modules/commande/");
- // Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
- }
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
- if (! $mybool)
- {
- dol_print_error('',"Failed to include file ".$file);
- return '';
- }
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
- $obj = new $classname();
- $numref = $obj->getNextValue($soc,$this);
+ $obj = new $classname();
+ $numref = $obj->getNextValue($soc,$this);
- if ($numref != "")
- {
- return $numref;
- }
- else
+ if ($numref != "")
+ {
+ return $numref;
+ }
+ else
{
$this->error=$obj->error;
- //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
- return "";
- }
- }
- else
- {
- print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
- return "";
- }
- }
-
-
- /**
- * Validate order
- *
- * @param User $user User making status change
- * @param int $idwarehouse Id of warehouse to use for stock decrease
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <=0 if OK, 0=Nothing done, >0 if KO
- */
- function valid($user, $idwarehouse=0, $notrigger=0)
- {
- global $conf,$langs;
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
- $error=0;
-
- // Protection
- if ($this->statut == self::STATUS_VALIDATED)
- {
- dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
- return 0;
- }
-
- if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
- {
- $this->error='NotEnoughPermissions';
- dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
- return -1;
- }
-
- $now=dol_now();
-
- $this->db->begin();
-
- // Definition du nom de module de numerotation de commande
- $soc = new Societe($this->db);
- $soc->fetch($this->socid);
-
- // Class of company linked to order
- $result=$soc->set_as_client();
-
- // Define new ref
- if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
- {
- $num = $this->getNextNumRef($soc);
- }
- else
+ //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+ return "";
+ }
+ }
+ else
{
- $num = $this->ref;
- }
- $this->newref = $num;
+ print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
+ return "";
+ }
+ }
- // Validate
- $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
- $sql.= " SET ref = '".$num."',";
- $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
- $sql.= " date_valid='".$this->db->idate($now)."',";
- $sql.= " fk_user_valid = ".$user->id;
- $sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
- {
- dol_print_error($this->db);
- $this->error=$this->db->lasterror();
- $error++;
- }
+ /**
+ * Validate order
+ *
+ * @param User $user User making status change
+ * @param int $idwarehouse Id of warehouse to use for stock decrease
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <=0 if OK, 0=Nothing done, >0 if KO
+ */
+ function valid($user, $idwarehouse=0, $notrigger=0)
+ {
+ global $conf,$langs;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- if (! $error)
- {
- // If stock is incremented on validate order, we must increment it
- if ($result >= 0 && ! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
- {
- require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
- $langs->load("agenda");
+ $error=0;
- // Loop on each line
- $cpt=count($this->lines);
- for ($i = 0; $i < $cpt; $i++)
- {
- if ($this->lines[$i]->fk_product > 0)
- {
- $mouvP = new MouvementStock($this->db);
+ // Protection
+ if ($this->statut == self::STATUS_VALIDATED)
+ {
+ dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+ return 0;
+ }
+
+ if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
+ {
+ $this->error='NotEnoughPermissions';
+ dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+ return -1;
+ }
+
+ $now=dol_now();
+
+ $this->db->begin();
+
+ // Definition du nom de module de numerotation de commande
+ $soc = new Societe($this->db);
+ $soc->fetch($this->socid);
+
+ // Class of company linked to order
+ $result=$soc->set_as_client();
+
+ // Define new ref
+ if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+ {
+ $num = $this->getNextNumRef($soc);
+ }
+ else
+ {
+ $num = $this->ref;
+ }
+ $this->newref = $num;
+
+ // Validate
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+ $sql.= " SET ref = '".$num."',";
+ $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
+ $sql.= " date_valid='".$this->db->idate($now)."',";
+ $sql.= " fk_user_valid = ".$user->id;
+ $sql.= " WHERE rowid = ".$this->id;
+
+ dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($this->db);
+ $this->error=$this->db->lasterror();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ // If stock is incremented on validate order, we must increment it
+ if ($result >= 0 && ! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+ $langs->load("agenda");
+
+ // Loop on each line
+ $cpt=count($this->lines);
+ for ($i = 0; $i < $cpt; $i++)
+ {
+ if ($this->lines[$i]->fk_product > 0)
+ {
+ $mouvP = new MouvementStock($this->db);
$mouvP->origin = &$this;
- // We decrement stock of product (and sub-products)
- $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
- if ($result < 0)
- {
- $error++;
- $this->error=$mouvP->error;
- }
- }
- if ($error) break;
- }
- }
- }
+ // We decrement stock of product (and sub-products)
+ $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
+ if ($result < 0)
+ {
+ $error++;
+ $this->error=$mouvP->error;
+ }
+ }
+ if ($error) break;
+ }
+ }
+ }
- if (! $error && ! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_VALIDATE',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->oldref = $this->ref;
-
- // Rename directory if dir was a temporary ref
- if (preg_match('/^[\(]?PROV/i', $this->ref))
- {
- // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
- // in order not to lose the attachments
- $oldref = dol_sanitizeFileName($this->ref);
- $newref = dol_sanitizeFileName($num);
- $dirsource = $conf->commande->dir_output.'/'.$oldref;
- $dirdest = $conf->commande->dir_output.'/'.$newref;
- if (file_exists($dirsource))
- {
- dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
-
- if (@rename($dirsource, $dirdest))
- {
- dol_syslog("Rename ok");
- // Rename docs starting with $oldref with $newref
- $listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
- foreach($listoffiles as $fileentry)
- {
- $dirsource=$fileentry['name'];
- $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
- $dirsource=$fileentry['path'].'/'.$dirsource;
- $dirdest=$fileentry['path'].'/'.$dirdest;
- @rename($dirsource, $dirdest);
- }
- }
- }
- }
- }
-
- // Set new ref and current status
- if (! $error)
- {
- $this->ref = $num;
- $this->statut = self::STATUS_VALIDATED;
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
+ if (! $error && ! $notrigger)
{
- $this->db->rollback();
- return -1;
- }
- }
+ // Call trigger
+ $result=$this->call_trigger('ORDER_VALIDATE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- /**
- * Set draft status
- *
- * @param User $user Object user that modify
- * @param int $idwarehouse Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
- * @return int <0 if KO, >0 if OK
- */
- function set_draft($user, $idwarehouse=-1)
- {
- global $conf,$langs;
+ if (! $error)
+ {
+ $this->oldref = $this->ref;
- $error=0;
+ // Rename directory if dir was a temporary ref
+ if (preg_match('/^[\(]?PROV/i', $this->ref))
+ {
+ // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
+ // in order not to lose the attachments
+ $oldref = dol_sanitizeFileName($this->ref);
+ $newref = dol_sanitizeFileName($num);
+ $dirsource = $conf->commande->dir_output.'/'.$oldref;
+ $dirdest = $conf->commande->dir_output.'/'.$newref;
+ if (file_exists($dirsource))
+ {
+ dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
- // Protection
- if ($this->statut <= self::STATUS_DRAFT)
- {
- return 0;
- }
+ if (@rename($dirsource, $dirdest))
+ {
+ dol_syslog("Rename ok");
+ // Rename docs starting with $oldref with $newref
+ $listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+ foreach($listoffiles as $fileentry)
+ {
+ $dirsource=$fileentry['name'];
+ $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+ $dirsource=$fileentry['path'].'/'.$dirsource;
+ $dirdest=$fileentry['path'].'/'.$dirdest;
+ @rename($dirsource, $dirdest);
+ }
+ }
+ }
+ }
+ }
- if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
- {
- $this->error='Permission denied';
- return -1;
- }
+ // Set new ref and current status
+ if (! $error)
+ {
+ $this->ref = $num;
+ $this->statut = self::STATUS_VALIDATED;
+ }
- $this->db->begin();
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
- $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
- $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
- $sql.= " WHERE rowid = ".$this->id;
+ /**
+ * Set draft status
+ *
+ * @param User $user Object user that modify
+ * @param int $idwarehouse Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
+ * @return int <0 if KO, >0 if OK
+ */
+ function set_draft($user, $idwarehouse=-1)
+ {
+ global $conf,$langs;
- dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
- if ($this->db->query($sql))
- {
- // If stock is decremented on validate order, we must reincrement it
- if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
- {
- $result = 0;
+ $error=0;
- require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
- $langs->load("agenda");
+ // Protection
+ if ($this->statut <= self::STATUS_DRAFT)
+ {
+ return 0;
+ }
- $num=count($this->lines);
- for ($i = 0; $i < $num; $i++)
- {
- if ($this->lines[$i]->fk_product > 0)
- {
- $mouvP = new MouvementStock($this->db);
- $mouvP->origin = &$this;
- // We increment stock of product (and sub-products)
- $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
- if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
- }
- }
- }
+ if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))))
+ {
+ $this->error='Permission denied';
+ return -1;
+ }
- if (!$error) {
- // Call trigger
- $result=$this->call_trigger('ORDER_UNVALIDATE',$user);
- if ($result < 0) $error++;
- }
+ $this->db->begin();
- if (!$error) {
- $this->statut=self::STATUS_DRAFT;
- $this->db->commit();
- return 1;
- }else {
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -1;
- }
- }
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+ $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
+ $sql.= " WHERE rowid = ".$this->id;
+
+ dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
+ if ($this->db->query($sql))
+ {
+ // If stock is decremented on validate order, we must reincrement it
+ if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+ {
+ $result = 0;
+
+ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+ $langs->load("agenda");
+
+ $num=count($this->lines);
+ for ($i = 0; $i < $num; $i++)
+ {
+ if ($this->lines[$i]->fk_product > 0)
+ {
+ $mouvP = new MouvementStock($this->db);
+ $mouvP->origin = &$this;
+ // We increment stock of product (and sub-products)
+ $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
+ if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
+ }
+ }
+ }
+
+ if (!$error) {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_UNVALIDATE',$user);
+ if ($result < 0) $error++;
+ }
+
+ if (!$error) {
+ $this->statut=self::STATUS_DRAFT;
+ $this->db->commit();
+ return 1;
+ }else {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * Tag the order as validated (opened)
- * Function used when order is reopend after being closed.
- *
- * @param User $user Object user that change status
- * @return int <0 if KO, 0 if nothing is done, >0 if OK
- */
- function set_reopen($user)
- {
- $error=0;
+ /**
+ * Tag the order as validated (opened)
+ * Function used when order is reopend after being closed.
+ *
+ * @param User $user Object user that change status
+ * @return int <0 if KO, 0 if nothing is done, >0 if OK
+ */
+ function set_reopen($user)
+ {
+ $error=0;
- if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
- {
- dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
- return 0;
- }
+ if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
+ {
+ dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
+ return 0;
+ }
- $this->db->begin();
+ $this->db->begin();
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
+ $sql.= ' WHERE rowid = '.$this->id;
- dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_REOPEN',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
- else
- {
- $error++;
- $this->error=$this->db->lasterror();
- dol_print_error($this->db);
- }
+ dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_REOPEN',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+ else
+ {
+ $error++;
+ $this->error=$this->db->lasterror();
+ dol_print_error($this->db);
+ }
- if (! $error)
- {
- $this->statut = self::STATUS_VALIDATED;
- $this->billed = 0;
+ if (! $error)
+ {
+ $this->statut = self::STATUS_VALIDATED;
+ $this->billed = 0;
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
- /**
- * Close order
- *
- * @param User $user Objet user that close
- * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function cloture($user, $notrigger=0)
- {
- global $conf;
+ /**
+ * Close order
+ *
+ * @param User $user Objet user that close
+ * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function cloture($user, $notrigger=0)
+ {
+ global $conf;
- $error=0;
+ $error=0;
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
- {
- $this->db->begin();
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
+ {
+ $this->db->begin();
- $now=dol_now();
+ $now=dol_now();
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
- $sql.= ' fk_user_cloture = '.$user->id.',';
- $sql.= " date_cloture = '".$this->db->idate($now)."'";
- $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
+ $sql.= ' fk_user_cloture = '.$user->id.',';
+ $sql.= " date_cloture = '".$this->db->idate($now)."'";
+ $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
- if ($this->db->query($sql))
- {
- if (! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_CLOSE',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
+ if ($this->db->query($sql))
+ {
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CLOSE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- if (! $error)
- {
- $this->statut=self::STATUS_CLOSED;
+ if (! $error)
+ {
+ $this->statut=self::STATUS_CLOSED;
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->error=$this->db->lasterror();
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- }
- return 0;
- }
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ return 0;
+ }
- /**
- * Cancel an order
- * If stock is decremented on order validation, we must reincrement it
- *
- * @param int $idwarehouse Id warehouse to use for stock change.
- * @return int <0 if KO, >0 if OK
- */
+ /**
+ * Cancel an order
+ * If stock is decremented on order validation, we must reincrement it
+ *
+ * @param int $idwarehouse Id warehouse to use for stock change.
+ * @return int <0 if KO, >0 if OK
+ */
function cancel($idwarehouse=-1)
{
global $conf,$user,$langs;
@@ -678,10 +678,10 @@ class Commande extends CommonOrder
if (! $error)
{
- // Call trigger
- $result=$this->call_trigger('ORDER_CANCEL',$user);
- if ($result < 0) $error++;
- // End call triggers
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CANCEL',$user);
+ if ($result < 0) $error++;
+ // End call triggers
}
if (! $error)
@@ -709,24 +709,24 @@ class Commande extends CommonOrder
}
}
- /**
- * Create order
- * Note that this->ref can be set or empty. If empty, we will use "(PROV)"
- *
- * @param User $user Objet user that make creation
- * @param int $notrigger Disable all triggers
- * @return int <0 if KO, >0 if OK
- */
- function create($user, $notrigger=0)
- {
- global $conf,$langs;
- $error=0;
+ /**
+ * Create order
+ * Note that this->ref can be set or empty. If empty, we will use "(PROV)"
+ *
+ * @param User $user Objet user that make creation
+ * @param int $notrigger Disable all triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function create($user, $notrigger=0)
+ {
+ global $conf,$langs;
+ $error=0;
- // Clean parameters
- $this->brouillon = 1; // set command as draft
+ // Clean parameters
+ $this->brouillon = 1; // set command as draft
// $date_commande is deprecated
- $date = ($this->date_commande ? $this->date_commande : $this->date);
+ $date = ($this->date_commande ? $this->date_commande : $this->date);
// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
@@ -738,412 +738,412 @@ class Commande extends CommonOrder
$this->multicurrency_tx = 1;
}
- dol_syslog(get_class($this)."::create user=".$user->id);
+ dol_syslog(get_class($this)."::create user=".$user->id);
- // Check parameters
- if (! empty($this->ref)) // We check that ref is not already used
- {
- $result=self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
- if ($result > 0)
- {
- $this->error='ErrorRefAlreadyExists';
- dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
- $this->db->rollback();
- return -1;
- }
- }
+ // Check parameters
+ if (! empty($this->ref)) // We check that ref is not already used
+ {
+ $result=self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
+ if ($result > 0)
+ {
+ $this->error='ErrorRefAlreadyExists';
+ dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
+ $this->db->rollback();
+ return -1;
+ }
+ }
- $soc = new Societe($this->db);
- $result=$soc->fetch($this->socid);
- if ($result < 0)
- {
- $this->error="Failed to fetch company";
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
- return -2;
- }
- if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
- {
- $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
- return -1;
- }
+ $soc = new Societe($this->db);
+ $result=$soc->fetch($this->socid);
+ if ($result < 0)
+ {
+ $this->error="Failed to fetch company";
+ dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+ return -2;
+ }
+ if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
+ {
+ $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
+ dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+ return -1;
+ }
- $now=dol_now();
+ $now=dol_now();
- $this->db->begin();
+ $this->db->begin();
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
- $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
- $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
- $sql.= ", fk_shipping_method";
- $sql.= ", fk_warehouse";
- $sql.= ", remise_absolue, remise_percent";
- $sql.= ", fk_incoterms, location_incoterms";
- $sql.= ", entity";
- $sql.= ", fk_multicurrency";
- $sql.= ", multicurrency_code";
- $sql.= ", multicurrency_tx";
- $sql.= ")";
- $sql.= " VALUES ('(PROV)', ".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
- $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
- $sql.= ", '".$this->db->idate($date)."'";
- $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->db->escape($this->source):'null');
- $sql.= ", '".$this->db->escape($this->note_private)."'";
- $sql.= ", '".$this->db->escape($this->note_public)."'";
- $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
- $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
- $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
- $sql.= ", '".$this->db->escape($this->modelpdf)."'";
- $sql.= ", ".($this->cond_reglement_id>0?$this->cond_reglement_id:"null");
- $sql.= ", ".($this->mode_reglement_id>0?$this->mode_reglement_id:"null");
- $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
- $sql.= ", ".($this->availability_id>0?$this->availability_id:"null");
- $sql.= ", ".($this->demand_reason_id>0?$this->demand_reason_id:"null");
- $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
- $sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
- $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
- $sql.= ", ".($this->warehouse_id>0?$this->warehouse_id:'NULL');
- $sql.= ", ".($this->remise_absolue>0?$this->db->escape($this->remise_absolue):'NULL');
- $sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
- $sql.= ", ".(int) $this->fk_incoterms;
- $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
- $sql.= ", ".$conf->entity;
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
+ $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
+ $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
+ $sql.= ", fk_shipping_method";
+ $sql.= ", fk_warehouse";
+ $sql.= ", remise_absolue, remise_percent";
+ $sql.= ", fk_incoterms, location_incoterms";
+ $sql.= ", entity";
+ $sql.= ", fk_multicurrency";
+ $sql.= ", multicurrency_code";
+ $sql.= ", multicurrency_tx";
+ $sql.= ")";
+ $sql.= " VALUES ('(PROV)', ".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
+ $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
+ $sql.= ", '".$this->db->idate($date)."'";
+ $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->db->escape($this->source):'null');
+ $sql.= ", '".$this->db->escape($this->note_private)."'";
+ $sql.= ", '".$this->db->escape($this->note_public)."'";
+ $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
+ $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
+ $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
+ $sql.= ", '".$this->db->escape($this->modelpdf)."'";
+ $sql.= ", ".($this->cond_reglement_id>0?$this->cond_reglement_id:"null");
+ $sql.= ", ".($this->mode_reglement_id>0?$this->mode_reglement_id:"null");
+ $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+ $sql.= ", ".($this->availability_id>0?$this->availability_id:"null");
+ $sql.= ", ".($this->demand_reason_id>0?$this->demand_reason_id:"null");
+ $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
+ $sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
+ $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
+ $sql.= ", ".($this->warehouse_id>0?$this->warehouse_id:'NULL');
+ $sql.= ", ".($this->remise_absolue>0?$this->db->escape($this->remise_absolue):'NULL');
+ $sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
+ $sql.= ", ".(int) $this->fk_incoterms;
+ $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+ $sql.= ", ".$conf->entity;
$sql.= ", ".(int) $this->fk_multicurrency;
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".(double) $this->multicurrency_tx;
- $sql.= ")";
+ $sql.= ")";
- dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'commande');
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'commande');
- if ($this->id)
- {
- $fk_parent_line=0;
- $num=count($this->lines);
+ if ($this->id)
+ {
+ $fk_parent_line=0;
+ $num=count($this->lines);
- /*
- * Insert products details into db
- */
- for ($i=0;$i<$num;$i++)
- {
- $line = $this->lines[$i];
+ /*
+ * Insert products details into db
+ */
+ for ($i=0;$i<$num;$i++)
+ {
+ $line = $this->lines[$i];
- // Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
- //if (! is_object($line)) $line=json_decode(json_encode($line), false); // convert recursively array into object.
- if (! is_object($line)) $line = (object) $line;
+ // Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+ //if (! is_object($line)) $line=json_decode(json_encode($line), false); // convert recursively array into object.
+ if (! is_object($line)) $line = (object) $line;
- // Reset fk_parent_line for no child products and special product
- if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
- $fk_parent_line = 0;
- }
+ // Reset fk_parent_line for no child products and special product
+ if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+ $fk_parent_line = 0;
+ }
// Complete vat rate with code
$vatrate = $line->tva_tx;
if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
- $result = $this->addline(
- $line->desc,
- $line->subprice,
- $line->qty,
- $vatrate,
- $line->localtax1_tx,
- $line->localtax2_tx,
- $line->fk_product,
- $line->remise_percent,
- $line->info_bits,
- $line->fk_remise_except,
- 'HT',
- 0,
- $line->date_start,
- $line->date_end,
- $line->product_type,
- $line->rang,
- $line->special_code,
- $fk_parent_line,
- $line->fk_fournprice,
- $line->pa_ht,
- $line->label,
- $line->array_options,
- $line->fk_unit,
- $this->element,
- $line->id
- );
- if ($result < 0)
- {
- if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
- {
- $this->error=$this->db->lasterror();
- dol_print_error($this->db);
- }
- $this->db->rollback();
- return -1;
- }
- // Defined the new fk_parent_line
- if ($result > 0 && $line->product_type == 9) {
- $fk_parent_line = $result;
- }
- }
-
- // update ref
- $initialref='(PROV'.$this->id.')';
- if (! empty($this->ref)) $initialref=$this->ref;
-
- $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
- if ($this->db->query($sql))
- {
- if ($this->id)
- {
- $this->ref = $initialref;
-
- 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
- }
-
- // Add object linked
- if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
- {
- foreach($this->linked_objects as $origin => $tmp_origin_id)
- {
- if (is_array($tmp_origin_id)) // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
- {
- foreach($tmp_origin_id as $origin_id)
- {
- $ret = $this->add_object_linked($origin, $origin_id);
- if (! $ret)
- {
- $this->error=$this->db->lasterror();
- $error++;
- }
- }
- }
- 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)
- {
- $this->error=$this->db->lasterror();
- $error++;
- }
- }
- }
- }
-
- if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) // Get contact from origin object
- {
- $originforcontact = $this->origin;
- $originidforcontact = $this->origin_id;
- if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order
- {
- require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
- $exp = new Expedition($this->db);
- $exp->fetch($this->origin_id);
- $exp->fetchObjectLinked();
- if (count($exp->linkedObjectsIds['commande']) > 0)
- {
- foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
- {
- $originforcontact = 'commande';
- if (is_object($value)) $originidforcontact = $value->id;
- else $originidforcontact = $value;
- break; // We take first one
- }
- }
- }
-
- $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
- $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
- $resqlcontact = $this->db->query($sqlcontact);
- if ($resqlcontact)
- {
- while($objcontact = $this->db->fetch_object($resqlcontact))
- {
- //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
- $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
- }
- }
- else dol_print_error($resqlcontact);
- }
- }
-
- if (! $error)
- {
- $result=$this->insertExtraFields();
- if ($result < 0) $error++;
- }
-
- if (! $error && ! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_CREATE',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->db->commit();
- return $this->id;
- }
- else
+ $result = $this->addline(
+ $line->desc,
+ $line->subprice,
+ $line->qty,
+ $vatrate,
+ $line->localtax1_tx,
+ $line->localtax2_tx,
+ $line->fk_product,
+ $line->remise_percent,
+ $line->info_bits,
+ $line->fk_remise_except,
+ 'HT',
+ 0,
+ $line->date_start,
+ $line->date_end,
+ $line->product_type,
+ $line->rang,
+ $line->special_code,
+ $fk_parent_line,
+ $line->fk_fournprice,
+ $line->pa_ht,
+ $line->label,
+ $line->array_options,
+ $line->fk_unit,
+ $this->element,
+ $line->id
+ );
+ if ($result < 0)
{
- $this->db->rollback();
- return -1*$error;
+ if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
+ {
+ $this->error=$this->db->lasterror();
+ dol_print_error($this->db);
+ }
+ $this->db->rollback();
+ return -1;
}
- }
- else
+ // Defined the new fk_parent_line
+ if ($result > 0 && $line->product_type == 9) {
+ $fk_parent_line = $result;
+ }
+ }
+
+ // update ref
+ $initialref='(PROV'.$this->id.')';
+ if (! empty($this->ref)) $initialref=$this->ref;
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
+ if ($this->db->query($sql))
+ {
+ if ($this->id)
+ {
+ $this->ref = $initialref;
+
+ 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
+ }
+
+ // Add object linked
+ if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+ {
+ foreach($this->linked_objects as $origin => $tmp_origin_id)
+ {
+ if (is_array($tmp_origin_id)) // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+ {
+ foreach($tmp_origin_id as $origin_id)
+ {
+ $ret = $this->add_object_linked($origin, $origin_id);
+ if (! $ret)
+ {
+ $this->error=$this->db->lasterror();
+ $error++;
+ }
+ }
+ }
+ 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)
+ {
+ $this->error=$this->db->lasterror();
+ $error++;
+ }
+ }
+ }
+ }
+
+ if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) // Get contact from origin object
+ {
+ $originforcontact = $this->origin;
+ $originidforcontact = $this->origin_id;
+ if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order
+ {
+ require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+ $exp = new Expedition($this->db);
+ $exp->fetch($this->origin_id);
+ $exp->fetchObjectLinked();
+ if (count($exp->linkedObjectsIds['commande']) > 0)
+ {
+ foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+ {
+ $originforcontact = 'commande';
+ if (is_object($value)) $originidforcontact = $value->id;
+ else $originidforcontact = $value;
+ break; // We take first one
+ }
+ }
+ }
+
+ $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+ $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+
+ $resqlcontact = $this->db->query($sqlcontact);
+ if ($resqlcontact)
+ {
+ while($objcontact = $this->db->fetch_object($resqlcontact))
+ {
+ //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+ $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
+ }
+ }
+ else dol_print_error($resqlcontact);
+ }
+ }
+
+ if (! $error)
+ {
+ $result=$this->insertExtraFields();
+ if ($result < 0) $error++;
+ }
+
+ if (! $error && ! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CREATE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
{
$this->error=$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- }
- }
- else
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ }
+ else
{
- dol_print_error($this->db);
- $this->db->rollback();
- return -1;
- }
- }
+ dol_print_error($this->db);
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * Load an object from its id and create a new one in database
- *
- * @param int $socid Id of thirdparty
- * @return int New id of clone
- */
- function createFromClone($socid=0)
- {
- global $user,$hookmanager;
+ /**
+ * Load an object from its id and create a new one in database
+ *
+ * @param int $socid Id of thirdparty
+ * @return int New id of clone
+ */
+ function createFromClone($socid=0)
+ {
+ global $user,$hookmanager;
- $error=0;
+ $error=0;
- $this->context['createfromclone'] = 'createfromclone';
+ $this->context['createfromclone'] = 'createfromclone';
- $this->db->begin();
+ $this->db->begin();
// get lines so they will be clone
foreach($this->lines as $line)
$line->fetch_optionals();
- // Load source object
- $objFrom = clone $this;
+ // Load source object
+ $objFrom = clone $this;
- // Change socid if needed
- if (! empty($socid) && $socid != $this->socid)
- {
- $objsoc = new Societe($this->db);
+ // Change socid if needed
+ if (! empty($socid) && $socid != $this->socid)
+ {
+ $objsoc = new Societe($this->db);
- if ($objsoc->fetch($socid)>0)
- {
- $this->socid = $objsoc->id;
- $this->cond_reglement_id = (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
- $this->mode_reglement_id = (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
- $this->fk_project = 0;
- $this->fk_delivery_address = 0;
- }
+ if ($objsoc->fetch($socid)>0)
+ {
+ $this->socid = $objsoc->id;
+ $this->cond_reglement_id = (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+ $this->mode_reglement_id = (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+ $this->fk_project = 0;
+ $this->fk_delivery_address = 0;
+ }
- // TODO Change product price if multi-prices
- }
+ // TODO Change product price if multi-prices
+ }
- $this->id=0;
- $this->ref = '';
- $this->statut=self::STATUS_DRAFT;
+ $this->id=0;
+ $this->ref = '';
+ $this->statut=self::STATUS_DRAFT;
- // Clear fields
- $this->user_author_id = $user->id;
- $this->user_valid = '';
- $this->date = dol_now();
- $this->date_commande = dol_now();
- $this->date_creation = '';
- $this->date_validation = '';
- $this->ref_client = '';
+ // Clear fields
+ $this->user_author_id = $user->id;
+ $this->user_valid = '';
+ $this->date = dol_now();
+ $this->date_commande = dol_now();
+ $this->date_creation = '';
+ $this->date_validation = '';
+ $this->ref_client = '';
- // Create clone
- $result=$this->create($user);
- if ($result < 0) $error++;
+ // Create clone
+ $result=$this->create($user);
+ if ($result < 0) $error++;
- if (! $error)
- {
- // Hook of thirdparty module
- if (is_object($hookmanager))
- {
- $parameters=array('objFrom'=>$objFrom);
- $action='';
- $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if ($reshook < 0) $error++;
- }
- }
+ if (! $error)
+ {
+ // Hook of thirdparty module
+ if (is_object($hookmanager))
+ {
+ $parameters=array('objFrom'=>$objFrom);
+ $action='';
+ $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) $error++;
+ }
+ }
- unset($this->context['createfromclone']);
+ unset($this->context['createfromclone']);
- // End
- if (! $error)
- {
- $this->db->commit();
- return $this->id;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
+ // End
+ if (! $error)
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * Load an object from a proposal and create a new order into database
- *
- * @param Object $object Object source
- * @param User $user User making creation
- * @return int <0 if KO, 0 if nothing done, 1 if OK
- */
- function createFromProposal($object, User $user)
- {
- global $conf, $hookmanager;
+ /**
+ * Load an object from a proposal and create a new order into database
+ *
+ * @param Object $object Object source
+ * @param User $user User making creation
+ * @return int <0 if KO, 0 if nothing done, 1 if OK
+ */
+ function createFromProposal($object, User $user)
+ {
+ global $conf, $hookmanager;
dol_include_once('/core/class/extrafields.class.php');
- $error=0;
+ $error=0;
- $this->date_commande = dol_now();
- $this->source = 0;
+ $this->date_commande = dol_now();
+ $this->source = 0;
- $num=count($object->lines);
- for ($i = 0; $i < $num; $i++)
- {
- $line = new OrderLine($this->db);
+ $num=count($object->lines);
+ for ($i = 0; $i < $num; $i++)
+ {
+ $line = new OrderLine($this->db);
- $line->libelle = $object->lines[$i]->libelle;
- $line->label = $object->lines[$i]->label;
- $line->desc = $object->lines[$i]->desc;
- $line->price = $object->lines[$i]->price;
- $line->subprice = $object->lines[$i]->subprice;
- $line->vat_src_code = $object->lines[$i]->vat_src_code;
- $line->tva_tx = $object->lines[$i]->tva_tx;
- $line->localtax1_tx = $object->lines[$i]->localtax1_tx;
- $line->localtax2_tx = $object->lines[$i]->localtax2_tx;
- $line->qty = $object->lines[$i]->qty;
- $line->fk_remise_except = $object->lines[$i]->fk_remise_except;
- $line->remise_percent = $object->lines[$i]->remise_percent;
- $line->fk_product = $object->lines[$i]->fk_product;
- $line->info_bits = $object->lines[$i]->info_bits;
- $line->product_type = $object->lines[$i]->product_type;
- $line->rang = $object->lines[$i]->rang;
- $line->special_code = $object->lines[$i]->special_code;
- $line->fk_parent_line = $object->lines[$i]->fk_parent_line;
- $line->fk_unit = $object->lines[$i]->fk_unit;
+ $line->libelle = $object->lines[$i]->libelle;
+ $line->label = $object->lines[$i]->label;
+ $line->desc = $object->lines[$i]->desc;
+ $line->price = $object->lines[$i]->price;
+ $line->subprice = $object->lines[$i]->subprice;
+ $line->vat_src_code = $object->lines[$i]->vat_src_code;
+ $line->tva_tx = $object->lines[$i]->tva_tx;
+ $line->localtax1_tx = $object->lines[$i]->localtax1_tx;
+ $line->localtax2_tx = $object->lines[$i]->localtax2_tx;
+ $line->qty = $object->lines[$i]->qty;
+ $line->fk_remise_except = $object->lines[$i]->fk_remise_except;
+ $line->remise_percent = $object->lines[$i]->remise_percent;
+ $line->fk_product = $object->lines[$i]->fk_product;
+ $line->info_bits = $object->lines[$i]->info_bits;
+ $line->product_type = $object->lines[$i]->product_type;
+ $line->rang = $object->lines[$i]->rang;
+ $line->special_code = $object->lines[$i]->special_code;
+ $line->fk_parent_line = $object->lines[$i]->fk_parent_line;
+ $line->fk_unit = $object->lines[$i]->fk_unit;
- $line->date_start = $object->lines[$i]->date_start;
- $line->date_end = $object->lines[$i]->date_end;
+ $line->date_start = $object->lines[$i]->date_start;
+ $line->date_end = $object->lines[$i]->date_end;
$line->fk_fournprice = $object->lines[$i]->fk_fournprice;
$marginInfos = getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
@@ -1151,34 +1151,34 @@ class Commande extends CommonOrder
$line->marge_tx = $marginInfos[1];
$line->marque_tx = $marginInfos[2];
- // get extrafields from original line
+ // get extrafields from original line
$object->lines[$i]->fetch_optionals();
foreach($object->lines[$i]->array_options as $options_key => $value)
$line->array_options[$options_key] = $value;
- $this->lines[$i] = $line;
- }
+ $this->lines[$i] = $line;
+ }
- $this->socid = $object->socid;
- $this->fk_project = $object->fk_project;
- $this->cond_reglement_id = $object->cond_reglement_id;
- $this->mode_reglement_id = $object->mode_reglement_id;
- $this->fk_account = $object->fk_account;
- $this->availability_id = $object->availability_id;
- $this->demand_reason_id = $object->demand_reason_id;
- $this->date_livraison = $object->date_livraison;
- $this->shipping_method_id = $object->shipping_method_id;
- $this->warehouse_id = $object->warehouse_id;
- $this->fk_delivery_address = $object->fk_delivery_address;
- $this->contact_id = $object->contactid;
- $this->ref_client = $object->ref_client;
- $this->note_private = $object->note_private;
- $this->note_public = $object->note_public;
+ $this->socid = $object->socid;
+ $this->fk_project = $object->fk_project;
+ $this->cond_reglement_id = $object->cond_reglement_id;
+ $this->mode_reglement_id = $object->mode_reglement_id;
+ $this->fk_account = $object->fk_account;
+ $this->availability_id = $object->availability_id;
+ $this->demand_reason_id = $object->demand_reason_id;
+ $this->date_livraison = $object->date_livraison;
+ $this->shipping_method_id = $object->shipping_method_id;
+ $this->warehouse_id = $object->warehouse_id;
+ $this->fk_delivery_address = $object->fk_delivery_address;
+ $this->contact_id = $object->contactid;
+ $this->ref_client = $object->ref_client;
+ $this->note_private = $object->note_private;
+ $this->note_public = $object->note_public;
- $this->origin = $object->element;
- $this->origin_id = $object->id;
+ $this->origin = $object->element;
+ $this->origin_id = $object->id;
- // get extrafields from original line
+ // get extrafields from original line
$object->fetch_optionals($object->id);
$e = new ExtraFields($this->db);
@@ -1189,129 +1189,129 @@ class Commande extends CommonOrder
$this->array_options[$options_key] = $value;
}
}
- // Possibility to add external linked objects with hooks
- $this->linked_objects[$this->origin] = $this->origin_id;
- if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
- {
- $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
- }
+ // Possibility to add external linked objects with hooks
+ $this->linked_objects[$this->origin] = $this->origin_id;
+ if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
+ {
+ $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
+ }
- $ret = $this->create($user);
+ $ret = $this->create($user);
- if ($ret > 0)
- {
- // Actions hooked (by external module)
- $hookmanager->initHooks(array('orderdao'));
+ if ($ret > 0)
+ {
+ // Actions hooked (by external module)
+ $hookmanager->initHooks(array('orderdao'));
- $parameters=array('objFrom'=>$object);
- $action='';
- $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if ($reshook < 0) $error++;
+ $parameters=array('objFrom'=>$object);
+ $action='';
+ $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) $error++;
- if (! $error)
- {
- // Ne pas passer par la commande provisoire
- if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
- {
- $this->fetch($ret);
- $this->valid($user);
- }
- return $ret;
- }
- else return -1;
- }
- else return -1;
- }
+ if (! $error)
+ {
+ // Ne pas passer par la commande provisoire
+ if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
+ {
+ $this->fetch($ret);
+ $this->valid($user);
+ }
+ return $ret;
+ }
+ else return -1;
+ }
+ else return -1;
+ }
- /**
- * Add an order line into database (linked to product/service or not)
- *
- * @param string $desc Description of line
- * @param float $pu_ht Unit price (without tax)
- * @param float $qty Quantite
- * @param float $txtva Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
- * @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside)
- * @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside)
- * @param int $fk_product Id of product
- * @param float $remise_percent Pourcentage de remise de la ligne
- * @param int $info_bits Bits de type de lignes
- * @param int $fk_remise_except Id remise
- * @param string $price_base_type HT or TTC
- * @param float $pu_ttc Prix unitaire TTC
- * @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- * @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- * @param int $type Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
- * @param int $rang Position of line
- * @param int $special_code Special code (also used by externals modules!)
- * @param int $fk_parent_line Parent line
- * @param int $fk_fournprice Id supplier price
- * @param int $pa_ht Buying price (without tax)
- * @param string $label Label
+ /**
+ * Add an order line into database (linked to product/service or not)
+ *
+ * @param string $desc Description of line
+ * @param float $pu_ht Unit price (without tax)
+ * @param float $qty Quantite
+ * @param float $txtva Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
+ * @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside)
+ * @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside)
+ * @param int $fk_product Id of product
+ * @param float $remise_percent Pourcentage de remise de la ligne
+ * @param int $info_bits Bits de type de lignes
+ * @param int $fk_remise_except Id remise
+ * @param string $price_base_type HT or TTC
+ * @param float $pu_ttc Prix unitaire TTC
+ * @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ * @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ * @param int $type Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+ * @param int $rang Position of line
+ * @param int $special_code Special code (also used by externals modules!)
+ * @param int $fk_parent_line Parent line
+ * @param int $fk_fournprice Id supplier price
+ * @param int $pa_ht Buying price (without tax)
+ * @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 $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 double $pu_ht_devise Unit price in currency
- * @return int >0 if OK, <0 if KO
- *
- * @see add_product
- *
- * Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
- * de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
- * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
- * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
- */
+ * @return int >0 if OK, <0 if KO
+ *
+ * @see add_product
+ *
+ * Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+ * de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
+ * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
+ * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
+ */
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0)
- {
- global $mysoc, $conf, $langs, $user;
+ {
+ global $mysoc, $conf, $langs, $user;
$logtext = "::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent";
$logtext.= ", info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start";
$logtext.= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise";
- dol_syslog(get_class($this).$logtext, LOG_DEBUG);
+ dol_syslog(get_class($this).$logtext, LOG_DEBUG);
- include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
- // Clean parameters
- if (empty($remise_percent)) $remise_percent=0;
- if (empty($qty)) $qty=0;
- if (empty($info_bits)) $info_bits=0;
- if (empty($rang)) $rang=0;
- if (empty($txtva)) $txtva=0;
- if (empty($txlocaltax1)) $txlocaltax1=0;
- if (empty($txlocaltax2)) $txlocaltax2=0;
- if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
- if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
+ // Clean parameters
+ if (empty($remise_percent)) $remise_percent=0;
+ if (empty($qty)) $qty=0;
+ if (empty($info_bits)) $info_bits=0;
+ if (empty($rang)) $rang=0;
+ if (empty($txtva)) $txtva=0;
+ if (empty($txlocaltax1)) $txlocaltax1=0;
+ if (empty($txlocaltax2)) $txlocaltax2=0;
+ if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+ if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
- $remise_percent=price2num($remise_percent);
- $qty=price2num($qty);
- $pu_ht=price2num($pu_ht);
- $pu_ht_devise=price2num($pu_ht_devise);
- $pu_ttc=price2num($pu_ttc);
- $pa_ht=price2num($pa_ht);
- $txtva = price2num($txtva);
- $txlocaltax1 = price2num($txlocaltax1);
- $txlocaltax2 = price2num($txlocaltax2);
- if ($price_base_type=='HT')
- {
- $pu=$pu_ht;
- }
- else
- {
- $pu=$pu_ttc;
- }
- $label=trim($label);
- $desc=trim($desc);
+ $remise_percent=price2num($remise_percent);
+ $qty=price2num($qty);
+ $pu_ht=price2num($pu_ht);
+ $pu_ht_devise=price2num($pu_ht_devise);
+ $pu_ttc=price2num($pu_ttc);
+ $pa_ht=price2num($pa_ht);
+ $txtva = price2num($txtva);
+ $txlocaltax1 = price2num($txlocaltax1);
+ $txlocaltax2 = price2num($txlocaltax2);
+ if ($price_base_type=='HT')
+ {
+ $pu=$pu_ht;
+ }
+ else
+ {
+ $pu=$pu_ttc;
+ }
+ $label=trim($label);
+ $desc=trim($desc);
- // Check parameters
- if ($type < 0) return -1;
+ // Check parameters
+ if ($type < 0) return -1;
- if ($this->statut == self::STATUS_DRAFT)
- {
- $this->db->begin();
+ if ($this->statut == self::STATUS_DRAFT)
+ {
+ $this->db->begin();
- $product_type=$type;
+ $product_type=$type;
if (!empty($fk_product))
{
$product=new Product($this->db);
@@ -1320,105 +1320,105 @@ class Commande extends CommonOrder
if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
{
- $langs->load("errors");
- $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
$this->db->rollback();
return self::STOCK_NOT_ENOUGH_FOR_ORDER;
}
}
// Calcul du total TTC et de la TVA pour la ligne a partir de
- // qty, pu, remise_percent et txtva
- // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
- // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+ // qty, pu, remise_percent et txtva
+ // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+ // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
+ $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
- // Clean vat code
- $vat_src_code='';
- if (preg_match('/\((.*)\)/', $txtva, $reg))
- {
- $vat_src_code = $reg[1];
- $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
- }
+ // Clean vat code
+ $vat_src_code='';
+ if (preg_match('/\((.*)\)/', $txtva, $reg))
+ {
+ $vat_src_code = $reg[1];
+ $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+ }
- $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+ $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
- /*var_dump($txlocaltax1);
- var_dump($txlocaltax2);
- var_dump($localtaxes_type);
- var_dump($tabprice);
- var_dump($tabprice[9]);
- var_dump($tabprice[10]);
- exit;*/
+ /*var_dump($txlocaltax1);
+ var_dump($txlocaltax2);
+ var_dump($localtaxes_type);
+ var_dump($tabprice);
+ var_dump($tabprice[9]);
+ var_dump($tabprice[10]);
+ exit;*/
- $total_ht = $tabprice[0];
- $total_tva = $tabprice[1];
- $total_ttc = $tabprice[2];
- $total_localtax1 = $tabprice[9];
- $total_localtax2 = $tabprice[10];
+ $total_ht = $tabprice[0];
+ $total_tva = $tabprice[1];
+ $total_ttc = $tabprice[2];
+ $total_localtax1 = $tabprice[9];
+ $total_localtax2 = $tabprice[10];
$pu_ht = $tabprice[3];
// MultiCurrency
$multicurrency_total_ht = $tabprice[16];
- $multicurrency_total_tva = $tabprice[17];
- $multicurrency_total_ttc = $tabprice[18];
+ $multicurrency_total_tva = $tabprice[17];
+ $multicurrency_total_ttc = $tabprice[18];
$pu_ht_devise = $tabprice[19];
- // Rang to use
- $rangtouse = $rang;
- if ($rangtouse == -1)
- {
- $rangmax = $this->line_max($fk_parent_line);
- $rangtouse = $rangmax + 1;
- }
+ // Rang to use
+ $rangtouse = $rang;
+ if ($rangtouse == -1)
+ {
+ $rangmax = $this->line_max($fk_parent_line);
+ $rangtouse = $rangmax + 1;
+ }
- // TODO A virer
- // Anciens indicateurs: $price, $remise (a ne plus utiliser)
- $price = $pu;
- $remise = 0;
- if ($remise_percent > 0)
- {
- $remise = round(($pu * $remise_percent / 100), 2);
- $price = $pu - $remise;
- }
+ // TODO A virer
+ // Anciens indicateurs: $price, $remise (a ne plus utiliser)
+ $price = $pu;
+ $remise = 0;
+ if ($remise_percent > 0)
+ {
+ $remise = round(($pu * $remise_percent / 100), 2);
+ $price = $pu - $remise;
+ }
- // Insert line
- $this->line=new OrderLine($this->db);
+ // Insert line
+ $this->line=new OrderLine($this->db);
- $this->line->context = $this->context;
+ $this->line->context = $this->context;
- $this->line->fk_commande=$this->id;
- $this->line->label=$label;
- $this->line->desc=$desc;
- $this->line->qty=$qty;
+ $this->line->fk_commande=$this->id;
+ $this->line->label=$label;
+ $this->line->desc=$desc;
+ $this->line->qty=$qty;
- $this->line->vat_src_code=$vat_src_code;
- $this->line->tva_tx=$txtva;
- $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
- $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
- $this->line->localtax1_type=$localtaxes_type[0];
- $this->line->localtax2_type=$localtaxes_type[2];
- $this->line->fk_product=$fk_product;
+ $this->line->vat_src_code=$vat_src_code;
+ $this->line->tva_tx=$txtva;
+ $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
+ $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
+ $this->line->localtax1_type=$localtaxes_type[0];
+ $this->line->localtax2_type=$localtaxes_type[2];
+ $this->line->fk_product=$fk_product;
$this->line->product_type=$product_type;
- $this->line->fk_remise_except=$fk_remise_except;
- $this->line->remise_percent=$remise_percent;
- $this->line->subprice=$pu_ht;
- $this->line->rang=$rangtouse;
- $this->line->info_bits=$info_bits;
- $this->line->total_ht=$total_ht;
- $this->line->total_tva=$total_tva;
- $this->line->total_localtax1=$total_localtax1;
- $this->line->total_localtax2=$total_localtax2;
- $this->line->total_ttc=$total_ttc;
- $this->line->special_code=$special_code;
- $this->line->origin=$origin;
- $this->line->origin_id=$origin_id;
- $this->line->fk_parent_line=$fk_parent_line;
- $this->line->fk_unit=$fk_unit;
+ $this->line->fk_remise_except=$fk_remise_except;
+ $this->line->remise_percent=$remise_percent;
+ $this->line->subprice=$pu_ht;
+ $this->line->rang=$rangtouse;
+ $this->line->info_bits=$info_bits;
+ $this->line->total_ht=$total_ht;
+ $this->line->total_tva=$total_tva;
+ $this->line->total_localtax1=$total_localtax1;
+ $this->line->total_localtax2=$total_localtax2;
+ $this->line->total_ttc=$total_ttc;
+ $this->line->special_code=$special_code;
+ $this->line->origin=$origin;
+ $this->line->origin_id=$origin_id;
+ $this->line->fk_parent_line=$fk_parent_line;
+ $this->line->fk_unit=$fk_unit;
- $this->line->date_start=$date_start;
- $this->line->date_end=$date_end;
+ $this->line->date_start=$date_start;
+ $this->line->date_end=$date_end;
$this->line->fk_fournprice = $fk_fournprice;
$this->line->pa_ht = $pa_ht;
@@ -1428,187 +1428,187 @@ class Commande extends CommonOrder
$this->line->multicurrency_code = $this->multicurrency_code;
$this->line->multicurrency_subprice = $pu_ht_devise;
$this->line->multicurrency_total_ht = $multicurrency_total_ht;
- $this->line->multicurrency_total_tva = $multicurrency_total_tva;
- $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
+ $this->line->multicurrency_total_tva = $multicurrency_total_tva;
+ $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
- // TODO Ne plus utiliser
- $this->line->price=$price;
- $this->line->remise=$remise;
+ // TODO Ne plus utiliser
+ $this->line->price=$price;
+ $this->line->remise=$remise;
if (is_array($array_options) && count($array_options)>0) {
$this->line->array_options=$array_options;
}
- $result=$this->line->insert($user);
- if ($result > 0)
- {
- // Reorder if child line
- if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+ $result=$this->line->insert($user);
+ if ($result > 0)
+ {
+ // Reorder if child line
+ if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
- // Mise a jour informations denormalisees au niveau de la commande meme
- $result=$this->update_price(1,'auto',0,$mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
- if ($result > 0)
- {
- $this->db->commit();
- return $this->line->rowid;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->error=$this->line->error;
- dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
- $this->db->rollback();
- return -2;
- }
- }
+ // Mise a jour informations denormalisees au niveau de la commande meme
+ $result=$this->update_price(1,'auto',0,$mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ if ($result > 0)
+ {
+ $this->db->commit();
+ return $this->line->rowid;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=$this->line->error;
+ dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
+ $this->db->rollback();
+ return -2;
+ }
+ }
else
{
- dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+ dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
return -3;
- }
- }
+ }
+ }
- /**
- * Add line into array
- * $this->client must be loaded
- *
- * @param int $idproduct Product Id
- * @param float $qty Quantity
- * @param float $remise_percent Product discount relative
- * @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- * @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- * @return void
- *
- * TODO Remplacer les appels a cette fonction par generation objet Ligne
- * insere dans tableau $this->products
- */
- function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
- {
- global $conf, $mysoc;
+ /**
+ * Add line into array
+ * $this->client must be loaded
+ *
+ * @param int $idproduct Product Id
+ * @param float $qty Quantity
+ * @param float $remise_percent Product discount relative
+ * @param int $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ * @param int $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ * @return void
+ *
+ * TODO Remplacer les appels a cette fonction par generation objet Ligne
+ * insere dans tableau $this->products
+ */
+ function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='')
+ {
+ global $conf, $mysoc;
- if (! $qty) $qty = 1;
+ if (! $qty) $qty = 1;
- if ($idproduct > 0)
- {
- $prod=new Product($this->db);
- $prod->fetch($idproduct);
+ if ($idproduct > 0)
+ {
+ $prod=new Product($this->db);
+ $prod->fetch($idproduct);
- $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
- $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
- if (empty($tva_tx)) $tva_npr=0;
- $vat_src_code = ''; // May be defined into tva_tx
+ $tva_tx = get_default_tva($mysoc,$this->thirdparty,$prod->id);
+ $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
+ if (empty($tva_tx)) $tva_npr=0;
+ $vat_src_code = ''; // May be defined into tva_tx
- $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
- $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
+ $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
+ $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
- // multiprix
- if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
- $price = $prod->multiprices[$this->thirdparty->price_level];
- else
- $price = $prod->price;
+ // multiprix
+ if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+ $price = $prod->multiprices[$this->thirdparty->price_level];
+ else
+ $price = $prod->price;
- $line=new OrderLine($this->db);
+ $line=new OrderLine($this->db);
- $line->context = $this->context;
+ $line->context = $this->context;
- $line->fk_product=$idproduct;
- $line->desc=$prod->description;
- $line->qty=$qty;
- $line->subprice=$price;
- $line->remise_percent=$remise_percent;
- $line->vat_src_code=$vat_src_code;
- $line->tva_tx=$tva_tx;
- $line->localtax1_tx=$localtax1_tx;
- $line->localtax2_tx=$localtax2_tx;
- $line->ref=$prod->ref;
- $line->libelle=$prod->label;
- $line->product_desc=$prod->description;
- $line->fk_unit=$prod->fk_unit;
+ $line->fk_product=$idproduct;
+ $line->desc=$prod->description;
+ $line->qty=$qty;
+ $line->subprice=$price;
+ $line->remise_percent=$remise_percent;
+ $line->vat_src_code=$vat_src_code;
+ $line->tva_tx=$tva_tx;
+ $line->localtax1_tx=$localtax1_tx;
+ $line->localtax2_tx=$localtax2_tx;
+ $line->ref=$prod->ref;
+ $line->libelle=$prod->label;
+ $line->product_desc=$prod->description;
+ $line->fk_unit=$prod->fk_unit;
- // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- // Save the start and end date of the line in the object
- if ($date_start) { $line->date_start = $date_start; }
- if ($date_end) { $line->date_end = $date_end; }
+ // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ // Save the start and end date of the line in the object
+ if ($date_start) { $line->date_start = $date_start; }
+ if ($date_end) { $line->date_end = $date_end; }
- $this->lines[] = $line;
+ $this->lines[] = $line;
- /** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
- if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
- {
- $prod = new Product($this->db);
- $prod->fetch($idproduct);
- $prod -> get_sousproduits_arbo();
- $prods_arbo = $prod->get_arbo_each_prod();
- if(count($prods_arbo) > 0)
- {
- foreach($prods_arbo as $key => $value)
- {
- // print "id : ".$value[1].' :qty: '.$value[0].'
';
- if(! in_array($value[1],$this->products))
- $this->add_product($value[1], $value[0]);
+ /** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
+ if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+ {
+ $prod = new Product($this->db);
+ $prod->fetch($idproduct);
+ $prod -> get_sousproduits_arbo();
+ $prods_arbo = $prod->get_arbo_each_prod();
+ if(count($prods_arbo) > 0)
+ {
+ foreach($prods_arbo as $key => $value)
+ {
+ // print "id : ".$value[1].' :qty: '.$value[0].'
';
+ if(! in_array($value[1],$this->products))
+ $this->add_product($value[1], $value[0]);
- }
- }
+ }
+ }
- }
- **/
- }
- }
+ }
+ **/
+ }
+ }
- /**
- * Get object and lines from database
- *
- * @param int $id Id of object to load
- * @param string $ref Ref of object
- * @param string $ref_ext External reference of object
- * @param string $ref_int Internal reference of other object
- * @return int >0 if OK, <0 if KO, 0 if not found
- */
- function fetch($id, $ref='', $ref_ext='', $ref_int='')
- {
+ /**
+ * Get object and lines from database
+ *
+ * @param int $id Id of object to load
+ * @param string $ref Ref of object
+ * @param string $ref_ext External reference of object
+ * @param string $ref_int Internal reference of other object
+ * @return int >0 if OK, <0 if KO, 0 if not found
+ */
+ function fetch($id, $ref='', $ref_ext='', $ref_int='')
+ {
- // Check parameters
- if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+ // Check parameters
+ if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
- $sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
- $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
- $sql.= ', c.fk_account';
- $sql.= ', c.date_commande';
- $sql.= ', c.date_livraison';
- $sql.= ', c.fk_shipping_method';
- $sql.= ', c.fk_warehouse';
- $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
- $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.last_main_doc, c.fk_delivery_address, c.extraparams';
- $sql.= ', c.fk_incoterms, c.location_incoterms';
+ $sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
+ $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
+ $sql.= ', c.fk_account';
+ $sql.= ', c.date_commande';
+ $sql.= ', c.date_livraison';
+ $sql.= ', c.fk_shipping_method';
+ $sql.= ', c.fk_warehouse';
+ $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
+ $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.last_main_doc, c.fk_delivery_address, c.extraparams';
+ $sql.= ', c.fk_incoterms, c.location_incoterms';
$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
- $sql.= ", i.libelle as libelle_incoterms";
- $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
- $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
- $sql.= ', ca.code as availability_code, ca.label as availability_label';
- $sql.= ', dr.code as demand_reason_code';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
+ $sql.= ", i.libelle as libelle_incoterms";
+ $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+ $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
+ $sql.= ', ca.code as availability_code, ca.label as availability_label';
+ $sql.= ', dr.code as demand_reason_code';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
if ($id) $sql.= " WHERE c.rowid=".$id;
else $sql.= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
- if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
- if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
- if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
+ if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
+ if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+ if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
- dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $result = $this->db->query($sql);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+ $result = $this->db->query($sql);
if ($result)
{
$obj = $this->db->fetch_object($result);
@@ -1617,50 +1617,50 @@ class Commande extends CommonOrder
$this->id = $obj->rowid;
$this->entity = $obj->entity;
- $this->ref = $obj->ref;
- $this->ref_client = $obj->ref_client;
- $this->ref_customer = $obj->ref_client;
- $this->ref_ext = $obj->ref_ext;
- $this->ref_int = $obj->ref_int;
- $this->socid = $obj->fk_soc;
- $this->statut = $obj->fk_statut;
- $this->user_author_id = $obj->fk_user_author;
- $this->user_valid = $obj->fk_user_valid;
- $this->total_ht = $obj->total_ht;
- $this->total_tva = $obj->total_tva;
- $this->total_localtax1 = $obj->total_localtax1;
- $this->total_localtax2 = $obj->total_localtax2;
- $this->total_ttc = $obj->total_ttc;
- $this->date = $this->db->jdate($obj->date_commande);
- $this->date_commande = $this->db->jdate($obj->date_commande);
- $this->remise = $obj->remise;
- $this->remise_percent = $obj->remise_percent;
- $this->remise_absolue = $obj->remise_absolue;
- $this->source = $obj->source;
- $this->billed = $obj->billed;
- $this->note = $obj->note_private; // deprecated
- $this->note_private = $obj->note_private;
- $this->note_public = $obj->note_public;
- $this->fk_project = $obj->fk_projet;
- $this->modelpdf = $obj->model_pdf;
- $this->last_main_doc = $obj->last_main_doc;
- $this->mode_reglement_id = $obj->fk_mode_reglement;
- $this->mode_reglement_code = $obj->mode_reglement_code;
- $this->mode_reglement = $obj->mode_reglement_libelle;
- $this->cond_reglement_id = $obj->fk_cond_reglement;
- $this->cond_reglement_code = $obj->cond_reglement_code;
- $this->cond_reglement = $obj->cond_reglement_libelle;
- $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
- $this->fk_account = $obj->fk_account;
- $this->availability_id = $obj->fk_availability;
- $this->availability_code = $obj->availability_code;
- $this->availability = $obj->availability_label;
- $this->demand_reason_id = $obj->fk_input_reason;
- $this->demand_reason_code = $obj->demand_reason_code;
- $this->date_livraison = $this->db->jdate($obj->date_livraison);
- $this->shipping_method_id = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
- $this->warehouse_id = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
- $this->fk_delivery_address = $obj->fk_delivery_address;
+ $this->ref = $obj->ref;
+ $this->ref_client = $obj->ref_client;
+ $this->ref_customer = $obj->ref_client;
+ $this->ref_ext = $obj->ref_ext;
+ $this->ref_int = $obj->ref_int;
+ $this->socid = $obj->fk_soc;
+ $this->statut = $obj->fk_statut;
+ $this->user_author_id = $obj->fk_user_author;
+ $this->user_valid = $obj->fk_user_valid;
+ $this->total_ht = $obj->total_ht;
+ $this->total_tva = $obj->total_tva;
+ $this->total_localtax1 = $obj->total_localtax1;
+ $this->total_localtax2 = $obj->total_localtax2;
+ $this->total_ttc = $obj->total_ttc;
+ $this->date = $this->db->jdate($obj->date_commande);
+ $this->date_commande = $this->db->jdate($obj->date_commande);
+ $this->remise = $obj->remise;
+ $this->remise_percent = $obj->remise_percent;
+ $this->remise_absolue = $obj->remise_absolue;
+ $this->source = $obj->source;
+ $this->billed = $obj->billed;
+ $this->note = $obj->note_private; // deprecated
+ $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
+ $this->fk_project = $obj->fk_projet;
+ $this->modelpdf = $obj->model_pdf;
+ $this->last_main_doc = $obj->last_main_doc;
+ $this->mode_reglement_id = $obj->fk_mode_reglement;
+ $this->mode_reglement_code = $obj->mode_reglement_code;
+ $this->mode_reglement = $obj->mode_reglement_libelle;
+ $this->cond_reglement_id = $obj->fk_cond_reglement;
+ $this->cond_reglement_code = $obj->cond_reglement_code;
+ $this->cond_reglement = $obj->cond_reglement_libelle;
+ $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
+ $this->fk_account = $obj->fk_account;
+ $this->availability_id = $obj->fk_availability;
+ $this->availability_code = $obj->availability_code;
+ $this->availability = $obj->availability_label;
+ $this->demand_reason_id = $obj->fk_input_reason;
+ $this->demand_reason_code = $obj->demand_reason_code;
+ $this->date_livraison = $this->db->jdate($obj->date_livraison);
+ $this->shipping_method_id = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+ $this->warehouse_id = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
+ $this->fk_delivery_address = $obj->fk_delivery_address;
//Incoterms
$this->fk_incoterms = $obj->fk_incoterms;
@@ -1675,207 +1675,207 @@ class Commande extends CommonOrder
$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
- $this->extraparams = (array) json_decode($obj->extraparams, true);
+ $this->extraparams = (array) json_decode($obj->extraparams, true);
- $this->lines = array();
+ $this->lines = array();
- if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+ if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
- // Retreive all extrafield
- // fetch optionals attributes and labels
- $this->fetch_optionals();
+ // Retreive all extrafield
+ // fetch optionals attributes and labels
+ $this->fetch_optionals();
- $this->db->free($result);
+ $this->db->free($result);
- /*
- * Lines
- */
- $result=$this->fetch_lines();
- if ($result < 0)
- {
- return -3;
- }
- return 1;
- }
- else
- {
- $this->error='Order with id '.$id.' not found sql='.$sql;
- return 0;
- }
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }
- }
+ /*
+ * Lines
+ */
+ $result=$this->fetch_lines();
+ if ($result < 0)
+ {
+ return -3;
+ }
+ return 1;
+ }
+ else
+ {
+ $this->error='Order with id '.$id.' not found sql='.$sql;
+ return 0;
+ }
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
- /**
- * Adding line of fixed discount in the order in DB
- *
- * @param int $idremise Id de la remise fixe
- * @return int >0 si ok, <0 si ko
- */
- function insert_discount($idremise)
- {
- global $langs;
+ /**
+ * Adding line of fixed discount in the order in DB
+ *
+ * @param int $idremise Id de la remise fixe
+ * @return int >0 si ok, <0 si ko
+ */
+ function insert_discount($idremise)
+ {
+ global $langs;
- include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
- include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
- $this->db->begin();
+ $this->db->begin();
- $remise=new DiscountAbsolute($this->db);
- $result=$remise->fetch($idremise);
+ $remise=new DiscountAbsolute($this->db);
+ $result=$remise->fetch($idremise);
- if ($result > 0)
- {
- if ($remise->fk_facture) // Protection against multiple submission
- {
- $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
- $this->db->rollback();
- return -5;
- }
+ if ($result > 0)
+ {
+ if ($remise->fk_facture) // Protection against multiple submission
+ {
+ $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+ $this->db->rollback();
+ return -5;
+ }
- $line = new OrderLine($this->db);
+ $line = new OrderLine($this->db);
- $line->fk_commande=$this->id;
- $line->fk_remise_except=$remise->id;
- $line->desc=$remise->description; // Description ligne
- $line->vat_src_code=$remise->vat_src_code;
- $line->tva_tx=$remise->tva_tx;
- $line->subprice=-$remise->amount_ht;
- $line->price=-$remise->amount_ht;
- $line->fk_product=0; // Id produit predefini
- $line->qty=1;
- $line->remise=0;
- $line->remise_percent=0;
- $line->rang=-1;
- $line->info_bits=2;
+ $line->fk_commande=$this->id;
+ $line->fk_remise_except=$remise->id;
+ $line->desc=$remise->description; // Description ligne
+ $line->vat_src_code=$remise->vat_src_code;
+ $line->tva_tx=$remise->tva_tx;
+ $line->subprice=-$remise->amount_ht;
+ $line->price=-$remise->amount_ht;
+ $line->fk_product=0; // Id produit predefini
+ $line->qty=1;
+ $line->remise=0;
+ $line->remise_percent=0;
+ $line->rang=-1;
+ $line->info_bits=2;
- $line->total_ht = -$remise->amount_ht;
- $line->total_tva = -$remise->amount_tva;
- $line->total_ttc = -$remise->amount_ttc;
+ $line->total_ht = -$remise->amount_ht;
+ $line->total_tva = -$remise->amount_tva;
+ $line->total_ttc = -$remise->amount_ttc;
- $result=$line->insert();
- if ($result > 0)
- {
- $result=$this->update_price(1);
- if ($result > 0)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->error=$line->error;
- $this->db->rollback();
- return -2;
- }
- }
- else
- {
- $this->db->rollback();
- return -2;
- }
- }
+ $result=$line->insert();
+ if ($result > 0)
+ {
+ $result=$this->update_price(1);
+ if ($result > 0)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=$line->error;
+ $this->db->rollback();
+ return -2;
+ }
+ }
+ else
+ {
+ $this->db->rollback();
+ return -2;
+ }
+ }
- /**
- * Load array lines
- *
- * @param int $only_product Return only physical products
- * @return int <0 if KO, >0 if OK
- */
- function fetch_lines($only_product=0)
- {
- $this->lines=array();
+ /**
+ * Load array lines
+ *
+ * @param int $only_product Return only physical products
+ * @return int <0 if KO, >0 if OK
+ */
+ function fetch_lines($only_product=0)
+ {
+ $this->lines=array();
- $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
- $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
- $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
- $sql.= ' l.fk_unit,';
+ $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+ $sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
+ $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
+ $sql.= ' l.fk_unit,';
$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
- $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
- $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
- $sql.= ' WHERE l.fk_commande = '.$this->id;
- if ($only_product) $sql .= ' AND p.fk_product_type = 0';
- $sql .= ' ORDER BY l.rang, l.rowid';
+ $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+ $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
+ $sql.= ' WHERE l.fk_commande = '.$this->id;
+ if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+ $sql .= ' ORDER BY l.rang, l.rowid';
- dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
- $result = $this->db->query($sql);
- if ($result)
- {
- $num = $this->db->num_rows($result);
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $num = $this->db->num_rows($result);
- $i = 0;
- while ($i < $num)
- {
- $objp = $this->db->fetch_object($result);
+ $i = 0;
+ while ($i < $num)
+ {
+ $objp = $this->db->fetch_object($result);
- $line = new OrderLine($this->db);
+ $line = new OrderLine($this->db);
- $line->rowid = $objp->rowid;
- $line->id = $objp->rowid;
- $line->fk_commande = $objp->fk_commande;
- $line->commande_id = $objp->fk_commande;
- $line->label = $objp->custom_label;
- $line->desc = $objp->description;
- $line->description = $objp->description; // Description line
- $line->product_type = $objp->product_type;
- $line->qty = $objp->qty;
+ $line->rowid = $objp->rowid;
+ $line->id = $objp->rowid;
+ $line->fk_commande = $objp->fk_commande;
+ $line->commande_id = $objp->fk_commande;
+ $line->label = $objp->custom_label;
+ $line->desc = $objp->description;
+ $line->description = $objp->description; // Description line
+ $line->product_type = $objp->product_type;
+ $line->qty = $objp->qty;
- $line->vat_src_code = $objp->vat_src_code;
- $line->tva_tx = $objp->tva_tx;
- $line->localtax1_tx = $objp->localtax1_tx;
- $line->localtax2_tx = $objp->localtax2_tx;
- $line->localtax1_type = $objp->localtax1_type;
- $line->localtax2_type = $objp->localtax2_type;
- $line->total_ht = $objp->total_ht;
- $line->total_ttc = $objp->total_ttc;
- $line->total_tva = $objp->total_tva;
- $line->total_localtax1 = $objp->total_localtax1;
- $line->total_localtax2 = $objp->total_localtax2;
- $line->subprice = $objp->subprice;
- $line->fk_remise_except = $objp->fk_remise_except;
- $line->remise_percent = $objp->remise_percent;
- $line->price = $objp->price;
- $line->fk_product = $objp->fk_product;
+ $line->vat_src_code = $objp->vat_src_code;
+ $line->tva_tx = $objp->tva_tx;
+ $line->localtax1_tx = $objp->localtax1_tx;
+ $line->localtax2_tx = $objp->localtax2_tx;
+ $line->localtax1_type = $objp->localtax1_type;
+ $line->localtax2_type = $objp->localtax2_type;
+ $line->total_ht = $objp->total_ht;
+ $line->total_ttc = $objp->total_ttc;
+ $line->total_tva = $objp->total_tva;
+ $line->total_localtax1 = $objp->total_localtax1;
+ $line->total_localtax2 = $objp->total_localtax2;
+ $line->subprice = $objp->subprice;
+ $line->fk_remise_except = $objp->fk_remise_except;
+ $line->remise_percent = $objp->remise_percent;
+ $line->price = $objp->price;
+ $line->fk_product = $objp->fk_product;
$line->fk_fournprice = $objp->fk_fournprice;
- $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
- $line->pa_ht = $marginInfos[0];
- $line->marge_tx = $marginInfos[1];
- $line->marque_tx = $marginInfos[2];
- $line->rang = $objp->rang;
- $line->info_bits = $objp->info_bits;
- $line->special_code = $objp->special_code;
- $line->fk_parent_line = $objp->fk_parent_line;
+ $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+ $line->pa_ht = $marginInfos[0];
+ $line->marge_tx = $marginInfos[1];
+ $line->marque_tx = $marginInfos[2];
+ $line->rang = $objp->rang;
+ $line->info_bits = $objp->info_bits;
+ $line->special_code = $objp->special_code;
+ $line->fk_parent_line = $objp->fk_parent_line;
- $line->ref = $objp->product_ref;
- $line->product_ref = $objp->product_ref;
- $line->libelle = $objp->product_label;
- $line->product_label = $objp->product_label;
- $line->product_desc = $objp->product_desc;
- $line->product_tobatch = $objp->product_tobatch;
- $line->fk_product_type = $objp->fk_product_type; // Produit ou service
- $line->fk_unit = $objp->fk_unit;
+ $line->ref = $objp->product_ref;
+ $line->product_ref = $objp->product_ref;
+ $line->libelle = $objp->product_label;
+ $line->product_label = $objp->product_label;
+ $line->product_desc = $objp->product_desc;
+ $line->product_tobatch = $objp->product_tobatch;
+ $line->fk_product_type = $objp->fk_product_type; // Produit ou service
+ $line->fk_unit = $objp->fk_unit;
- $line->weight = $objp->weight;
- $line->weight_units = $objp->weight_units;
- $line->volume = $objp->volume;
- $line->volume_units = $objp->volume_units;
+ $line->weight = $objp->weight;
+ $line->weight_units = $objp->weight_units;
+ $line->volume = $objp->volume;
+ $line->volume_units = $objp->volume_units;
- $line->date_start = $this->db->jdate($objp->date_start);
- $line->date_end = $this->db->jdate($objp->date_end);
+ $line->date_start = $this->db->jdate($objp->date_start);
+ $line->date_end = $this->db->jdate($objp->date_end);
// Multicurrency
$line->fk_multicurrency = $objp->fk_multicurrency;
@@ -1885,810 +1885,810 @@ class Commande extends CommonOrder
$line->multicurrency_total_tva = $objp->multicurrency_total_tva;
$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
- $this->lines[$i] = $line;
+ $this->lines[$i] = $line;
- $i++;
- }
+ $i++;
+ }
- $this->db->free($result);
+ $this->db->free($result);
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- return -3;
- }
- }
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -3;
+ }
+ }
- /**
- * Return number of line with type product.
- *
- * @return int <0 if KO, Nbr of product lines if OK
- */
- function getNbOfProductsLines()
- {
- $nb=0;
- foreach($this->lines as $line)
- {
- if ($line->product_type == 0) $nb++;
- }
- return $nb;
- }
+ /**
+ * Return number of line with type product.
+ *
+ * @return int <0 if KO, Nbr of product lines if OK
+ */
+ function getNbOfProductsLines()
+ {
+ $nb=0;
+ foreach($this->lines as $line)
+ {
+ if ($line->product_type == 0) $nb++;
+ }
+ return $nb;
+ }
- /**
- * Return number of line with type service.
- *
- * @return int <0 if KO, Nbr of service lines if OK
- */
- function getNbOfServicesLines()
- {
- $nb=0;
- foreach($this->lines as $line)
- {
- if ($line->product_type == 1) $nb++;
- }
- return $nb;
- }
+ /**
+ * Return number of line with type service.
+ *
+ * @return int <0 if KO, Nbr of service lines if OK
+ */
+ function getNbOfServicesLines()
+ {
+ $nb=0;
+ foreach($this->lines as $line)
+ {
+ if ($line->product_type == 1) $nb++;
+ }
+ return $nb;
+ }
- /**
- * Count numbe rof shipments for this order
- *
- * @return int <0 if KO, Nb of shipment found if OK
- */
- function getNbOfShipments()
- {
- $nb = 0;
+ /**
+ * Count numbe rof shipments for this order
+ *
+ * @return int <0 if KO, Nb of shipment found if OK
+ */
+ function getNbOfShipments()
+ {
+ $nb = 0;
- $sql = 'SELECT COUNT(DISTINCT ed.fk_expedition) as nb';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
- $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
- $sql.= ' WHERE';
- $sql.= ' ed.fk_origin_line = cd.rowid';
- $sql.= ' AND cd.fk_commande =' .$this->id;
- //print $sql;
+ $sql = 'SELECT COUNT(DISTINCT ed.fk_expedition) as nb';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
+ $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
+ $sql.= ' WHERE';
+ $sql.= ' ed.fk_origin_line = cd.rowid';
+ $sql.= ' AND cd.fk_commande =' .$this->id;
+ //print $sql;
- dol_syslog(get_class($this)."::getNbOfShipments", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $obj = $this->db->fetch_object($resql);
- if ($obj) $nb = $obj->nb;
+ dol_syslog(get_class($this)."::getNbOfShipments", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) $nb = $obj->nb;
- $this->db->free($resql);
- return $nb;
- }
- else
- {
- $this->error=$this->db->lasterror();
- return -1;
- }
- }
+ $this->db->free($resql);
+ return $nb;
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
+ }
- /**
- * Load array this->expeditions of lines of shipments with nb of products sent for each order line
- * Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
- *
- * @param int $filtre_statut Filter on shipment status
- * @return int <0 if KO, Nb of lines found if OK
- */
- function loadExpeditions($filtre_statut=-1)
- {
- $this->expeditions = array();
+ /**
+ * Load array this->expeditions of lines of shipments with nb of products sent for each order line
+ * Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
+ *
+ * @param int $filtre_statut Filter on shipment status
+ * @return int <0 if KO, Nb of lines found if OK
+ */
+ function loadExpeditions($filtre_statut=-1)
+ {
+ $this->expeditions = array();
- $sql = 'SELECT cd.rowid, cd.fk_product,';
- $sql.= ' sum(ed.qty) as qty';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
- if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
- $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
- $sql.= ' WHERE';
- if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
- $sql.= ' ed.fk_origin_line = cd.rowid';
- $sql.= ' AND cd.fk_commande =' .$this->id;
- if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
- if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
- $sql.= ' GROUP BY cd.rowid, cd.fk_product';
- //print $sql;
+ $sql = 'SELECT cd.rowid, cd.fk_product,';
+ $sql.= ' sum(ed.qty) as qty';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
+ if ($filtre_statut >= 0) $sql.= ' '.MAIN_DB_PREFIX.'expedition as e,';
+ $sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
+ $sql.= ' WHERE';
+ if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
+ $sql.= ' ed.fk_origin_line = cd.rowid';
+ $sql.= ' AND cd.fk_commande =' .$this->id;
+ if ($this->fk_product > 0) $sql.= ' AND cd.fk_product = '.$this->fk_product;
+ if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
+ $sql.= ' GROUP BY cd.rowid, cd.fk_product';
+ //print $sql;
- dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
- $this->expeditions[$obj->rowid] = $obj->qty;
- $i++;
- }
- $this->db->free($resql);
- return $num;
- }
- else
- {
- $this->error=$this->db->lasterror();
- return -1;
- }
- }
+ dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $this->expeditions[$obj->rowid] = $obj->qty;
+ $i++;
+ }
+ $this->db->free($resql);
+ return $num;
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
+ }
- /**
- * Returns a array with expeditions lines number
- *
- * @return int Nb of shipments
- *
- * TODO deprecate, move to Shipping class
- */
- function nb_expedition()
- {
- $sql = 'SELECT count(*)';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
- $sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
- $sql.= ' WHERE el.fk_source = '.$this->id;
- $sql.= " AND el.fk_target = e.rowid";
- $sql.= " AND el.targettype = 'shipping'";
+ /**
+ * Returns a array with expeditions lines number
+ *
+ * @return int Nb of shipments
+ *
+ * TODO deprecate, move to Shipping class
+ */
+ function nb_expedition()
+ {
+ $sql = 'SELECT count(*)';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
+ $sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
+ $sql.= ' WHERE el.fk_source = '.$this->id;
+ $sql.= " AND el.fk_target = e.rowid";
+ $sql.= " AND el.targettype = 'shipping'";
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $row = $this->db->fetch_row($resql);
- return $row[0];
- }
- else dol_print_error($this->db);
- }
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $row = $this->db->fetch_row($resql);
+ return $row[0];
+ }
+ else dol_print_error($this->db);
+ }
- /**
- * Return a array with the pending stock by product
- *
- * @param int $filtre_statut Filtre sur statut
- * @return int 0 si OK, <0 si KO
- *
- * TODO FONCTION NON FINIE A FINIR
- */
- function stock_array($filtre_statut=self::STATUS_CANCELED)
- {
- $this->stocks = array();
+ /**
+ * Return a array with the pending stock by product
+ *
+ * @param int $filtre_statut Filtre sur statut
+ * @return int 0 si OK, <0 si KO
+ *
+ * TODO FONCTION NON FINIE A FINIR
+ */
+ function stock_array($filtre_statut=self::STATUS_CANCELED)
+ {
+ $this->stocks = array();
- // Tableau des id de produit de la commande
+ // Tableau des id de produit de la commande
$array_of_product=array();
- // Recherche total en stock pour chaque produit
- // TODO $array_of_product est défini vide juste au dessus !!
- if (count($array_of_product))
- {
- $sql = "SELECT fk_product, sum(ps.reel) as total";
- $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
- $sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
- $sql.= ' GROUP BY fk_product ';
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
- $this->stocks[$obj->fk_product] = $obj->total;
- $i++;
- }
- $this->db->free($resql);
- }
- }
- return 0;
- }
+ // Recherche total en stock pour chaque produit
+ // TODO $array_of_product est défini vide juste au dessus !!
+ if (count($array_of_product))
+ {
+ $sql = "SELECT fk_product, sum(ps.reel) as total";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+ $sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
+ $sql.= ' GROUP BY fk_product ';
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $this->stocks[$obj->fk_product] = $obj->total;
+ $i++;
+ }
+ $this->db->free($resql);
+ }
+ }
+ return 0;
+ }
- /**
- * Delete an order line
- *
- * @param User $user User object
- * @param int $lineid Id of line to delete
- * @return int >0 if OK, 0 if nothing to do, <0 if KO
- */
- function deleteline($user=null, $lineid=0)
- {
- if ($this->statut == self::STATUS_DRAFT)
- {
- $this->db->begin();
+ /**
+ * Delete an order line
+ *
+ * @param User $user User object
+ * @param int $lineid Id of line to delete
+ * @return int >0 if OK, 0 if nothing to do, <0 if KO
+ */
+ function deleteline($user=null, $lineid=0)
+ {
+ if ($this->statut == self::STATUS_DRAFT)
+ {
+ $this->db->begin();
- $sql = "SELECT fk_product, qty";
- $sql.= " FROM ".MAIN_DB_PREFIX."commandedet";
- $sql.= " WHERE rowid = ".$lineid;
+ $sql = "SELECT fk_product, qty";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commandedet";
+ $sql.= " WHERE rowid = ".$lineid;
- $result = $this->db->query($sql);
- if ($result)
- {
- $obj = $this->db->fetch_object($result);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $obj = $this->db->fetch_object($result);
- if ($obj)
- {
- $product = new Product($this->db);
- $product->id = $obj->fk_product;
+ if ($obj)
+ {
+ $product = new Product($this->db);
+ $product->id = $obj->fk_product;
- // Delete line
- $line = new OrderLine($this->db);
+ // Delete line
+ $line = new OrderLine($this->db);
- // For triggers
- $line->fetch($lineid);
+ // For triggers
+ $line->fetch($lineid);
- if ($line->delete($user) > 0)
- {
- $result=$this->update_price(1);
-
- if ($result > 0)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->db->rollback();
- $this->error=$this->db->lasterror();
- return -1;
- }
- }
- else
- {
- $this->db->rollback();
- $this->error=$line->error;
- return -1;
- }
- }
- else
- {
- $this->db->rollback();
- return 0;
- }
- }
- else
- {
- $this->db->rollback();
- $this->error=$this->db->lasterror();
- return -1;
- }
- }
- else
- {
- $this->error='ErrorDeleteLineNotAllowedByObjectStatus';
- return -1;
- }
- }
-
- /**
- * Applique une remise relative
- *
- * @param User $user User qui positionne la remise
- * @param float $remise Discount (percent)
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function set_remise($user, $remise, $notrigger=0)
- {
- $remise=trim($remise)?trim($remise):0;
-
- if ($user->rights->commande->creer)
- {
- $error=0;
-
- $this->db->begin();
-
- $remise=price2num($remise);
-
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql.= ' SET remise_percent = '.$remise;
- $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
-
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
-
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->remise_percent = $remise;
- $this->update_price(1);
- }
-
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- }
-
-
- /**
- * Applique une remise absolue
- *
- * @param User $user User qui positionne la remise
- * @param float $remise Discount
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function set_remise_absolue($user, $remise, $notrigger=0)
- {
- $remise=trim($remise)?trim($remise):0;
-
- if ($user->rights->commande->creer)
- {
- $error=0;
-
- $this->db->begin();
-
- $remise=price2num($remise);
-
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql.= ' SET remise_absolue = '.$remise;
- $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
-
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
-
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->remise_absolue = $remise;
- $this->update_price(1);
- }
-
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- }
-
-
- /**
- * Set the order date
- *
- * @param User $user Object user making change
- * @param int $date Date
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function set_date($user, $date, $notrigger=0)
- {
- if ($user->rights->commande->creer)
- {
- $error=0;
-
- $this->db->begin();
-
- $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
- $sql.= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
- $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
-
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
-
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->date = $date;
- }
-
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- return -2;
- }
- }
-
- /**
- * Set the planned delivery date
- *
- * @param User $user Objet utilisateur qui modifie
- * @param int $date_livraison Date de livraison
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 si ko, >0 si ok
- */
- function set_date_livraison($user, $date_livraison, $notrigger=0)
- {
- if ($user->rights->commande->creer)
- {
- $error=0;
-
- $this->db->begin();
-
- $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
- $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
- $sql.= " WHERE rowid = ".$this->id;
-
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
-
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->date_livraison = $date_livraison;
- }
-
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- return -2;
- }
- }
-
- /**
- * Return list of orders (eventuelly filtered on a user) into an array
- *
- * @param int $shortlist 0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
- * @param int $draft 0=not draft, 1=draft
- * @param User $excluser Objet user to exclude
- * @param int $socid Id third pary
- * @param int $limit For pagination
- * @param int $offset For pagination
- * @param string $sortfield Sort criteria
- * @param string $sortorder Sort order
- * @return int -1 if KO, array with result if OK
- */
- function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC')
- {
- global $user;
-
- $ga = array();
-
- $sql = "SELECT s.rowid, s.nom as name, s.client,";
- $sql.= " c.rowid as cid, c.ref";
- if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
- if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE c.entity IN (".getEntity('commande').")";
- $sql.= " AND c.fk_soc = s.rowid";
- if (! $user->rights->societe->client->voir && ! $socid) //restriction
- {
- $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- }
- if ($socid) $sql.= " AND s.rowid = ".$socid;
- if ($draft) $sql.= " AND c.fk_statut = ".self::STATUS_DRAFT;
- if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
- $sql.= $this->db->order($sortfield,$sortorder);
- $sql.= $this->db->plimit($limit,$offset);
-
- $result=$this->db->query($sql);
- if ($result)
- {
- $numc = $this->db->num_rows($result);
- if ($numc)
- {
- $i = 0;
- while ($i < $numc)
- {
- $obj = $this->db->fetch_object($result);
-
- if ($shortlist == 1)
- {
- $ga[$obj->cid] = $obj->ref;
- }
- else if ($shortlist == 2)
- {
- $ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
- }
- else
+ if ($line->delete($user) > 0)
{
- $ga[$i]['id'] = $obj->cid;
- $ga[$i]['ref'] = $obj->ref;
- $ga[$i]['name'] = $obj->name;
- }
- $i++;
- }
- }
- return $ga;
- }
- else
- {
- dol_print_error($this->db);
- return -1;
- }
- }
+ $result=$this->update_price(1);
- /**
- * Update delivery delay
- *
- * @param int $availability_id Id du nouveau mode
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int >0 if OK, <0 if KO
- */
- function availability($availability_id, $notrigger=0)
- {
- global $user;
+ if ($result > 0)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->db->rollback();
+ $this->error=$line->error;
+ return -1;
+ }
+ }
+ else
+ {
+ $this->db->rollback();
+ return 0;
+ }
+ }
+ else
+ {
+ $this->db->rollback();
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error='ErrorDeleteLineNotAllowedByObjectStatus';
+ return -1;
+ }
+ }
- dol_syslog('Commande::availability('.$availability_id.')');
- if ($this->statut >= self::STATUS_DRAFT)
- {
- $error=0;
+ /**
+ * Applique une remise relative
+ *
+ * @param User $user User qui positionne la remise
+ * @param float $remise Discount (percent)
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function set_remise($user, $remise, $notrigger=0)
+ {
+ $remise=trim($remise)?trim($remise):0;
- $this->db->begin();
+ if ($user->rights->commande->creer)
+ {
+ $error=0;
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql .= ' SET fk_availability = '.$availability_id;
- $sql .= ' WHERE rowid='.$this->id;
+ $this->db->begin();
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
+ $remise=price2num($remise);
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->availability_id = $availability_id;
- }
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql.= ' SET remise_percent = '.$remise;
+ $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- $error_str='Command status do not meet requirement '.$this->statut;
- dol_syslog(__METHOD__.$error_str, LOG_ERR);
- $this->error=$error_str;
- $this->errors[]= $this->error;
- return -2;
- }
- }
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->remise_percent = $remise;
+ $this->update_price(1);
+ }
- /**
- * Update order demand_reason
- *
- * @param int $demand_reason_id Id of new demand
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int >0 if ok, <0 if ko
- */
- function demand_reason($demand_reason_id, $notrigger=0)
- {
- global $user;
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
- if ($this->statut >= self::STATUS_DRAFT)
- {
- $error=0;
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ }
- $this->db->begin();
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
- $sql .= ' SET fk_input_reason = '.$demand_reason_id;
- $sql .= ' WHERE rowid='.$this->id;
+ /**
+ * Applique une remise absolue
+ *
+ * @param User $user User qui positionne la remise
+ * @param float $remise Discount
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function set_remise_absolue($user, $remise, $notrigger=0)
+ {
+ $remise=trim($remise)?trim($remise):0;
- dol_syslog(__METHOD__, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
+ if ($user->rights->commande->creer)
+ {
+ $error=0;
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->demand_reason_id = $demand_reason_id;
- }
+ $this->db->begin();
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
+ $remise=price2num($remise);
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- $error_str='order status do not meet requirement '.$this->statut;
- dol_syslog(__METHOD__.$error_str, LOG_ERR);
- $this->error=$error_str;
- $this->errors[]= $this->error;
- return -2;
- }
- }
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql.= ' SET remise_absolue = '.$remise;
+ $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
- /**
- * Set customer ref
- *
- * @param User $user User that make change
- * @param string $ref_client Customer ref
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function set_ref_client($user, $ref_client, $notrigger=0)
- {
- if ($user->rights->commande->creer)
- {
- $error=0;
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
- $this->db->begin();
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->remise_absolue = $remise;
+ $this->update_price(1);
+ }
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
- $sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
- $sql.= ' WHERE rowid = '.$this->id;
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (!$resql)
- {
- $this->errors[]=$this->db->error();
- $error++;
- }
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ }
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->ref_client = $ref_client;
- }
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_MODIFY',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- return -1;
- }
- }
+ /**
+ * Set the order date
+ *
+ * @param User $user Object user making change
+ * @param int $date Date
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function set_date($user, $date, $notrigger=0)
+ {
+ if ($user->rights->commande->creer)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+ $sql.= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
+ $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->date = $date;
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ return -2;
+ }
+ }
+
+ /**
+ * Set the planned delivery date
+ *
+ * @param User $user Objet utilisateur qui modifie
+ * @param int $date_livraison Date de livraison
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 si ko, >0 si ok
+ */
+ function set_date_livraison($user, $date_livraison, $notrigger=0)
+ {
+ if ($user->rights->commande->creer)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
+ $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+ $sql.= " WHERE rowid = ".$this->id;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->date_livraison = $date_livraison;
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ return -2;
+ }
+ }
+
+ /**
+ * Return list of orders (eventuelly filtered on a user) into an array
+ *
+ * @param int $shortlist 0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
+ * @param int $draft 0=not draft, 1=draft
+ * @param User $excluser Objet user to exclude
+ * @param int $socid Id third pary
+ * @param int $limit For pagination
+ * @param int $offset For pagination
+ * @param string $sortfield Sort criteria
+ * @param string $sortorder Sort order
+ * @return int -1 if KO, array with result if OK
+ */
+ function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC')
+ {
+ global $user;
+
+ $ga = array();
+
+ $sql = "SELECT s.rowid, s.nom as name, s.client,";
+ $sql.= " c.rowid as cid, c.ref";
+ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql.= " WHERE c.entity IN (".getEntity('commande').")";
+ $sql.= " AND c.fk_soc = s.rowid";
+ if (! $user->rights->societe->client->voir && ! $socid) //restriction
+ {
+ $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ }
+ if ($socid) $sql.= " AND s.rowid = ".$socid;
+ if ($draft) $sql.= " AND c.fk_statut = ".self::STATUS_DRAFT;
+ if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
+ $sql.= $this->db->order($sortfield,$sortorder);
+ $sql.= $this->db->plimit($limit,$offset);
+
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ $numc = $this->db->num_rows($result);
+ if ($numc)
+ {
+ $i = 0;
+ while ($i < $numc)
+ {
+ $obj = $this->db->fetch_object($result);
+
+ if ($shortlist == 1)
+ {
+ $ga[$obj->cid] = $obj->ref;
+ }
+ else if ($shortlist == 2)
+ {
+ $ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
+ }
+ else
+ {
+ $ga[$i]['id'] = $obj->cid;
+ $ga[$i]['ref'] = $obj->ref;
+ $ga[$i]['name'] = $obj->name;
+ }
+ $i++;
+ }
+ }
+ return $ga;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update delivery delay
+ *
+ * @param int $availability_id Id du nouveau mode
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int >0 if OK, <0 if KO
+ */
+ function availability($availability_id, $notrigger=0)
+ {
+ global $user;
+
+ dol_syslog('Commande::availability('.$availability_id.')');
+ if ($this->statut >= self::STATUS_DRAFT)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql .= ' SET fk_availability = '.$availability_id;
+ $sql .= ' WHERE rowid='.$this->id;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->availability_id = $availability_id;
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ $error_str='Command status do not meet requirement '.$this->statut;
+ dol_syslog(__METHOD__.$error_str, LOG_ERR);
+ $this->error=$error_str;
+ $this->errors[]= $this->error;
+ return -2;
+ }
+ }
+
+ /**
+ * Update order demand_reason
+ *
+ * @param int $demand_reason_id Id of new demand
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int >0 if ok, <0 if ko
+ */
+ function demand_reason($demand_reason_id, $notrigger=0)
+ {
+ global $user;
+
+ dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
+ if ($this->statut >= self::STATUS_DRAFT)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
+ $sql .= ' SET fk_input_reason = '.$demand_reason_id;
+ $sql .= ' WHERE rowid='.$this->id;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->demand_reason_id = $demand_reason_id;
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ $error_str='order status do not meet requirement '.$this->statut;
+ dol_syslog(__METHOD__.$error_str, LOG_ERR);
+ $this->error=$error_str;
+ $this->errors[]= $this->error;
+ return -2;
+ }
+ }
+
+ /**
+ * Set customer ref
+ *
+ * @param User $user User that make change
+ * @param string $ref_client Customer ref
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function set_ref_client($user, $ref_client, $notrigger=0)
+ {
+ if ($user->rights->commande->creer)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
+ $sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
+ $sql.= ' WHERE rowid = '.$this->id;
+
+ dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (!$resql)
+ {
+ $this->errors[]=$this->db->error();
+ $error++;
+ }
+
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->ref_client = $ref_client;
+ }
+
+ if (! $notrigger && empty($error))
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_MODIFY',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ return -1;
+ }
+ }
/**
* Classify the order as invoiced
@@ -2699,7 +2699,7 @@ class Commande extends CommonOrder
*/
function classifyBilled(User $user, $notrigger=0)
{
- $error = 0;
+ $error = 0;
$this->db->begin();
@@ -2718,10 +2718,10 @@ class Commande extends CommonOrder
if (! $notrigger && empty($error))
{
- // Call trigger
- $result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
- if ($result < 0) $error++;
- // End call triggers
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
+ if ($result < 0) $error++;
+ // End call triggers
}
if (! $error)
@@ -2743,7 +2743,7 @@ class Commande extends CommonOrder
else
{
$this->error=$this->db->error();
- $this->db->rollback();
+ $this->db->rollback();
return -1;
}
}
@@ -2755,146 +2755,146 @@ class Commande extends CommonOrder
*/
function classifyUnBilled()
{
- global $conf, $user, $langs;
- $error = 0;
+ global $conf, $user, $langs;
+ $error = 0;
- $this->db->begin();
+ $this->db->begin();
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
- $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
+ $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
- dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
- if ($this->db->query($sql))
- {
- if (! $error)
- {
- $this->oldcopy= clone $this;
- $this->billed=1;
- }
+ dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
+ if ($this->db->query($sql))
+ {
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ $this->billed=1;
+ }
- // Call trigger
- $result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
- if ($result < 0) $error++;
- // End call triggers
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CLASSIFY_UNBILLED',$user);
+ if ($result < 0) $error++;
+ // End call triggers
- if (! $error)
- {
- $this->billed=0;
+ if (! $error)
+ {
+ $this->billed=0;
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -1;
- }
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -1;
+ }
}
- /**
- * Update a line in database
- *
- * @param int $rowid Id of line to update
- * @param string $desc Description of line
- * @param float $pu Unit price
- * @param float $qty Quantity
- * @param float $remise_percent Percent of discount
- * @param float $txtva Taux TVA
- * @param float $txlocaltax1 Local tax 1 rate
- * @param float $txlocaltax2 Local tax 2 rate
- * @param string $price_base_type HT or TTC
- * @param int $info_bits Miscellaneous informations on line
- * @param int $date_start Start date of the line
- * @param int $date_end End date of the line
- * @param int $type Type of line (0=product, 1=service)
- * @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
- * @param int $skip_update_total Keep fields total_xxx to 0 (used for special lines by some modules)
- * @param int $fk_fournprice Id of origin supplier price
- * @param int $pa_ht Price (without tax) of product when it was bought
- * @param string $label Label
- * @param int $special_code Special code (also used by externals modules!)
+ /**
+ * Update a line in database
+ *
+ * @param int $rowid Id of line to update
+ * @param string $desc Description of line
+ * @param float $pu Unit price
+ * @param float $qty Quantity
+ * @param float $remise_percent Percent of discount
+ * @param float $txtva Taux TVA
+ * @param float $txlocaltax1 Local tax 1 rate
+ * @param float $txlocaltax2 Local tax 2 rate
+ * @param string $price_base_type HT or TTC
+ * @param int $info_bits Miscellaneous informations on line
+ * @param int $date_start Start date of the line
+ * @param int $date_end End date of the line
+ * @param int $type Type of line (0=product, 1=service)
+ * @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
+ * @param int $skip_update_total Keep fields total_xxx to 0 (used for special lines by some modules)
+ * @param int $fk_fournprice Id of origin supplier price
+ * @param int $pa_ht Price (without tax) of product when it was bought
+ * @param string $label Label
+ * @param int $special_code Special code (also used by externals modules!)
* @param array $array_options extrafields array
- * @param string $fk_unit Code of the unit to use. Null to use the default one
+ * @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Amount in currency
- * @param int $notrigger disable line update trigger
- * @return int < 0 if KO, > 0 if OK
- */
+ * @param int $notrigger disable line update trigger
+ * @return int < 0 if KO, > 0 if OK
+ */
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0)
- {
- global $conf, $mysoc, $langs, $user;
+ {
+ global $conf, $mysoc, $langs, $user;
- dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
- include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+ dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
- if (! empty($this->brouillon))
- {
- $this->db->begin();
+ if (! empty($this->brouillon))
+ {
+ $this->db->begin();
- // Clean parameters
- if (empty($qty)) $qty=0;
- if (empty($info_bits)) $info_bits=0;
- if (empty($txtva)) $txtva=0;
- if (empty($txlocaltax1)) $txlocaltax1=0;
- if (empty($txlocaltax2)) $txlocaltax2=0;
- if (empty($remise_percent)) $remise_percent=0;
- if (empty($special_code) || $special_code == 3) $special_code=0;
+ // Clean parameters
+ if (empty($qty)) $qty=0;
+ if (empty($info_bits)) $info_bits=0;
+ if (empty($txtva)) $txtva=0;
+ if (empty($txlocaltax1)) $txlocaltax1=0;
+ if (empty($txlocaltax2)) $txlocaltax2=0;
+ if (empty($remise_percent)) $remise_percent=0;
+ if (empty($special_code) || $special_code == 3) $special_code=0;
- $remise_percent=price2num($remise_percent);
- $qty=price2num($qty);
- $pu = price2num($pu);
- $pa_ht=price2num($pa_ht);
- $pu_ht_devise=price2num($pu_ht_devise);
- $txtva=price2num($txtva);
- $txlocaltax1=price2num($txlocaltax1);
- $txlocaltax2=price2num($txlocaltax2);
+ $remise_percent=price2num($remise_percent);
+ $qty=price2num($qty);
+ $pu = price2num($pu);
+ $pa_ht=price2num($pa_ht);
+ $pu_ht_devise=price2num($pu_ht_devise);
+ $txtva=price2num($txtva);
+ $txlocaltax1=price2num($txlocaltax1);
+ $txlocaltax2=price2num($txlocaltax2);
- // Calcul du total TTC et de la TVA pour la ligne a partir de
- // qty, pu, remise_percent et txtva
- // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
- // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+ // Calcul du total TTC et de la TVA pour la ligne a partir de
+ // qty, pu, remise_percent et txtva
+ // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+ // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+ $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
- // Clean vat code
- $vat_src_code='';
- if (preg_match('/\((.*)\)/', $txtva, $reg))
- {
- $vat_src_code = $reg[1];
- $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
- }
+ // Clean vat code
+ $vat_src_code='';
+ if (preg_match('/\((.*)\)/', $txtva, $reg))
+ {
+ $vat_src_code = $reg[1];
+ $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+ }
- $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+ $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
- $total_ht = $tabprice[0];
- $total_tva = $tabprice[1];
- $total_ttc = $tabprice[2];
- $total_localtax1 = $tabprice[9];
- $total_localtax2 = $tabprice[10];
+ $total_ht = $tabprice[0];
+ $total_tva = $tabprice[1];
+ $total_ttc = $tabprice[2];
+ $total_localtax1 = $tabprice[9];
+ $total_localtax2 = $tabprice[10];
$pu_ht = $tabprice[3];
$pu_tva = $tabprice[4];
$pu_ttc = $tabprice[5];
// MultiCurrency
$multicurrency_total_ht = $tabprice[16];
- $multicurrency_total_tva = $tabprice[17];
- $multicurrency_total_ttc = $tabprice[18];
+ $multicurrency_total_tva = $tabprice[17];
+ $multicurrency_total_ttc = $tabprice[18];
$pu_ht_devise = $tabprice[19];
- // Anciens indicateurs: $price, $subprice (a ne plus utiliser)
- $price = $pu_ht;
+ // Anciens indicateurs: $price, $subprice (a ne plus utiliser)
+ $price = $pu_ht;
if ($price_base_type == 'TTC')
{
$subprice = $pu_ttc;
@@ -2903,72 +2903,72 @@ class Commande extends CommonOrder
{
$subprice = $pu_ht;
}
- $remise = 0;
- if ($remise_percent > 0)
- {
- $remise = round(($pu * $remise_percent / 100),2);
- $price = ($pu - $remise);
- }
+ $remise = 0;
+ if ($remise_percent > 0)
+ {
+ $remise = round(($pu * $remise_percent / 100),2);
+ $price = ($pu - $remise);
+ }
- //Fetch current line from the database and then clone the object and set it in $oldline property
- $line = new OrderLine($this->db);
- $line->fetch($rowid);
+ //Fetch current line from the database and then clone the object and set it in $oldline property
+ $line = new OrderLine($this->db);
+ $line->fetch($rowid);
- if (!empty($line->fk_product))
- {
- $product=new Product($this->db);
- $result=$product->fetch($line->fk_product);
- $product_type=$product->type;
+ if (!empty($line->fk_product))
+ {
+ $product=new Product($this->db);
+ $result=$product->fetch($line->fk_product);
+ $product_type=$product->type;
- if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
- {
- $langs->load("errors");
- $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
- dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
- $this->db->rollback();
- return self::STOCK_NOT_ENOUGH_FOR_ORDER;
- }
- }
+ if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+ {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
+ dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
+ $this->db->rollback();
+ return self::STOCK_NOT_ENOUGH_FOR_ORDER;
+ }
+ }
- $staticline = clone $line;
+ $staticline = clone $line;
- $line->oldline = $staticline;
- $this->line = $line;
- $this->line->context = $this->context;
+ $line->oldline = $staticline;
+ $this->line = $line;
+ $this->line->context = $this->context;
- // Reorder if fk_parent_line change
- if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
- {
- $rangmax = $this->line_max($fk_parent_line);
- $this->line->rang = $rangmax + 1;
- }
+ // Reorder if fk_parent_line change
+ if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
+ {
+ $rangmax = $this->line_max($fk_parent_line);
+ $this->line->rang = $rangmax + 1;
+ }
- $this->line->rowid=$rowid;
- $this->line->label=$label;
- $this->line->desc=$desc;
- $this->line->qty=$qty;
+ $this->line->rowid=$rowid;
+ $this->line->label=$label;
+ $this->line->desc=$desc;
+ $this->line->qty=$qty;
- $this->line->vat_src_code = $vat_src_code;
- $this->line->tva_tx = $txtva;
- $this->line->localtax1_tx = $txlocaltax1;
- $this->line->localtax2_tx = $txlocaltax2;
+ $this->line->vat_src_code = $vat_src_code;
+ $this->line->tva_tx = $txtva;
+ $this->line->localtax1_tx = $txlocaltax1;
+ $this->line->localtax2_tx = $txlocaltax2;
$this->line->localtax1_type = $localtaxes_type[0];
$this->line->localtax2_type = $localtaxes_type[2];
- $this->line->remise_percent = $remise_percent;
- $this->line->subprice = $subprice;
- $this->line->info_bits = $info_bits;
- $this->line->special_code = $special_code;
- $this->line->total_ht = $total_ht;
- $this->line->total_tva = $total_tva;
- $this->line->total_localtax1= $total_localtax1;
- $this->line->total_localtax2= $total_localtax2;
- $this->line->total_ttc = $total_ttc;
- $this->line->date_start = $date_start;
- $this->line->date_end = $date_end;
- $this->line->product_type = $type;
- $this->line->fk_parent_line = $fk_parent_line;
- $this->line->skip_update_total=$skip_update_total;
- $this->line->fk_unit = $fk_unit;
+ $this->line->remise_percent = $remise_percent;
+ $this->line->subprice = $subprice;
+ $this->line->info_bits = $info_bits;
+ $this->line->special_code = $special_code;
+ $this->line->total_ht = $total_ht;
+ $this->line->total_tva = $total_tva;
+ $this->line->total_localtax1= $total_localtax1;
+ $this->line->total_localtax2= $total_localtax2;
+ $this->line->total_ttc = $total_ttc;
+ $this->line->date_start = $date_start;
+ $this->line->date_end = $date_end;
+ $this->line->product_type = $type;
+ $this->line->fk_parent_line = $fk_parent_line;
+ $this->line->skip_update_total=$skip_update_total;
+ $this->line->fk_unit = $fk_unit;
$this->line->fk_fournprice = $fk_fournprice;
$this->line->pa_ht = $pa_ht;
@@ -2976,44 +2976,44 @@ class Commande extends CommonOrder
// Multicurrency
$this->line->multicurrency_subprice = $pu_ht_devise;
$this->line->multicurrency_total_ht = $multicurrency_total_ht;
- $this->line->multicurrency_total_tva = $multicurrency_total_tva;
- $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
+ $this->line->multicurrency_total_tva = $multicurrency_total_tva;
+ $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
- // TODO deprecated
- $this->line->price=$price;
- $this->line->remise=$remise;
+ // TODO deprecated
+ $this->line->price=$price;
+ $this->line->remise=$remise;
if (is_array($array_options) && count($array_options)>0) {
$this->line->array_options=$array_options;
}
- $result=$this->line->update($user, $notrigger);
- if ($result > 0)
- {
- // Reorder if child line
- if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+ $result=$this->line->update($user, $notrigger);
+ if ($result > 0)
+ {
+ // Reorder if child line
+ if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
- // Mise a jour info denormalisees
- $this->update_price(1);
+ // Mise a jour info denormalisees
+ $this->update_price(1);
- $this->db->commit();
- return $result;
- }
- else
- {
- $this->error=$this->line->error;
+ $this->db->commit();
+ return $result;
+ }
+ else
+ {
+ $this->error=$this->line->error;
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->error=get_class($this)."::updateline Order status makes operation forbidden";
- $this->errors=array('OrderStatusMakeOperationForbidden');
- return -2;
- }
- }
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=get_class($this)."::updateline Order status makes operation forbidden";
+ $this->errors=array('OrderStatusMakeOperationForbidden');
+ return -2;
+ }
+ }
/**
* Update database
@@ -3110,31 +3110,31 @@ class Commande extends CommonOrder
}
}
- /**
- * Delete the customer order
- *
- * @param User $user User object
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <=0 if KO, >0 if OK
- */
- function delete($user, $notrigger=0)
- {
- global $conf, $langs;
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ /**
+ * Delete the customer order
+ *
+ * @param User $user User object
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <=0 if KO, >0 if OK
+ */
+ function delete($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $error = 0;
+ $error = 0;
- dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
- $this->db->begin();
+ $this->db->begin();
- if (! $error && ! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('ORDER_DELETE',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
+ if (! $error && ! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_DELETE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
if ($this->nb_expedition() != 0)
{
@@ -3142,558 +3142,558 @@ class Commande extends CommonOrder
$error++;
}
- if (! $error)
- {
- // Delete order details
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
- if (! $this->db->query($sql) )
- {
- $error++;
- $this->errors[]=$this->db->lasterror();
- }
- }
-
- if (! $error)
- {
- // Delete linked object
- $res = $this->deleteObjectLinked();
- if ($res < 0) $error++;
- }
-
- if (! $error)
- {
- // Delete linked contacts
- $res = $this->delete_linked_contact();
- if ($res < 0) $error++;
- }
-
- if (! $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);
- }
- }
- }
-
- if (! $error)
- {
- // Delete object
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
- if (! $this->db->query($sql) )
- {
- $error++;
- $this->errors[]=$this->db->lasterror();
- }
- }
-
- if (! $error)
- {
- // Remove directory with files
- $comref = dol_sanitizeFileName($this->ref);
- if ($conf->commande->dir_output && !empty($this->ref))
- {
- $dir = $conf->commande->dir_output . "/" . $comref ;
- $file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
- if (file_exists($file)) // We must delete all files before deleting directory
- {
- dol_delete_preview($this);
-
- if (! dol_delete_file($file,0,0,0,$this)) // For triggers
- {
- $this->db->rollback();
- return 0;
- }
- }
- if (file_exists($dir))
- {
- if (! dol_delete_dir_recursive($dir))
- {
- $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
- $this->db->rollback();
- return 0;
- }
- }
- }
- }
-
- if (! $error)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- foreach($this->errors as $errmsg)
- {
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- }
-
-
- /**
- * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
- *
- * @param User $user Object user
- * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
- */
- function load_board($user)
- {
- global $conf, $langs;
-
- $clause = " WHERE";
-
- $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
- $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
- {
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
- $clause = " AND";
- }
- $sql.= $clause." c.entity IN (".getEntity('commande').")";
- //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
- $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
- if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $response = new WorkboardResponse();
- $response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
- $response->label=$langs->trans("OrdersToProcess");
- $response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
- $response->img=img_object('',"order");
-
- $generic_commande = new Commande($this->db);
-
- while ($obj=$this->db->fetch_object($resql))
- {
- $response->nbtodo++;
- $response->total+= $obj->total_ht;
-
- $generic_commande->statut = $obj->fk_statut;
- $generic_commande->date_commande = $this->db->jdate($obj->date_commande);
- $generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
-
- if ($generic_commande->hasDelay()) {
- $response->nbtodolate++;
- }
- }
-
- return $response;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }
- }
-
- /**
- * Return source label of order
- *
- * @return string Label
- */
- function getLabelSource()
- {
- global $langs;
-
- $label=$langs->trans('OrderSource'.$this->source);
-
- if ($label == 'OrderSource') return '';
- return $label;
- }
-
- /**
- * Return status label of Order
- *
- * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
- * @return string Label of status
- */
- function getLibStatut($mode)
- {
- return $this->LibStatut($this->statut, $this->billed, $mode);
- }
-
- /**
- * Return label of status
- *
- * @param int $statut Id statut
- * @param int $billed If invoiced
- * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
- * @param int $donotshowbilled Do not show billed status after order status
- * @return string Label of status
- */
- function LibStatut($statut,$billed,$mode,$donotshowbilled=0)
- {
- global $langs, $conf;
-
- $billedtext = '';
- if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
-
- //print 'x'.$statut.'-'.$billed;
- if ($mode == 0)
- {
- if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
- if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
- if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
- }
- elseif ($mode == 1)
- {
- if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
- if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
- if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
- }
- elseif ($mode == 2)
- {
- if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
- if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
- if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
- }
- elseif ($mode == 3)
- {
- if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
- if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
- if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
- }
- elseif ($mode == 4)
- {
- if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
- if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
- if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
- }
- elseif ($mode == 5)
- {
- if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
- if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
- if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return ''.$langs->trans('StatusOrderSentShort').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDeliveredShort').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
- }
- elseif ($mode == 6)
- {
- if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceled').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
- if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraft').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
- if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidated').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
- if ($statut==self::STATUS_SHIPMENTONPROCESS) return ''.$langs->trans('StatusOrderSent').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
- if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBill').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
- if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessed').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
- if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDelivered').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
- }
-
- }
-
-
- /**
- * Return clicable link of object (with eventually picto)
- *
- * @param int $withpicto Add picto into link
- * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
- * @param int $max Max length to show
- * @param int $short ???
- * @param int $notooltip 1=Disable tooltip
- * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
- * @return string String with URL
- */
- function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
- {
- global $conf, $langs, $user;
-
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
-
- $result='';
-
- if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
- else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
-
- if (!$user->rights->commande->lire)
- $option = 'nolink';
-
- if ($option !== 'nolink')
- {
- // Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
- }
-
- if ($short) return $url;
-
- $label = '';
-
- if ($user->rights->commande->lire) {
- $label = ''.$langs->trans("ShowOrder").'';
- $label .= '
'.$langs->trans('Ref').': '.$this->ref;
- $label .= '
'.$langs->trans('RefCustomer').': '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
- if (!empty($this->total_ht)) {
- $label .= '
'.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
- }
- if (!empty($this->total_tva)) {
- $label .= '
'.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
- }
- if (!empty($this->total_ttc)) {
- $label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
- }
- }
-
- $linkclose='';
- if (empty($notooltip) && $user->rights->commande->lire)
+ if (! $error)
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
- $label=$langs->trans("ShowOrder");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
- }
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip"';
+ // Delete order details
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
+ if (! $this->db->query($sql) )
+ {
+ $error++;
+ $this->errors[]=$this->db->lasterror();
+ }
}
- $linkstart = '';
- $linkend='';
+ if (! $error)
+ {
+ // Delete linked object
+ $res = $this->deleteObjectLinked();
+ if ($res < 0) $error++;
+ }
- if ($option === 'nolink') {
- $linkstart = '';
- $linkend = '';
- }
+ if (! $error)
+ {
+ // Delete linked contacts
+ $res = $this->delete_linked_contact();
+ if ($res < 0) $error++;
+ }
- $result .= $linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.= $this->ref;
- $result .= $linkend;
+ if (! $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);
+ }
+ }
+ }
- return $result;
- }
+ if (! $error)
+ {
+ // Delete object
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
+ if (! $this->db->query($sql) )
+ {
+ $error++;
+ $this->errors[]=$this->db->lasterror();
+ }
+ }
+
+ if (! $error)
+ {
+ // Remove directory with files
+ $comref = dol_sanitizeFileName($this->ref);
+ if ($conf->commande->dir_output && !empty($this->ref))
+ {
+ $dir = $conf->commande->dir_output . "/" . $comref ;
+ $file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
+ if (file_exists($file)) // We must delete all files before deleting directory
+ {
+ dol_delete_preview($this);
+
+ if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+ {
+ $this->db->rollback();
+ return 0;
+ }
+ }
+ if (file_exists($dir))
+ {
+ if (! dol_delete_dir_recursive($dir))
+ {
+ $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+ $this->db->rollback();
+ return 0;
+ }
+ }
+ }
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ foreach($this->errors as $errmsg)
+ {
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ }
- /**
- * Charge les informations d'ordre info dans l'objet commande
- *
- * @param int $id Id of order
- * @return void
- */
- function info($id)
- {
- $sql = 'SELECT c.rowid, date_creation as datec, tms as datem,';
- $sql.= ' date_valid as datev,';
- $sql.= ' date_cloture as datecloture,';
- $sql.= ' fk_user_author, fk_user_valid, fk_user_cloture';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
- $sql.= ' WHERE c.rowid = '.$id;
- $result=$this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
- {
- $obj = $this->db->fetch_object($result);
- $this->id = $obj->rowid;
- if ($obj->fk_user_author)
- {
- $cuser = new User($this->db);
- $cuser->fetch($obj->fk_user_author);
- $this->user_creation = $cuser;
- }
+ /**
+ * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+ *
+ * @param User $user Object user
+ * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+ */
+ function load_board($user)
+ {
+ global $conf, $langs;
- if ($obj->fk_user_valid)
- {
- $vuser = new User($this->db);
- $vuser->fetch($obj->fk_user_valid);
- $this->user_validation = $vuser;
- }
+ $clause = " WHERE";
- if ($obj->fk_user_cloture)
- {
- $cluser = new User($this->db);
- $cluser->fetch($obj->fk_user_cloture);
- $this->user_cloture = $cluser;
- }
+ $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+ if (!$user->rights->societe->client->voir && !$user->societe_id)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+ $sql.= " WHERE sc.fk_user = " .$user->id;
+ $clause = " AND";
+ }
+ $sql.= $clause." c.entity IN (".getEntity('commande').")";
+ //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
+ $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
+ if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
- $this->date_creation = $this->db->jdate($obj->datec);
- $this->date_modification = $this->db->jdate($obj->datem);
- $this->date_validation = $this->db->jdate($obj->datev);
- $this->date_cloture = $this->db->jdate($obj->datecloture);
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $response = new WorkboardResponse();
+ $response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
+ $response->label=$langs->trans("OrdersToProcess");
+ $response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
+ $response->img=img_object('',"order");
- $this->db->free($result);
+ $generic_commande = new Commande($this->db);
- }
- else
- {
- dol_print_error($this->db);
- }
- }
+ while ($obj=$this->db->fetch_object($resql))
+ {
+ $response->nbtodo++;
+ $response->total+= $obj->total_ht;
+
+ $generic_commande->statut = $obj->fk_statut;
+ $generic_commande->date_commande = $this->db->jdate($obj->date_commande);
+ $generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
+
+ if ($generic_commande->hasDelay()) {
+ $response->nbtodolate++;
+ }
+ }
+
+ return $response;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
+
+ /**
+ * Return source label of order
+ *
+ * @return string Label
+ */
+ function getLabelSource()
+ {
+ global $langs;
+
+ $label=$langs->trans('OrderSource'.$this->source);
+
+ if ($label == 'OrderSource') return '';
+ return $label;
+ }
+
+ /**
+ * Return status label of Order
+ *
+ * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ function getLibStatut($mode)
+ {
+ return $this->LibStatut($this->statut, $this->billed, $mode);
+ }
+
+ /**
+ * Return label of status
+ *
+ * @param int $statut Id statut
+ * @param int $billed If invoiced
+ * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+ * @param int $donotshowbilled Do not show billed status after order status
+ * @return string Label of status
+ */
+ function LibStatut($statut,$billed,$mode,$donotshowbilled=0)
+ {
+ global $langs, $conf;
+
+ $billedtext = '';
+ if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
+
+ //print 'x'.$statut.'-'.$billed;
+ if ($mode == 0)
+ {
+ if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
+ if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
+ if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+ }
+ elseif ($mode == 1)
+ {
+ if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
+ if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
+ if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
+ }
+ elseif ($mode == 2)
+ {
+ if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
+ if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
+ if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
+ }
+ elseif ($mode == 3)
+ {
+ if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+ if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+ if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+ }
+ elseif ($mode == 4)
+ {
+ if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
+ if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
+ if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
+ }
+ elseif ($mode == 5)
+ {
+ if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+ if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
+ if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return ''.$langs->trans('StatusOrderSentShort').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDeliveredShort').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+ }
+ elseif ($mode == 6)
+ {
+ if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceled').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+ if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraft').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
+ if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidated').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return ''.$langs->trans('StatusOrderSent').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
+ if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBill').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
+ if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessed').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+ if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDelivered').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
+ }
+
+ }
- /**
- * Initialise an instance with random values.
- * Used to build previews or test instances.
- * id must be 0 if object instance is a specimen.
- *
- * @return void
- */
- function initAsSpecimen()
- {
- global $langs;
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param int $withpicto Add picto into link
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param int $max Max length to show
+ * @param int $short ???
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+ {
+ global $conf, $langs, $user;
- dol_syslog(get_class($this)."::initAsSpecimen");
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
- // Load array of products prodids
- $num_prods = 0;
- $prodids = array();
- $sql = "SELECT rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."product";
- $sql.= " WHERE entity IN (".getEntity('product').")";
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num_prods = $this->db->num_rows($resql);
- $i = 0;
- while ($i < $num_prods)
- {
- $i++;
- $row = $this->db->fetch_row($resql);
- $prodids[$i] = $row[0];
- }
- }
+ $result='';
- // Initialise parametres
- $this->id=0;
- $this->ref = 'SPECIMEN';
- $this->specimen=1;
- $this->socid = 1;
- $this->date = time();
- $this->date_lim_reglement=$this->date+3600*24*30;
- $this->cond_reglement_code = 'RECEP';
- $this->mode_reglement_code = 'CHQ';
- $this->availability_code = 'DSP';
- $this->demand_reason_code = 'SRC_00';
- $this->note_public='This is a comment (public)';
- $this->note_private='This is a comment (private)';
- // Lines
- $nbp = 5;
- $xnbp = 0;
- while ($xnbp < $nbp)
- {
- $line=new OrderLine($this->db);
+ if (! empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
+ else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
- $line->desc=$langs->trans("Description")." ".$xnbp;
- $line->qty=1;
- $line->subprice=100;
- $line->price=100;
- $line->tva_tx=20;
- if ($xnbp == 2)
- {
- $line->total_ht=50;
- $line->total_ttc=60;
- $line->total_tva=10;
- $line->remise_percent=50;
- }
- else
- {
- $line->total_ht=100;
- $line->total_ttc=120;
- $line->total_tva=20;
- $line->remise_percent=0;
- }
- if ($num_prods > 0)
- {
- $prodid = mt_rand(1, $num_prods);
- $line->fk_product=$prodids[$prodid];
+ if (!$user->rights->commande->lire)
+ $option = 'nolink';
+
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
+ if ($short) return $url;
+
+ $label = '';
+
+ if ($user->rights->commande->lire) {
+ $label = ''.$langs->trans("ShowOrder").'';
+ $label .= '
'.$langs->trans('Ref').': '.$this->ref;
+ $label .= '
'.$langs->trans('RefCustomer').': '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
+ if (!empty($this->total_ht)) {
+ $label .= '
'.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+ }
+ if (!empty($this->total_tva)) {
+ $label .= '
'.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+ }
+ if (!empty($this->total_ttc)) {
+ $label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+ }
+ }
+
+ $linkclose='';
+ if (empty($notooltip) && $user->rights->commande->lire)
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowOrder");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip"';
+ }
+
+ $linkstart = '';
+ $linkend='';
+
+ if ($option === 'nolink') {
+ $linkstart = '';
+ $linkend = '';
+ }
+
+ $result .= $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->ref;
+ $result .= $linkend;
+
+ return $result;
+ }
+
+
+ /**
+ * Charge les informations d'ordre info dans l'objet commande
+ *
+ * @param int $id Id of order
+ * @return void
+ */
+ function info($id)
+ {
+ $sql = 'SELECT c.rowid, date_creation as datec, tms as datem,';
+ $sql.= ' date_valid as datev,';
+ $sql.= ' date_cloture as datecloture,';
+ $sql.= ' fk_user_author, fk_user_valid, fk_user_cloture';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
+ $sql.= ' WHERE c.rowid = '.$id;
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $this->id = $obj->rowid;
+ if ($obj->fk_user_author)
+ {
+ $cuser = new User($this->db);
+ $cuser->fetch($obj->fk_user_author);
+ $this->user_creation = $cuser;
+ }
+
+ if ($obj->fk_user_valid)
+ {
+ $vuser = new User($this->db);
+ $vuser->fetch($obj->fk_user_valid);
+ $this->user_validation = $vuser;
+ }
+
+ if ($obj->fk_user_cloture)
+ {
+ $cluser = new User($this->db);
+ $cluser->fetch($obj->fk_user_cloture);
+ $this->user_cloture = $cluser;
+ }
+
+ $this->date_creation = $this->db->jdate($obj->datec);
+ $this->date_modification = $this->db->jdate($obj->datem);
+ $this->date_validation = $this->db->jdate($obj->datev);
+ $this->date_cloture = $this->db->jdate($obj->datecloture);
+ }
+
+ $this->db->free($result);
+
+ }
+ else
+ {
+ dol_print_error($this->db);
+ }
+ }
+
+
+ /**
+ * Initialise an instance with random values.
+ * Used to build previews or test instances.
+ * id must be 0 if object instance is a specimen.
+ *
+ * @return void
+ */
+ function initAsSpecimen()
+ {
+ global $langs;
+
+ dol_syslog(get_class($this)."::initAsSpecimen");
+
+ // Load array of products prodids
+ $num_prods = 0;
+ $prodids = array();
+ $sql = "SELECT rowid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product";
+ $sql.= " WHERE entity IN (".getEntity('product').")";
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $num_prods = $this->db->num_rows($resql);
+ $i = 0;
+ while ($i < $num_prods)
+ {
+ $i++;
+ $row = $this->db->fetch_row($resql);
+ $prodids[$i] = $row[0];
+ }
+ }
+
+ // Initialise parametres
+ $this->id=0;
+ $this->ref = 'SPECIMEN';
+ $this->specimen=1;
+ $this->socid = 1;
+ $this->date = time();
+ $this->date_lim_reglement=$this->date+3600*24*30;
+ $this->cond_reglement_code = 'RECEP';
+ $this->mode_reglement_code = 'CHQ';
+ $this->availability_code = 'DSP';
+ $this->demand_reason_code = 'SRC_00';
+ $this->note_public='This is a comment (public)';
+ $this->note_private='This is a comment (private)';
+ // Lines
+ $nbp = 5;
+ $xnbp = 0;
+ while ($xnbp < $nbp)
+ {
+ $line=new OrderLine($this->db);
+
+ $line->desc=$langs->trans("Description")." ".$xnbp;
+ $line->qty=1;
+ $line->subprice=100;
+ $line->price=100;
+ $line->tva_tx=20;
+ if ($xnbp == 2)
+ {
+ $line->total_ht=50;
+ $line->total_ttc=60;
+ $line->total_tva=10;
+ $line->remise_percent=50;
+ }
+ else
+ {
+ $line->total_ht=100;
+ $line->total_ttc=120;
+ $line->total_tva=20;
+ $line->remise_percent=0;
+ }
+ if ($num_prods > 0)
+ {
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product=$prodids[$prodid];
$line->product_ref='SPECIMEN';
- }
+ }
- $this->lines[$xnbp]=$line;
+ $this->lines[$xnbp]=$line;
- $this->total_ht += $line->total_ht;
- $this->total_tva += $line->total_tva;
- $this->total_ttc += $line->total_ttc;
+ $this->total_ht += $line->total_ht;
+ $this->total_tva += $line->total_tva;
+ $this->total_ttc += $line->total_ttc;
- $xnbp++;
- }
- }
+ $xnbp++;
+ }
+ }
- /**
- * Charge indicateurs this->nb de tableau de bord
- *
- * @return int <0 si ko, >0 si ok
- */
- function load_state_board()
- {
- global $user;
+ /**
+ * Charge indicateurs this->nb de tableau de bord
+ *
+ * @return int <0 si ko, >0 si ok
+ */
+ function load_state_board()
+ {
+ global $user;
- $this->nb=array();
- $clause = "WHERE";
+ $this->nb=array();
+ $clause = "WHERE";
- $sql = "SELECT count(co.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
- {
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
- $clause = "AND";
- }
- $sql.= " ".$clause." co.entity IN (".getEntity('commande').")";
+ $sql = "SELECT count(co.rowid) as nb";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+ if (!$user->rights->societe->client->voir && !$user->societe_id)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql.= " WHERE sc.fk_user = " .$user->id;
+ $clause = "AND";
+ }
+ $sql.= " ".$clause." co.entity IN (".getEntity('commande').")";
- $resql=$this->db->query($sql);
- if ($resql)
- {
- while ($obj=$this->db->fetch_object($resql))
- {
- $this->nb["orders"]=$obj->nb;
- }
- $this->db->free($resql);
- return 1;
- }
- else
- {
- dol_print_error($this->db);
- $this->error=$this->db->error();
- return -1;
- }
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ while ($obj=$this->db->fetch_object($resql))
+ {
+ $this->nb["orders"]=$obj->nb;
+ }
+ $this->db->free($resql);
+ return 1;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
- /**
+ /**
* Create an array of order lines
*
* @return int >0 if OK, <0 if KO
- */
- function getLinesArray()
- {
- return $this->fetch_lines();
- }
+ */
+ function getLinesArray()
+ {
+ return $this->fetch_lines();
+ }
/**
* Create a document onto disk according to template module.
@@ -3703,7 +3703,7 @@ class Commande extends CommonOrder
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
- * @param null|array $moreparams Array to provide more information
+ * @param null|array $moreparams Array to provide more information
* @return int 0 if KO, 1 if OK
*/
public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
@@ -3740,45 +3740,45 @@ class Commande extends CommonOrder
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
{
$tables = array(
- 'commande'
+ 'commande'
);
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
}
- /**
- * Is the customer order delayed?
- *
- * @return bool true if late, false if not
- */
- public function hasDelay()
- {
- global $conf;
+ /**
+ * Is the customer order delayed?
+ *
+ * @return bool true if late, false if not
+ */
+ public function hasDelay()
+ {
+ global $conf;
- if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
- return false; // Never late if not inside this status range
- }
+ if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
+ return false; // Never late if not inside this status range
+ }
- $now = dol_now();
+ $now = dol_now();
- return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
- }
+ return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
+ }
- /**
- * Show the customer delayed info
- *
- * @return string Show delayed information
- */
- public function showDelay()
- {
- global $conf, $langs;
+ /**
+ * Show the customer delayed info
+ *
+ * @return string Show delayed information
+ */
+ public function showDelay()
+ {
+ global $conf, $langs;
- if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
- else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
- $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+ if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+ else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+ $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
- return $text;
- }
+ return $text;
+ }
}
@@ -3791,10 +3791,10 @@ class OrderLine extends CommonOrderLine
* @var string ID to identify managed object
*/
public $element='commandedet';
-
+
public $table_element='commandedet';
- var $oldline;
+ var $oldline;
/**
* Id of parent order
@@ -3810,17 +3810,17 @@ class OrderLine extends CommonOrderLine
*/
public $commande_id;
- // From llx_commandedet
- var $fk_parent_line;
- var $fk_facture;
-
- /**
- * @var string proper name for given parameter
- */
- public $label;
-
- var $fk_remise_except;
- var $rang = 0;
+ // From llx_commandedet
+ var $fk_parent_line;
+ var $fk_facture;
+
+ /**
+ * @var string proper name for given parameter
+ */
+ public $label;
+
+ var $fk_remise_except;
+ var $rang = 0;
var $fk_fournprice;
/**
@@ -3828,8 +3828,8 @@ class OrderLine extends CommonOrderLine
* @var float
*/
var $pa_ht;
- var $marge_tx;
- var $marque_tx;
+ var $marge_tx;
+ var $marque_tx;
/**
* @deprecated
@@ -3837,89 +3837,89 @@ class OrderLine extends CommonOrderLine
*/
var $remise;
- // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
- // Start and end date of the line
- var $date_start;
- var $date_end;
+ // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+ // Start and end date of the line
+ var $date_start;
+ var $date_end;
- var $skip_update_total; // Skip update price total for special lines
+ var $skip_update_total; // Skip update price total for special lines
- /**
- * Constructor
- *
- * @param DoliDB $db handler d'acces base de donnee
- */
- function __construct($db)
- {
- $this->db= $db;
- }
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db handler d'acces base de donnee
+ */
+ function __construct($db)
+ {
+ $this->db= $db;
+ }
- /**
- * Load line order
- *
- * @param int $rowid Id line order
- * @return int <0 if KO, >0 if OK
- */
- function fetch($rowid)
- {
- $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
- $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
- $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
- $sql.= ' cd.fk_unit,';
+ /**
+ * Load line order
+ *
+ * @param int $rowid Id line order
+ * @return int <0 if KO, >0 if OK
+ */
+ function fetch($rowid)
+ {
+ $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
+ $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
+ $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
+ $sql.= ' cd.fk_unit,';
$sql.= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
- $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
- $sql.= ' cd.date_start, cd.date_end';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
- $sql.= ' WHERE cd.rowid = '.$rowid;
- $result = $this->db->query($sql);
- if ($result)
- {
- $objp = $this->db->fetch_object($result);
- $this->rowid = $objp->rowid;
- $this->id = $objp->rowid;
- $this->fk_commande = $objp->fk_commande;
- $this->fk_parent_line = $objp->fk_parent_line;
- $this->label = $objp->custom_label;
- $this->desc = $objp->description;
- $this->qty = $objp->qty;
- $this->price = $objp->price;
- $this->subprice = $objp->subprice;
- $this->vat_src_code = $objp->vat_src_code;
- $this->tva_tx = $objp->tva_tx;
- $this->localtax1_tx = $objp->localtax1_tx;
- $this->localtax2_tx = $objp->localtax2_tx;
- $this->remise = $objp->remise;
- $this->remise_percent = $objp->remise_percent;
- $this->fk_remise_except = $objp->fk_remise_except;
- $this->fk_product = $objp->fk_product;
- $this->product_type = $objp->product_type;
- $this->info_bits = $objp->info_bits;
+ $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
+ $sql.= ' cd.date_start, cd.date_end';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+ $sql.= ' WHERE cd.rowid = '.$rowid;
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $objp = $this->db->fetch_object($result);
+ $this->rowid = $objp->rowid;
+ $this->id = $objp->rowid;
+ $this->fk_commande = $objp->fk_commande;
+ $this->fk_parent_line = $objp->fk_parent_line;
+ $this->label = $objp->custom_label;
+ $this->desc = $objp->description;
+ $this->qty = $objp->qty;
+ $this->price = $objp->price;
+ $this->subprice = $objp->subprice;
+ $this->vat_src_code = $objp->vat_src_code;
+ $this->tva_tx = $objp->tva_tx;
+ $this->localtax1_tx = $objp->localtax1_tx;
+ $this->localtax2_tx = $objp->localtax2_tx;
+ $this->remise = $objp->remise;
+ $this->remise_percent = $objp->remise_percent;
+ $this->fk_remise_except = $objp->fk_remise_except;
+ $this->fk_product = $objp->fk_product;
+ $this->product_type = $objp->product_type;
+ $this->info_bits = $objp->info_bits;
$this->special_code = $objp->special_code;
- $this->total_ht = $objp->total_ht;
- $this->total_tva = $objp->total_tva;
- $this->total_localtax1 = $objp->total_localtax1;
- $this->total_localtax2 = $objp->total_localtax2;
- $this->total_ttc = $objp->total_ttc;
+ $this->total_ht = $objp->total_ht;
+ $this->total_tva = $objp->total_tva;
+ $this->total_localtax1 = $objp->total_localtax1;
+ $this->total_localtax2 = $objp->total_localtax2;
+ $this->total_ttc = $objp->total_ttc;
$this->fk_fournprice = $objp->fk_fournprice;
$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
$this->pa_ht = $marginInfos[0];
$this->marge_tx = $marginInfos[1];
$this->marque_tx = $marginInfos[2];
- $this->special_code = $objp->special_code;
- $this->rang = $objp->rang;
+ $this->special_code = $objp->special_code;
+ $this->rang = $objp->rang;
- $this->ref = $objp->product_ref; // deprecated
- $this->product_ref = $objp->product_ref;
- $this->libelle = $objp->product_libelle; // deprecated
- $this->product_label = $objp->product_libelle;
- $this->product_desc = $objp->product_desc;
- $this->product_tobatch = $objp->product_tobatch;
- $this->fk_unit = $objp->fk_unit;
+ $this->ref = $objp->product_ref; // deprecated
+ $this->product_ref = $objp->product_ref;
+ $this->libelle = $objp->product_libelle; // deprecated
+ $this->product_label = $objp->product_libelle;
+ $this->product_desc = $objp->product_desc;
+ $this->product_tobatch = $objp->product_tobatch;
+ $this->fk_unit = $objp->fk_unit;
- $this->date_start = $this->db->jdate($objp->date_start);
- $this->date_end = $this->db->jdate($objp->date_end);
+ $this->date_start = $this->db->jdate($objp->date_start);
+ $this->date_end = $this->db->jdate($objp->date_end);
$this->fk_multicurrency = $objp->fk_multicurrency;
$this->multicurrency_code = $objp->multicurrency_code;
@@ -3928,38 +3928,38 @@ class OrderLine extends CommonOrderLine
$this->multicurrency_total_tva = $objp->multicurrency_total_tva;
$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
- $this->db->free($result);
+ $this->db->free($result);
- return 1;
- }
- else
- {
- $this->error = $this->db->lasterror();
- return -1;
- }
- }
+ return 1;
+ }
+ else
+ {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
- /**
- * Delete line in database
- *
- * @param User $user User that modify
+ /**
+ * Delete line in database
+ *
+ * @param User $user User that modify
* @param int $notrigger 0=launch triggers after, 1=disable triggers
- * @return int <0 si ko, >0 si ok
- */
- function delete($user=null, $notrigger=0)
- {
- global $conf, $user, $langs;
+ * @return int <0 si ko, >0 si ok
+ */
+ function delete($user=null, $notrigger=0)
+ {
+ global $conf, $user, $langs;
$error=0;
- $this->db->begin();
+ $this->db->begin();
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
- dol_syslog("OrderLine::delete", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
+ dol_syslog("OrderLine::delete", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
// Remove extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{
@@ -3974,63 +3974,63 @@ class OrderLine extends CommonOrderLine
if (! $error && ! $notrigger)
{
- // Call trigger
- $result=$this->call_trigger('LINEORDER_DELETE',$user);
- if ($result < 0) $error++;
- // End call triggers
+ // Call trigger
+ $result=$this->call_trigger('LINEORDER_DELETE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
}
- if (!$error) {
- $this->db->commit();
- return 1;
- }
+ if (!$error) {
+ $this->db->commit();
+ return 1;
+ }
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- else
- {
- $this->error=$this->db->lasterror();
- return -1;
- }
- }
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
+ }
- /**
- * Insert line into database
- *
- * @param User $user User that modify
- * @param int $notrigger 1 = disable triggers
- * @return int <0 if KO, >0 if OK
- */
- function insert($user=null, $notrigger=0)
- {
- global $langs, $conf;
+ /**
+ * Insert line into database
+ *
+ * @param User $user User that modify
+ * @param int $notrigger 1 = disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function insert($user=null, $notrigger=0)
+ {
+ global $langs, $conf;
$error=0;
- $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+ $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
- dol_syslog(get_class($this)."::insert rang=".$this->rang);
+ dol_syslog(get_class($this)."::insert rang=".$this->rang);
- // Clean parameters
- if (empty($this->tva_tx)) $this->tva_tx=0;
- if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
- if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+ // Clean parameters
+ if (empty($this->tva_tx)) $this->tva_tx=0;
+ if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+ if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
if (empty($this->localtax1_type)) $this->localtax1_type=0;
if (empty($this->localtax2_type)) $this->localtax2_type=0;
- if (empty($this->total_localtax1)) $this->total_localtax1=0;
- if (empty($this->total_localtax2)) $this->total_localtax2=0;
- if (empty($this->rang)) $this->rang=0;
- if (empty($this->remise)) $this->remise=0;
- if (empty($this->remise_percent)) $this->remise_percent=0;
- if (empty($this->info_bits)) $this->info_bits=0;
- if (empty($this->special_code)) $this->special_code=0;
- if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+ if (empty($this->total_localtax1)) $this->total_localtax1=0;
+ if (empty($this->total_localtax2)) $this->total_localtax2=0;
+ if (empty($this->rang)) $this->rang=0;
+ if (empty($this->remise)) $this->remise=0;
+ if (empty($this->remise_percent)) $this->remise_percent=0;
+ if (empty($this->info_bits)) $this->info_bits=0;
+ if (empty($this->special_code)) $this->special_code=0;
+ if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->pa_ht)) $this->pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
@@ -4046,65 +4046,65 @@ class OrderLine extends CommonOrderLine
}
}
- // Check parameters
- if ($this->product_type < 0) return -1;
+ // Check parameters
+ if ($this->product_type < 0) return -1;
- $this->db->begin();
+ $this->db->begin();
- // Insertion dans base de la ligne
- $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
- $sql.= ' (fk_commande, fk_parent_line, label, description, qty, ';
- $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
- $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
- $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
- $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
- $sql.= ' fk_unit';
+ // Insertion dans base de la ligne
+ $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
+ $sql.= ' (fk_commande, fk_parent_line, label, description, qty, ';
+ $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+ $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
+ $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
+ $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
+ $sql.= ' fk_unit';
$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
$sql.= ')';
- $sql.= " VALUES (".$this->fk_commande.",";
- $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
- $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
- $sql.= " '".$this->db->escape($this->desc)."',";
- $sql.= " '".price2num($this->qty)."',";
- $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
- $sql.= " '".price2num($this->tva_tx)."',";
- $sql.= " '".price2num($this->localtax1_tx)."',";
- $sql.= " '".price2num($this->localtax2_tx)."',";
+ $sql.= " VALUES (".$this->fk_commande.",";
+ $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
+ $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+ $sql.= " '".$this->db->escape($this->desc)."',";
+ $sql.= " '".price2num($this->qty)."',";
+ $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+ $sql.= " '".price2num($this->tva_tx)."',";
+ $sql.= " '".price2num($this->localtax1_tx)."',";
+ $sql.= " '".price2num($this->localtax2_tx)."',";
$sql.= " '".$this->db->escape($this->localtax1_type)."',";
$sql.= " '".$this->db->escape($this->localtax2_type)."',";
- $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
- $sql.= " '".$this->db->escape($this->product_type)."',";
- $sql.= " '".price2num($this->remise_percent)."',";
- $sql.= " ".(price2num($this->subprice)!==''?price2num($this->subprice):"null").",";
- $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").",";
- $sql.= " '".price2num($this->remise)."',";
- $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
- $sql.= ' '.$this->special_code.',';
- $sql.= ' '.$this->rang.',';
+ $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
+ $sql.= " '".$this->db->escape($this->product_type)."',";
+ $sql.= " '".price2num($this->remise_percent)."',";
+ $sql.= " ".(price2num($this->subprice)!==''?price2num($this->subprice):"null").",";
+ $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").",";
+ $sql.= " '".price2num($this->remise)."',";
+ $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
+ $sql.= ' '.$this->special_code.',';
+ $sql.= ' '.$this->rang.',';
$sql.= ' '.(! empty($this->fk_fournprice)?$this->fk_fournprice:"null").',';
$sql.= ' '.price2num($this->pa_ht).',';
- $sql.= " '".$this->db->escape($this->info_bits)."',";
- $sql.= " ".price2num($this->total_ht).",";
- $sql.= " ".price2num($this->total_tva).",";
- $sql.= " ".price2num($this->total_localtax1).",";
- $sql.= " ".price2num($this->total_localtax2).",";
- $sql.= " ".price2num($this->total_ttc).",";
- $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
- $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
- $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+ $sql.= " '".$this->db->escape($this->info_bits)."',";
+ $sql.= " ".price2num($this->total_ht).",";
+ $sql.= " ".price2num($this->total_tva).",";
+ $sql.= " ".price2num($this->total_localtax1).",";
+ $sql.= " ".price2num($this->total_localtax2).",";
+ $sql.= " ".price2num($this->total_ttc).",";
+ $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
+ $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
+ $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
$sql.= ", ".(! empty($this->fk_multicurrency) ? $this->fk_multicurrency : 'NULL');
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".$this->multicurrency_subprice;
$sql.= ", ".$this->multicurrency_total_ht;
$sql.= ", ".$this->multicurrency_total_tva;
$sql.= ", ".$this->multicurrency_total_ttc;
- $sql.= ')';
+ $sql.= ')';
- dol_syslog(get_class($this)."::insert", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
+ dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
@@ -4116,42 +4116,42 @@ class OrderLine extends CommonOrderLine
}
}
- if (! $error && ! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('LINEORDER_INSERT',$user);
- if ($result < 0) $error++;
- // End call triggers
- }
+ if (! $error && ! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('LINEORDER_INSERT',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- if (!$error) {
- $this->db->commit();
- return 1;
- }
+ if (!$error) {
+ $this->db->commit();
+ return 1;
+ }
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -2;
- }
- }
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -2;
+ }
+ }
- /**
- * Update the line object into db
- *
- * @param User $user User that modify
+ /**
+ * Update the line object into db
+ *
+ * @param User $user User that modify
* @param int $notrigger 1 = disable triggers
- * @return int <0 si ko, >0 si ok
- */
+ * @return int <0 si ko, >0 si ok
+ */
function update(User $user, $notrigger=0)
{
global $conf,$langs;
@@ -4174,7 +4174,7 @@ class OrderLine extends CommonOrderLine
if (empty($this->remise)) $this->remise=0;
if (empty($this->remise_percent)) $this->remise_percent=0;
if (empty($this->info_bits)) $this->info_bits=0;
- if (empty($this->special_code)) $this->special_code=0;
+ if (empty($this->special_code)) $this->special_code=0;
if (empty($this->product_type)) $this->product_type=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->pa_ht)) $this->pa_ht=0;
@@ -4220,7 +4220,7 @@ class OrderLine extends CommonOrderLine
$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?$this->fk_fournprice:"null");
$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
$sql.= " , info_bits=".$this->info_bits;
- $sql.= " , special_code=".$this->special_code;
+ $sql.= " , special_code=".$this->special_code;
$sql.= " , date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
$sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
$sql.= " , product_type=".$this->product_type;
@@ -4230,9 +4230,9 @@ class OrderLine extends CommonOrderLine
// Multicurrency
$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
- $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
- $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
- $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+ $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+ $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+ $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
$sql.= " WHERE rowid = ".$this->rowid;
@@ -4252,10 +4252,10 @@ class OrderLine extends CommonOrderLine
if (! $error && ! $notrigger)
{
- // Call trigger
- $result=$this->call_trigger('LINEORDER_UPDATE',$user);
- if ($result < 0) $error++;
- // End call triggers
+ // Call trigger
+ $result=$this->call_trigger('LINEORDER_UPDATE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
}
if (!$error) {
@@ -4279,42 +4279,41 @@ class OrderLine extends CommonOrderLine
}
}
- /**
- * Update totals of order into database
- *
- * @return int <0 if ko, >0 if ok
- */
- function update_total()
- {
- $this->db->begin();
+ /**
+ * Update totals of order into database
+ *
+ * @return int <0 if ko, >0 if ok
+ */
+ function update_total()
+ {
+ $this->db->begin();
- // Clean parameters
- if (empty($this->total_localtax1)) $this->total_localtax1=0;
- if (empty($this->total_localtax2)) $this->total_localtax2=0;
+ // Clean parameters
+ if (empty($this->total_localtax1)) $this->total_localtax1=0;
+ if (empty($this->total_localtax2)) $this->total_localtax2=0;
- // Mise a jour ligne en base
- $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
- $sql.= " total_ht='".price2num($this->total_ht)."'";
- $sql.= ",total_tva='".price2num($this->total_tva)."'";
- $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
- $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
- $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
- $sql.= " WHERE rowid = ".$this->rowid;
+ // Mise a jour ligne en base
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
+ $sql.= " total_ht='".price2num($this->total_ht)."'";
+ $sql.= ",total_tva='".price2num($this->total_tva)."'";
+ $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
+ $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
+ $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
+ $sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog("OrderLine::update_total", LOG_DEBUG);
+ dol_syslog("OrderLine::update_total", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -2;
- }
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -2;
+ }
+ }
}
-