Merge lp:~invitu/openobject-addons/7.0-fix-1179307-1179305 into lp:openobject-addons/7.0

[invitu]

[IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting
[FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view

[invitu (invitu)]

merge proposal comes from ocb-addons branch

[lp:~invitu/openobject-addons/7.0-fix-1179307-1179305]

9178. By invitu on 2013-05-27

[IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting
[FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Invitu,

your branch includes other fixes from ocb. Please try again, for instance in the following way by cherrypicking the relevant revision:

bzr branch lp:openobject-addons/7.0
cd 7.0
bzr merge lp:~invitu/ocb-addons/7.0-fix-1179307-1179305 -r 9177..9178

Then push and propose to openobject-addons.

review: Needs Resubmitting

Unmerged revisions

9178. By invitu on 2013-05-27

[IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting
[FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view

9177. By Launchpad Translations on behalf of openerp on 2013-05-25

Launchpad automatic translations update.

9176. By Thibault Delavallée (OpenERP) on 2013-05-24

[FIX] Chatter: fixed suggested recipients, when having no email, unchecking the box was not taken into account.

9175. By Thibault Delavallée (OpenERP) on 2013-05-24

[FIX] project_issue: fixed access rights issues when truing to find suggested partners.

9174. By Martin Trigaux (OpenERP) on 2013-05-24

[IMP] hr_timesheet_sheet: dispay timesheets as time_float instead of float

9173. By Launchpad Translations on behalf of openerp on 2013-05-24

Launchpad automatic translations update.

9172. By Martin Trigaux (OpenERP) on 2013-05-23

[MERGE] [FIX] account_followup: remove create button in report

9171. By Martin Trigaux (OpenERP) on 2013-05-23

[MERGE] [FIX] res partner copy method returns None

9170. By Quentin (OpenERP) <email address hidden> on 2013-05-23

[FIX] account: divide the residual amount of invoices proportionally to the number of invoices partially reconciled together if needed + if necessary, do a conversion at the right currency rate

9169. By Quentin (OpenERP) <email address hidden> on 2013-05-23

[FIX] account: exclude company_id from build_ctx_periods()'s criteria to allow printing consolidated reports

=== modified file 'account/account.py'
--- account/account.py	2013-05-23 12:27:56 +0000
+++ account/account.py	2013-05-27 04:26:42 +0000
@@ -1040,9 +1040,15 @@
             context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+            ids = self.search(cr, user,
+                              [('code', 'ilike', name)] + args,
+                              limit=limit,
+                              context=context)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+            ids = self.search(cr, user,
+                              [('name', operator, name)] + args,
+                              limit=limit,
+                              context=context)
         return self.name_get(cr, user, ids, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
 
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-05-23 12:28:55 +0000
+++ account/account_invoice.py	2013-05-27 04:26:42 +0000
@@ -778,9 +778,11 @@
 
     def action_date_assign(self, cr, uid, ids, *args):
         for inv in self.browse(cr, uid, ids):
-            res = self.onchange_payment_term_date_invoice(cr, uid, inv.id, inv.payment_term.id, inv.date_invoice)
-            if res and res['value']:
-                self.write(cr, uid, [inv.id], res['value'])
+            if not inv.date_due:
+                res = self.onchange_payment_term_date_invoice(cr, uid, inv.id,
+                                                              inv.payment_term.id, inv.date_invoice)
+                if res and res['value']:
+                    self.write(cr, uid, [inv.id], res['value'])
         return True
 
     def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
 
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-04-20 02:26:42 +0000
+++ crm/crm_lead_view.xml	2013-05-27 04:26:42 +0000
@@ -73,16 +73,20 @@
                 name="Phone calls"
                 groups="base.group_sale_salesman"
                 res_model="crm.phonecall"
+                src_model="crm.lead"
                 view_mode="tree,calendar,form"
                 context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
                 view_type="form"/>
 
         <act_window
                 id="act_crm_opportunity_crm_meeting_new"
                 name="Meetings"
                 res_model="crm.meeting"
+                src_model="crm.lead"
                 view_mode="tree,form,calendar"
                 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
                 view_type="form"/>
 
 
 
=== modified file 'crm/report/crm_phonecall_report.py'
--- crm/report/crm_phonecall_report.py	2012-12-06 14:56:32 +0000
+++ crm/report/crm_phonecall_report.py	2013-05-27 04:26:42 +0000
@@ -61,6 +61,7 @@
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'opportunity_id': fields.many2one('crm.lead', 'Lead/Opportunity' , readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True, select=True),
         'creation_date': fields.date('Creation Date', readonly=True, select=True),
@@ -88,6 +89,7 @@
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
+                    c.opportunity_id,
                     c.duration,
                     c.company_id,
                     c.priority,
 
=== modified file 'crm/report/crm_phonecall_report_view.xml'
--- crm/report/crm_phonecall_report_view.xml	2013-04-20 02:26:42 +0000
+++ crm/report/crm_phonecall_report_view.xml	2013-05-27 04:26:42 +0000
@@ -16,6 +16,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
+                    <field name="opportunity_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -72,6 +73,7 @@
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Lead/Opportunity" icon="terp-personal+" context="{'group_by':'opportunity_id'}" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
 
=== modified file 'email_template/res_partner.py'
--- email_template/res_partner.py	2013-03-13 11:20:13 +0000
+++ email_template/res_partner.py	2013-05-27 04:26:42 +0000
@@ -34,7 +34,7 @@
     }
 
     _defaults = {
-        'opt_out': False,
+        'opt_out': True,
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2013-04-23 09:16:26 +0000
+++ hr_payroll/hr_payroll.py	2013-05-27 04:26:42 +0000
@@ -385,7 +385,7 @@
         #OR if it starts between the given dates
         clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
         #OR if it starts before the date_from and finish after the date_end (or never finish)
-        clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
+        clause_3 = ['&',('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
         clause_final =  [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
         contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
         return contract_ids
 
=== modified file 'mail/res_partner.py'
--- mail/res_partner.py	2013-03-13 12:51:24 +0000
+++ mail/res_partner.py	2013-05-27 04:26:42 +0000
@@ -43,7 +43,7 @@
     }
 
     _defaults = {
-        'notification_email_send': lambda *args: 'comment'
+        'notification_email_send': lambda *args: 'none'
     }
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
 
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2013-03-19 12:52:16 +0000
+++ mrp/mrp_view.xml	2013-05-27 04:26:42 +0000
@@ -461,7 +461,6 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
-                    <field name="sequence" invisible="1"/>
                     <field name="name" groups="base.group_no_one"/>
                     <field name="code"/>
                     <field name="product_id"/>
 
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-12-18 22:50:15 +0000
+++ project_timesheet/project_timesheet.py	2013-05-27 04:26:42 +0000
@@ -200,7 +200,9 @@
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     vals_line['amount'] = amount_unit['value']['amount']
 
-            self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
+            if vals_line:
+                self.pool.get('hr.analytic.timesheet').write(cr, uid, 
+                        [line_id.id], vals_line, context=context)
 
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
 
=== modified file 'report_webkit/__openerp__.py'
--- report_webkit/__openerp__.py	2013-05-14 14:28:37 +0000
+++ report_webkit/__openerp__.py	2013-05-27 04:26:42 +0000
@@ -62,8 +62,9 @@
 PDF. Version 0.9.9 or later is necessary, and can be found at
 http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
 
-After installing the library on the OpenERP Server machine, you need to set the
-path to the ``wkthtmltopdf`` executable file on each Company.
+After installing the library on the OpenERP Server machine, you need to set
+the path to the ``wkthtmltopdf`` executable file in a system parameter named ``webkit_path``
+in Settings -> Customization -> Low Level Object -> System Parameters
 
 If you are experiencing missing header/footer problems on Linux, be sure to
 install a 'static' version of the library. The default ``wkhtmltopdf`` on
 
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-05-14 09:19:14 +0000
+++ stock/stock_view.xml	2013-05-27 04:26:42 +0000
@@ -337,16 +337,20 @@
             <field name="model">stock.production.lot</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
-                    </div>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                    </div>
+                    <group>
+                        <div>
+                            <div class="oe_button_box oe_right">
+                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
+                            </div>
+                            <div class="oe_title">
+                                <label for="name" class="oe_edit_only"/>
+                                <h1>
+                                    <field name="name"/>
+                                </h1>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <group>
                             <field name="product_id"/>