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

Merge pull request #15170 from fappels/13_set_date_livraison

Browse Source 
Re-add set_date_livraison as a deprecated function.
This commit is contained in:
Laurent Destailleur 2020-10-26 18:57:17 +01:00 committed by GitHub
commit 5e2b0a98cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 97 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/card.php
View File

@ -287,7 +287,7 @@ if (empty($reshook))
dol_print_error($db, $object->error);
} elseif ($action == 'setdate_livraison' && $usercancreate)
{
$result = $object->set_delivery_date($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
if ($result < 0)
dol_print_error($db, $object->error);
} // Positionne ref client

20
htdocs/comm/propal/class/propal.class.php
View File

@ -2060,8 +2060,23 @@ class Propal extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set delivery date
*
* @param User $user Object user that modify
* @param int $delivery_date Delivery date
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok
* @deprecated Use setDeliveryDate
*/
public function set_date_livraison($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
return $this->setDeliveryDate($user, $delivery_date, $notrigger);
}
/**
* Set delivery date
*
* @param User $user Object user that modify
@ -2069,9 +2084,8 @@ class Propal extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok
*/
public function set_delivery_date($user, $delivery_date, $notrigger = 0)
public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
if (!empty($user->rights->propal->creer))
{
$error = 0;

2
htdocs/commande/card.php
View File

@ -541,7 +541,7 @@ if (empty($reshook))
$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$object->fetch($id);
$result = $object->set_delivery_date($user, $datedelivery);
$result = $object->setDeliveryDate($user, $datedelivery);
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}

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

@ -2548,6 +2548,21 @@ class Commande extends CommonOrder
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set delivery date
*
* @param User $user Object user that modify
* @param int $delivery_date Delivery date
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok
* @deprecated Use setDeliveryDate
*/
public function set_date_livraison($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
return $this->setDeliveryDate($user, $delivery_date, $notrigger);
}
/**
* Set the planned delivery date
*
@ -2556,9 +2571,8 @@ class Commande extends CommonOrder
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 si ko, >0 si ok
*/
public function set_delivery_date($user, $delivery_date, $notrigger = 0)
public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
if ($user->rights->commande->creer)
{
$error = 0;

2
htdocs/delivery/card.php
View File

@ -171,7 +171,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
if ($action == 'setdate_livraison' && $user->rights->expedition->delivery->creer)
{
$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$result = $object->set_delivery_date($user, $datedelivery);
$result = $object->setDeliveryDate($user, $datedelivery);
if ($result < 0)
{
$mesg = '<div class="error">'.$object->error.'</div>';

8
htdocs/delivery/class/delivery.class.php
View File

@ -999,24 +999,22 @@ class Delivery extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
/**
* Set the planned delivery date
*
* @param User $user Objet utilisateur qui modifie
* @param integer $delivery_date Delivery date
* @return int <0 if KO, >0 if OK
*/
public function set_delivery_date($user, $delivery_date)
public function setDeliveryDate($user, $delivery_date)
{
// phpcs:enable
if ($user->rights->expedition->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."delivery";
$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::set_delivery_date", LOG_DEBUG);
dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{

2
htdocs/expedition/card.php
View File

@ -479,7 +479,7 @@ if (empty($reshook))
$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$object->fetch($id);
$result = $object->set_delivery_date($user, $datedelivery);
$result = $object->setDeliveryDate($user, $datedelivery);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');

21
htdocs/expedition/class/expedition.class.php
View File

@ -1957,24 +1957,37 @@ class Expedition extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set delivery date
*
* @param User $user Object user that modify
* @param int $delivery_date Delivery date
* @return int <0 if ko, >0 if ok
* @deprecated Use setDeliveryDate
*/
public function set_date_livraison($user, $delivery_date)
{
// phpcs:enable
return $this->setDeliveryDate($user, $delivery_date);
}
/**
* Set the planned delivery date
*
* @param User $user Objet user that modify
* @param integer $delivery_date Date of delivery
* @return int <0 if KO, >0 if OK
*/
public function set_delivery_date($user, $delivery_date)
public function setDeliveryDate($user, $delivery_date)
{
// phpcs:enable
if ($user->rights->expedition->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::set_delivery_date", LOG_DEBUG);
dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{

2
htdocs/expedition/shipment.php
View File

@ -108,7 +108,7 @@ if (empty($reshook))
$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$object->fetch($id);
$result = $object->set_delivery_date($user, $datedelivery);
$result = $object->setDeliveryDate($user, $datedelivery);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');

18
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2258,6 +2258,21 @@ class CommandeFournisseur extends CommonOrder
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set delivery date
*
* @param User $user Object user that modify
* @param int $delivery_date Delivery date
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok
* @deprecated Use setDeliveryDate
*/
public function set_date_livraison($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
return $this->setDeliveryDate($user, $delivery_date, $notrigger);
}
/**
* Set the planned delivery date
*
@ -2266,9 +2281,8 @@ class CommandeFournisseur extends CommonOrder
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if KO, >0 if OK
*/
public function set_delivery_date($user, $delivery_date, $notrigger = 0)
public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
{
// phpcs:enable
if ($user->rights->fournisseur->commande->creer)
{
$error = 0;

4
htdocs/fourn/commande/card.php
View File

@ -203,7 +203,7 @@ if (empty($reshook))
// date of delivery
if ($action == 'setdate_livraison' && $usercancreate)
{
$result = $object->set_delivery_date($user, $datelivraison);
$result = $object->setDeliveryDate($user, $datelivraison);
if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}
@ -1199,7 +1199,7 @@ if (empty($reshook))
$result = $srcobject->fetch($object->origin_id);
if ($result > 0)
{
$object->set_delivery_date($user, $srcobject->date_livraison);
$object->setDeliveryDate($user, $srcobject->date_livraison);
$object->set_id_projet($user, $srcobject->fk_project);
$lines = $srcobject->lines;

2
htdocs/reception/card.php
View File

@ -425,7 +425,7 @@ if (empty($reshook))
$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$object->fetch($id);
$result = $object->set_delivery_date($user, $datedelivery);
$result = $object->setDeliveryDate($user, $datedelivery);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');

7
htdocs/reception/class/reception.class.php
View File

@ -1219,15 +1219,14 @@ class Reception extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
/**
* Set the planned delivery date
*
* @param User $user Objet utilisateur qui modifie
* @param integer $delivery_date Delivery date
* @return int <0 if KO, >0 if OK
*/
public function set_delivery_date($user, $delivery_date)
public function setDeliveryDate($user, $delivery_date)
{
// phpcs:enable
if ($user->rights->reception->creer)
@ -1236,7 +1235,7 @@ class Reception extends CommonObject
$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::set_delivery_date", LOG_DEBUG);
dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{

2
htdocs/supplier_proposal/card.php
View File

@ -229,7 +229,7 @@ if (empty($reshook))
else setEventMessages($langs->trans($object->error), null, 'errors');
}
} elseif ($action == 'setdate_livraison' && $usercancreate) {
$result = $object->set_delivery_date($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
if ($result < 0)
dol_print_error($db, $object->error);
}

19
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1507,6 +1507,20 @@ class SupplierProposal extends CommonObject
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set delivery date
*
* @param User $user Object user that modify
* @param int $delivery_date Delivery date
* @return int <0 if ko, >0 if ok
* @deprecated Use setDeliveryDate
*/
public function set_date_livraison($user, $delivery_date)
{
// phpcs:enable
return $this->setDeliveryDate($user, $delivery_date);
}
/**
* Set delivery date
*
@ -1514,9 +1528,8 @@ class SupplierProposal extends CommonObject
* @param int $delivery_date Delivery date
* @return int <0 if ko, >0 if ok
*/
public function set_delivery_date($user, $delivery_date)
public function setDeliveryDate($user, $delivery_date)
{
// phpcs:enable
if (!empty($user->rights->supplier_proposal->creer))
{
$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
@ -1529,7 +1542,7 @@ class SupplierProposal extends CommonObject
return 1;
} else {
$this->error = $this->db->error();
dol_syslog(get_class($this)."::set_delivery_date Erreur SQL");
dol_syslog(get_class($this)."::setDeliveryDate Erreur SQL");
return -1;
}
}