diff --git a/ChangeLog b/ChangeLog
index dc79f3a44c1..2dfff9a6e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,24 +5,26 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.2 compared to 3.1 *****
For users:
-- New: task #11243: Show quantity into stocks for each sub-products into the sub-product tab
-- New: task #10500: Option to choose if professional id are unique
-- New: Add hidden option FOURN_PRODUCT_AVAILABILITY
-- New: task #11123: Add best supplier price
+- New: Can edit customer discounts from invoice create and edit card.
+- New: task #11243: Show quantity into stocks for each sub-products into the sub-product tab.
+- New: task #10500: Option to choose if professional id are unique.
+- New: Add hidden option FOURN_PRODUCT_AVAILABILITY.
+- New: task #11123: Add best supplier price.
- New: Enhancement in styles.
-- New: task #11289 : Modify third party accountancy code generator aquarium
-- New: task #10606 : more comprehensive message error
-- New: task #11278 : Option into point of sale module to add services in list
+- New: task #11289 : Modify third party accountancy code generator aquarium.
+- New: task #10606 : more comprehensive message error.
+- New: task #11278 : Option into point of sale module to add services in list.
- New: task #11261 : Add an entry into menu called "New shipment".
-- New: Make option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT available by default
+- New: Make option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT available by default.
- New: Can build PDF in USLetter format or canada format.
For developers:
- Qual: Removed no more used external libraries.
- Qual: Cleaned a lot of dead code.
- Qual: Parent templates classes were moved as abstract classes.
-- Qual: Added more "hooks"
+- Qual: Add more "hooks".
- Qual: Add "canvas" feature to overwrite page of thirdparty, contact, product with yours.
+- More OOP (usage of "abstract", "static", ...), unifformize constructors.
***** ChangeLog for 3.1 compared to 3.0 *****
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index e1da0c851a6..0dbad6754b1 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -40,21 +40,21 @@ class AccountancySystem
/**
- * \brief Constructor of class
- * \param DB Database handler
- * \param id Id compte (0 by default)
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
- function AccountancySystem($DB, $id=0)
+ function AccountancySystem($DB)
{
$this->db = $DB;
- $this->id = $id ;
}
/**
- * \brief Insert accountancy system name into database
- * \param user User making insert
- * \return int <0 if KO, Id of line if OK
+ * Insert accountancy system name into database
+ *
+ * @param User $user User making insert
+ * @return int <0 if KO, Id of line if OK
*/
function create($user)
{
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index afe18f165b8..6bfd0b6c286 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -41,15 +41,13 @@ class Bookmark
/**
- * Constructor
- *
- * @param DoliDB $db Handler for Database Access
- * @param int $id Bookmark Id
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
- function Bookmark($db, $id=-1)
+ function Bookmark($db)
{
$this->db = $db;
- $this->id = $id;
}
/**
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 683d9cc8f70..5b1ab4595bd 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -70,7 +70,7 @@ class Facturation {
/**
- * Constructor
+ * Constructor
*/
public function Facturation()
{
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 4530b2031b6..8d28f73439d 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -68,12 +68,13 @@ switch ( $_GET['action'] )
{
$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
$productid = $ret['rowid'];
-
+
$societe = new Societe($db);
$societe->fetch($thirdpartyid);
-
- $product = new Product($db, $productid);
-
+
+ $product = new Product($db);
+ $product->fetch($productid);
+
if(isset($product->multiprices[$societe->price_level]))
{
$ret['price'] = $product->multiprices_ttc[$societe->price_level];
@@ -82,9 +83,9 @@ switch ( $_GET['action'] )
// $product->multiprices_base_type[$societe->price_level];
$ret['tva_tx'] = $product->multiprices_tva_tx[$societe->price_level];
}
- }
+ }
/** end add Ditto */
-
+
$obj_facturation->id( $ret['rowid'] );
$obj_facturation->ref( $ret['ref'] );
$obj_facturation->stock( $ret['reel'] );
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 78e4b60867e..61c3b283183 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -64,7 +64,8 @@ along with this program. If not, see .
/** add Ditto for MultiPrix*/
if($conf->global->PRODUIT_MULTIPRICES)
{
- $product = new Product($db, $ret[$i]['id']);
+ $product = new Product($db);
+ $product->fetch($ret[$i]['id']);
if(isset($product->multiprices[$societe->price_level]))
{
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 7173ad4f122..2bffb92b113 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -55,23 +55,23 @@ class Categorie
/**
- * Constructor
+ * Constructor
*
- * @param DB acces base de donnees
- * @param id id de la categorie
+ * @param DoliDB $DB Database handler
+ * @param int $id Id of category to fetch during init
*/
function Categorie($DB, $id=-1)
{
$this->db = $DB;
$this->id = $id;
- if ($id != -1) $this->fetch ($this->id);
+ if ($id != -1) $this->fetch($this->id);
}
/**
* Load category into memory from database
*
- * @param id id of category
+ * @param int $id Id of category
*/
function fetch($id)
{
@@ -216,7 +216,7 @@ class Categorie
$this->description=trim($this->description);
$this->parentId = ($this->id_mere) != "" ? intval($this->id_mere) : 0;
$this->visible = ($this->visible) != "" ? intval($this->visible) : 0;
-
+
if ($this->already_exists())
{
$this->error=$langs->trans("ImpossibleUpdateCat");
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 2ce4e6e5f5f..acb12159f9e 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -105,12 +105,8 @@ llxHeader("","",$langs->trans("Categories"));
print_fiche_titre($langs->trans("ModifCat"));
-if ($mesg)
-{
- print '
';
- print $mesg;
- print '
';
-}
+dol_htmloutput_errors($mesg);
+
$categorie = new Categorie($db, $id);
$html = new Form($db);
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 98cb3494a8b..4c0049d8cb0 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -84,14 +84,16 @@ if ($_POST['action'] == 'setcustomeraccountancycode')
if ($_GET["action"] == 'attribute_prefix' && $user->rights->societe->creer)
{
- $societe = new Societe($db, $_GET["socid"]);
+ $societe = new Societe($db);
+ $societe->fetch($_GET["socid"]);
$societe->attribute_prefix($db, $_GET["socid"]);
}
// conditions de reglement
if ($_POST["action"] == 'setconditions' && $user->rights->societe->creer)
{
- $societe = new Societe($db, $_GET["socid"]);
+ $societe = new Societe($db);
+ $societe->fetch($_GET["socid"]);
$societe->cond_reglement=$_POST['cond_reglement_id'];
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET cond_reglement='".$_POST['cond_reglement_id'];
$sql.= "' WHERE rowid='".$_GET["socid"]."'";
@@ -101,7 +103,8 @@ if ($_POST["action"] == 'setconditions' && $user->rights->societe->creer)
// mode de reglement
if ($_POST["action"] == 'setmode' && $user->rights->societe->creer)
{
- $societe = new Societe($db, $_GET["socid"]);
+ $societe = new Societe($db);
+ $societe->fetch($_GET["socid"]);
$societe->mode_reglement=$_POST['mode_reglement_id'];
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET mode_reglement='".$_POST['mode_reglement_id'];
$sql.= "' WHERE rowid='".$_GET["socid"]."'";
@@ -111,7 +114,8 @@ if ($_POST["action"] == 'setmode' && $user->rights->societe->creer)
// assujetissement a la TVA
if ($_POST["action"] == 'setassujtva' && $user->rights->societe->creer)
{
- $societe = new Societe($db, $_GET["socid"]);
+ $societe = new Societe($db);
+ $societe->fetch($_GET["socid"]);
$societe->tva_assuj=$_POST['assujtva_value'];
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE rowid='".$socid."'";
$result = $db->query($sql);
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index b9fe58eed1f..5b2d1522d62 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -661,7 +661,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
// Ecrase $txtva par celui du produit
if ($_POST['idprod'])
{
- $prod = new Product($db, $_POST['idprod']);
+ $prod = new Product($db);
$prod->fetch($_POST['idprod']);
$tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 56a229b63ac..a7556454a3c 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -62,7 +62,7 @@ if ($id > 0 || ! empty($ref))
if ($object->fetch($id,$ref) > 0)
{
- $soc = new Societe($db, $object->socid);
+ $soc = new Societe($db);
$soc->fetch($object->socid);
$head = propal_prepare_head($object);
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 2f00edaac72..a6e818a07ac 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -138,7 +138,7 @@ if ($id > 0 || ! empty($ref))
$propal = New Propal($db);
if ( $propal->fetch($id,$ref) > 0)
{
- $soc = new Societe($db, $propal->socid);
+ $soc = new Societe($db);
$soc->fetch($propal->socid);
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 2b33767f889..47463460abe 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -55,7 +55,8 @@ if ($_GET["action"] == 'cstc')
// set prospect level
if ($_POST["action"] == 'setprospectlevel' && $user->rights->societe->creer)
{
- $societe = new Societe($db, $_GET["socid"]);
+ $societe = new Societe($db);
+ $societe->fetch($_GET["socid"]);
$societe->fk_prospectlevel=$_POST['prospect_level_id'];
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_prospectlevel='".$_POST['prospect_level_id'];
$sql.= "' WHERE rowid='".$_GET["socid"]."'";
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index b460d1176ff..348e0000ba7 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -65,7 +65,7 @@ if ($id > 0 || ! empty($ref))
if ($object->fetch($id,$ref) > 0)
{
- $soc = new Societe($db, $object->socid);
+ $soc = new Societe($db);
$soc->fetch($object->socid);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8066a72121c..e999090bb21 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -99,10 +99,11 @@ class Commande extends CommonObject
/**
- * \brief Constructeur
- * \param DB Handler d'acces base
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
- function Commande($DB, $socid="", $commandeid=0)
+ function Commande($DB)
{
global $langs;
$langs->load('orders');
@@ -1152,7 +1153,8 @@ class Commande extends CommonObject
/** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
{
- $prod = new Product($this->db, $idproduct);
+ $prod = new Product($this->db);
+ $prod->fetch($idproduct);
$prod -> get_sousproduits_arbo ();
$prods_arbo = $prod->get_each_prod();
if(sizeof($prods_arbo) > 0)
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index f77d771e3f6..4d4d240500e 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -134,7 +134,7 @@ if ($id > 0 || ! empty($ref))
$commande = new Commande($db);
if ( $commande->fetch($_GET['id'],$_GET['ref']) > 0)
{
- $soc = new Societe($db, $commande->socid);
+ $soc = new Societe($db);
$soc->fetch($commande->socid);
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 13e012ba97c..0f2a2c5651d 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -510,7 +510,7 @@ if ($action == 'addline' && $user->rights->commande->creer)
// Ecrase $base_price_type par celui du produit
if ($_POST['idprod'])
{
- $prod = new Product($db, $_POST['idprod']);
+ $prod = new Product($db);
$prod->fetch($_POST['idprod']);
$tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 0582d7f6ecb..cc09dbeac21 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -49,7 +49,7 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES
$commande = new Commande($db);
$commande->fetch($_GET["id"]);
$commande->info($_GET["id"]);
-$soc = new Societe($db, $commande->socid);
+$soc = new Societe($db);
$soc->fetch($commande->socid);
$head = commande_prepare_head($commande);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 68b08227398..343b5d38e2b 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -85,7 +85,7 @@ $html = new Form($db);
if ($id > 0 || ! empty($ref))
{
- $soc = new Societe($db, $commande->socid);
+ $soc = new Societe($db);
$soc->fetch($commande->socid);
$head = commande_prepare_head($commande);
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 8f420ea51e5..32b341c3276 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -36,94 +36,96 @@
*/
class BankCateg // extends CommonObject
{
- var $db; //!< To store db handler
- var $error; //!< To return error code (or message)
- var $errors=array(); //!< To return several error codes (or messages)
- //var $element='bank_categ'; //!< Id that identify managed objects
- //var $table_element='bank_categ'; //!< Name of table without prefix where object is stored
+ var $db; //!< To store db handler
+ var $error; //!< To return error code (or message)
+ var $errors=array(); //!< To return several error codes (or messages)
+ //var $element='bank_categ'; //!< Id that identify managed objects
+ //var $table_element='bank_categ'; //!< Name of table without prefix where object is stored
- var $id;
+ var $id;
- var $label;
+ var $label;
/**
- * \brief Constructor
- * \param DB Database handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function BankCateg($DB)
{
- $this->db = $DB;
- return 1;
+ $this->db = $DB;
+ return 1;
}
/**
- * \brief Create in database
- * \param user User that create
- * \param notrigger 0=launch triggers after, 1=disable triggers
- * \return int <0 if KO, Id of created object if OK
+ * Create in database
+ *
+ * @param user User that create
+ * @param notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, Id of created object if OK
*/
function create($user, $notrigger=0)
{
- global $conf, $langs;
- $error=0;
+ global $conf, $langs;
+ $error=0;
- // Clean parameters
- if (isset($this->label)) $this->label=trim($this->label);
+ // Clean parameters
+ if (isset($this->label)) $this->label=trim($this->label);
- // Check parameters
- // Put here code to add control on parameters values
+ // Check parameters
+ // Put here code to add control on parameters values
- // Insert request
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
- $sql.= "label";
- $sql.= ", entity";
- $sql.= ") VALUES (";
- $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'")."";
- $sql.= ", ".$conf->entity;
- $sql.= ")";
+ // Insert request
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
+ $sql.= "label";
+ $sql.= ", entity";
+ $sql.= ") VALUES (";
+ $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'")."";
+ $sql.= ", ".$conf->entity;
+ $sql.= ")";
- $this->db->begin();
+ $this->db->begin();
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
- if (! $error)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_categ");
+ if (! $error)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_categ");
- if (! $notrigger)
- {
- // Uncomment this and change MYOBJECT to your own tag if you
- // want this action call a trigger.
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action call a trigger.
- //// Call triggers
- //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- //$interface=new Interfaces($this->db);
- //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
- //if ($result < 0) { $error++; $this->errors=$interface->errors; }
- //// End call triggers
- }
+ //// Call triggers
+ //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
}
// Commit or rollback
if ($error)
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- else
- {
- $this->db->commit();
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
return $this->id;
- }
+ }
}
@@ -134,36 +136,36 @@ class BankCateg // extends CommonObject
*/
function fetch($id)
{
- global $langs,$conf;
+ global $langs,$conf;
- $sql = "SELECT";
- $sql.= " t.rowid,";
- $sql.= " t.label";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as t";
- $sql.= " WHERE t.rowid = ".$id;
- $sql.= " AND t.entity = ".$conf->entity;
+ $sql = "SELECT";
+ $sql.= " t.rowid,";
+ $sql.= " t.label";
+ $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as t";
+ $sql.= " WHERE t.rowid = ".$id;
+ $sql.= " AND t.entity = ".$conf->entity;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
+ dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
{
- $obj = $this->db->fetch_object($resql);
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->label = $obj->label;
+ $this->id = $obj->rowid;
+ $this->label = $obj->label;
+ }
+ $this->db->free($resql);
+
+ return 1;
+ }
+ else
+ {
+ $this->error="Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+ return -1;
}
- $this->db->free($resql);
-
- return 1;
- }
- else
- {
- $this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
- return -1;
- }
}
@@ -175,185 +177,185 @@ class BankCateg // extends CommonObject
*/
function update($user=0, $notrigger=0)
{
- global $conf, $langs;
- $error=0;
+ global $conf, $langs;
+ $error=0;
- // Clean parameters
- if (isset($this->label)) $this->label=trim($this->label);
+ // Clean parameters
+ if (isset($this->label)) $this->label=trim($this->label);
- // Check parameters
- // Put here code to add control on parameters values
+ // Check parameters
+ // Put here code to add control on parameters values
- // Update request
- $sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ SET";
- $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null")."";
- $sql.= " WHERE rowid=".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ // Update request
+ $sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ SET";
+ $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null")."";
+ $sql.= " WHERE rowid=".$this->id;
+ $sql.= " AND entity = ".$conf->entity;
- $this->db->begin();
+ $this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
- $resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
- if (! $error)
- {
- if (! $notrigger)
- {
- // Uncomment this and change MYOBJECT to your own tag if you
- // want this action call a trigger.
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action call a trigger.
- //// Call triggers
- //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- //$interface=new Interfaces($this->db);
- //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
- //if ($result < 0) { $error++; $this->errors=$interface->errors; }
- //// End call triggers
- }
- }
+ //// Call triggers
+ //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
+ }
// Commit or rollback
- if ($error)
- {
- foreach($this->errors as $errmsg)
- {
- dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
- }
- $this->db->rollback();
- return -1*$error;
- }
- else
- {
- $this->db->commit();
- return 1;
- }
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
}
- /**
- * \brief Delete object in database
+ /**
+ * \brief Delete object in database
* \param user User that delete
* \param notrigger 0=launch triggers after, 1=disable triggers
- * \return int <0 if KO, >0 if OK
- */
- function delete($user, $notrigger=0)
- {
- global $conf, $langs;
- $error=0;
+ * \return int <0 if KO, >0 if OK
+ */
+ function delete($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
- $sql.= " WHERE rowid=".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
+ $sql.= " WHERE rowid=".$this->id;
+ $sql.= " AND entity = ".$conf->entity;
- $this->db->begin();
+ $this->db->begin();
- dol_syslog(get_class($this)."::delete sql=".$sql);
- $resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ dol_syslog(get_class($this)."::delete sql=".$sql);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
- if (! $error)
- {
- if (! $notrigger)
- {
- // Uncomment this and change MYOBJECT to your own tag if you
- // want this action call a trigger.
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action call a trigger.
- //// Call triggers
- //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- //$interface=new Interfaces($this->db);
- //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
- //if ($result < 0) { $error++; $this->errors=$interface->errors; }
- //// End call triggers
- }
- }
+ //// Call triggers
+ //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
+ }
// Commit or rollback
- if ($error)
- {
- 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->db->commit();
- return 1;
- }
- }
+ if ($error)
+ {
+ 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->db->commit();
+ return 1;
+ }
+ }
- /**
- * \brief Load an object from its id and create a new one in database
- * \param fromid Id of object to clone
- * \return int New id of clone
- */
- function createFromClone($fromid)
- {
- global $user,$langs;
+ /**
+ * \brief Load an object from its id and create a new one in database
+ * \param fromid Id of object to clone
+ * \return int New id of clone
+ */
+ function createFromClone($fromid)
+ {
+ global $user,$langs;
- $error=0;
+ $error=0;
- $object=new Bank_categ($this->db);
+ $object=new Bank_categ($this->db);
- $this->db->begin();
+ $this->db->begin();
- // Load source object
- $object->fetch($fromid);
- $object->id=0;
- $object->statut=0;
+ // Load source object
+ $object->fetch($fromid);
+ $object->id=0;
+ $object->statut=0;
- // Clear fields
- // ...
+ // Clear fields
+ // ...
- // Create clone
- $result=$object->create($user);
+ // Create clone
+ $result=$object->create($user);
- // Other options
- if ($result < 0)
- {
- $this->error=$object->error;
- $error++;
- }
+ // Other options
+ if ($result < 0)
+ {
+ $this->error=$object->error;
+ $error++;
+ }
- if (! $error)
- {
+ if (! $error)
+ {
- }
+ }
- // End
- if (! $error)
- {
- $this->db->commit();
- return $object->id;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
+ // End
+ if (! $error)
+ {
+ $this->db->commit();
+ return $object->id;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * \brief Initialise object with example values
- * \remarks id must be 0 if object instance is a specimen.
- */
- function initAsSpecimen()
- {
- $this->id=0;
+ /**
+ * \brief Initialise object with example values
+ * \remarks id must be 0 if object instance is a specimen.
+ */
+ function initAsSpecimen()
+ {
+ $this->id=0;
- $this->label='';
+ $this->label='';
- }
+ }
}
?>
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index a04d049d318..da534537bed 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -63,7 +63,8 @@ $thirdpartystatic=new Societe($db);
if ($action == 'attribute_prefix')
{
- $societe = new Societe($db, $socid);
+ $societe = new Societe($db);
+ $societe->fetch($socid);
$societe->attribute_prefix($db, $socid);
}
diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php
index 2e07c713dfa..2ef51313192 100644
--- a/htdocs/compta/deplacement/note.php
+++ b/htdocs/compta/deplacement/note.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
$trip = new Deplacement($db);
$trip->fetch($id,$ref);
- $soc = new Societe($db, $trip->socid);
+ $soc = new Societe($db);
$soc->fetch($trip->socid);
$h=0;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 0019765095f..ce03fde199f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -903,7 +903,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
// Ecrase $base_price_type par celui du produit
if ($_POST['idprod'])
{
- $prod = new Product($db, $_POST['idprod']);
+ $prod = new Product($db);
$prod->fetch($_POST['idprod']);
$tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
@@ -1884,7 +1884,7 @@ else
$result=$object->fetch_thirdparty();
- $soc = new Societe($db, $object->socid);
+ $soc = new Societe($db);
$soc->fetch($object->socid);
$totalpaye = $object->getSommePaiement();
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index cbc544f193b..aebabed12d3 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -63,7 +63,7 @@ if ($id > 0 || ! empty($ref))
if ($object->fetch($id,$ref) > 0)
{
- $soc = new Societe($db, $object->socid);
+ $soc = new Societe($db);
$soc->fetch($object->socid);
$author = new User($db);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5ee4c1142bf..5b313e49850 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -372,7 +372,7 @@ class Facture extends CommonObject
{
if ($_facrec->lines[$i]->fk_product)
{
- $prod = new Product($this->db, $_facrec->lines[$i]->fk_product);
+ $prod = new Product($this->db);
$res=$prod->fetch($_facrec->lines[$i]->fk_product);
}
$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index c5e9e456e88..381d643fdbb 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -337,7 +337,7 @@ else
if ($fac->fetch($facid, $user->societe_id) > 0)
{
- $soc = new Societe($db, $fac->socid);
+ $soc = new Societe($db);
$soc->fetch($fac->socid);
$author = new User($db);
$author->fetch($fac->user_author);
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 50821b3fea0..5f04fda1944 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -41,7 +41,7 @@ $fac = new Facture($db);
$fac->fetch($_GET["facid"]);
$fac->info($_GET["facid"]);
-$soc = new Societe($db, $fac->socid);
+$soc = new Societe($db);
$soc->fetch($fac->socid);
$head = facture_prepare_head($fac);
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 7fdf45eab26..6fbb1b18049 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -100,7 +100,7 @@ if ($id > 0 || ! empty($ref))
$fac = new Facture($db);
$fac->fetch($id,$ref);
- $soc = new Societe($db, $fac->socid);
+ $soc = new Societe($db);
$soc->fetch($fac->socid);
$head = facture_prepare_head($fac);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 0818f95f458..1e1feb3dbe0 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -105,7 +105,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
if ($mesg) print $mesg.' ';
- $soc = new Societe($db, $fac->socid);
+ $soc = new Societe($db);
$soc->fetch($fac->socid);
$totalpaye = $fac->getSommePaiement();
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 571563521d7..b3b689d5737 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -44,9 +44,9 @@ class RemiseCheque extends CommonObject
var $errno;
/**
- * Constructor
+ * Constructor
*
- * @param DoliDB $DB Database handler
+ * @param DoliDB $DB Database handler
*/
function RemiseCheque($DB)
{
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index b8f20830aca..c29a0d77d36 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -50,14 +50,16 @@ class BonPrelevement extends CommonObject
var $statut; // 0-Wait, 1-Trans, 2-Done
var $labelstatut=array();
- /**
- * Class constructor
- * @param DB data base handler access
- * @param filename filename
- */
+
+ /**
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
+ * @param string $filename Filename of withdraw receipt
+ */
function BonPrelevement($DB, $filename='')
{
- global $conf,$langs;
+ global $conf,$langs;
$error = 0;
$this->db = $DB;
@@ -84,26 +86,26 @@ class BonPrelevement extends CommonObject
$this->_fetched = 0;
- $langs->load("withdrawals");
- $this->labelstatut[0]=$langs->trans("StatusWaiting");
- $this->labelstatut[1]=$langs->trans("StatusTrans");
- $this->labelstatut[2]=$langs->trans("StatusCredited");
+ $langs->load("withdrawals");
+ $this->labelstatut[0]=$langs->trans("StatusWaiting");
+ $this->labelstatut[1]=$langs->trans("StatusTrans");
+ $this->labelstatut[2]=$langs->trans("StatusCredited");
return 1;
}
- /**
- * Add facture to withdrawal
- * @param facture_id id invoice to add
- * @param client_id id invoice customer
- * @param client_nom name of cliente
- * @param amount amount of invoice
- * @param code_banque code of bank withdrawal
- * @param code_guichet code of bank's office
- * @param number bank account number
- * @param number_key number key of account number
- * @return int >0 if OK, <0 if KO
- */
+ /**
+ * Add facture to withdrawal
+ * @param facture_id id invoice to add
+ * @param client_id id invoice customer
+ * @param client_nom name of cliente
+ * @param amount amount of invoice
+ * @param code_banque code of bank withdrawal
+ * @param code_guichet code of bank's office
+ * @param number bank account number
+ * @param number_key number key of account number
+ * @return int >0 if OK, <0 if KO
+ */
function AddFacture($facture_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key)
{
$result = 0;
@@ -150,17 +152,17 @@ class BonPrelevement extends CommonObject
}
/**
- * Add line to withdrawal
- * @param ligne_id id line to add
- * @param client_id id invoice customer
- * @param client_nom name of cliente
- * @param amount amount of invoice
- * @param code_banque code of bank withdrawal
- * @param code_guichet code of bank's office
- * @param number bank account number
- * @param number_key number key of account number
- * @return int >0 if OK, <0 if KO
- */
+ * Add line to withdrawal
+ * @param ligne_id id line to add
+ * @param client_id id invoice customer
+ * @param client_nom name of cliente
+ * @param amount amount of invoice
+ * @param code_banque code of bank withdrawal
+ * @param code_guichet code of bank's office
+ * @param number bank account number
+ * @param number_key number key of account number
+ * @return int >0 if OK, <0 if KO
+ */
function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key)
{
$result = -1;
@@ -231,10 +233,10 @@ class BonPrelevement extends CommonObject
}
/**
- * Read errors
- * @param error id of error
- * @return array of errors
- */
+ * Read errors
+ * @param error id of error
+ * @return array of errors
+ */
function ReadError($error)
{
$errors = array();
@@ -244,14 +246,14 @@ class BonPrelevement extends CommonObject
return $errors[abs($error)];
}
- /**
- * Get object and lines from database
- * @param rowid id of object to load
- * @return int >0 if OK, <0 if KO
- */
+ /**
+ * Get object and lines from database
+ * @param rowid id of object to load
+ * @return int >0 if OK, <0 if KO
+ */
function fetch($rowid)
{
- global $conf;
+ global $conf;
$sql = "SELECT p.rowid, p.ref, p.amount, p.note";
$sql.= ", p.datec as dc";
@@ -381,15 +383,15 @@ class BonPrelevement extends CommonObject
}
}
- /**
- * Set withdrawal to creditet status
- * @param user id of user
- * @param date date of action
- * @return int >0 if OK, <0 if KO
- */
+ /**
+ * Set withdrawal to creditet status
+ * @param user id of user
+ * @param date date of action
+ * @return int >0 if OK, <0 if KO
+ */
function set_infocredit($user, $date)
{
- global $conf,$langs;
+ global $conf,$langs;
$error == 0;
@@ -414,104 +416,104 @@ class BonPrelevement extends CommonObject
$subject = $langs->trans("InfoCreditSubject", $this->ref);
$message = $langs->trans("InfoCreditMessage", $this->ref, dol_print_date($date,'dayhour'));
- //Add payment of withdrawal into bank
- $bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
- $facs = array();
- $amounts = array();
+ //Add payment of withdrawal into bank
+ $bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
+ $facs = array();
+ $amounts = array();
- $facs = $this->_get_list_factures();
+ $facs = $this->_get_list_factures();
- for ($i = 0 ; $i < sizeof($facs) ; $i++)
- {
- $fac = new Facture($this->db);
- $fac->fetch($facs[$i]);
- $amounts[$fac->id] = $fac->total_ttc;
- $result = $fac->set_paid($user);
- }
- $paiement = new Paiement($this->db);
- $paiement->datepaye = $date ;
- $paiement->amounts = $amounts;
- $paiement->paiementid = 3; //
- $paiement->num_paiement = $this->ref ;
+ for ($i = 0 ; $i < sizeof($facs) ; $i++)
+ {
+ $fac = new Facture($this->db);
+ $fac->fetch($facs[$i]);
+ $amounts[$fac->id] = $fac->total_ttc;
+ $result = $fac->set_paid($user);
+ }
+ $paiement = new Paiement($this->db);
+ $paiement->datepaye = $date ;
+ $paiement->amounts = $amounts;
+ $paiement->paiementid = 3; //
+ $paiement->num_paiement = $this->ref ;
- $paiement_id = $paiement->create($user);
- if ($paiement_id < 0)
- {
- dol_syslog("BonPrelevement::set_credite AddPayment Error");
- $error++;
- }
- else
- {
- $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
- if ($result < 0)
- {
- dol_syslog("BonPrelevement::set_credite AddPaymentToBank Error");
- $error++;
- }
- }
- // Update prelevement line
- // TODO: Translate to ligne-prelevement.class.php
- $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
- $sql.= " SET statut = 2";
- $sql.= " WHERE fk_prelevement_bons = ".$this->id;
+ $paiement_id = $paiement->create($user);
+ if ($paiement_id < 0)
+ {
+ dol_syslog("BonPrelevement::set_credite AddPayment Error");
+ $error++;
+ }
+ else
+ {
+ $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
+ if ($result < 0)
+ {
+ dol_syslog("BonPrelevement::set_credite AddPaymentToBank Error");
+ $error++;
+ }
+ }
+ // Update prelevement line
+ // TODO: Translate to ligne-prelevement.class.php
+ $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
+ $sql.= " SET statut = 2";
+ $sql.= " WHERE fk_prelevement_bons = ".$this->id;
- if (! $this->db->query($sql))
- {
- dol_syslog("BonPrelevement::set_credite Update lines Error");
- $error++;
- }
+ if (! $this->db->query($sql))
+ {
+ dol_syslog("BonPrelevement::set_credite Update lines Error");
+ $error++;
+ }
- }
- else
- {
- dol_syslog("BonPrelevement::set_infocredit Update Bons Error");
- $error++;
- }
+ }
+ else
+ {
+ dol_syslog("BonPrelevement::set_infocredit Update Bons Error");
+ $error++;
+ }
- /*
- * End of procedure
- *
+ /*
+ * End of procedure
+ *
*/
- if ($error == 0)
- {
- $this->db->commit();
- return 0;
- }
- else
- {
- $this->db->rollback();
- dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
- return -1;
- }
- }
- else
- {
- dol_syslog("bon-prelevement::set_infocredit 1025 Open SQL transaction impossible ");
- return -1025;
- }
- }
- else
- {
- dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
- return -1027;
- }
- }
- else
- {
- return -1026;
- }
- }
+ if ($error == 0)
+ {
+ $this->db->commit();
+ return 0;
+ }
+ else
+ {
+ $this->db->rollback();
+ dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
+ return -1;
+ }
+ }
+ else
+ {
+ dol_syslog("bon-prelevement::set_infocredit 1025 Open SQL transaction impossible ");
+ return -1025;
+ }
+ }
+ else
+ {
+ dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
+ return -1027;
+ }
+ }
+ else
+ {
+ return -1026;
+ }
+ }
/**
- * Set withdrawal to transmited status
- * @param user id of user
- * @param date date of action
- * @param method method of transmision to bank
- * @return int >0 if OK, <0 if KO
- */
+ * Set withdrawal to transmited status
+ * @param user id of user
+ * @param date date of action
+ * @param method method of transmision to bank
+ * @return int >0 if OK, <0 if KO
+ */
function set_infotrans($user, $date, $method)
{
- global $conf,$langs;
+ global $conf,$langs;
$error == 0;
dol_syslog("bon-prelevement::set_infotrans Start",LOG_INFO);
@@ -570,12 +572,12 @@ class BonPrelevement extends CommonObject
}
/**
- * Get invoice list
- * @return array id of invoices
- */
+ * Get invoice list
+ * @return array id of invoices
+ */
function _get_list_factures()
{
- global $conf;
+ global $conf;
$arr = array();
@@ -623,7 +625,7 @@ class BonPrelevement extends CommonObject
*/
function SommeAPrelever()
{
- global $conf;
+ global $conf;
$sql = "SELECT sum(f.total_ttc)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
@@ -661,7 +663,7 @@ class BonPrelevement extends CommonObject
*/
function NbFactureAPrelever($banque=0,$agence=0)
{
- global $conf;
+ global $conf;
$sql = "SELECT count(f.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -776,7 +778,7 @@ class BonPrelevement extends CommonObject
if (! $error)
{
// Check RIB
- $i = 0;
+ $i = 0;
dol_syslog("Start RIB check");
if (sizeof($factures) > 0)
@@ -820,33 +822,33 @@ class BonPrelevement extends CommonObject
}
}
- $ok=0;
+ $ok=0;
// Withdraw invoices in factures_prev array
$out=sizeof($factures_prev)." invoices will be withdrawn.";
- //print $out."\n";
- dol_syslog($out);
+ //print $out."\n";
+ dol_syslog($out);
- if (sizeof($factures_prev) > 0)
- {
- if ($mode=='real')
- {
- $ok=1;
- }
- else
- {
- print $langs->trans("ModeWarning"); //"Option for real mode was not set, we stop after this simulation\n";
- }
- }
+ if (sizeof($factures_prev) > 0)
+ {
+ if ($mode=='real')
+ {
+ $ok=1;
+ }
+ else
+ {
+ print $langs->trans("ModeWarning"); //"Option for real mode was not set, we stop after this simulation\n";
+ }
+ }
if ($ok)
{
- /*
- * We are in real mode.
- * We create withdraw receipt and build withdraw into disk
- */
+ /*
+ * We are in real mode.
+ * We create withdraw receipt and build withdraw into disk
+ */
$this->db->begin();
/*
@@ -862,7 +864,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE ref LIKE '".$ref."%'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -888,7 +890,7 @@ class BonPrelevement extends CommonObject
$sql.= ", '".$this->db->idate(mktime())."'";
$sql.= ")";
- dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -913,165 +915,165 @@ class BonPrelevement extends CommonObject
* Creation process
*
*/
- if (!$error)
- {
- if (sizeof($factures_prev) > 0)
- {
- foreach ($factures_prev as $fac)
- {
- // Fetch invoice
- $fact = new Facture($this->db);
- $fact->fetch($fac[0]);
- /*
- * Add standing order
- *
- *
- * $fac[3] : banque
- * $fac[4] : guichet
- * $fac[5] : number
- * $fac[6] : cle rib
- * $fac[7] : amount
- * $fac[8] : client nom
- * $fac[2] : client id
- */
- $ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7],
- $fac[3], $fac[4], $fac[5], $fac[6]);
- if ($ri <> 0)
- {
- $error++;
- }
+ if (!$error)
+ {
+ if (sizeof($factures_prev) > 0)
+ {
+ foreach ($factures_prev as $fac)
+ {
+ // Fetch invoice
+ $fact = new Facture($this->db);
+ $fact->fetch($fac[0]);
+ /*
+ * Add standing order
+ *
+ *
+ * $fac[3] : banque
+ * $fac[4] : guichet
+ * $fac[5] : number
+ * $fac[6] : cle rib
+ * $fac[7] : amount
+ * $fac[8] : client nom
+ * $fac[2] : client id
+ */
+ $ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7],
+ $fac[3], $fac[4], $fac[5], $fac[6]);
+ if ($ri <> 0)
+ {
+ $error++;
+ }
- /*
- * Update orders
- *
- */
- $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
- $sql.= " SET traite = 1";
- $sql.= ", date_traite = ".$this->db->idate(mktime());
- $sql.= ", fk_prelevement_bons = ".$prev_id;
- $sql.= " WHERE rowid = ".$fac[1];
+ /*
+ * Update orders
+ *
+ */
+ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
+ $sql.= " SET traite = 1";
+ $sql.= ", date_traite = ".$this->db->idate(mktime());
+ $sql.= ", fk_prelevement_bons = ".$prev_id;
+ $sql.= " WHERE rowid = ".$fac[1];
- dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
- if ($this->db->query($sql))
- {
+ dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
+ if ($this->db->query($sql))
+ {
- }
- else
- {
- $error++;
- dol_syslog("Erreur mise a jour des demandes");
- dol_syslog($this->db->error());
- }
+ }
+ else
+ {
+ $error++;
+ dol_syslog("Erreur mise a jour des demandes");
+ dol_syslog($this->db->error());
+ }
- }
+ }
- }
+ }
- }
+ }
- if (!$error)
- {
- /*
- * Withdraw receipt
- */
+ if (!$error)
+ {
+ /*
+ * Withdraw receipt
+ */
- dol_syslog("Debut prelevement - Nombre de factures ".sizeof($factures_prev));
+ dol_syslog("Debut prelevement - Nombre de factures ".sizeof($factures_prev));
- if (sizeof($factures_prev) > 0)
- {
- $bonprev->date_echeance = $datetimeprev;
- $bonprev->reference_remise = $ref;
+ if (sizeof($factures_prev) > 0)
+ {
+ $bonprev->date_echeance = $datetimeprev;
+ $bonprev->reference_remise = $ref;
- $bonprev->numero_national_emetteur = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR;
- $bonprev->raison_sociale = $conf->global->PRELEVEMENT_RAISON_SOCIALE;
+ $bonprev->numero_national_emetteur = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR;
+ $bonprev->raison_sociale = $conf->global->PRELEVEMENT_RAISON_SOCIALE;
- $bonprev->emetteur_code_banque = $conf->global->PRELEVEMENT_CODE_BANQUE;
- $bonprev->emetteur_code_guichet = $conf->global->PRELEVEMENT_CODE_GUICHET;
- $bonprev->emetteur_numero_compte = $conf->global->PRELEVEMENT_NUMERO_COMPTE;
- $bonprev->emetteur_number_key = $conf->global->PRELEVEMENT_NUMBER_KEY;
+ $bonprev->emetteur_code_banque = $conf->global->PRELEVEMENT_CODE_BANQUE;
+ $bonprev->emetteur_code_guichet = $conf->global->PRELEVEMENT_CODE_GUICHET;
+ $bonprev->emetteur_numero_compte = $conf->global->PRELEVEMENT_NUMERO_COMPTE;
+ $bonprev->emetteur_number_key = $conf->global->PRELEVEMENT_NUMBER_KEY;
- $bonprev->factures = $factures_prev_id;
+ $bonprev->factures = $factures_prev_id;
- //Build file
- $bonprev->generate();
- }
- dol_syslog( $filebonprev ) ;
- dol_syslog("Fin prelevement");
- }
+ //Build file
+ $bonprev->generate();
+ }
+ dol_syslog( $filebonprev ) ;
+ dol_syslog("Fin prelevement");
+ }
- /*
- * Update total
- *
- */
+ /*
+ * Update total
+ *
+ */
- $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
- $sql.= " SET amount = ".price2num($bonprev->total);
- $sql.= " WHERE rowid = ".$prev_id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
+ $sql.= " SET amount = ".price2num($bonprev->total);
+ $sql.= " WHERE rowid = ".$prev_id;
+ $sql.= " AND entity = ".$conf->entity;
- dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
- {
- $error++;
- dol_syslog("Erreur mise a jour du total - $sql");
- }
+ dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql)
+ {
+ $error++;
+ dol_syslog("Erreur mise a jour du total - $sql");
+ }
- /*
- * Rollback or Commit
- *
- */
- if (!$error)
- {
- $this->db->commit();
- }
- else
- {
- $this->db->rollback();
- dol_syslog("Error",LOG_ERROR);
- }
+ /*
+ * Rollback or Commit
+ *
+ */
+ if (!$error)
+ {
+ $this->db->commit();
+ }
+ else
+ {
+ $this->db->rollback();
+ dol_syslog("Error",LOG_ERROR);
+ }
- return sizeof($factures_prev);
- }
- else
- {
- return 0;
- }
- }
-
-
- /**
- * Returns clickable name (with picto)
- * @param withpicto link with picto
- * @param option link target
- * @return string URL of target
- */
- function getNomUrl($withpicto=0,$option='')
- {
- global $langs;
-
- $result='';
-
- $lien = '';
- $lienfin='';
-
- if ($option == 'xxx')
- {
- $lien = '';
- $lienfin='';
- }
-
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"),'payment').$lienfin.' ');
- $result.=$lien.$this->ref.$lienfin;
- return $result;
- }
+ return sizeof($factures_prev);
+ }
+ else
+ {
+ return 0;
+ }
+ }
/**
- * Delete a notification def by id
- * @param rowid id of notification
- * @return int 0 if OK, <0 if KO
- */
+ * Returns clickable name (with picto)
+ * @param withpicto link with picto
+ * @param option link target
+ * @return string URL of target
+ */
+ function getNomUrl($withpicto=0,$option='')
+ {
+ global $langs;
+
+ $result='';
+
+ $lien = '';
+ $lienfin='';
+
+ if ($option == 'xxx')
+ {
+ $lien = '';
+ $lienfin='';
+ }
+
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"),'payment').$lienfin.' ');
+ $result.=$lien.$this->ref.$lienfin;
+ return $result;
+ }
+
+
+ /**
+ * Delete a notification def by id
+ * @param rowid id of notification
+ * @return int 0 if OK, <0 if KO
+ */
function DeleteNotificationById($rowid)
{
$result = 0;
@@ -1090,17 +1092,17 @@ class BonPrelevement extends CommonObject
}
/**
- * Delete a notification
- * @param user notification user
- * @param action notification action
- * @return int >0 if OK, <0 if KO
- */
+ * Delete a notification
+ * @param user notification user
+ * @param action notification action
+ * @return int >0 if OK, <0 if KO
+ */
function DeleteNotification($user, $action)
{
$result = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
- $sql .= " WHERE fk_user=".$user." AND fk_action=".$action;
+ $sql .= " WHERE fk_user=".$user." AND fk_action=".$action;
if ($this->db->query($sql))
{
@@ -1113,19 +1115,19 @@ class BonPrelevement extends CommonObject
}
/**
- * Add a notification
- * @param user notification user
- * @param action notification action
- * @return int 0 if OK, <0 if KO
- */
+ * Add a notification
+ * @param user notification user
+ * @param action notification action
+ * @return int 0 if OK, <0 if KO
+ */
function AddNotification($db, $user, $action)
{
$result = 0;
if ($this->DeleteNotification($user, $action) == 0)
{
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
- $sql .= " VALUES (".$db->idate(mktime()).",".$user.", 'NULL', 'NULL', ".$action.")";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
+ $sql .= " VALUES (".$db->idate(mktime()).",".$user.", 'NULL', 'NULL', ".$action.")";
dol_syslog("adnotiff: ".$sql);
if ($this->db->query($sql))
@@ -1144,18 +1146,18 @@ class BonPrelevement extends CommonObject
/**
- * Generate a withdrawal file
- * Generation Formats:
- * France: CFONB
- * Spain: AEB19 (if external module EsAEB is enabled)
- * Others: Warning message
- * File is generated with name this->filename
- * @return int 0 if OK, <0 if KO
- */
+ * Generate a withdrawal file
+ * Generation Formats:
+ * France: CFONB
+ * Spain: AEB19 (if external module EsAEB is enabled)
+ * Others: Warning message
+ * File is generated with name this->filename
+ * @return int 0 if OK, <0 if KO
+ */
//TODO: Optimize code to read lines in a single function
function Generate()
{
- global $conf,$langs,$mysoc;
+ global $conf,$langs,$mysoc;
$result = 0;
@@ -1166,207 +1168,207 @@ class BonPrelevement extends CommonObject
//Build file for Spain
if ($mysoc->pays_code=='ES')
{
- if ($conf->esaeb->enabled)
- {
- //Head
- $esaeb19 = new AEB19DocWritter;
- $esaeb19->configuraPresentador($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_PRESENTADOR,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet);
- $idOrdenante = $esaeb19->agregaOrdenante($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_ORDENANTE,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet, $this->emetteur_number_key, $this->emetteur_numero_compte);
- $this->total = 0;
- $sql = "SELECT pl.rowid, pl.client_nom, pl.code_banque, pl.code_guichet, pl.cle_rib, pl.number, pl.amount,";
- $sql.= " f.facnumber, pf.fk_facture";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
+ if ($conf->esaeb->enabled)
+ {
+ //Head
+ $esaeb19 = new AEB19DocWritter;
+ $esaeb19->configuraPresentador($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_PRESENTADOR,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet);
+ $idOrdenante = $esaeb19->agregaOrdenante($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_ORDENANTE,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet, $this->emetteur_number_key, $this->emetteur_numero_compte);
+ $this->total = 0;
+ $sql = "SELECT pl.rowid, pl.client_nom, pl.code_banque, pl.code_guichet, pl.cle_rib, pl.number, pl.amount,";
+ $sql.= " f.facnumber, pf.fk_facture";
+ $sql.= " FROM";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql.= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql.= " AND pf.fk_facture = f.rowid";
- //Lines
- $i = 0;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
+ //Lines
+ $i = 0;
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
- $esaeb19->agregaRecibo($idOrdenante,
+ $esaeb19->agregaRecibo($idOrdenante,
"idcliente".$i+1,
- $obj->client_nom,
- $obj->code_banque,
- $obj->code_guichet,
- $obj->cle_rib,
- $obj->number,
- $obj->amount,
+ $obj->client_nom,
+ $obj->code_banque,
+ $obj->code_guichet,
+ $obj->cle_rib,
+ $obj->number,
+ $obj->amount,
"Fra.".$obj->facnumber." ".$obj->amount);
- $this->total = $this->total + $obj->amount;
+ $this->total = $this->total + $obj->amount;
- $i++;
- }
- }
+ $i++;
+ }
+ }
- else
- {
- $result = -2;
- }
+ else
+ {
+ $result = -2;
+ }
- fputs ($this->file, $esaeb19->generaRemesa());
- }
- else
- {
- $this->total = 0;
- $sql = "SELECT pl.amount";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
+ fputs ($this->file, $esaeb19->generaRemesa());
+ }
+ else
+ {
+ $this->total = 0;
+ $sql = "SELECT pl.amount";
+ $sql.= " FROM";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql.= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql.= " AND pf.fk_facture = f.rowid";
- //Lines
- $i = 0;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
+ //Lines
+ $i = 0;
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
- $this->total = $this->total + $obj->amount;
- $i++;
- }
- }
- else
- {
- $result = -2;
- }
- $langs->load('withdrawals');
- fputs ($this->file, $langs->trans('WithdrawalFileNotCapable'));
- }
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $this->total = $this->total + $obj->amount;
+ $i++;
+ }
+ }
+ else
+ {
+ $result = -2;
+ }
+ $langs->load('withdrawals');
+ fputs ($this->file, $langs->trans('WithdrawalFileNotCapable'));
+ }
}
//Build file for France
elseif ($mysoc->pays_code=='FR')
{
- /*
- * En-tete Emetteur
- */
- $this->EnregEmetteur();
+ /*
+ * En-tete Emetteur
+ */
+ $this->EnregEmetteur();
- /*
- * Lines
- */
- $this->total = 0;
+ /*
+ * Lines
+ */
+ $this->total = 0;
- $sql = "SELECT pl.rowid, pl.client_nom, pl.code_banque, pl.code_guichet, pl.number, pl.amount,";
- $sql.= " f.facnumber, pf.fk_facture";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
+ $sql = "SELECT pl.rowid, pl.client_nom, pl.code_banque, pl.code_guichet, pl.number, pl.amount,";
+ $sql.= " f.facnumber, pf.fk_facture";
+ $sql.= " FROM";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql.= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql.= " AND pf.fk_facture = f.rowid";
- $i = 0;
+ $i = 0;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
- while ($i < $num)
- {
- $row = $this->db->fetch_row($resql);
+ while ($i < $num)
+ {
+ $row = $this->db->fetch_row($resql);
- $this->EnregDestinataire($row[0],
- $row[1],
- $row[2],
- $row[3],
- $row[4],
- $row[5],
- $row[6],
- $row[7]);
+ $this->EnregDestinataire($row[0],
+ $row[1],
+ $row[2],
+ $row[3],
+ $row[4],
+ $row[5],
+ $row[6],
+ $row[7]);
- $this->total = $this->total + $row[5];
+ $this->total = $this->total + $row[5];
- $i++;
- }
- }
- else
- {
- $result = -2;
- }
+ $i++;
+ }
+ }
+ else
+ {
+ $result = -2;
+ }
- /*
- * Pied de page total
- */
+ /*
+ * Pied de page total
+ */
- $this->EnregTotal($this->total);
+ $this->EnregTotal($this->total);
}
//Build file for Other Countries with unknow format
- else
+ else
{
- $this->total = 0;
- $sql = "SELECT pl.amount";
- $sql.= " FROM";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
- $sql.= " ".MAIN_DB_PREFIX."facture as f,";
- $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
- $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
- $sql.= " AND pf.fk_facture = f.rowid";
+ $this->total = 0;
+ $sql = "SELECT pl.amount";
+ $sql.= " FROM";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+ $sql.= " ".MAIN_DB_PREFIX."facture as f,";
+ $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
+ $sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
+ $sql.= " AND pf.fk_facture = f.rowid";
- //Lines
- $i = 0;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
+ //Lines
+ $i = 0;
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
- $this->total = $this->total + $obj->amount;
- $i++;
- }
- }
- else
- {
- $result = -2;
- }
- $langs->load('withdrawals');
- fputs ($this->file, $langs->trans('WithdrawalFileNotCapable'));
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $this->total = $this->total + $obj->amount;
+ $i++;
+ }
+ }
+ else
+ {
+ $result = -2;
+ }
+ $langs->load('withdrawals');
+ fputs ($this->file, $langs->trans('WithdrawalFileNotCapable'));
}
fclose($this->file);
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($this->file, octdec($conf->global->MAIN_UMASK));
- return $result;
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($this->file, octdec($conf->global->MAIN_UMASK));
+ return $result;
}
/**
- * Write recipient of request (customer)
- * @param rowid id of line
- * @param client_nom name of customer
- * @param rib_banque code of bank
- * @param rib_guichet code of bank office
- * @param rib_number bank account
- * @param amount amount
- * @param facnumber ref of invoice
- * @param facid id of invoice
- */
+ * Write recipient of request (customer)
+ * @param rowid id of line
+ * @param client_nom name of customer
+ * @param rib_banque code of bank
+ * @param rib_guichet code of bank office
+ * @param rib_number bank account
+ * @param amount amount
+ * @param facnumber ref of invoice
+ * @param facid id of invoice
+ */
function EnregDestinataire($rowid, $client_nom, $rib_banque, $rib_guichet, $rib_number, $amount, $facnumber, $facid)
{
fputs ($this->file, "06");
@@ -1426,8 +1428,8 @@ class BonPrelevement extends CommonObject
/**
- * Write sender of request (me)
- */
+ * Write sender of request (me)
+ */
function EnregEmetteur()
{
fputs ($this->file, "03");
@@ -1490,9 +1492,9 @@ class BonPrelevement extends CommonObject
}
/**
- * Write end
- * @param total total amount
- */
+ * Write end
+ * @param total total amount
+ */
function EnregTotal($total)
{
fputs ($this->file, "08");
@@ -1548,51 +1550,51 @@ class BonPrelevement extends CommonObject
fputs ($this->file, "\n");
}
-/**
- * Return status label of object
- * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
- * @return string Label
- */
- function getLibStatut($mode=0)
- {
- return $this->LibStatut($this->statut,$mode);
- }
+ /**
+ * Return status label of object
+ * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
+ * @return string Label
+ */
+ function getLibStatut($mode=0)
+ {
+ return $this->LibStatut($this->statut,$mode);
+ }
- /**
- * Return status label for a status
- * @param statut id statut
- * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
- * @return string Label
- */
- function LibStatut($statut,$mode=0)
- {
- global $langs;
+ /**
+ * Return status label for a status
+ * @param statut id statut
+ * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
+ * @return string Label
+ */
+ function LibStatut($statut,$mode=0)
+ {
+ global $langs;
- if ($mode == 0)
- {
- return $langs->trans($this->labelstatut[$statut]);
- }
+ if ($mode == 0)
+ {
+ return $langs->trans($this->labelstatut[$statut]);
+ }
- if ($mode == 1)
- {
- if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
- if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
- if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4').' '.$langs->trans($this->labelstatut[$statut]);
- }
- if ($mode == 2)
- {
- if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
- if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
- if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
- }
+ if ($mode == 1)
+ {
+ if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
+ if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+ if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4').' '.$langs->trans($this->labelstatut[$statut]);
+ }
+ if ($mode == 2)
+ {
+ if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
+ if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+ if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
+ }
- if ($mode == 3)
- {
- if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
- if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
- if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
- }
- }
+ if ($mode == 3)
+ {
+ if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
+ if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+ if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
+ }
+ }
}
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 52a4966d540..a344f8fb774 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -53,8 +53,9 @@ class PaymentSocialContribution extends CommonObject
var $fk_user_modif;
/**
- * \brief Constructor
- * \param DB Database handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function PaymentSocialContribution($DB)
{
@@ -63,10 +64,11 @@ class PaymentSocialContribution extends CommonObject
}
/**
- * Create payment of social contribution into database.
- * Use this->amounts to have list of lines for the payment
- * @param user User making payment
- * @return int <0 if KO, id of payment if OK
+ * Create payment of social contribution into database.
+ * Use this->amounts to have list of lines for the payment
+ *
+ * @param User $user User making payment
+ * @return int <0 if KO, id of payment if OK
*/
function create($user)
{
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 8417972d104..264a18deb54 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -56,8 +56,9 @@ class Tva extends CommonObject
/**
- * \brief Constructor
- * \param DB Database handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function Tva($DB)
{
@@ -67,9 +68,10 @@ class Tva extends CommonObject
/**
- * \brief Create in database
- * \param user User that create
- * \return int <0 si ko, >0 si ok
+ * Create in database
+ *
+ * @param User $user User that create
+ * @return int <0 if KO, >0 if OK
*/
function create($user)
{
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 8397528f648..3de4ff37be5 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -45,10 +45,11 @@ abstract class ActionsContactCardCommon
/**
* Constructor
- * @param DB Handler acces base de donnees
- * @param targmetmodule Name of directory of module where canvas is stored
- * @param canvas Name of canvas
- * @param card Name of tab (sub-canvas)
+ *
+ * @param DoliDB $DB Handler acces base de donnees
+ * @param string $targmetmodule Name of directory of module where canvas is stored
+ * @param string $canvas Name of canvas
+ * @param streing $card Name of tab (sub-canvas)
*/
function ActionsContactCardCommon($DB,$targetmodule,$canvas,$card)
{
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 9b293eccb48..1575e120a6e 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -36,10 +36,11 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
/**
* Constructor
- * @param DB Handler acces base de donnees
- * @param targmetmodule Name of directory of module where canvas is stored
- * @param canvas Name of canvas
- * @param card Name of tab (sub-canvas)
+ *
+ * @param DoliDB $DB Handler acces base de donnees
+ * @param string $targmetmodule Name of directory of module where canvas is stored
+ * @param string $canvas Name of canvas
+ * @param string $card Name of tab (sub-canvas)
*/
function ActionsContactCardDefault($DB,$targetmodule,$canvas,$card)
{
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index d7dedea8b5b..c52e6a7e96e 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -80,8 +80,9 @@ class Contact extends CommonObject
/**
- * Constructor of class Contact
- * @param DB Habler d'acces base
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function Contact($DB)
{
@@ -89,9 +90,10 @@ class Contact extends CommonObject
}
/**
- * Add a contact into database
- * @param user Object user that create
- * @return int <0 if KO, >0 if OK
+ * Add a contact into database
+ *
+ * @param User $user Object user that create
+ * @return int <0 if KO, >0 if OK
*/
function create($user)
{
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 62fd4a42fd6..efc8faabf60 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -72,8 +72,9 @@ class Contrat extends CommonObject
/**
- * Constructor of classe
- * @param DB Databse handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function Contrat($DB)
{
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 82d536d36b3..89a29e67c4c 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -109,7 +109,7 @@ llxHeader("","",$langs->trans("CardProduct".$product->type));
if ($contrat->id)
{
- $soc = new Societe($db, $contrat->societe->id);
+ $soc = new Societe($db);
$soc->fetch($contrat->societe->id);
if ( $error_msg )
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 413a5ea4612..f25b6b08bb1 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -233,7 +233,7 @@ if ($action == 'addline' && $user->rights->contrat->creer)
// Ecrase $base_price_type par celui du produit
if ($_POST['idprod'])
{
- $prod = new Product($db, $_POST['idprod']);
+ $prod = new Product($db);
$prod->fetch($_POST['idprod']);
$tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 310c0493886..748b309286d 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -92,9 +92,9 @@ $html = new Form($db);
if ($_GET["id"])
{
- if ($mesg) print $mesg;
+ dol_htmloutput_mesg($mesg);
- $soc = new Societe($db, $contrat->societe->id);
+ $soc = new Societe($db);
$soc->fetch($contrat->societe->id);
$head = contract_prepare_head($contrat);
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 9d637305dd7..4664d2a1188 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -48,8 +48,8 @@ class Canvas
/**
* Constructor
*
- * @param DB Database handler
- * @param action Action ('create', 'view', 'edit')
+ * @param DoliDB $DB Database handler
+ * @param string $action Action ('create', 'view', 'edit')
*/
function Canvas($DB, $action='view')
{
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index b129fd8a9ad..74b22aff19e 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -39,8 +39,9 @@ class DolCookie
var $cookie;
/**
- * \brief Constructor
- * \param key Personnal key
+ * Constructor
+ *
+ * @param string $key Personnal key
*/
function DolCookie($key = '')
{
@@ -53,7 +54,7 @@ class DolCookie
/**
- * \brief Encrypt en create the cookie
+ * Encrypt en create the cookie
*/
function cryptCookie()
{
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index eaa3fb0a6f6..4e1ec677cef 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -89,8 +89,9 @@ class Events // extends CommonObject
/**
- * \brief Constructor
- * \param DB Database handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function Events($DB)
{
@@ -100,9 +101,9 @@ class Events // extends CommonObject
/**
- * \brief Create in database
- * \param user User that create
- * \return int <0 si ko, >0 si ok
+ * Create in database
+ * @param User $user User that create
+ * @return int <0 if KO, >0 if OK
*/
function create($user)
{
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index cc2746a5526..25eaa6bcf54 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -44,8 +44,9 @@ class ExtraFields
/**
- * Constructor
- * @param DB base de donnees
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function ExtraFields($DB)
{
@@ -405,7 +406,7 @@ class ExtraFields
function showInputField($key,$value,$moreparam='')
{
global $conf;
-
+
$label=$this->attribute_label[$key];
$type=$this->attribute_type[$key];
$size=$this->attribute_size[$key];
@@ -427,7 +428,7 @@ class ExtraFields
$showsize=round($size);
if ($showsize > 48) $showsize=48;
}
-
+
if ($type == 'varchar')
{
$out='';
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
index 0849f31b0e5..de4511f8283 100755
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -33,9 +33,9 @@ class GenericObject extends CommonObject
var $db;
/**
- * Class constructor
+ * Constructor
*
- * @param DoliDB $db Data base handler access
+ * @param DoliDB $DB Database handler
*/
function GenericObject($db)
{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e9a2241021a..4378a42455e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -55,8 +55,9 @@ class Form
/**
- * Constructor
- * @param $DB Database handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function Form($DB)
{
@@ -65,6 +66,7 @@ class Form
/**
* Output key field for an editable field
+ *
* @param text Text of label
* @param htmlname Name of select field
* @param preselected Preselected value for parameter
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 56081253519..207de988a4f 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -35,8 +35,9 @@ class FormActions
/**
- * Constructor
- * @param DB Database access handler
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function FormActions($DB)
{
@@ -48,6 +49,7 @@ class FormActions
/**
* Show list of action status
+ *
* @param formname Name of form where select in included
* @param selected Preselected value
* @param canedit 1=can edit, 0=read only
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 07ffffbef63..03c619fb00f 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -35,8 +35,9 @@ class FormAdmin
/**
- * \brief Constructor
- * \param DB handler d'acces base de donnee
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function FormAdmin($DB)
{
@@ -46,7 +47,8 @@ class FormAdmin
}
/**
- * Output list with available languages.
+ * Output list with available languages
+ *
* @deprecated Use select_language instead
* @param selected Langue pre-selectionnee
* @param htmlname Nom de la zone select
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b770f293f4a..340977969b8 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -37,8 +37,9 @@ class FormFile
/**
- * Constructor
- * @param DB handler d'acces base de donnee
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
*/
function FormFile($DB)
{
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 2afb7ecce04..7334b3682e6 100755
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -61,7 +61,8 @@ class FormSms
/**
* Constructor
- * @param DB handler d'acces base de donnee
+ *
+ * @param DoliDB $DB Database handler
*/
function FormSms($DB)
{
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 16472aedbc5..86837c476b7 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -31,264 +31,265 @@
class Interfaces
{
- var $dir; // Directory with all core and external triggers files
- var $errors = array(); // Array for errors
+ var $dir; // Directory with all core and external triggers files
+ var $errors = array(); // Array for errors
- /**
- * \brief Constructor.
- * \param DB Database handler
- */
- function Interfaces($DB)
- {
- $this->db = $DB ;
- }
+ /**
+ * Constructor
+ *
+ * @param DoliDB $DB Database handler
+ */
+ function Interfaces($DB)
+ {
+ $this->db = $DB ;
+ }
- /**
- * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr.
- * Cette fonction declenche tous les triggers trouves actifs.
- * \param action Trigger event code
- * \param object Objet concern
- * \param user Objet user
- * \param lang Objet lang
- * \param conf Objet conf
- * \return int Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
- */
- function run_triggers($action,$object,$user,$langs,$conf)
- {
- // Check parameters
- if (! is_object($object) || ! is_object($conf)) // Error
- {
- dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERROR);
- return -1;
- }
- if (! is_object($user) || ! is_object($langs)) // Warning
- {
- dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
- }
+ /**
+ * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr.
+ * Cette fonction declenche tous les triggers trouves actifs.
+ * \param action Trigger event code
+ * \param object Objet concern
+ * \param user Objet user
+ * \param lang Objet lang
+ * \param conf Objet conf
+ * \return int Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
+ */
+ function run_triggers($action,$object,$user,$langs,$conf)
+ {
+ // Check parameters
+ if (! is_object($object) || ! is_object($conf)) // Error
+ {
+ dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERROR);
+ return -1;
+ }
+ if (! is_object($user) || ! is_object($langs)) // Warning
+ {
+ dol_syslog('interface::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+ }
- foreach($conf->triggers_modules as $reldir)
- {
- $dir=dol_buildpath($reldir,0);
- //print "xx".$dir;exit;
+ foreach($conf->triggers_modules as $reldir)
+ {
+ $dir=dol_buildpath($reldir,0);
+ //print "xx".$dir;exit;
- // Check if directory exists
- if (!is_dir($dir)) continue;
+ // Check if directory exists
+ if (!is_dir($dir)) continue;
- $handle=opendir($dir);
- $modules = array();
- $nbfile = $nbtotal = $nbok = $nbko = 0;
+ $handle=opendir($dir);
+ $modules = array();
+ $nbfile = $nbtotal = $nbok = $nbko = 0;
if (is_resource($handle))
{
- while (($file = readdir($handle))!==false)
- {
- if (is_readable($dir."/".$file) && preg_match('/^interface_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
- {
- $nbfile++;
+ while (($file = readdir($handle))!==false)
+ {
+ if (is_readable($dir."/".$file) && preg_match('/^interface_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
+ {
+ $nbfile++;
- $modName = "Interface".ucfirst($reg[2]);
- //print "file=$file"; print "modName=$modName"; exit;
- if (in_array($modName,$modules))
- {
- $langs->load("errors");
- dol_syslog("Interface::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/"),LOG_ERR);
- continue;
- }
+ $modName = "Interface".ucfirst($reg[2]);
+ //print "file=$file"; print "modName=$modName"; exit;
+ if (in_array($modName,$modules))
+ {
+ $langs->load("errors");
+ dol_syslog("Interface::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/"),LOG_ERR);
+ continue;
+ }
- // Check if trigger file is disabled by name
- if (preg_match('/NORUN$/i',$file))
- {
- continue;
- }
- // Check if trigger file is for a particular module
- $qualified=true;
- if (strtolower($reg[1]) != 'all')
- {
- $module=preg_replace('/^mod/i','',$reg[1]);
- $constparam='MAIN_MODULE_'.strtoupper($module);
- if (empty($conf->global->$constparam)) $qualified=false;
- }
+ // Check if trigger file is disabled by name
+ if (preg_match('/NORUN$/i',$file))
+ {
+ continue;
+ }
+ // Check if trigger file is for a particular module
+ $qualified=true;
+ if (strtolower($reg[1]) != 'all')
+ {
+ $module=preg_replace('/^mod/i','',$reg[1]);
+ $constparam='MAIN_MODULE_'.strtoupper($module);
+ if (empty($conf->global->$constparam)) $qualified=false;
+ }
- if (! $qualified)
- {
- dol_syslog("Interfaces::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled",LOG_INFO);
- continue;
- }
+ if (! $qualified)
+ {
+ dol_syslog("Interfaces::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled",LOG_INFO);
+ continue;
+ }
- include_once($dir."/".$file);
- $objMod = new $modName($this->db);
- $i=0;
- if ($objMod)
- {
- // Bypass if workflow module is enabled and if the trigger asked to be disable in such case
- if (! empty($conf->workflow->enabled) && ! empty($objMod->disabled_if_workflow))
- {
- dol_syslog("Interfaces::run_triggers action=".$action." Bypass triggers for file '".$file."'",LOG_INFO);
- continue;
- }
+ include_once($dir."/".$file);
+ $objMod = new $modName($this->db);
+ $i=0;
+ if ($objMod)
+ {
+ // Bypass if workflow module is enabled and if the trigger asked to be disable in such case
+ if (! empty($conf->workflow->enabled) && ! empty($objMod->disabled_if_workflow))
+ {
+ dol_syslog("Interfaces::run_triggers action=".$action." Bypass triggers for file '".$file."'",LOG_INFO);
+ continue;
+ }
- dol_syslog("Interfaces::run_triggers action=".$action." Launch triggers for file '".$file."'",LOG_INFO);
+ dol_syslog("Interfaces::run_triggers action=".$action." Launch triggers for file '".$file."'",LOG_INFO);
- $modules[$i] = $modName;
- //dol_syslog("Interfaces::run_triggers Launch triggers for file '".$file."'",LOG_INFO);
- $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
- if ($result > 0)
- {
- // Action OK
- $nbtotal++;
- $nbok++;
- }
- if ($result == 0)
- {
- // Aucune action faite
- $nbtotal++;
- }
- if ($result < 0)
- {
- // Action KO
- $nbtotal++;
- $nbko++;
- $this->errors[]=$objMod->error;
- }
- $i++;
- }
- else
- {
- dol_syslog("Interfaces::run_triggers action=".$action." Failed to instantiate trigger for file '".$file."'",LOG_ERROR);
- }
- }
- }
- closedir($handle);
+ $modules[$i] = $modName;
+ //dol_syslog("Interfaces::run_triggers Launch triggers for file '".$file."'",LOG_INFO);
+ $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+ if ($result > 0)
+ {
+ // Action OK
+ $nbtotal++;
+ $nbok++;
+ }
+ if ($result == 0)
+ {
+ // Aucune action faite
+ $nbtotal++;
+ }
+ if ($result < 0)
+ {
+ // Action KO
+ $nbtotal++;
+ $nbko++;
+ $this->errors[]=$objMod->error;
+ }
+ $i++;
+ }
+ else
+ {
+ dol_syslog("Interfaces::run_triggers action=".$action." Failed to instantiate trigger for file '".$file."'",LOG_ERROR);
+ }
+ }
+ }
+ closedir($handle);
}
- }
+ }
- if ($nbko)
- {
- dol_syslog("Interfaces::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_ERR);
- return -$nbko;
- }
- else
- {
- //dol_syslog("Interfaces::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
- return $nbok;
- }
- }
+ if ($nbko)
+ {
+ dol_syslog("Interfaces::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_ERR);
+ return -$nbko;
+ }
+ else
+ {
+ //dol_syslog("Interfaces::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
+ return $nbok;
+ }
+ }
- /**
- * Return list of triggers. Function used by admin page htdoc/admin/triggers
- * @param workflow 0=Return all triggers, 1=Return only triggers not disabled if workflow module activated
- * @return array Array list of triggers
- */
- function getTriggersList($workflow=0)
- {
- global $conf, $langs;
+ /**
+ * Return list of triggers. Function used by admin page htdoc/admin/triggers
+ * @param workflow 0=Return all triggers, 1=Return only triggers not disabled if workflow module activated
+ * @return array Array list of triggers
+ */
+ function getTriggersList($workflow=0)
+ {
+ global $conf, $langs;
- $html = new Form($this->db);
+ $html = new Form($this->db);
- $files = array();
- $modules = array();
- $orders = array();
- $i = 0;
+ $files = array();
+ $modules = array();
+ $orders = array();
+ $i = 0;
- foreach($conf->triggers_modules as $reldir)
- {
- $dir=dol_buildpath($reldir,0);
- //print "xx".$dir;exit;
+ foreach($conf->triggers_modules as $reldir)
+ {
+ $dir=dol_buildpath($reldir,0);
+ //print "xx".$dir;exit;
- // Check if directory exists
- if (!is_dir($dir)) continue;
+ // Check if directory exists
+ if (!is_dir($dir)) continue;
- $handle=opendir($dir);
+ $handle=opendir($dir);
if (is_resource($handle))
{
- while (($file = readdir($handle))!==false)
- {
- if (is_readable($dir.'/'.$file) && preg_match('/^interface_([^_]+)_(.+)\.class\.php/',$file,$reg))
- {
- $modName = 'Interface'.ucfirst($reg[2]);
- //print "file=$file"; print "modName=$modName"; exit;
- if (in_array($modName,$modules))
- {
- $langs->load("errors");
- print '