- New: Add Option to not change date on cloning project
This commit is contained in:
parent
b5ac417431
commit
99f817b69a
@ -1,6 +1,8 @@
|
|||||||
--------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
English Dolibarr ChangeLog
|
English Dolibarr ChangeLog
|
||||||
--------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
|
***** ChangeLog for 3.8 compared to 3.7.* *****
|
||||||
|
- New: Add Option to not change date on cloning project
|
||||||
|
|
||||||
|
|
||||||
***** ChangeLog for 3.7 compared to 3.6.* *****
|
***** ChangeLog for 3.7 compared to 3.6.* *****
|
||||||
|
|||||||
@ -103,6 +103,7 @@ CloneContacts=Clone contacts
|
|||||||
CloneNotes=Clone notes
|
CloneNotes=Clone notes
|
||||||
CloneProjectFiles=Clone project joined files
|
CloneProjectFiles=Clone project joined files
|
||||||
CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
|
CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
|
||||||
|
CloneMoveDate=Update project/tasks dates from now ?
|
||||||
ConfirmCloneProject=Are you sure to clone this project ?
|
ConfirmCloneProject=Are you sure to clone this project ?
|
||||||
ProjectReportDate=Change task date according project start date
|
ProjectReportDate=Change task date according project start date
|
||||||
ErrorShiftTaskDate=Impossible to shift task date according to new project start date
|
ErrorShiftTaskDate=Impossible to shift task date according to new project start date
|
||||||
|
|||||||
@ -101,6 +101,7 @@ CloneContacts=Cloner les contacts
|
|||||||
CloneNotes=Cloner les notes
|
CloneNotes=Cloner les notes
|
||||||
CloneProjectFiles=Cloner les pièces jointes du projet
|
CloneProjectFiles=Cloner les pièces jointes du projet
|
||||||
CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
|
CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
|
||||||
|
CloneMoveDate=Deplacer les date projets/taches sur maintenant
|
||||||
ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
|
ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
|
||||||
ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
|
ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
|
||||||
ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
|
ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
|
||||||
|
|||||||
@ -353,7 +353,8 @@ if (empty($reshook))
|
|||||||
$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
|
$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
|
||||||
$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
|
$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
|
||||||
$clone_notes=GETPOST('clone_notes')?1:0;
|
$clone_notes=GETPOST('clone_notes')?1:0;
|
||||||
$result=$object->createFromClone($object->id,$clone_contacts,$clone_tasks,$clone_project_files,$clone_task_files,$clone_notes);
|
$move_date=GETPOST('move_date')?1:0;
|
||||||
|
$result=$object->createFromClone($object->id,$clone_contacts,$clone_tasks,$clone_project_files,$clone_task_files,$clone_notes,$move_date);
|
||||||
if ($result <= 0)
|
if ($result <= 0)
|
||||||
{
|
{
|
||||||
setEventMessage($object->error, 'errors');
|
setEventMessage($object->error, 'errors');
|
||||||
@ -538,6 +539,7 @@ else
|
|||||||
'text' => $langs->trans("ConfirmClone"),
|
'text' => $langs->trans("ConfirmClone"),
|
||||||
array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
|
array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
|
||||||
array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
|
array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
|
||||||
|
array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
|
||||||
array('type' => 'checkbox', 'name' => 'clone_notes', 'label' => $langs->trans("CloneNotes"), 'value' => true),
|
array('type' => 'checkbox', 'name' => 'clone_notes', 'label' => $langs->trans("CloneNotes"), 'value' => true),
|
||||||
array('type' => 'checkbox', 'name' => 'clone_project_files','label' => $langs->trans("CloneProjectFiles"), 'value' => false),
|
array('type' => 'checkbox', 'name' => 'clone_project_files','label' => $langs->trans("CloneProjectFiles"), 'value' => false),
|
||||||
array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
|
array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
|
||||||
|
|||||||
@ -984,7 +984,7 @@ class Project extends CommonObject
|
|||||||
* @param bool $notrigger no trigger flag
|
* @param bool $notrigger no trigger flag
|
||||||
* @return int New id of clone
|
* @return int New id of clone
|
||||||
*/
|
*/
|
||||||
function createFromClone($fromid,$clone_contact=false,$clone_task=true,$clone_project_file=false,$clone_task_file=false,$clone_note=true,$notrigger=0)
|
function createFromClone($fromid,$clone_contact=false,$clone_task=true,$clone_project_file=false,$clone_task_file=false,$clone_note=true,$move_date=true,$notrigger=0)
|
||||||
{
|
{
|
||||||
global $user,$langs,$conf;
|
global $user,$langs,$conf;
|
||||||
|
|
||||||
@ -1006,11 +1006,13 @@ class Project extends CommonObject
|
|||||||
$orign_project_ref=$clone_project->ref;
|
$orign_project_ref=$clone_project->ref;
|
||||||
|
|
||||||
$clone_project->id=0;
|
$clone_project->id=0;
|
||||||
$clone_project->date_start = $now;
|
if ($move_date) {
|
||||||
if (!(empty($clone_project->date_end)))
|
$clone_project->date_start = $now;
|
||||||
{
|
if (!(empty($clone_project->date_end)))
|
||||||
$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
|
{
|
||||||
}
|
$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$clone_project->datec = $now;
|
$clone_project->datec = $now;
|
||||||
|
|
||||||
@ -1164,7 +1166,7 @@ class Project extends CommonObject
|
|||||||
|
|
||||||
foreach ($tasksarray as $tasktoclone)
|
foreach ($tasksarray as $tasktoclone)
|
||||||
{
|
{
|
||||||
$result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,true,true,false,$clone_task_file,true,false);
|
$result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,$move_date,true,false,$clone_task_file,true,false);
|
||||||
if ($result_clone <= 0)
|
if ($result_clone <= 0)
|
||||||
{
|
{
|
||||||
$this->error.=$result_clone->error;
|
$this->error.=$result_clone->error;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user