diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 3ddf739c813..f78059c2969 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -261,7 +261,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) $parameters=array(); $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook $sql.=preg_replace('/^,/', '', $hookmanager->resPrint); -$sql =preg_replace('/, $/', '', $sql); +$sql =preg_replace('/,\s*$/', '', $sql); $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index 3a0b2c67af9..cf1d5241753 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -156,6 +156,8 @@ class box_task extends ModeleBoxes $sql.= " pt.entity = ".$conf->entity; $sql.= " AND p.fk_statut = ".Project::STATUS_VALIDATED; $sql.= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed + $sql.= " AND p.usage_task = 1 "; + $sql.= " ORDER BY pt.datee ASC, pt.dateo ASC"; $sql.= $db->plimit($max, 0); diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 19d89c6799b..d37c7d5f960 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -565,7 +565,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t // resume print ''; - print getTaskProgressView($taskstatic, false, false); + if ($lines[$i]->progress != '' && $lines[$i]->duration) { + print getTaskProgressView($taskstatic, false, false); + } print ''; if ($showbilltime) @@ -664,12 +666,48 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t print convertSecondToTime($total_projectlinesa_spent, 'allhourmin'); if ($projectidfortotallink > 0) print ''; print ''; + + if ($total_projectlinesa_planned) { + $totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2); + $totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2); + // this conf is actually hidden, by default we use 1% for "be carefull or warning" + $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01; + + // define progress color according to time spend vs workload + $progressBarClass = 'progress-bar-info'; + $badgeClass = 'badge '; + + if ($totalCalculatedProgress > $totalAverageDeclaredProgress) { + $progressBarClass = 'progress-bar-danger'; + $badgeClass.= 'badge-danger'; + } elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1% + $progressBarClass = 'progress-bar-warning'; + $badgeClass.= 'badge-warning'; + } else { + $progressBarClass = 'progress-bar-success'; + $badgeClass.= 'badge-success'; + } + } + print ''; - if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %'; + if ($total_projectlinesa_planned) print $totalCalculatedProgress.' %'; print ''; print ''; - if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2).' %'; + if ($total_projectlinesa_planned) print ''.$totalAverageDeclaredProgress.' %'; print ''; + + + // resume + print ''; + if ($total_projectlinesa_planned){ + print ''; + print '
'; + print '
'; + print '
'; + print ''; + } + print ''; + if ($showbilltime) { print ''; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 9efb4dd1e27..a4eb2d57053 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -176,7 +176,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = $menu_arr[] = array( 'name' => 'TMenuMRP', 'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=', - 'title' => $langs->trans("TMenuMRP"), + 'title' => "TMenuMRP", 'level' => 0, 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php index 96cf345ff09..d6bcb3fcd25 100644 --- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php @@ -71,10 +71,10 @@ class modPhpbarcode extends ModeleBarCode } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php index 3d2564591da..aad1493ff5f 100644 --- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php +++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php @@ -67,10 +67,10 @@ class modTcpdfbarcode extends ModeleBarCode } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php index aa8eef7aa59..3f6be391a37 100644 --- a/htdocs/core/modules/bom/mod_bom_advanced.php +++ b/htdocs/core/modules/bom/mod_bom_advanced.php @@ -92,7 +92,7 @@ class mod_bom_advanced extends ModeleNumRefboms } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php index 39af3ecc7e1..0f3c704b5dd 100644 --- a/htdocs/core/modules/bom/mod_bom_standard.php +++ b/htdocs/core/modules/bom/mod_bom_standard.php @@ -61,7 +61,7 @@ class mod_bom_standard extends ModeleNumRefboms /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -72,10 +72,10 @@ class mod_bom_standard extends ModeleNumRefboms /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/bom/modules_bom.php b/htdocs/core/modules/bom/modules_bom.php index fc4d2167980..35cd9c11abd 100644 --- a/htdocs/core/modules/bom/modules_bom.php +++ b/htdocs/core/modules/bom/modules_bom.php @@ -85,7 +85,7 @@ abstract class ModeleNumRefBoms } /** - * Renvoie la description par defaut du modele de numerotation + * Returns the default description of the numbering template * * @return string Texte descripif */ @@ -97,7 +97,7 @@ abstract class ModeleNumRefBoms } /** - * Renvoie un exemple de numerotation + * Returns an example of numbering * * @return string Example */ @@ -109,9 +109,10 @@ abstract class ModeleNumRefBoms } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de conflits qui empecheraient cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { @@ -119,7 +120,7 @@ abstract class ModeleNumRefBoms } /** - * Renvoie prochaine valeur attribuee + * Returns next assigned value * * @param Societe $objsoc Object thirdparty * @param Object $object Object we need next value for @@ -132,7 +133,7 @@ abstract class ModeleNumRefBoms } /** - * Renvoie version du module numerotation + * Returns version of numbering module * * @return string Valeur */ diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php index 0169ce04a70..f9e98d550b8 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php @@ -58,7 +58,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -69,10 +69,10 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php index 545222c8b03..69aa090ab04 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php @@ -86,7 +86,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php index 29fd071200a..7d05e4f94b8 100644 --- a/htdocs/core/modules/cheque/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/modules_chequereceipts.php @@ -76,10 +76,11 @@ abstract class ModeleNumRefChequeReceipts } /** - * Test if the existing numbers in the database do not cause conflicts that would prevent this numbering run. - * - * @return boolean false si conflit, true si ok - */ + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. + * + * @return boolean false if conflict, true if ok + */ public function canBeActivated() { return true; diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php index 160a07635f4..85ec964a100 100644 --- a/htdocs/core/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -61,7 +61,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -72,10 +72,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index 4f9931f35e9..c976290377b 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -92,7 +92,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 47fb20a56b4..974b30f6f68 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -110,9 +110,10 @@ abstract class ModeleNumRefCommandes } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de conflits qui empecheraient cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { @@ -120,7 +121,7 @@ abstract class ModeleNumRefCommandes } /** - * Renvoie prochaine valeur attribuee + * Returns next assigned value * * @param Societe $objsoc Object thirdparty * @param Object $object Object we need next value for @@ -133,7 +134,7 @@ abstract class ModeleNumRefCommandes } /** - * Renvoie version du module numerotation + * Returns version of numbering module * * @return string Valeur */ diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php index 9957bf4f326..edca09dd57b 100644 --- a/htdocs/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -96,7 +96,7 @@ abstract class ModeleNumRefDons } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -108,10 +108,10 @@ abstract class ModeleNumRefDons } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas d - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php index 176c3a46dcb..d8e5979f126 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php @@ -78,10 +78,10 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport /** - * Test whether the numbers already in force in the base do not cause conflicts - * that would prevent this numbering from working. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 5217e2dc1c3..5abace4279c 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -95,7 +95,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php index 4c9d249d6c8..bc7ae612d09 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -74,7 +74,7 @@ class mod_facture_mars extends ModeleNumRefFactures } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -84,10 +84,10 @@ class mod_facture_mars extends ModeleNumRefFactures } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index db9a3e2e046..6644702c82f 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -84,7 +84,7 @@ class mod_facture_terre extends ModeleNumRefFactures } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -94,10 +94,10 @@ class mod_facture_terre extends ModeleNumRefFactures } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 7ed9eb7e94a..c9a010a84c2 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -98,7 +98,7 @@ abstract class ModeleNumRefFactures } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -110,10 +110,10 @@ abstract class ModeleNumRefFactures } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas - * de conflits qui empecheraient cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php index 1d33cb7fc83..6c1ec0d46fe 100644 --- a/htdocs/core/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -97,7 +97,7 @@ class mod_arctic extends ModeleNumRefFicheinter } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php index 7d636a8b8e0..74fedefba9a 100644 --- a/htdocs/core/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -68,7 +68,7 @@ class mod_pacific extends ModeleNumRefFicheinter } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -78,10 +78,10 @@ class mod_pacific extends ModeleNumRefFicheinter } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index f5056bf45bb..970507e8c0b 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -109,10 +109,10 @@ abstract class ModeleNumRefFicheinter } /** - * Tests if the numbers already in force in the database do not cause conflicts - * that would prevent this numbering from working. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php index 5cae280f245..de16820b8f3 100644 --- a/htdocs/core/modules/livraison/mod_livraison_jade.php +++ b/htdocs/core/modules/livraison/mod_livraison_jade.php @@ -72,7 +72,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -82,10 +82,10 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index ce9d9b77f77..9dff79742ef 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -100,7 +100,7 @@ abstract class ModeleNumRefDeliveryOrder } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -112,10 +112,10 @@ abstract class ModeleNumRefDeliveryOrder } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas d - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index 62990ec6f90..cd3a6f79b0f 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -113,9 +113,10 @@ class mailing_xinputuser extends MailingTargets * Ajoute destinataires dans table des cibles * * @param int $mailing_id Id of emailing + * @param array $cibles Array with targets * @return int < 0 si erreur, nb ajout si ok */ - public function add_to_target($mailing_id) + public function add_to_target($mailing_id, $cibles) { // phpcs:enable global $conf,$langs,$_FILES; diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php index 8e1e1f1288b..d8d75eced2a 100644 --- a/htdocs/core/modules/modBom.class.php +++ b/htdocs/core/modules/modBom.class.php @@ -66,7 +66,7 @@ class modBom extends DolibarrModules $this->descriptionlong = "Bill of Materials definitions. They can be used to make Manufacturing Resource Planning"; // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z' - $this->version = 'experimental'; + $this->version = 'dolibarr'; //Url to the file with your last numberversion of this module //$this->url_last_version = 'http://www.example.com/versionmodule.txt'; @@ -105,7 +105,7 @@ class modBom extends DolibarrModules // Dependencies $this->hidden = false; // A condition to hide module $this->depends = array('modProduct'); // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...) - $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...) + $this->requiredby = array('modMrp'); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...) $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...) $this->langfiles = array("mrp"); //$this->phpmin = array(5,4); // Minimum version of PHP required by module diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php index a9cde1b86cb..a9bacfede80 100644 --- a/htdocs/core/modules/payment/mod_payment_ant.php +++ b/htdocs/core/modules/payment/mod_payment_ant.php @@ -95,7 +95,7 @@ class mod_payment_ant extends ModeleNumRefPayments } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php index a6f1eee1ef7..7aff7dff662 100644 --- a/htdocs/core/modules/payment/mod_payment_cicada.php +++ b/htdocs/core/modules/payment/mod_payment_cicada.php @@ -68,7 +68,7 @@ class mod_payment_cicada extends ModeleNumRefPayments /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -79,10 +79,10 @@ class mod_payment_cicada extends ModeleNumRefPayments /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/payment/modules_payment.php b/htdocs/core/modules/payment/modules_payment.php index b85c97008e3..d0e0c99ed66 100644 --- a/htdocs/core/modules/payment/modules_payment.php +++ b/htdocs/core/modules/payment/modules_payment.php @@ -63,10 +63,11 @@ abstract class ModeleNumRefPayments } /** - * Test if the existing numbers in the database do not cause conflicts that would prevent this numbering run. - * - * @return boolean false si conflit, true si ok - */ + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. + * + * @return boolean false if conflict, true if ok + */ public function canBeActivated() { return true; diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index 30350d9378f..482f35cacd0 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -90,7 +90,7 @@ abstract class ModeleProductCode } - /** Renvoi un exemple de numerotation + /** Return an example of numbering * * @param Translate $langs Object langs * @return string Example @@ -101,10 +101,11 @@ abstract class ModeleProductCode return $langs->trans("NoExample"); } - /** Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + /** + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index faab6523820..a8b7f3b4cd0 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -80,10 +80,11 @@ class mod_project_simple extends ModeleNumRefProjects } - /** Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + /** + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index 70394f92129..d27f3d1c250 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -96,7 +96,7 @@ class mod_project_universal extends ModeleNumRefProjects } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index f77111bade3..211b586e8f1 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -95,7 +95,7 @@ abstract class ModeleNumRefProjects } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -107,10 +107,10 @@ abstract class ModeleNumRefProjects } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index 7619c9b6834..11139f4366a 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -80,10 +80,11 @@ class mod_task_simple extends ModeleNumRefTask } - /** Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + /** + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php index 760caaa366e..1d311f96391 100644 --- a/htdocs/core/modules/project/task/mod_task_universal.php +++ b/htdocs/core/modules/project/task/mod_task_universal.php @@ -96,7 +96,7 @@ class mod_task_universal extends ModeleNumRefTask } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index e37c4b1dabb..510f727e7ec 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -96,7 +96,7 @@ abstract class ModeleNumRefTask } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -108,10 +108,10 @@ abstract class ModeleNumRefTask } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index 4fba93d7a8d..dcc535bcca1 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -81,10 +81,10 @@ class mod_propale_marbre extends ModeleNumRefPropales /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index 99c82217a87..bb9bf463930 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -98,7 +98,7 @@ class mod_propale_saphir extends ModeleNumRefPropales } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index dc01941ece4..5cd2791cc95 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -99,7 +99,7 @@ abstract class ModeleNumRefPropales } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -111,10 +111,10 @@ abstract class ModeleNumRefPropales } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 62f481b9b25..b665e36f163 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -105,10 +105,11 @@ abstract class ModeleThirdPartyCode return $langs->trans("NoExample"); } - /** Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + /** + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { @@ -297,10 +298,11 @@ abstract class ModeleAccountancyCode return $langs->trans("NoExample"); } - /** Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + /** + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index 96dc9fbfd99..d10ce45a7f9 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -80,7 +80,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -91,10 +91,10 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index c816953a298..96c294c2e8d 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -98,7 +98,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php index d06a2ccfcf3..7eaf44a691f 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php @@ -95,7 +95,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php index e01c82cb445..b1f8dbd2e9c 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php @@ -68,7 +68,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -79,10 +79,10 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php index a3f7495efb5..07bad24bcfc 100644 --- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php +++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php @@ -98,10 +98,11 @@ abstract class ModeleNumRefSupplierPayments } /** - * Test if the existing numbers in the database do not cause conflicts that would prevent this numbering run. - * - * @return boolean false si conflit, true si ok - */ + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. + * + * @return boolean false if conflict, true if ok + */ public function canBeActivated() { return true; diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index db9cec8e2c3..5238ebb4b4d 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -81,10 +81,10 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal /** - * Test si les numeros deje en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php index 343e16df8ed..072409fbcba 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php @@ -98,7 +98,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php index a7c12a9aeed..eda9e24eb1f 100644 --- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php +++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php @@ -99,7 +99,7 @@ abstract class ModeleNumRefSupplierProposal } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -111,10 +111,10 @@ abstract class ModeleNumRefSupplierProposal } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index 299c9c6a485..e3cab2404ad 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -77,10 +77,10 @@ class mod_ticket_simple extends ModeleNumRefTicket } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index 007e0b318cd..64e58f1b66b 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -94,7 +94,7 @@ class mod_ticket_universal extends ModeleNumRefTicket } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php index b66eb30422f..945b8f0fe67 100644 --- a/htdocs/core/modules/ticket/modules_ticket.php +++ b/htdocs/core/modules/ticket/modules_ticket.php @@ -57,7 +57,7 @@ abstract class ModeleNumRefTicket } /** - * Renvoi un exemple de numerotation + * Return an example of numbering * * @return string Example */ @@ -69,10 +69,10 @@ abstract class ModeleNumRefTicket } /** - * Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette numerotation de fonctionner. + * Checks if the numbers already in force in the data base do not + * cause conflicts that would prevent this numbering from working. * - * @return boolean false si conflit, true si ok + * @return boolean false if conflict, true if ok */ public function canBeActivated() { diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 4b4a787b6ad..8d3297b6587 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -249,4 +249,7 @@ TimeSpentForInvoice=Time spent OneLinePerUser=One line per user ServiceToUseOnLines=Service to use on lines InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project -ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). \ No newline at end of file +ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). +UsageOpportunity=Usage: Opportunity +UsageTasks=Usage: Tasks +UsageBillTimeShort=Usage: Bill time \ No newline at end of file diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 4b7efffdfed..e5ba591dce7 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -2390,68 +2390,68 @@ elseif (! empty($module)) { foreach ($menus as $menu) { - print ''; + print ''; - print ''; - print $menu['type']; - print ''; + print ''; + print $menu['type']; + print ''; - print ''; - print $menu['fk_menu']; - print ''; + print ''; + print $menu['fk_menu']; + print ''; - print ''; - print $menu['titre']; - print ''; + print ''; + print $menu['titre']; + print ''; - print ''; - print $menu['mainmenu']; - print ''; + print ''; + print $menu['mainmenu']; + print ''; - print ''; - print $menu['left']; - print ''; + print ''; + print $menu['left']; + print ''; - print ''; - print $menu['url']; - print ''; + print ''; + print $menu['url']; + print ''; - print ''; - print $menu['langs']; - print ''; + print ''; + print $menu['langs']; + print ''; - print ''; - print $menu['position']; - print ''; + print ''; + print $menu['position']; + print ''; - print ''; - print $menu['enabled']; - print ''; + print ''; + print $menu['enabled']; + print ''; - print ''; - print $menu['perms']; - print ''; + print ''; + print $menu['perms']; + print ''; - print ''; - print $menu['target']; - print ''; + print ''; + print $menu['target']; + print ''; - print ''; - print $menu['user']; - print ''; + print ''; + print $menu['user']; + print ''; - print ''; - } - } - else - { + print ''; + } + } + else + { print ''.$langs->trans("None").''; - } + } - print ''; - print ''; + print ''; + print ''; - print ''; + print ''; } else { @@ -2523,26 +2523,26 @@ elseif (! empty($module)) { foreach ($perms as $perm) { - print ''; + print ''; - print ''; - print $perm[0]; - print ''; + print ''; + print $perm[0]; + print ''; - print ''; - print $perm[1]; - print ''; + print ''; + print $perm[1]; + print ''; - print ''; - print $perm[4]; - print ''; + print ''; + print $perm[4]; + print ''; - print ''; - print $perm[5]; - print ''; + print ''; + print $perm[5]; + print ''; - print ''; - } + print ''; + } } else { diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 60f64834583..497f46919fd 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -222,7 +222,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) $parameters=array(); $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook $sql.=preg_replace('/^,/', '', $hookmanager->resPrint); -$sql =preg_replace('/, $/', '', $sql); +$sql =preg_replace('/,\s*$/', '', $sql); $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)"; if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")"; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 5aa28bcddc8..03c814d65bf 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -85,6 +85,9 @@ $search_budget_amount=GETPOST("search_budget_amount", 'alpha'); $search_public=GETPOST("search_public", 'int'); $search_project_user=GETPOST('search_project_user', 'int'); $search_sale=GETPOST('search_sale', 'int'); +$search_usage_opportunity=GETPOST('search_usage_opportunity', 'int'); +$search_usage_task=GETPOST('search_usage_task', 'int'); +$search_usage_bill_time=GETPOST('search_usage_bill_time', 'int'); $optioncss = GETPOST('optioncss', 'alpha'); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; @@ -129,7 +132,9 @@ $arrayfields=array( 'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104), 'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105), 'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110), - 'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115), + 'p.usage_opportunity'=>array('label'=>$langs->trans("UsageOpportunity"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>115), + 'p.usage_task'=>array('label'=>$langs->trans("UsageTasks"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_HIDE_TASKS?0:1), 'position'=>116), + 'p.usage_bill_time'=>array('label'=>$langs->trans("UsageBillTimeShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_HIDE_TASKS?0:1), 'position'=>117), 'p.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500), 'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), 'p.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), @@ -184,6 +189,9 @@ if (empty($reshook)) $search_eday=""; $search_emonth=""; $search_eyear=""; + $search_usage_opportunity=''; + $search_usage_task=''; + $search_usage_bill_time=''; $toselect=''; $search_array_options=array(); } @@ -279,7 +287,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0'; $distinct='DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once. $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat"; -$sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount, p.usage_bill_time"; +$sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount, p.usage_opportunity, p.usage_task, p.usage_bill_time"; $sql.= ", s.rowid as socid, s.nom as name, s.email"; $sql.= ", cls.code as opp_status_code"; // We'll need these fields in order to filter by categ @@ -364,6 +372,9 @@ if ($search_sale > 0) $sql.= " AND sc.fk_user = " .$search_sale; if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user; if ($search_opp_amount != '') $sql .= natural_search('p.opp_amount', $search_opp_amount, 1); if ($search_budget_amount != '') $sql .= natural_search('p.budget_amount', $search_budget_amount, 1); +if ($search_usage_opportunity != '' && $search_usage_opportunity >= 0) $sql .= natural_search('p.usage_opportunity', $search_usage_opportunity, 2); +if ($search_usage_task != '' && $search_usage_task >= 0) $sql .= natural_search('p.usage_task', $search_usage_task, 2); +if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0) $sql .= natural_search('p.usage_bill_time', $search_usage_bill_time, 2); // Add where from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks @@ -619,10 +630,23 @@ if (! empty($arrayfields['p.budget_amount']['checked'])) print ''; print ''; } +if (! empty($arrayfields['p.usage_opportunity']['checked'])) +{ + print ''; + print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1); + print ''; + print ''; +} +if (! empty($arrayfields['p.usage_task']['checked'])) +{ + print ''; + print $form->selectyesno('search_usage_task', $search_usage_task, 1, false, 1); + print ''; +} if (! empty($arrayfields['p.usage_bill_time']['checked'])) { print ''; - print ''; + print $form->selectyesno('search_usage_bill_time', $search_usage_bill_time, 1, false, 1); print ''; } // Extra fields @@ -674,7 +698,9 @@ if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right '); -if (! empty($arrayfields['p.usage_bill_time']['checked'])) print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.usage_opportunity']['checked'])) print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.usage_task']['checked'])) print_liste_field_titre($arrayfields['p.usage_task']['label'], $_SERVER["PHP_SELF"], 'p.usage_task', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.usage_bill_time']['checked'])) print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields @@ -855,6 +881,28 @@ while ($i < min($num, $limit)) if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalbudgetfield']=$totalarray['nbfield']; } + // Usage opportunity + if (! empty($arrayfields['p.usage_opportunity']['checked'])) + { + print ''; + if ($obj->usage_opportunity) + { + print yn($obj->usage_opportunity); + } + print ''; + if (! $i) $totalarray['nbfield']++; + } + // Usage task + if (! empty($arrayfields['p.usage_task']['checked'])) + { + print ''; + if ($obj->usage_task) + { + print yn($obj->usage_task); + } + print ''; + if (! $i) $totalarray['nbfield']++; + } // Bill time if (! empty($arrayfields['p.usage_bill_time']['checked'])) { diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 7b74e3a743a..ebe506c15d6 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -121,6 +121,7 @@ $arrayfields=array( 't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>103), 't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>104), 't.progress'=>array('label'=>$langs->trans("ProgressDeclared"), 'checked'=>1, 'position'=>105), + 't.progress_summary'=>array('label'=>$langs->trans("TaskProgressSummary"), 'checked'=>1, 'position'=>106), 't.tobill'=>array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>110), 't.billed'=>array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>111), 't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), @@ -570,6 +571,7 @@ if (! empty($arrayfields['t.planned_workload']['checked'])) print ''; if (! empty($arrayfields['t.progress_calculated']['checked'])) print ''; if (! empty($arrayfields['t.progress']['checked'])) print ''; +if (! empty($arrayfields['t.progress_summary']['checked'])) print ''; if (! empty($arrayfields['t.tobill']['checked'])) print ''; if (! empty($arrayfields['t.billed']['checked'])) print ''; // Extra fields @@ -610,6 +612,7 @@ if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_ if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center '); if (! empty($arrayfields['t.progress']['checked'])) print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['t.progress_summary']['checked'])) print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['t.tobill']['checked'])) print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['t.billed']['checked'])) print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center '); // Extra fields @@ -642,6 +645,9 @@ while ($i < min($num, $limit)) $object->progress = $obj->progress; $object->datee = $db->jdate($obj->date_end); // deprecated $object->date_end = $db->jdate($obj->date_end); + $object->planned_workload= $obj->planned_workload; + $object->duration_effective= $obj->duration_effective; + $projectstatic->id = $obj->projectid; $projectstatic->ref = $obj->projectref; @@ -784,12 +790,23 @@ while ($i < min($num, $limit)) print ''; if ($obj->progress != '') { - print $obj->progress.' %'; + print getTaskProgressBadge($object); } print ''; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalprogress_declaredfield']=$totalarray['nbfield']; $totalarray['totaldurationdeclared'] += $obj->planned_workload * $obj->progress / 100; + } + // Progress summary + if (! empty($arrayfields['t.progress_summary']['checked'])) + { + print ''; + if($obj->progress != '' && $obj->duration_effective){ + print getTaskProgressView($object, false, false); + } + print ''; + if (! $i) $totalarray['nbfield']++; + if (! $i) $totalarray['totalprogress_summary']=$totalarray['nbfield']; } // Time not billed if (! empty($arrayfields['t.tobill']['checked'])) @@ -891,7 +908,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota elseif ($totalarray['totalprogress_declaredfield'] == $i) print ''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').''; elseif ($totalarray['totaltobillfield'] == $i) print ''.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).''; elseif ($totalarray['totalbilledfield'] == $i) print ''.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).''; - else print ''; + else print ''; } print ''; }