[Erp5-report] r28971 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: seb
Date: Fri Sep 11 16:20:54 2009
New Revision: 28971

URL: http://svn.erp5.org?rev=28971&view=rev
Log:
* It was a mistake to edit the comment property, the intention
  was to display information in the workflow history (edit workflow)
* it is useless to set things in the workflow history here, it is
  already done in the user interface and stored in the causality
  workflow
* Check that when we solve a divergency we do not loose comment
  on the delivery

Modified:
    erp5/trunk/products/ERP5/Document/DeliveryBuilder.py
    erp5/trunk/products/ERP5/tests/testTaskReportDivergence.py

Modified: erp5/trunk/products/ERP5/Document/DeliveryBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryBuilder.py?rev=28971&r1=28970&r2=28971&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryBuilder.py [utf8] Fri Sep 11 16:20:54 2009
@@ -189,11 +189,10 @@
     return solveDeliveryGroupDivergence(*args, **kw)
 
   def _solveDeliveryGroupDivergence(self, delivery_relative_url,
-                                    property_dict=None, comment=None):
+                                    property_dict=None):
     if property_dict in (None, {}):
       return
     delivery = self.getPortalObject().restrictedTraverse(delivery_relative_url)
-    delivery.edit(comment=comment)
     for (property, value) in property_dict.iteritems():
       delivery.setPropertyList(property, value)
 

Modified: erp5/trunk/products/ERP5/tests/testTaskReportDivergence.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testTaskReportDivergence.py?rev=28971&r1=28970&r2=28971&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testTaskReportDivergence.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testTaskReportDivergence.py [utf8] Fri Sep 11 16:20:54 2009
@@ -105,6 +105,29 @@
     rule_tool.Base_setDefaultSecurity()
     self.logout()
 
+  def stepChangeCommentOnTaskReport(self, sequence=None, **kw):
+    task_report = sequence.get('task_report')
+    task_report.edit(comment='foo')
+    self.assertEquals('foo', task_report.getComment())
+
+  def stepAcceptDateDecision(self, sequence=None, **kw):
+    task_report = sequence.get('task_report')
+    # XXX This is not really cool, when we will have nice api, it is required
+    # to use it
+    self.getPortal().portal_deliveries\
+        .task_report_builder.solveDeliveryGroupDivergence(
+        task_report.getRelativeUrl(),
+        property_dict={'start_date':[self.datetime + 15]})
+
+  def stepCheckCommentStillOnTaskReport(self, sequence=None, **kw):
+    """
+    It already happened that the action of solving divergence
+    erased the comment on the delivery. We make sure that was is
+    logical (the comment remains) is true
+    """
+    task_report = sequence.get('task_report')
+    self.assertEquals('foo', task_report.getComment())
+
 class TestTaskReportDivergence(TestTaskReportDivergenceMixin, ERP5TypeTestCase) :
 
   run_all_test = 1
@@ -184,10 +207,15 @@
                       stepSetStrictSecurity \
                       ' + self.default_task_sequence + '\
                       stepCheckTaskReportIsSolved \
+                      stepChangeCommentOnTaskReport \
                       stepChangeTaskReportStartDate \
                       stepCheckTaskReportIsCalculating \
                       stepTic \
                       stepCheckTaskReportIsDiverged \
+                      stepAcceptDateDecision \
+                      stepTic \
+                      stepCheckTaskReportIsSolved \
+                      stepCheckCommentStillOnTaskReport \
                       '
     sequence_list.addSequenceString(sequence_string)