openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

Jigar Amin - OpenERP has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #693833 [6.0] performance issues - stock_move, account_move_lines and others
  https://bugs.launchpad.net/bugs/693833
  #695038 OpenOfficeReportDesigner Group to Remove in Trunk
  https://bugs.launchpad.net/bugs/695038
  #695596 Audit trail module does not creating an audit log for users.
  https://bugs.launchpad.net/bugs/695596
  #703969 OpenERP V6 - Project / Task: Start and end date are not subjected to a logical inspection
  https://bugs.launchpad.net/bugs/703969

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/46589

Hello,
    Problems fixed and Propose for merging
     + Survey default_get fixed
     + Survey descriptive field boll error fixed
    Kindly Review it.
Thank You.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/46589
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.

=== modified file 'survey/survey.py'
--- survey/survey.py	2011-01-14 00:11:01 +0000
+++ survey/survey.py	2011-01-18 12:19:13 +0000
@@ -184,7 +184,7 @@
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         if context.has_key('survey_id'):
-            data['survey_id'] = context['survey_id']
+            data['survey_id'] = context.get('survey_id', False)
         return data
 
     def survey_save(self, cr, uid, ids, context=None):

=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_answer.py	2011-01-18 12:19:13 +0000
@@ -297,8 +297,9 @@
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'datetime', 'string':ans.answer}
 
                         elif que_rec.type == 'descriptive_text':
-                            for que_test in que_rec.descriptive_text.split('\n'):
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                            if que_rec.descriptive_text:
+                                for que_test in que_rec.descriptive_text.split('\n'):
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
 
                         elif que_rec.type == 'single_textbox':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_single", 'nolabel':"1" ,'colspan':"4"})