[Erp5-report] r23414 - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: romain
Date: Thu Sep  4 16:24:03 2008
New Revision: 23414

URL: http://svn.erp5.org?rev=23414&view=rev
Log:
Fix Task lines date wrong calculation, due to acquisition.

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml?rev=23414&r1=23413&r2=23414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml Thu Sep  4 16:24:03 2008
@@ -82,16 +82,23 @@
 \n
 for line in pasted_task.getMovementList():\n
   # Get task line dates\n
-  line_start_date = line.getStartDate()\n
-  line_stop_date = line.getStopDate()\n
-  if (line_start_date is not start_date) or \\\n
-     (line_stop_date is not stop_date):\n
-    # Line dates are different from task dates\n
-    next_line_start_date = addToDate(line_start_date, second=second_to_add)\n
-    line.edit(\n
-      start_date=next_line_start_date,\n
-      stop_date=addToDate(next_line_start_date, second=duration),\n
-    )\n
+  if line.hasStartDate():\n
+    line_start_date = line.getStartDate()\n
+  else:\n
+    line_start_date = start_date\n
+\n
+  if line.hasStopDate():\n
+    line_stop_date = line.getStopDate()\n
+  else:\n
+    line_stop_date = stop_date\n
+\n
+  line_duration = int(line_stop_date) - int(line_start_date)\n
+  # Line dates are different from task dates\n
+  next_line_start_date = addToDate(line_start_date, second=second_to_add)\n
+  line.edit(\n
+    start_date=next_line_start_date,\n
+    stop_date=addToDate(next_line_start_date, second=line_duration),\n
+  )\n
 \n
 pasted_task.edit(\n
   start_date=next_date,\n
@@ -159,6 +166,7 @@
                             <string>line</string>
                             <string>line_start_date</string>
                             <string>line_stop_date</string>
+                            <string>line_duration</string>
                             <string>next_line_start_date</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=23414&r1=23413&r2=23414&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Thu Sep  4 16:24:03 2008
@@ -1,1 +1,1 @@
-577
+578