Merge lp:~openerp-dev/openobject-addons/trunk-dev-addons1 into lp:openobject-addons

[Bhumika Shrimali]

Bug fixes by addons1 team

=== modified file 'crm/crm.py'
--- crm/crm.py	2011-01-14 00:11:01 +0000
+++ crm/crm.py	2011-02-17 10:06:23 +0000
@@ -303,7 +303,10 @@
         if not add:
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email, 'phone': address.phone}}
+        if address.email:
+            return {'value': {'email_from': address.email, 'phone': address.phone}}
+        else:
+            return {'value': {'phone': address.phone}}
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
@@ -742,6 +745,15 @@
     _columns = {
         'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(users, self).write(cr, uid, ids, vals, context=context)
+        section_obj=self.pool.get('crm.case.section')
+        if isinstance(ids, (str, int, long)):
+            ids = [ids]
+        for user in self.browse(cr, uid, ids, context):
+            if user.context_section_id:
+               section_obj.write(cr, uid, [user.context_section_id.id], {'member_ids':[(4, user.id)]},context)
+        return res    
 users()
 
 

=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2011-01-20 17:20:12 +0000
+++ crm/crm_meeting_view.xml	2011-02-17 10:06:23 +0000
@@ -59,7 +59,7 @@
                             <field name="section_id" widget="selection"
                                 groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
+                            <separator colspan="2" string="Contact"/>
                             <field name="partner_id" string="Partner"
                                 on_change="onchange_partner_id(partner_id)" />
                             <field name="partner_address_id"

=== modified file 'crm/wizard/crm_add_note_view.xml'
--- crm/wizard/crm_add_note_view.xml	2011-01-14 00:11:01 +0000
+++ crm/wizard/crm_add_note_view.xml	2011-02-17 10:06:23 +0000
@@ -30,7 +30,7 @@
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
                         <field name="state" />
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button string="_Cancel" icon="gtk-close" special="cancel" />
                         <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
                     </group>
                 </form>

=== modified file 'l10n_ch/wizard/create_dta.py'
--- l10n_ch/wizard/create_dta.py	2011-01-24 13:21:29 +0000
+++ l10n_ch/wizard/create_dta.py	2011-02-17 10:06:23 +0000
@@ -374,7 +374,6 @@
         raise osv.except_osv(_('Error'),
                 _('No IBAN for the company bank account.'))
 
-    dta_line_obj = pool.get('account.dta.line')
     res_partner_bank_obj = pool.get('res.partner.bank')
 
     seq = 1

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2011-02-14 11:45:07 +0000
+++ mrp/mrp.py	2011-02-17 10:06:23 +0000
@@ -672,7 +672,6 @@
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
 
-        final_product_todo = []
 
         produced_qty = 0
         if production_mode == 'consume_produce':
@@ -714,7 +713,7 @@
 
         if production_mode == 'consume_produce':
             # To produce remaining qty of final product
-            vals = {'state':'confirmed'}
+            #vals = {'state':'confirmed'}
             #final_product_todo = [x.id for x in production.move_created_ids]
             #stock_mov_obj.write(cr, uid, final_product_todo, vals)
             #stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)

=== modified file 'project/wizard/project_task_close.py'
--- project/wizard/project_task_close.py	2011-01-14 00:11:01 +0000
+++ project/wizard/project_task_close.py	2011-02-17 10:06:23 +0000
@@ -22,7 +22,7 @@
 from osv import fields, osv
 import tools
 from tools.translate import _
-
+import re
 class project_task_close(osv.osv_memory):
     """
     Close Task
@@ -99,8 +99,14 @@
                 }
 
                 to_adr = []
-                header = (project.warn_header or '') % val
-                footer = (project.warn_footer or '') % val
+                header = footer = ''
+                try:
+                    header_str = (project.warn_header or '')
+                    footer_str = (project.warn_footer or '')
+                    header = (re.sub(r'\%\W*\(', '%(', header_str)) % val
+                    footer = (re.sub(r'\%\W*\(', '%(', footer_str)) % val
+                except:
+                    raise osv.except_osv(_('Error'), _("Invlaid automatic variables used in project header or foooter."))
                 body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature)
                 if data.manager_warn and data.manager_email:
                     to_adr.append(data.manager_email)

=== modified file 'project/wizard/project_task_delegate.py'
--- project/wizard/project_task_delegate.py	2011-01-14 00:11:01 +0000
+++ project/wizard/project_task_delegate.py	2011-02-17 10:06:23 +0000
@@ -53,17 +53,17 @@
 
         if 'name' in fields:
             if task_name.startswith(_('CHECK: ')):
-                newname = str(task_name).replace(_('CHECK: '), '')
+                newname = tools.ustr(task_name).replace(_('CHECK: '), '')
             else:
-                newname = task_name or ''
+                newname = tools.ustr(task_name or '')
             res.update({'name': newname})
         if 'planned_hours' in fields:
             res.update({'planned_hours': task.remaining_hours or 0.0})
         if 'prefix' in fields:
             if task_name.startswith(_('CHECK: ')):
-                newname = str(task_name).replace(_('CHECK: '), '')
+                newname = tools.ustr(task_name).replace(_('CHECK: '), '')
             else:
-                newname = task_name or ''
+                newname = tools.ustr(task_name or '')
             prefix = _('CHECK: ') + newname
             res.update({'prefix': prefix})
         if 'new_task_description' in fields:

=== modified file 'project_planning/project_planning_demo.xml'
--- project_planning/project_planning_demo.xml	2011-02-01 15:50:23 +0000
+++ project_planning/project_planning_demo.xml	2011-02-17 10:06:23 +0000
@@ -7,8 +7,8 @@
         <record id="project_plannning_1" model="report_account_analytic.planning">
             <field name="name">Project_Planning</field>
             <field name="business_days">20</field>
-            <field name="date_from" eval="time.strftime('%Y-%m-01 10:00:00')"/>
-            <field name="date_to" eval="time.strftime('%Y-%m-28 15:00:00')"/>
+            <field name="date_from" eval="time.strftime('%Y-%m-01')"/>
+            <field name="date_to" eval="time.strftime('%Y-%m-28')"/>
             <field name="state">open</field>
             <field name="user_id" ref="project.res_users_project_manager"/>
         </record>

=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2011-02-14 11:45:07 +0000 and thunderbird/plugin/openerp_plugin.xpi	2011-02-17 10:06:23 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2011-02-14 11:45:07 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2011-02-17 10:06:23 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js'
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js	2011-02-01 14:25:28 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js	2011-02-17 10:06:23 +0000
@@ -1384,6 +1384,7 @@
     xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
+
 //function to create the xmlrpc supported variables for xmlrpc request
 function dictcontact(a,b){
     var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});