| '; print $langs->trans('CronLabel')." | "; @@ -567,7 +567,7 @@ else // box add_jobs_box print '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; print $langs->trans('CronLabel')." | "; @@ -638,7 +638,7 @@ else print '|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; print $langs->trans('CronEvery')." | "; @@ -697,7 +697,7 @@ else print '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; print $langs->trans('CronDtLastLaunch')." | "; diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql index 3ac96e7a435..8efe44db103 100644 --- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql +++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql @@ -81,3 +81,13 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token; ALTER TABLE llx_mailing ADD COLUMN tms timestamp; ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp; + +ALTER TABLE llx_projet ADD COLUMN usage_opportunity integer DEFAULT 0; +ALTER TABLE llx_projet ADD COLUMN usage_task integer DEFAULT 1; +ALTER TABLE llx_projet CHANGE COLUMN bill_time usage_bill_time integer DEFAULT 0; -- rename existing field +ALTER TABLE llx_projet ADD COLUMN usage_organize_event integer DEFAULT 0; + +UPDATE llx_projet set usage_opportunity = 1 WHERE fk_opp_status > 0; + + + \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 7216a0f20b1..792a9237693 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -42,7 +42,10 @@ create table llx_projet --budget_days real, -- budget in days is sum of field planned_workload of tasks opp_amount double(24,8), budget_amount double(24,8), - bill_time integer DEFAULT 0, -- Set to 1 if time spent must be converted into invoices + usage_opportunity integer DEFAULT 0, -- Set to 1 if project is used to follow an opportunity + usage_task integer DEFAULT 1, -- Set to 1 if project is used to manage tasks and/or record timesheet + usage_bill_time integer DEFAULT 0, -- Set to 1 if time spent must be converted into invoices + usage_organize_event integer DEFAULT 0, -- Set to 1 if you want to use project to organize an event, receive attendees subscription model_pdf varchar(255), import_key varchar(14) -- Import key )ENGINE=innodb; diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 00c66c59002..250ff0e16bc 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -203,6 +203,8 @@ AssignTask=Assigner ProjectOverview=Vue d'ensemble ManageTasks=Utiliser les projets pour suivre les tâches et/ou saisir du temps consommé (feuilles de temps) ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités +ProjectFollowOpportunity=Follow a lead or opportunity +ProjectFollowTasks=Follow tasks and time spent ProjectNbProjectByMonth=Nb de projets créés par mois ProjectNbTaskByMonth=Nb de tâches créées par mois ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 52028ac7160..9a97f49135d 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -125,7 +125,7 @@ $arrayfields['t.progress']=array('label'=>'ProgressDeclared', 'checked'=>1, 'ena 'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104), 'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105), 'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110), - 'p.bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115), + 'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115), ); */ // Extra fields diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 80745b5d352..6343d40cbf7 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -133,7 +133,7 @@ $arrayfields=array(); 'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104), 'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105), 'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110), - 'p.bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115), + 'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115), );*/ $arrayfields['t.planned_workload']=array('label'=>'PlannedWorkload', 'checked'=>1, 'enabled'=>1, 'position'=>0); $arrayfields['t.progress']=array('label'=>'ProgressDeclared', 'checked'=>1, 'enabled'=>1, 'position'=>0); diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 88bda602721..1e4ba396560 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -156,13 +156,16 @@ if (empty($reshook)) $object->public = GETPOST('public', 'alpha'); $object->opp_amount = price2num(GETPOST('opp_amount', 'alpha')); $object->budget_amount = price2num(GETPOST('budget_amount', 'alpha')); - $object->datec = dol_now(); + $object->date_c = dol_now(); $object->date_start = $date_start; $object->date_end = $date_end; $object->statut = $status; $object->opp_status = $opp_status; $object->opp_percent = $opp_percent; - $object->bill_time = (GETPOST('bill_time', 'alpha')=='on'?1:0); + $object->usage_opportunity = (GETPOST('usage_opportunity', 'alpha')=='on'?1:0); + $object->usage_task = (GETPOST('usage_task', 'alpha')=='on'?1:0); + $object->usage_bill_time = (GETPOST('usage_bill_time', 'alpha')=='on'?1:0); + $object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha')=='on'?1:0); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels, $object); @@ -263,7 +266,10 @@ if (empty($reshook)) if (isset($_POST['budget_amount'])) $object->budget_amount= price2num(GETPOST('budget_amount', 'alpha')); if (isset($_POST['opp_status'])) $object->opp_status = $opp_status; if (isset($_POST['opp_percent'])) $object->opp_percent = $opp_percent; - $object->bill_time = (GETPOST('bill_time', 'alpha')=='on'?1:0); + $object->usage_opportunity = (GETPOST('usage_opportunity', 'alpha')=='on'?1:0); + $object->usage_task = (GETPOST('usage_task', 'alpha')=='on'?1:0); + $object->usage_bill_time = (GETPOST('usage_bill_time', 'alpha')=='on'?1:0); + $object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha')=='on'?1:0); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels, $object); @@ -539,6 +545,39 @@ if ($action == 'create' && $user->rights->projet->creer) // Label print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Label").' | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; + print $langs->trans("Usage"); + print ' | '; + print '';
+ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ print ' ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print ' '; + } + if (empty($conf->global->PROJECT_HIDE_TASKS)) + { + print ' '; + $htmltext = $langs->trans("ProjectFollowTasks"); + print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext); + print ' '; + } + if (! empty($conf->global->PROJECT_BILL_TIME_SPENT)) + { + print ' '; + $htmltext = $langs->trans("ProjectBillTimeDescription"); + print $form->textwithpicto($langs->trans("BillTime"), $htmltext); + print ' '; + } + /* + print ' '; + $htmltext = $langs->trans("OrganizeEvent"); + print $form->textwithpicto($langs->trans("OrganizeEvent"), $htmltext);*/ + print ' | ';
+ print '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; - $htmltext = $langs->trans("ProjectBillTimeDescription"); - print $form->textwithpicto($langs->trans("BillTime"), $htmltext); - print ' | '; - print ''; - print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Categories").' | '; @@ -769,6 +797,7 @@ elseif ($object->id > 0) print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Label").' | '; print '|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Status").' | '; print ''; print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; + print $langs->trans("Usage"); + print ' | '; + print '';
+ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ print 'usage_opportunity ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print ' '; + } + if (empty($conf->global->PROJECT_HIDE_TASKS)) + { + print 'usage_task ? ' checked="checked"' : '')).'"> '; + $htmltext = $langs->trans("ProjectFollowTasks"); + print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext); + print ' '; + } + if (! empty($conf->global->PROJECT_BILL_TIME_SPENT)) + { + print 'usage_bill_time ? ' checked="checked"' : '')).'"> '; + $htmltext = $langs->trans("ProjectBillTimeDescription"); + print $form->textwithpicto($langs->trans("BillTime"), $htmltext); + print ' '; + } + print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; - $htmltext = $langs->trans("ProjectBillTimeDescription"); - print $form->textwithpicto($langs->trans("BillTime"), $htmltext); - print ' | '; - print 'bill_time) ? ' checked="checked"' : '').'"> | '; - print '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; + print $langs->trans("Usage"); + print ' | '; + print '';
+ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ print 'usage_opportunity ? ' checked="checked"' : '')).'"> ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print ' '; + } + if (empty($conf->global->PROJECT_HIDE_TASKS)) + { + print 'usage_task ? ' checked="checked"' : '')).'"> '; + $htmltext = $langs->trans("ProjectFollowTasks"); + print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext); + print ' '; + } + if (! empty($conf->global->PROJECT_BILL_TIME_SPENT)) + { + print 'usage_bill_time ? ' checked="checked"' : '')).'"> '; + $htmltext = $langs->trans("ProjectBillTimeDescription"); + print $form->textwithpicto($langs->trans("BillTime"), $htmltext); + print ' '; + } + print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Visibility").' | '; if ($object->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("OpportunityStatus").' | '; @@ -990,17 +1064,6 @@ elseif ($object->id > 0) print nl2br($object->description); print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '; - $htmltext = $langs->trans("ProjectBillTimeDescription"); - print $form->textwithpicto($langs->trans("BillTime"), $htmltext); - print ' | '; - print ''.yn($object->bill_time).' | '; - print '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Categories").' | ';
@@ -1118,7 +1181,7 @@ elseif ($object->id > 0)
print '';
}
- // Modify
+ // Modify
if ($object->statut != 2 && $user->rights->projet->creer)
{
if ($userWrite > 0)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6e2b0a73a5e..3dcc486d266 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -88,7 +88,7 @@ class Project extends CommonObject
public $user_close_id;
public $public; //!< Tell if this is a public or private project
public $budget_amount;
- public $bill_time; // Is the time spent on project must be invoiced or not
+ public $usage_bill_time; // Is the time spent on project must be invoiced or not
public $statuts_short;
public $statuts_long;
@@ -213,7 +213,10 @@ class Project extends CommonObject
$sql.= ", datee";
$sql.= ", opp_amount";
$sql.= ", budget_amount";
- $sql.= ", bill_time";
+ $sql.= ", usage_opportunity";
+ $sql.= ", usage_task";
+ $sql.= ", usage_bill_time";
+ $sql.= ", usage_organize_event";
$sql.= ", note_private";
$sql.= ", note_public";
$sql.= ", entity";
@@ -232,7 +235,10 @@ class Project extends CommonObject
$sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
$sql.= ", " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : 'null');
$sql.= ", " . (strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : 'null');
- $sql.= ", " . ($this->bill_time ? 1 : 0);
+ $sql.= ", " . ($this->usage_opportunity ? 1 : 0);
+ $sql.= ", " . ($this->usage_task ? 1 : 0);
+ $sql.= ", " . ($this->usage_bill_time ? 1 : 0);
+ $sql.= ", " . ($this->usage_organize_event ? 1 : 0);
$sql.= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
$sql.= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
$sql.= ", ".$conf->entity;
@@ -338,7 +344,10 @@ class Project extends CommonObject
$sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
$sql.= ", budget_amount = " . (strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : "null");
$sql.= ", fk_user_modif = " . $user->id;
- $sql.= ", bill_time = " . ($this->bill_time ? 1 : 0);
+ $sql.= ", usage_opportunity = " . ($this->usage_opportunity ? 1 : 0);
+ $sql.= ", usage_task = " . ($this->usage_task ? 1 : 0);
+ $sql.= ", usage_bill_time = " . ($this->usage_bill_time ? 1 : 0);
+ $sql.= ", usage_organize_event = " . ($this->usage_organize_event ? 1 : 0);
$sql.= " WHERE rowid = " . $this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -437,7 +446,7 @@ class Project extends CommonObject
$sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
$sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
- $sql.= " note_private, note_public, model_pdf, bill_time, entity";
+ $sql.= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
$sql.= " FROM " . MAIN_DB_PREFIX . "projet";
if (! empty($id))
{
@@ -483,7 +492,10 @@ class Project extends CommonObject
$this->opp_percent = $obj->opp_percent;
$this->budget_amount = $obj->budget_amount;
$this->modelpdf = $obj->model_pdf;
- $this->bill_time = (int) $obj->bill_time;
+ $this->usage_opportunity = (int) $obj->usage_opportunity;
+ $this->usage_task = (int) $obj->usage_task;
+ $this->usage_bill_time = (int) $obj->usage_bill_time;
+ $this->usage_organize_event = (int) $obj->usage_organize_event;
$this->entity = $obj->entity;
$this->db->free($resql);
@@ -1097,6 +1109,11 @@ class Project extends CommonObject
$this->opp_amount = 20000;
$this->budget_amount = 10000;
+ $this->usage_opportunity = 1;
+ $this->usage_task = 1;
+ $this->usage_bill_time = 1;
+ $this->usage_organize_event = 1;
+
/*
$nbp = mt_rand(1, 9);
$xnbp = 0;
@@ -1845,9 +1862,9 @@ class Project extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Charge indicateurs this->nb pour le tableau de bord
+ * Charge indicateurs this->nb pour le tableau de bord
*
- * @return int <0 if KO, >0 if OK
+ * @return int <0 if KO, >0 if OK
*/
public function load_state_board()
{
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ce4779e1a6d..ca8a2dd365a 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -748,7 +748,7 @@ class Task extends CommonObject
// List of tasks (does not care about permissions. Filtering will be done later)
$sql = "SELECT ";
if ($filteronprojuser > 0 || $filterontaskuser > 0) $sql.= " DISTINCT"; // We may get several time the same record if user has several roles on same project/task
- $sql.= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus, p.bill_time,";
+ $sql.= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus, p.usage_bill_time,";
$sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
$sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
$sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email,";
@@ -847,7 +847,7 @@ class Task extends CommonObject
if ($morewherefilter) $sql.=$morewherefilter;
if ($includebilltime)
{
- $sql.=" GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.bill_time,";
+ $sql.=" GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.usage_bill_time,";
$sql.=" t.datec, t.dateo, t.datee, t.tms,";
$sql.=" t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
$sql.=" t.dateo, t.datee, t.planned_workload, t.rang,";
@@ -903,7 +903,7 @@ class Task extends CommonObject
$tasks[$i]->projectref = $obj->ref;
$tasks[$i]->projectlabel = $obj->plabel;
$tasks[$i]->projectstatus = $obj->projectstatus;
- $tasks[$i]->bill_time = $obj->bill_time;
+ $tasks[$i]->usage_bill_time = $obj->usage_bill_time;
$tasks[$i]->label = $obj->label;
$tasks[$i]->description = $obj->description;
$tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
@@ -931,7 +931,7 @@ class Task extends CommonObject
$tasks[$i]->opp_amount = $obj->opp_amount;
$tasks[$i]->opp_percent = $obj->opp_percent;
$tasks[$i]->budget_amount = $obj->budget_amount;
- $tasks[$i]->bill_time = $obj->bill_time;
+ $tasks[$i]->usage_bill_time = $obj->usage_bill_time;
if (!empty($extrafields->attributes['projet']['label']))
{
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 8bed0a87adc..4e4d514380e 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -180,7 +180,35 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '';
- print '
|