';
- if ($urltemp) $this->stringtoshow.='';
- $this->stringtoshow.='\'+';
- $this->stringtoshow.=($showlegend?'':'label+\'
\'+'); // Hide label if already shown in legend - $this->stringtoshow.=($showpointvalue?'number+':''); - $this->stringtoshow.=($showpercent?'\'
\'+percent+\'%\'+':''); - $this->stringtoshow.='\''; - if ($urltemp) $this->stringtoshow.=''; - $this->stringtoshow.='
\';
- },
- background: {
- opacity: 0.5,
- color: \'#000000\'
- }
- }
- }
+ series: {
+ pie: {
+ show: true,
+ radius: 0.8,
+ '.($this->combine ? '
+ combine: {
+ threshold: '.$this->combine.'
+ },' : '') . '
+ label: {
+ show: true,
+ radius: 0.9,
+ formatter: function(label, series) {
+ var percent=Math.round(series.percent);
+ var number=series.data[0][1];
+ return \'';
+ $this->stringtoshow.='\'+'); // Hide label if already shown in legend - $this->stringtoshow.=($showpointvalue?'number+':''); - $this->stringtoshow.=($showpercent?'\'
\'+percent+\'%\'+':''); - $this->stringtoshow.='\''; - if ($urltemp) $this->stringtoshow.=''; - $this->stringtoshow.='
';
+ if ($urltemp) $this->stringtoshow.='';
+ $this->stringtoshow.='\'+';
+ $this->stringtoshow.=($showlegend?'':'label+\' \'+'); // Hide label if already shown in legend
+ $this->stringtoshow.=($showpointvalue?'number+':'');
+ $this->stringtoshow.=($showpercent?'\'
\'+percent+\'%\'+':''); + $this->stringtoshow.='\''; + if ($urltemp) $this->stringtoshow.=''; + $this->stringtoshow.='
\';
+ },
+ background: {
+ opacity: 0.0,
+ color: \'#000000\'
+ }
+ }
+ }
},
zoom: {
- interactive: true
+ interactive: true
},
pan: {
- interactive: true
+ interactive: true
},';
if (count($datacolor))
{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5d75d7ad5d6..8b9ca77f6a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1777,26 +1777,29 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
series: {
pie: {
show: true,
- radius: 3/4,
+ radius: 0.8,
+ combine: {
+ threshold: 0.05
+ },
label: {
show: true,
- radius: 3/4,
+ radius: 0.9,
formatter: function(label, series) {
var percent=Math.round(series.percent);
var number=series.data[0][1];
return \'';
- print '\'+percent+\'%\'+':''); + $this->stringtoshow.='\''; + if ($urltemp) $this->stringtoshow.=''; + $this->stringtoshow.='
';
+ print ''; $ulprinted++; }
- print "\n".'';
+ print "\n".' ';
print $tab[$x]['entry'];
// And now we search all its sons of lower level
tree_recur($tab,$tab[$x],$rang+1);
@@ -153,7 +153,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
{
if (empty($ulprinted) && ! empty($pere['rowid'])) { print ''; $ulprinted++; }
- print "\n".'';
+ print "\n".' ';
print $tab[$x]['entry'];
// And now we search all its sons of lower level
tree_recur($tab,$tab[$x],$rang+1);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 341edac8271..eee8dd50287 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -194,6 +194,13 @@ abstract class DolibarrModules
*/
public $core_enabled;
+ /**
+ * Constructor. Define names, constants, directories, boxes, permissions
+ *
+ * @param DoliDB $db Database handler
+ */
+ abstract public function __construct($db);
+
/**
* Enables a module.
* Inserts all informations into database
@@ -1672,4 +1679,30 @@ print $sql;
return $err;
}
+ /**
+ * Function called when module is enabled.
+ * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+ * It also creates data directories
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ public function init($options = '')
+ {
+ return $this->_init(array(), $options);
+ }
+
+ /**
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ public function remove($options = '')
+ {
+ return $this->_remove(array(), $options);
+ }
+
}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 84e18048e84..7b7a9dd4517 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -272,35 +272,4 @@ class modAccounting extends DolibarrModules
$this->menus = array();
$r = 0;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
}
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index c897be729ec..1090e8b6939 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -230,37 +230,4 @@ class modAdherent extends DolibarrModules
$this->import_regex_array[$r]=array('a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
$this->import_examplevalues_array[$r]=array('a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index c6492ab5161..3119553f677 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -399,39 +399,4 @@ class modAgenda extends DolibarrModules
$this->export_sql_end[$r] .=' ORDER BY ac.datep';
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 2bdcbe03c54..5e0e825d1e0 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -232,21 +232,5 @@ class modApi extends DolibarrModules
return $this->_init($sql, $options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
-
}
diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php
index 371f2c9f214..23d4fb20f42 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modAskPriceSupplier.class.php
@@ -221,20 +221,4 @@ class modAskPriceSupplier extends DolibarrModules
return $this->_init($sql, $options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
\ No newline at end of file
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index df698b26a90..9222a38ff26 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -209,20 +209,4 @@ class modBanque extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 0d06c1657c2..4ee6084aaf6 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -146,20 +146,4 @@ class modBarcode extends DolibarrModules
return $this->_init($sql, $options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
-
}
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 587429aa830..a6585e14d54 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -99,35 +99,4 @@ class modBookmark extends DolibarrModules
$this->rights[$r][4] = 'supprimer';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories.
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index d6deb4ab51f..9b256162597 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -139,20 +139,4 @@ class modCashDesk extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted.
- *
- * @param string $options Options
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index b64c9671a99..e9efbcbe732 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -363,20 +363,4 @@ class modCategorie extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index 872700c1817..518cafa35a4 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -74,37 +74,4 @@ class modClickToDial extends DolibarrModules
$this->rights = array();
$this->rights_class = 'clicktodial';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- global $conf;
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 03b1a6d964b..4289bd54932 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -237,21 +237,4 @@ class modCommande extends DolibarrModules
return $this->_init($sql,$options);
}
-
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 74002f0065f..e23a04ce548 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -115,20 +115,4 @@ class modComptabilite extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index dedfc4efff0..c1bcc9fd914 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -199,20 +199,4 @@ class modContrat extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index fafec485b60..90d17882672 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -137,39 +137,4 @@ class modCron extends DolibarrModules
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 47642e5195d..08f21ae6c63 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -145,20 +145,4 @@ class modDeplacement extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index ea40750a161..c312cc37b5a 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -114,21 +114,4 @@ class modDocumentGeneration extends DolibarrModules
return $this->_init($sql,$options);
}
-
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index c546292c2b4..1d279b85148 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -158,20 +158,4 @@ class modDon extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
\ No newline at end of file
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index 1b2fb712a8b..78f56a76ab4 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -84,39 +84,4 @@ class modDynamicPrices extends DolibarrModules
$this->rights_class = 'dynamicprices';
$r=0;
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 60d76f2e995..2bf3542186a 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -179,36 +179,5 @@ class modECM extends DolibarrModules
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 2f4b7a88be8..6e019849ae2 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -277,20 +277,4 @@ class modExpedition extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 851ddb39d02..690ca7ba87e 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -345,19 +345,4 @@ class modExpenseReport extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted.
- *
- * @param string $options Options
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
}
\ No newline at end of file
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index ad2da537436..634306ea4db 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -89,35 +89,4 @@ class modExport extends DolibarrModules
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'creer';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 61eebe77f80..620fc53b53f 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -117,36 +117,5 @@ class modExternalSite extends DolibarrModules
$r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 38b16127c90..e7388faaedf 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -126,36 +126,5 @@ class modFTP extends DolibarrModules
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 1e0725659a0..54363bc9d80 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -342,20 +342,4 @@ class modFacture extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 8f81bf74f7b..6a5932cca5a 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -82,37 +82,4 @@ class modFckeditor extends DolibarrModules
$this->rights = array();
$this->rights_class = 'fckeditor';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- global $conf;
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index b41b291711a..91a672fb669 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -175,20 +175,4 @@ class modFicheinter extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index d43535dd4e1..0db347f0df2 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -564,20 +564,4 @@ class modFournisseur extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index cfe7acbdfa6..164d89243b8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -85,35 +85,4 @@ class modGeoIPMaxmind extends DolibarrModules
$this->rights_class = 'geoipmaxmind';
$r=0;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index aae38ae391b..241cca18dbb 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -183,38 +183,5 @@ class modGravatar extends DolibarrModules
// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
// $r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- //$result=$this->_load_tables('');
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 91dde16ed08..be075f2d57a 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -278,36 +278,5 @@ class modHoliday extends DolibarrModules
// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
// $r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories.
- *
- * @return int 1 if OK, 0 if KO
- */
- function init()
- {
- $sql = array();
-
- //$result=$this->_load_tables('');
-
- return $this->_init($sql);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted.
- *
- * @return int 1 if OK, 0 if KO
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-
}
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index 3a371ecf2e7..5ac3b8928db 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -85,35 +85,4 @@ class modImport extends DolibarrModules
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'run';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 2ae30951c8c..cae4f9ec28f 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -109,34 +109,4 @@ class modIncoterm extends DolibarrModules
$this->menus = array(); // List of menus to add
$r=0;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql, $options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
}
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 9519c63fb95..3292e2269fb 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -89,7 +89,6 @@ class modLabel extends DolibarrModules
}
-
/**
* Function called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
@@ -107,20 +106,4 @@ class modLabel extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index f7362ceefdd..cb2ad24fef4 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -90,35 +90,4 @@ class modLdap extends DolibarrModules
$this->rights = array();
$this->rights_class = 'ldap';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 21ae96eba26..ab2ca7f33c2 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -162,20 +162,4 @@ class modLoan extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 045f857b574..9930168a218 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -147,20 +147,4 @@ class modMailing extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 1b5bbab61c6..4d96b4e8cd1 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -77,37 +77,4 @@ class modMailmanSpip extends DolibarrModules
$this->rights = array();
$this->rights_class = 'clicktodial';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- global $conf;
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 1f0a95ea001..65396126585 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -139,36 +139,5 @@ class modMargin extends DolibarrModules
$this->rights[$r][4] = 'read';
$this->rights[$r][5] = 'all';
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories.
- *
- * @return int 1 if OK, 0 if KO
- */
- function init()
- {
- $sql = array();
-
- //$result=$this->_load_tables();
-
- return $this->_init($sql);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted.
- *
- * @return int 1 if OK, 0 if KO
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-
}
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index 78e939f4048..74d7e6dfbcc 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -90,20 +90,4 @@ class modNotification extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 44b9f928694..db93cae5220 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -195,20 +195,5 @@ class modOpenSurvey extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
}
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 820bc1d19c1..d77d2dfc3f4 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -172,38 +172,5 @@ class modPayBox extends DolibarrModules
// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
// $r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- //$result=$this->_load_tables('');
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 8c1e0fe4797..227540e825e 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -164,38 +164,5 @@ class modPaypal extends DolibarrModules
// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
// $r++;
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- //$result=$this->_load_tables('');
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 7bb5e748037..84bd19712df 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -141,20 +141,4 @@ class modPrelevement extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index bb18d7d022c..e14a2efd63e 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -120,35 +120,4 @@ class modPrinting extends DolibarrModules
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql, $options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
-
}
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 691cfe7d72d..f5e366bc3ad 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -343,20 +343,4 @@ class modProduct extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index bf77943ea6c..b55dba2945a 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -124,21 +124,5 @@ class modProductBatch extends DolibarrModules
return $this->_init($sql, $options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
-
}
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 1174c47d831..ca66e861862 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -361,20 +361,4 @@ class modProjet extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 6a8dc7254d4..cb297f87a61 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -231,20 +231,4 @@ class modPropale extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 1f7a92f47b7..94a4b56427a 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -360,21 +360,6 @@ class modResource extends DolibarrModules
return $this->_init($sql, $options);
}
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- public function remove($options = '')
- {
- $sql = array();
-
- return $this->_remove($sql, $options);
- }
-
/**
* Create tables, keys and data required by module
* Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index fa8a0ebd811..1708c7a8ed0 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -168,20 +168,4 @@ class modSalaries extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index b8040e41c7c..85ab2b03e7d 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -327,20 +327,4 @@ class modService extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
index f010f3b769e..a55f979db8c 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -87,39 +87,4 @@ class modSkype extends DolibarrModules
//------------------
$this->menu = array();
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 6de689e792c..1d7848f5f46 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -505,20 +505,4 @@ class modSociete extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 63613862550..2b8e983372e 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -198,35 +198,4 @@ class modStock extends DolibarrModules
);
}
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php
index 37366270a57..b87d7d9ecd5 100644
--- a/htdocs/core/modules/modSyncSupplierWebServices.class.php
+++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php
@@ -83,39 +83,4 @@ class modSyncSupplierWebServices extends DolibarrModules
$this->rights_class = 'syncsupplierwebservices';
$r=0;
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index f2b5f80ff32..a635e8f2fdc 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -80,37 +80,4 @@ class modSyslog extends DolibarrModules
$this->rights = array();
$this->rights_class = 'syslog';
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- $sql = array();
-
- return $this->_init($sql,$options);
-
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 6f47d66f5a9..9e8ee7908d7 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -156,20 +156,4 @@ class modTax extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 04d4b81039a..41598f51106 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -242,20 +242,4 @@ class modUser extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 9211d2749d0..a22e5a5be64 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -83,39 +83,4 @@ class modWebServices extends DolibarrModules
$this->rights_class = 'webservices';
$r=0;
}
-
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function init($options='')
- {
- // Prevent pb of modules not correctly disabled
- //$this->remove($options);
-
- $sql = array();
-
- return $this->_init($sql,$options);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index ed0f66e6455..0eb447306b4 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -148,20 +148,4 @@ class modWorkflow extends DolibarrModules
return $this->_init($sql,$options);
}
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
- *
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int 1 if OK, 0 if KO
- */
- function remove($options='')
- {
- $sql = array();
-
- return $this->_remove($sql,$options);
- }
-
}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index e36040743ad..04f5628a224 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -417,22 +417,22 @@ class ExpenseReport extends CommonObject
global $langs;
if ($mode == 0)
- return $langs->trans($this->statuts[$status]);
+ return $langs->transnoentities($this->statuts[$status]);
if ($mode == 1)
- return $langs->trans($this->statuts_short[$status]);
+ return $langs->transnoentities($this->statuts_short[$status]);
if ($mode == 2)
- return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->trans($this->statuts_short[$status]);
+ return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts_short[$status]);
if ($mode == 3)
- return img_picto($langs->trans($this->statuts_short[$status]), $this->statuts_logo[$status]);
+ return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]);
if ($mode == 4)
- return img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->trans($this->statuts[$status]);
+ return img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts[$status]);
if ($mode == 5)
- return ''.$langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),$this->statuts_logo[$status]);
+ return ''.$langs->transnoentities($this->statuts_short[$status]).' '.img_picto($langs->transnoentities($this->statuts_short[$status]),$this->statuts_logo[$status]);
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index b623c7daa1f..1bf286ff5aa 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1283,82 +1283,44 @@ class FactureFournisseur extends CommonInvoice
$product_type = $type;
}
- $this->db->begin();
+ $line = new SupplierInvoiceLine($this->db);
- $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
- $sql.= " description ='".$this->db->escape($desc)."'";
- $sql.= ", pu_ht = ".price2num($pu_ht);
- $sql.= ", pu_ttc = ".price2num($pu_ttc);
- $sql.= ", qty = ".price2num($qty);
- $sql.= ", remise_percent = ".price2num($remise_percent);
- $sql.= ", tva_tx = ".price2num($vatrate);
- $sql.= ", localtax1_tx = ".price2num($txlocaltax1);
- $sql.= ", localtax2_tx = ".price2num($txlocaltax2);
- $sql.= ", localtax1_type = '".$localtaxes_type[0]."'";
- $sql.= ", localtax2_type = '".$localtaxes_type[2]."'";
- $sql.= ", total_ht = ".price2num($total_ht);
- $sql.= ", tva= ".price2num($total_tva);
- $sql.= ", total_localtax1= ".price2num($total_localtax1);
- $sql.= ", total_localtax2= ".price2num($total_localtax2);
- $sql.= ", total_ttc = ".price2num($total_ttc);
- if ($idproduct) $sql.= ", fk_product = ".$idproduct;
- else $sql.= ", fk_product = null";
- $sql.= ", product_type = ".$product_type;
- $sql.= ", info_bits = ".$info_bits;
- $sql.= ", fk_unit = ".($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null");
- $sql.= " WHERE rowid = ".$id;
+ if ($line->fetch($id) < 1) {
+ return -1;
+ }
- dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->rowid = $id;
+ $line->description = $desc;
+ $line->subprice = $pu_ht;
+ $line->pu_ht = $pu_ht;
+ $line->pu_ttc = $pu_ttc;
+ $line->qty = $qty;
+ $line->remise_percent = $remise_percent;
+ $line->tva_tx = $vatrate;
+ $line->localtax1_tx = $txlocaltax1;
+ $line->localtax2_tx = $txlocaltax2;
+ $line->localtax1_type = $localtaxes_type[0];
+ $line->localtax2_type = $localtaxes_type[2];
+ $line->total_ht = $total_ht;
+ $line->total_tva = $total_tva;
+ $line->total_localtax1 = $total_localtax1;
+ $line->total_localtax2 = $total_localtax2;
+ $line->total_ttc = $total_ttc;
+ $line->fk_product = $idproduct;
+ $line->product_type = $product_type;
+ $line->info_bits = $info_bits;
+ $line->fk_unit = $fk_unit;
+ $line->array_options = $array_options;
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
- {
- $linetmp = new SupplierInvoiceLine($this->db);
- $linetmp->id=$this->rowid;
- $linetmp->array_options = $array_options;
- $result=$linetmp->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
- }
+ $res = $line->update($notrigger);
- if (! $error && ! $notrigger)
- {
- global $conf, $langs, $user;
- // Call trigger
- $result=$this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user);
- if ($result < 0)
- {
- $this->db->rollback();
- return -1;
- }
- // End call triggers
- }
+ if ($res < 1) {
+ $this->errors[] = $line->error;
+ } else {
+ // Update total price into invoice record
+ $res = $this->update_price('','auto');
+ }
- // Update total price into invoice record
- $result=$this->update_price('','auto');
-
- if (! $error)
- {
- $this->db->commit();
- return $result;
- }
- else
- {
- $this->db->rollback();
- return -1;
- }
- }
- else
- {
- $this->db->rollback();
- $this->error=$this->db->lasterror();
- return -1;
- }
+ return $res;
}
/**
@@ -1972,6 +1934,8 @@ class SupplierInvoiceLine extends CommonObjectLine
public $fk_parent_line;
public $special_code;
public $rang;
+ public $localtax1_type;
+ public $localtax2_type;
/**
@@ -1993,12 +1957,12 @@ class SupplierInvoiceLine extends CommonObjectLine
public function fetch($rowid)
{
$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
- $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+ $sql.= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
- $sql.= ' WHERE rowid = '.$rowid;
+ $sql.= ' WHERE f.rowid = '.$rowid;
$sql.= ' ORDER BY f.rang, f.rowid';
$query = $this->db->query($sql);
@@ -2029,6 +1993,8 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->tva_tx = $obj->tva_tx;
$this->localtax1_tx = $obj->localtax1_tx;
$this->localtax2_tx = $obj->localtax2_tx;
+ $this->localtax1_type = $obj->localtax1_type;
+ $this->localtax2_type = $obj->localtax2_type;
$this->qty = $obj->qty;
$this->remise_percent = $obj->remise_percent;
$this->tva = $obj->total_tva;
@@ -2095,5 +2061,113 @@ class SupplierInvoiceLine extends CommonObjectLine
}
}
+ /**
+ * Update a supplier invoice line
+ *
+ * @param int $notrigger Disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ public function update($notrigger = 0)
+ {
+ global $conf;
+
+ $pu = price2num($this->pu_ht);
+ $qty = price2num($this->qty);
+
+ // Check parameters
+ if (! is_numeric($pu) || ! is_numeric($qty)) {
+ return -1;
+ }
+
+ if ($this->product_type < 0) {
+ return -1;
+ }
+
+ // Clean parameters
+ if (empty($this->tva_tx)) {
+ $this->tva_tx = 0;
+ }
+ if (empty($this->localtax1_tx)) {
+ $this->localtax1_tx = 0;
+ }
+ if (empty($this->localtax2_tx)) {
+ $this->localtax2_tx = 0;
+ }
+
+ $this->db->begin();
+
+ if ($this->fk_product) {
+ $fk_product = "null";
+ } else {
+ $fk_product = $this->fk_product;
+ }
+
+ if ($this->fk_unit) {
+ $fk_unit = "'".$this->db->escape($this->fk_unit)."'";
+ } else {
+ $fk_unit = "null";
+ }
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
+ $sql.= " description ='".$this->db->escape($this->description)."'";
+ $sql.= ", pu_ht = ".price2num($this->pu_ht);
+ $sql.= ", pu_ttc = ".price2num($this->pu_ttc);
+ $sql.= ", qty = ".price2num($this->qty);
+ $sql.= ", remise_percent = ".price2num($this->remise_percent);
+ $sql.= ", tva_tx = ".price2num($this->tva_tx);
+ $sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
+ $sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
+ $sql.= ", localtax1_type = '".$this->localtax1_type."'";
+ $sql.= ", localtax2_type = '".$this->localtax2_type."'";
+ $sql.= ", total_ht = ".price2num($this->total_ht);
+ $sql.= ", tva= ".price2num($this->total_tva);
+ $sql.= ", total_localtax1= ".price2num($this->total_localtax1);
+ $sql.= ", total_localtax2= ".price2num($this->total_localtax2);
+ $sql.= ", total_ttc = ".price2num($this->total_ttc);
+ $sql.= ", fk_product = ".$fk_product;
+ $sql.= ", product_type = ".$this->product_type;
+ $sql.= ", info_bits = ".$this->info_bits;
+ $sql.= ", fk_unit = ".$fk_unit;
+ $sql.= " WHERE rowid = ".$this->id;
+
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+
+ if (!$resql) {
+ $this->db->rollback();
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+
+ $this->rowid = $this->id;
+ $error = 0;
+
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ {
+ if ($this->insertExtraFields() < 0) {
+ $error++;
+ }
+ }
+
+ if (! $error && ! $notrigger)
+ {
+ global $langs, $user;
+
+ // Call trigger
+ if ($this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user) < 0) {
+ $this->db->rollback();
+ return -1;
+ }
+ // End call triggers
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1;
+ }
+
+ $this->db->commit();
+ return 1;
+ }
}
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 4149691302e..0b9b08f3b68 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -5,6 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2013-2014 Juanjo Menent
* Copyright (C) 2014 Marcos García
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,8 +44,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("Dolibarr install/upgrade process started");
-
+dolibarr_install_syslog("--- check: Dolibarr install/upgrade process started");
/*
@@ -167,11 +167,11 @@ if ($memmaxorig != '')
}
-// If config file presente and filled
+// If config file present and filled
clearstatcache();
if (is_readable($conffile) && filesize($conffile) > 8)
{
- dolibarr_install_syslog("conf file '$conffile' already defined");
+ dolibarr_install_syslog("check: conf file '" . $conffile . "' already defined");
$confexists=1;
include_once $conffile;
@@ -189,19 +189,19 @@ if (is_readable($conffile) && filesize($conffile) > 8)
else
{
// If not, we create it
- dolibarr_install_syslog("we try to create conf file '$conffile'");
+ dolibarr_install_syslog("check: we try to create conf file '" . $conffile . "'");
$confexists=0;
// First we try by copying example
if (@copy($conffile.".example", $conffile))
{
// Success
- dolibarr_install_syslog("copied file ".$conffile.".example into ".$conffile." done successfully.");
+ dolibarr_install_syslog("check: successfully copied file " . $conffile . ".example into " . $conffile);
}
else
{
// If failed, we try to create an empty file
- dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
+ dolibarr_install_syslog("check: failed to copy file " . $conffile . ".example into " . $conffile . ". We try to create it.", LOG_WARNING);
$fp = @fopen($conffile, "w");
if ($fp)
@@ -210,7 +210,7 @@ else
@fputs($fp,"\n");
fclose($fp);
}
- else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR);
+ else dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);
}
// First install, we can't upgrade
@@ -282,7 +282,7 @@ else
if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php"))
{
print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; - dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING); + dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING); } else { @@ -531,5 +531,6 @@ $(".runupgrade").click(function() { '; +dolibarr_install_syslog("--- check: end"); pFooter(true); // Never display next button diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 04f8a3caf4c..92d2fc963a8 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -36,7 +36,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); $langs->load("errors"); -dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); +dolibarr_install_syslog("--- fileconf: entering fileconf.php page"); // You can force preselected values of the config step of Dolibarr by adding a file // install.forced.php into directory htdocs/install (This is the case with some wizard @@ -71,12 +71,14 @@ if (@file_exists($forcedfile)) { session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters) -pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/')); +pHeader($langs->trans("ConfigurationFile"),"step1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/')); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); + print $langs->trans("ConfFileIsNotWritable", $conffiletoshow); + dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING); + dolibarr_install_syslog("--- fileconf: end"); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -584,4 +586,5 @@ function jscheckparam() // $db->close(); Not database connexion yet +dolibarr_install_syslog("--- fileconf: end"); pFooter($err,$setuplang,'jscheckparam'); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index bac0ffe6eda..36d12421055 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -375,13 +375,13 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') print ''."\n"; if ($jQueryUiCustomPath) print ''."\n"; // JQuery - else print ''."\n"; // JQuery + else print ''."\n"; // JQuery print ''."\n"; if ($jQueryCustomPath) print ''."\n"; - else print ''."\n"; + else print ''."\n"; if ($jQueryUiCustomPath) print ''."\n"; - else print ''."\n"; + else print ''."\n"; print ''.$langs->trans("DolibarrSetup").' '."\n";
print ''."\n";
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 4508a266b08..9b0ac71931b 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -28,8 +28,7 @@ include_once '../core/class/html.formadmin.class.php';
$err = 0;
-// Si fichier conf existe deja et rempli, on est pas sur une premiere install,
-// on ne passe donc pas par la page de choix de langue
+// If the config file exists and is filled, we're not on first install so we skip the language selection page
if (file_exists($conffile) && isset($dolibarr_main_url_root))
{
header("Location: check.php?testget=ok");
@@ -45,7 +44,7 @@ $langs->load("admin");
$formadmin=new FormAdmin(''); // Note: $db does not exist yet but we don't need it, so we put ''.
-pHeader("", "check"); // Etape suivante = check
+pHeader("", "check"); // Next step = check
// Ask installation language
@@ -62,6 +61,6 @@ print '
';
print '';
if ($url) print '';
- print '\'+'.($showlegend?'number':'label+\'
\'+number'); + print '\'+'.($showlegend?'number':'label+\' \'+number'); if (! empty($showpercent)) print '+\'
\'+percent+\'%\''; print '+\''; if ($url) print ''; print '
\';
},
background: {
- opacity: 0.5,
+ opacity: 0.0,
color: \'#000000\'
- }
+ },
}
}
},
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 08fa63c52c6..5b1682c5494 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -144,7 +144,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
{
if (empty($ulprinted) && ! empty($pere['rowid'])) { print '\'+number'); + print '\'+'.($showlegend?'number':'label+\' \'+number'); if (! empty($showpercent)) print '+\'
\'+percent+\'%\''; print '+\''; if ($url) print ''; print '
'."\n"; - dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING); + dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING); } else { @@ -531,5 +531,6 @@ $(".runupgrade").click(function() { '; +dolibarr_install_syslog("--- check: end"); pFooter(true); // Never display next button diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 04f8a3caf4c..92d2fc963a8 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -36,7 +36,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); $langs->load("errors"); -dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); +dolibarr_install_syslog("--- fileconf: entering fileconf.php page"); // You can force preselected values of the config step of Dolibarr by adding a file // install.forced.php into directory htdocs/install (This is the case with some wizard @@ -71,12 +71,14 @@ if (@file_exists($forcedfile)) { session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters) -pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/')); +pHeader($langs->trans("ConfigurationFile"),"step1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/')); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); + print $langs->trans("ConfFileIsNotWritable", $conffiletoshow); + dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING); + dolibarr_install_syslog("--- fileconf: end"); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -584,4 +586,5 @@ function jscheckparam() // $db->close(); Not database connexion yet +dolibarr_install_syslog("--- fileconf: end"); pFooter($err,$setuplang,'jscheckparam'); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index bac0ffe6eda..36d12421055 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -375,13 +375,13 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') print ''."\n"; if ($jQueryUiCustomPath) print ''."\n"; // JQuery - else print ''."\n"; // JQuery + else print ''."\n"; // JQuery print ''."\n"; if ($jQueryCustomPath) print ''."\n"; - else print ''."\n"; + else print ''."\n"; if ($jQueryUiCustomPath) print ''."\n"; - else print ''."\n"; + else print ''."\n"; print '
'.$langs->trans("SomeTranslationAreUncomplete"); -// Si pas d'erreur, on affiche le bouton pour passer a l'etape suivante +// If there's no error, we display the next step button if ($err == 0) pFooter(0); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 786a8efb430..c8a77e9d8e7 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville
'; @@ -314,7 +316,7 @@ if (! $error && $db->connected && $action == "set") if (! $error) { - dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists"); + dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists"); } @@ -343,7 +345,7 @@ if (! $error && $db->connected && $action == "set") $pathhtaccess=$main_data_dir.'/.htaccess'; if (! file_exists($pathhtaccess)) { - dolibarr_install_syslog("etape1: .htaccess file does not exists, we create it in '".$main_data_dir."'"); + dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'"); $handlehtaccess=@fopen($pathhtaccess,'w'); if ($handlehtaccess) { @@ -351,7 +353,7 @@ if (! $error && $db->connected && $action == "set") fwrite($handlehtaccess,'Deny from all'."\n"); fclose($handlehtaccess); - dolibarr_install_syslog("etape1: .htaccess file created"); + dolibarr_install_syslog("step1: .htaccess file created"); } } @@ -372,7 +374,7 @@ if (! $error && $db->connected && $action == "set") { if (is_dir($dir[$i])) { - dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' exists"); + dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists"); } else { @@ -387,7 +389,7 @@ if (! $error && $db->connected && $action == "set") } else { - dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' created"); + dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created"); } } } @@ -475,7 +477,7 @@ if (! $error && $db->connected && $action == "set") // Si creation utilisateur admin demandee, on le cree if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on") { - dolibarr_install_syslog("etape1: Create database user: ".$dolibarr_main_db_user); + dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user); //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port; $databasefortest=$conf->db->name; @@ -523,7 +525,7 @@ if (! $error && $db->connected && $action == "set") || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') { - dolibarr_install_syslog("etape1: User already exists"); + dolibarr_install_syslog("step1: user already exists"); print '
'; print '
'; // Test if we can run a first install process @@ -153,7 +154,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) // Active module user $modName='modUser'; $file = $modName . ".class.php"; - dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO); + dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO); include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file; $objMod = new $modName($db); $result=$objMod->init(); @@ -188,13 +189,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) { if ($newuser->error == 'ErrorLoginAlreadyExists') { - dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING); + dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING); print '
'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."
"; $success = 1; } else { - dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR); + dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR); print '
'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'
'; } } @@ -203,7 +204,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) { $db->begin(); - dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG); + dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG); $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'"); if (! $resql) dol_print_error($db,'Error in setup program'); $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)"); @@ -212,7 +213,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) if ($useforcedwizard) { - dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG); + dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG); $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'"); if (! $resql) dol_print_error($db,'Error in setup program'); $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)"); @@ -232,7 +233,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) print $langs->trans("ActivateModule",$modtoactivatenew).'
'; $file=$modtoactivatenew.'.class.php'; - dolibarr_install_syslog('install/etape5.php Activate module file='.$file); + dolibarr_install_syslog('step5: activate module file=' . $file); $res=dol_include_once("/core/modules/".$file); $res=activateModule($modtoactivatenew,1); @@ -240,7 +241,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) } } - dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG); + dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const'); $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'"); if (! $resql) dol_print_error($db,'Error in setup program'); @@ -271,7 +272,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) if ($tagdatabase) { - dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion, LOG_DEBUG); + dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion); $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'"); if (! $resql) dol_print_error($db,'Error in setup program'); $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)"); @@ -280,7 +281,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) } else { - dolibarr_install_syslog('install/etape5.php We run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.', LOG_DEBUG); + dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.'); } } else @@ -290,7 +291,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) } else { - dol_print_error('','install/etape5.php Unknown choice of action'); + dol_print_error('','step5.php: unknown choice of action'); } // May fail if parameter already defined @@ -404,7 +405,7 @@ elseif (empty($action) || preg_match('/upgrade/i',$action)) } else { - dol_print_error('','install/etape5.php Unknown choice of action'); + dol_print_error('','step5.php: unknown choice of action'); } @@ -413,6 +414,6 @@ else clearstatcache(); -dolibarr_install_syslog("--- install/etape5.php Dolibarr setup finished", LOG_INFO); +dolibarr_install_syslog("--- step5: Dolibarr setup finished"); pFooter(1,$setuplang); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 9c2832f3623..7c9cc7fd325 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville
'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)."
'; - dolibarr_install_syslog("migrate_links_transfert", LOG_DEBUG); + dolibarr_install_syslog("migrate_links_transfert"); if (! $db->query($sql)) { @@ -992,7 +994,7 @@ function migrate_contracts_date1($db,$langs,$conf) print ''.$langs->trans('MigrationContractsEmptyDatesUpdate')."
\n"; $sql="update llx_contrat set date_contrat=tms where date_contrat is null"; - dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_contracts_date1"); $resql = $db->query($sql); if (! $resql) dol_print_error($db); if ($db->affected_rows($resql) > 0) @@ -1001,7 +1003,7 @@ function migrate_contracts_date1($db,$langs,$conf) print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."
\n"; $sql="update llx_contrat set datec=tms where datec is null"; - dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_contracts_date1"); $resql = $db->query($sql); if (! $resql) dol_print_error($db); if ($db->affected_rows($resql) > 0) @@ -1031,7 +1033,7 @@ function migrate_contracts_date2($db,$langs,$conf) $sql.= " GROUP BY c.rowid, c.date_contrat"; $resql = $db->query($sql); - dolibarr_install_syslog("upgrade2::migrate_contracts_date2", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_contracts_date2"); if ($resql) { $i = 0; @@ -1092,7 +1094,7 @@ function migrate_contracts_date3($db,$langs,$conf) print ''.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."
\n"; $sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat"; - dolibarr_install_syslog("upgrade2::migrate_contracts_date3", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_contracts_date3"); $resql = $db->query($sql); if (! $resql) dol_print_error($db); if ($db->affected_rows($resql) > 0) @@ -1120,7 +1122,7 @@ function migrate_contracts_open($db,$langs,$conf) $sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd"; $sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat"; - dolibarr_install_syslog("upgrade2::migrate_contracts_open", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_contracts_open"); $resql = $db->query($sql); if (! $resql) dol_print_error($db); if ($db->affected_rows($resql) > 0) { @@ -1190,7 +1192,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf) $select_sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn'; $select_sql.= ' WHERE fk_facture_fourn IS NOT NULL'; - dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn"); $select_resql = $db->query($select_sql); if ($select_resql) { @@ -1306,7 +1308,7 @@ function migrate_price_facture($db,$langs,$conf) $sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)"; //print $sql; - dolibarr_install_syslog("upgrade2::migrate_price_facture", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_price_facture"); $resql=$db->query($sql); if ($resql) { @@ -1340,7 +1342,7 @@ function migrate_price_facture($db,$langs,$conf) $facligne->total_tva = $total_tva; $facligne->total_ttc = $total_ttc; - dolibarr_install_syslog("upgrade2: Line $rowid: facid=$obj->facid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); + dolibarr_install_syslog("upgrade2: line " . $rowid . ": facid=" . $obj->facid . " pu=" . $pu ." qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc); print ". "; $facligne->update_total(); @@ -1419,7 +1421,7 @@ function migrate_price_propal($db,$langs,$conf) $sql.= " WHERE pd.fk_propal = p.rowid"; $sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)"; - dolibarr_install_syslog("upgrade2::migrate_price_propal", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_price_propal"); $resql=$db->query($sql); if ($resql) { @@ -1452,7 +1454,7 @@ function migrate_price_propal($db,$langs,$conf) $propalligne->total_tva = $total_tva; $propalligne->total_ttc = $total_ttc; - dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); + dolibarr_install_syslog("upgrade2: Line " . $rowid . ": propalid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva. ", " . $total_ttc); print ". "; $propalligne->update_total(); @@ -1528,7 +1530,7 @@ function migrate_price_contrat($db,$langs,$conf) $sql.= " WHERE cd.fk_contrat = c.rowid"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)"; - dolibarr_install_syslog("upgrade2::migrate_price_contrat", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_price_contrat"); $resql=$db->query($sql); if ($resql) { @@ -1561,7 +1563,7 @@ function migrate_price_contrat($db,$langs,$conf) $contratligne->total_tva = $total_tva; $contratligne->total_ttc = $total_ttc; - dolibarr_install_syslog("upgrade2: Line $rowid: contratdetid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent -> $total_ht, $total_tva, $total_ttc"); + dolibarr_install_syslog("upgrade2: Line " . $rowid . ": contratdetid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent. " -> " . $total_ht . ", " . $total_tva. " , " . $total_ttc); print ". "; $contratligne->update_total(); @@ -1613,7 +1615,7 @@ function migrate_price_commande($db,$langs,$conf) $sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)"; - dolibarr_install_syslog("upgrade2::migrate_price_commande", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_price_commande"); $resql=$db->query($sql); if ($resql) { @@ -1646,7 +1648,7 @@ function migrate_price_commande($db,$langs,$conf) $commandeligne->total_tva = $total_tva; $commandeligne->total_ttc = $total_ttc; - dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); + dolibarr_install_syslog("upgrade2: Line " . $rowid . " : commandeid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global. " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc); print ". "; $commandeligne->update_total(); @@ -1727,7 +1729,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf) $sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)"; - dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur"); $resql=$db->query($sql); if ($resql) { @@ -1760,7 +1762,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf) $commandeligne->total_tva = $total_tva; $commandeligne->total_ttc = $total_ttc; - dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); + dolibarr_install_syslog("upgrade2: Line " . $rowid . ": commandeid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc); print ". "; $commandeligne->update_total(); @@ -2448,7 +2450,7 @@ function migrate_restore_missing_links($db,$langs,$conf) $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2"; $sql.= " WHERE t1.rowid = t2.".$field2.")"; - dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1"); $resql = $db->query($sql); if ($resql) { @@ -2514,7 +2516,7 @@ function migrate_restore_missing_links($db,$langs,$conf) $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2"; $sql.= " WHERE t1.rowid = t2.".$field2.")"; - dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2", LOG_DEBUG); + dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2"); $resql = $db->query($sql); if ($resql) { @@ -2779,7 +2781,7 @@ function migrate_relationship_tables($db,$langs,$conf,$table,$fk_source,$sourcet if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table)) { - dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table); + dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = " . MAIN_DB_PREFIX . $table); $db->begin(); @@ -3304,7 +3306,7 @@ function migrate_actioncomm_element($db,$langs,$conf) $obj = $db->fetch_object($result); if ($obj) { - dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=".$field); + dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=" . $field); $db->begin(); @@ -3367,7 +3369,7 @@ function migrate_mode_reglement($db,$langs,$conf) { $error=0; - dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=".$elements['code'][$key]); + dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=" . $elements['code'][$key]); $sqlSelect = "SELECT id"; $sqlSelect.= " FROM ".MAIN_DB_PREFIX."c_paiement"; @@ -3624,7 +3626,7 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname) if (is_dir(DOL_DATA_ROOT.$oldname) && ! file_exists(DOL_DATA_ROOT.$newname)) { - dolibarr_install_syslog("upgrade2::migrate_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname); + dolibarr_install_syslog("upgrade2::migrate_directories move " . DOL_DATA_ROOT . $oldname . ' into ' . DOL_DATA_ROOT . $newname); @rename(DOL_DATA_ROOT.$oldname,DOL_DATA_ROOT.$newname); } } @@ -3774,7 +3776,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) if ($moduletoreload == 'MAIN_MODULE_AGENDA') { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Agenda module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'; if ($res) { $mod=new modAgenda($db); @@ -3784,7 +3786,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_BARCODE') { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Barcode"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php'; if ($res) { $mod=new modBarcode($db); @@ -3794,7 +3796,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_CRON') { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Cron"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php'; if ($res) { $mod=new modCron($db); @@ -3804,7 +3806,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_SOCIETE') { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'; if ($res) { $mod=new modSociete($db); @@ -3814,7 +3816,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_PRODUIT') // Permission has changed into 2.7 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'; if ($res) { $mod=new modProduct($db); @@ -3824,7 +3826,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'; if ($res) { @@ -3835,7 +3837,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'; if ($res) { @@ -3846,7 +3848,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'; if ($res) { $mod=new modFacture($db); @@ -3856,7 +3858,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR') // Permission has changed into 2.9 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; if ($res) { $mod=new modFournisseur($db); @@ -3866,7 +3868,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT') // Permission has changed into 3.0 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'; if ($res) { $mod=new modDeplacement($db); @@ -3876,7 +3878,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_DON') // Permission has changed into 3.0 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'; if ($res) { $mod=new modDon($db); @@ -3886,7 +3888,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; if ($res) { $mod=new modECM($db); @@ -3896,7 +3898,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_PAYBOX') // Permission has changed into 3.0 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'; if ($res) { $mod=new modPaybox($db); @@ -3906,7 +3908,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY') // Permission has changed into 3.0 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php'; if ($res) { $mod=new modOpenSurvey($db); @@ -3916,7 +3918,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) } if ($moduletoreload == 'MAIN_MODULE_USER') // Permission has changed into 3.0 { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate User module"); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'; if ($res) { $mod=new modUser($db); diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 09ac5dd44a7..0aaac7816bd 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -165,7 +165,18 @@ ProjectOverview=Overview ManageTasks=Use projects to follow tasks and time ManageOpportunitiesStatus=Use projects to follow leads/opportinuties ProjectNbProjectByMonth=Nb of created projects by month +ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month +ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month +ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status ProjectsStatistics=Statistics on projects/leads TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible. OpenedProjectsByThirdparties=Opened projects by thirdparties -OpportunityPonderatedAmount=Opportunities ponderated amount \ No newline at end of file +OpportunityTotalAmount=Opportunities total amount +OpportunityPonderatedAmount=Opportunities weighted amount +OppStatusPROSP=Prospection +OppStatusQUAL=Qualification +OppStatusPROPO=Proposal +OppStatusNEGO=Negociation +OppStatusPENDING=Pending +OppStatusWIN=Won +OppStatusLOST=Lost diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 5eb4549f0fa..a7b39cd5f34 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -69,7 +69,7 @@ function llxHeaderPaypal($title, $head = "") // JQuery. Must be before other includes print ''."\n"; - print ''."\n"; + print ''."\n"; // jQuery jnotify if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY)) { diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 27335777db1..ae99bb14188 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -54,6 +54,7 @@ class ProjectStats extends Stats $sql .= " count(DISTINCT t.rowid), t.fk_opp_status"; $sql .= " FROM " . MAIN_DB_PREFIX . "projet as t"; $sql .= $this->buildWhere(); + $sql .= " AND t.fk_statut = 1"; $sql .= " GROUP BY t.fk_opp_status"; $result = array (); @@ -118,7 +119,7 @@ class ProjectStats extends Stats */ public function buildWhere() { $sqlwhere_str = ''; - $sqlwhere = array (); + $sqlwhere = array(); $sqlwhere[] = ' t.entity IN (' . getEntity('project') . ')'; @@ -192,6 +193,126 @@ class ProjectStats extends Stats return $res; } + + /** + * Return amount of elements by month for several years + * + * @param int $endyear Start year + * @param int $startyear End year + * @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save) + * @return array Array of values + */ + function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0) + { + global $conf,$user,$langs; + + if ($startyear > $endyear) return -1; + + $datay=array(); + + // Search into cache + if (! empty($cachedelay)) + { + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; + } + + $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache'; + $newmask='0644'; + + $nowgmt = dol_now(); + + $foundintocache=0; + if ($cachedelay > 0) + { + $filedate=dol_filemtime($newpathofdestfile); + if ($filedate >= ($nowgmt - $cachedelay)) + { + $foundintocache=1; + + $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate; + } + else + { + dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it."); + } + } + + // Load file into $data + if ($foundintocache) // Cache file found and is not too old + { + dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate."."); + $data = json_decode(file_get_contents($newpathofdestfile), true); + } + else + { + $year=$startyear; + while($year <= $endyear) + { + $datay[$year] = $this->getWeightedAmountByMonth($year); + $year++; + } + + $data = array(); + // $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...) + for ($i = 0 ; $i < 12 ; $i++) + { + $data[$i][]=$datay[$endyear][$i][0]; // set label + $year=$startyear; + while($year <= $endyear) + { + $data[$i][]=$datay[$year][$i][1]; // set yval for x=i + $year++; + } + } + } + + // Save cache file + if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) + { + dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk."); + if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); + $fp = fopen($newpathofdestfile, 'w'); + if ($fp) + { + fwrite($fp, json_encode($data)); + fclose($fp); + if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; + @chmod($newpathofdestfile, octdec($newmask)); + } + else dol_syslog("Failed to write cache file", LOG_ERR); + $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt; + } + + return $data; + } + + + /** + * Return the Project amount by month for a year + * + * @param int $year scan + * @return array with amount by month + */ + function getWeightedAmountByMonth($year) { + global $user; + + $this->yearmonth = $year; + + $sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount)"; + $sql .= " FROM " . MAIN_DB_PREFIX . "projet as t"; + if (! $user->rights->societe->client->voir && ! $user->societe_id) + $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id; + $sql .= $this->buildWhere(); + $sql .= " GROUP BY dm"; + $sql .= $this->db->order('dm', 'DESC'); + $this->yearmonth=0; + + $res = $this->_getAmountByMonth($year, $sql); + // var_dump($res);print '
'; + return $res; + } + /** * Return amount of elements by month for several years * diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 264afb449f9..2625b1f8503 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -123,7 +123,7 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { - $sql = "SELECT count(p.rowid), p.fk_opp_status as status"; + $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, p.fk_opp_status as opp_status"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " AND p.fk_statut = 1"; @@ -136,20 +136,25 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $num = $db->num_rows($resql); $i = 0; - $total=0; - $totalinprocess=0; + $totalnb=0; + $totalamount=0; + $ponderated_opp_amount=0; + $valsnb=array(); + $valsamount=array(); $dataseries=array(); - $vals=array(); // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not) while ($i < $num) { - $row = $db->fetch_row($resql); - if ($row) + $obj = $db->fetch_object($resql); + if ($obj) { //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1)) { - $vals[$row[1]]=$row[0]; - $totalinprocess+=$row[0]; + $valsnb[$obj->opp_status]=$obj->nb; + $valsamount[$obj->opp_status]=$obj->opp_amount; + $totalnb+=$obj->nb; + $totalamount+=$obj->opp_amount; + $ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$obj->opp_status] * $obj->opp_amount / 100); } $total+=$row[0]; } @@ -169,15 +174,16 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if ($code) $labelstatus = $langs->trans("OppStatus".$code); if (empty($labelstatus)) $labelstatus=$listofopplabel[$status]; - $labelstatus .= ' ('.$langs->trans("Coeff").': '.$listofoppstatus[$status].')'; + //$labelstatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')'; + $labelstatus .= ' - '.price2num($listofoppstatus[$status]).'%'; - $dataseries[]=array('label'=>$labelstatus,'data'=>(isset($vals[$status])?(int) $vals[$status]:0)); + $dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0)); if (! $conf->use_javascript_ajax) { $var=!$var; print "
"; } else diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index fdb272ed70e..04dd819054e 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -122,7 +122,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $px->SetType(array ( 'pie' )); - $px->SetTitle($langs->trans('ProjectNbProjectByStatus')); + $px->SetTitle($langs->trans('ProjectOpenedProjectByOppStatus')); $result=$px->draw($filenamenb, $fileurlnb); if ($result<0) { setEventMessages($px->error, null, 'errors'); @@ -194,12 +194,12 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $px2->SetMinValue(min(0,$px2->GetFloorMinValue())); $px2->SetWidth($WIDTH); $px2->SetHeight($HEIGHT); - $px2->SetYLabel($langs->trans("ProjectAmountOfProject")); + $px2->SetYLabel($langs->trans("ProjectOppAmountOfProjectsByMonth")); $px2->SetShading(3); $px2->SetHorizTickIncrement(1); $px2->SetPrecisionY(0); $px2->mode='depth'; - $px2->SetTitle($langs->trans("ProjectAmountOfProjectsByMonth")); + $px2->SetTitle($langs->trans("ProjectOppAmountOfProjectsByMonth")); $px2->draw($filenamenb,$fileurlnb); } @@ -208,7 +208,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { // Build graphic with transformation rate - $data = $stats_project->getTransformRateByMonthWithPrevYear($endyear,$startyear); + $data = $stats_project->getWeightedAmountByMonthWithPrevYear($endyear,$startyear); //var_dump($data); // $data = array(array('Lib',val1,val2,val3),...) @@ -231,12 +231,12 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $px3->SetMinValue(min(0,$px3->GetFloorMinValue())); $px3->SetWidth($WIDTH); $px3->SetHeight($HEIGHT); - $px3->SetYLabel($langs->trans("ProjectTransRateOfProject")); + $px3->SetYLabel($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth")); $px3->SetShading(3); $px3->SetHorizTickIncrement(1); $px3->SetPrecisionY(0); $px3->mode='depth'; - $px3->SetTitle($langs->trans("ProjectTransRateOfProjectsByMonth")); + $px3->SetTitle($langs->trans("ProjectWeightedOppAmountOfProjectsByMonth")); $px3->draw($filenamenb,$fileurlnb); } @@ -340,15 +340,12 @@ print '
';
$stringtoshow.= '
| ';
if ($mesg) { print $mesg; }
else {
- if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
- {
- $stringtoshow.= $px->show();
- $stringtoshow.= " \n"; - } $stringtoshow.= $px1->show(); $stringtoshow.= " \n"; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { + $stringtoshow.= $px->show(); + $stringtoshow.= " \n"; $stringtoshow.= $px2->show(); $stringtoshow.= " \n"; $stringtoshow.= $px3->show(); diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 698046cf708..77d92e5d8eb 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -30,14 +30,14 @@ if (empty($usedolheader))
| '; // Status - print ' | '; + print ' | '; print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut); print ' | '; @@ -256,7 +256,7 @@ if ($result) // Statut $userstatic->statut=$obj->statut; - print ''.$userstatic->getLibStatut(5).' | '; + print ''.$userstatic->getLibStatut(5).' | '; print ''; print "\n"; $i++; |