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

Fix: move method in common class

Browse Source
This commit is contained in:
Regis Houssin 2012-03-13 20:01:10 +01:00
parent 9831a2028c
commit f8bf7ade83
11 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/comm/fiche.php
View File

@ -89,21 +89,15 @@ if ($action == 'setcustomeraccountancycode')
if ($action == 'setconditions' && $user->rights->societe->creer)
{
$object->fetch($id);
$object->cond_reglement=GETPOST('cond_reglement_id','int');
$result=$object->setPaymentTerms($object->cond_reglement);
$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
if ($result < 0) dol_print_error($db,$object->error);
}
// mode de reglement
if ($action == 'setmode' && $user->rights->societe->creer)
{
$object->fetch($id);
$object->mode_reglement=$_POST['mode_reglement_id'];
// TODO move to DAO class
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET mode_reglement='".$_POST['mode_reglement_id'];
$sql.= "' WHERE rowid='".$id."'";
$result = $db->query($sql);
if (! $result) dol_print_error($result);
$result=$object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
if ($result < 0) dol_print_error($db,$object->error);
}
// assujetissement a la TVA
if ($action == 'setassujtva' && $user->rights->societe->creer)

2
htdocs/comm/propal.php
View File

@ -1008,7 +1008,7 @@ else if ($action == 'setremiseabsolue' && $user->rights->propale->creer)
else if ($action == 'setmode')
{
$object->fetch($id);
$result = $object->mode_reglement($_POST['mode_reglement_id']);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
}
/*

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

@ -1922,6 +1922,7 @@ class Propal extends CommonObject
*
* @param int $mode_reglement_id Id of new payment mode
* @return int >0 if OK, <0 if KO
* TODO deprecated
*/
function mode_reglement($mode_reglement_id)
{

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

@ -2016,6 +2016,7 @@ class Commande extends CommonObject
*
* @param int $mode Id du nouveau mode
* @return int >0 si ok, <0 si ko
* TODO deprecated
*/
function mode_reglement($mode_reglement_id)
{

2
htdocs/commande/fiche.php
View File

@ -449,7 +449,7 @@ if ($action == 'setaddress' && $user->rights->commande->creer)
if ($action == 'setmode' && $user->rights->commande->creer)
{
$object->fetch($id);
$result=$object->mode_reglement($_POST['mode_reglement_id']);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
if ($result < 0) dol_print_error($db,$object->error);
}

2
htdocs/compta/facture.php
View File

@ -254,7 +254,7 @@ if ($action == 'classin')
if ($action == 'setmode')
{
$object->fetch($id);
$result=$object->mode_reglement($_POST['mode_reglement_id']);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
if ($result < 0) dol_print_error($db,$object->error);
}

1
htdocs/compta/facture/class/facture.class.php
View File

@ -2742,6 +2742,7 @@ class Facture extends CommonObject
*
* @param int $mode_reglement_id Id du nouveau mode
* @return int >0 if OK, <0 if KO
* TODO deprecated
*/
function mode_reglement($mode_reglement_id)
{

43
htdocs/core/class/commonobject.class.php
View File

@ -862,6 +862,46 @@ abstract class CommonObject
}
}
/**
* Change the payments methods
*
* @param int $id Id of new payment method
* @return int >0 if OK, <0 if KO
*/
function setPaymentMethods($id)
{
dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
if ($this->statut >= 0 || $this->element == 'societe')
{
// TODO uniformize field name
$fieldname = 'fk_mode_reglement';
if ($this->element == 'societe') $fieldname = 'mode_reglement';
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= ' SET '.$fieldname.' = '.$id;
$sql .= ' WHERE rowid='.$this->id;
if ($this->db->query($sql))
{
$this->mode_reglement_id = $id;
$this->mode_reglement = $id; // for compatibility
return 1;
}
else
{
dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
$this->error=$this->db->error();
return -1;
}
}
else
{
dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
$this->error='Status of the object is incompatible '.$this->statut;
return -2;
}
}
/**
* Change the payments terms
*
@ -883,7 +923,8 @@ abstract class CommonObject
if ($this->db->query($sql))
{
$this->cond_reglement_id = $id;
$this->cond_reglement_id = $id;
$this->cond_reglement = $id; // for compatibility
return 1;
}
else

2
htdocs/expedition/shipment.php
View File

@ -107,7 +107,7 @@ if ($action == 'setmode' && $user->rights->commande->creer)
{
$commande = new Commande($db);
$commande->fetch($id);
$result=$commande->mode_reglement(GETPOST('mode_reglement_id','int'));
$result = $commande->setPaymentMethods(GETPOST('mode_reglement_id','int'));
if ($result < 0) dol_print_error($db,$commande->error);
}

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

@ -1340,6 +1340,7 @@ class CommandeFournisseur extends Commande
*
* @param int $mode_reglement_id Id du nouveau mode
* @return int >0 if OK, <0 if KO
* TODO deprecated
*/
function mode_reglement($mode_reglement_id)
{

2
htdocs/fourn/commande/fiche.php
View File

@ -84,7 +84,7 @@ if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
{
$object->fetch($id);
$result=$object->mode_reglement($_POST['mode_reglement_id']);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
}
// Set project