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

Proposed by invitu
Status: Needs review
Proposed branch: lp:~invitu/openobject-addons/7.0-fix-1179307-1179305
Merge into: lp:openobject-addons/7.0
Diff against target: 222 lines (+44/-22)
12 files modified
account/account.py (+8/-2)
account/account_invoice.py (+5/-3)
crm/crm_lead_view.xml (+4/-0)
crm/report/crm_phonecall_report.py (+2/-0)
crm/report/crm_phonecall_report_view.xml (+2/-0)
email_template/res_partner.py (+1/-1)
hr_payroll/hr_payroll.py (+1/-1)
mail/res_partner.py (+1/-1)
mrp/mrp_view.xml (+0/-1)
project_timesheet/project_timesheet.py (+3/-1)
report_webkit/__openerp__.py (+3/-2)
stock/stock_view.xml (+14/-10)
To merge this branch: bzr merge lp:~invitu/openobject-addons/7.0-fix-1179307-1179305
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) Needs Resubmitting
OpenERP Core Team Pending
Review via email: mp+165790@code.launchpad.net

Description of the change

[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

To post a comment you must log in.
Revision history for this message
invitu (invitu) wrote :

merge proposal comes from ocb-addons branch

9178. By 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

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

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

[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

Launchpad automatic translations update.

9176. By Thibault Delavallée (OpenERP)

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

9175. By Thibault Delavallée (OpenERP)

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

9174. By Martin Trigaux (OpenERP)

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

9173. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

9172. By Martin Trigaux (OpenERP)

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

9171. By Martin Trigaux (OpenERP)

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

9170. By Quentin (OpenERP) <email address hidden>

[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>

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2013-05-23 12:27:56 +0000
3+++ account/account.py 2013-05-27 04:26:42 +0000
4@@ -1040,9 +1040,15 @@
5 context = {}
6 ids = []
7 if name:
8- ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
9+ ids = self.search(cr, user,
10+ [('code', 'ilike', name)] + args,
11+ limit=limit,
12+ context=context)
13 if not ids:
14- ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
15+ ids = self.search(cr, user,
16+ [('name', operator, name)] + args,
17+ limit=limit,
18+ context=context)
19 return self.name_get(cr, user, ids, context=context)
20
21 def write(self, cr, uid, ids, vals, context=None):
22
23=== modified file 'account/account_invoice.py'
24--- account/account_invoice.py 2013-05-23 12:28:55 +0000
25+++ account/account_invoice.py 2013-05-27 04:26:42 +0000
26@@ -778,9 +778,11 @@
27
28 def action_date_assign(self, cr, uid, ids, *args):
29 for inv in self.browse(cr, uid, ids):
30- res = self.onchange_payment_term_date_invoice(cr, uid, inv.id, inv.payment_term.id, inv.date_invoice)
31- if res and res['value']:
32- self.write(cr, uid, [inv.id], res['value'])
33+ if not inv.date_due:
34+ res = self.onchange_payment_term_date_invoice(cr, uid, inv.id,
35+ inv.payment_term.id, inv.date_invoice)
36+ if res and res['value']:
37+ self.write(cr, uid, [inv.id], res['value'])
38 return True
39
40 def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
41
42=== modified file 'crm/crm_lead_view.xml'
43--- crm/crm_lead_view.xml 2013-04-20 02:26:42 +0000
44+++ crm/crm_lead_view.xml 2013-05-27 04:26:42 +0000
45@@ -73,16 +73,20 @@
46 name="Phone calls"
47 groups="base.group_sale_salesman"
48 res_model="crm.phonecall"
49+ src_model="crm.lead"
50 view_mode="tree,calendar,form"
51 context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
52+ domain="[('opportunity_id', '=', active_id)]"
53 view_type="form"/>
54
55 <act_window
56 id="act_crm_opportunity_crm_meeting_new"
57 name="Meetings"
58 res_model="crm.meeting"
59+ src_model="crm.lead"
60 view_mode="tree,form,calendar"
61 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
62+ domain="[('opportunity_id', '=', active_id)]"
63 view_type="form"/>
64
65
66
67=== modified file 'crm/report/crm_phonecall_report.py'
68--- crm/report/crm_phonecall_report.py 2012-12-06 14:56:32 +0000
69+++ crm/report/crm_phonecall_report.py 2013-05-27 04:26:42 +0000
70@@ -61,6 +61,7 @@
71 domain="[('section_id','=',section_id),\
72 ('object_id.model', '=', 'crm.phonecall')]"),
73 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
74+ 'opportunity_id': fields.many2one('crm.lead', 'Lead/Opportunity' , readonly=True),
75 'company_id': fields.many2one('res.company', 'Company', readonly=True),
76 'opening_date': fields.date('Opening Date', readonly=True, select=True),
77 'creation_date': fields.date('Creation Date', readonly=True, select=True),
78@@ -88,6 +89,7 @@
79 c.section_id,
80 c.categ_id,
81 c.partner_id,
82+ c.opportunity_id,
83 c.duration,
84 c.company_id,
85 c.priority,
86
87=== modified file 'crm/report/crm_phonecall_report_view.xml'
88--- crm/report/crm_phonecall_report_view.xml 2013-04-20 02:26:42 +0000
89+++ crm/report/crm_phonecall_report_view.xml 2013-05-27 04:26:42 +0000
90@@ -16,6 +16,7 @@
91 <field name="user_id" invisible="1"/>
92 <field name="company_id" invisible="1"/>
93 <field name="partner_id" invisible="1"/>
94+ <field name="opportunity_id" invisible="1"/>
95 <field name="state" invisible="1"/>
96 <field name="categ_id" invisible="1"/>
97 <field name="day" invisible="1"/>
98@@ -72,6 +73,7 @@
99 <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
100 <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
101 <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
102+ <filter string="Lead/Opportunity" icon="terp-personal+" context="{'group_by':'opportunity_id'}" />
103 <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
104 <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
105 <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
106
107=== modified file 'email_template/res_partner.py'
108--- email_template/res_partner.py 2013-03-13 11:20:13 +0000
109+++ email_template/res_partner.py 2013-05-27 04:26:42 +0000
110@@ -34,7 +34,7 @@
111 }
112
113 _defaults = {
114- 'opt_out': False,
115+ 'opt_out': True,
116 }
117
118 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
119
120=== modified file 'hr_payroll/hr_payroll.py'
121--- hr_payroll/hr_payroll.py 2013-04-23 09:16:26 +0000
122+++ hr_payroll/hr_payroll.py 2013-05-27 04:26:42 +0000
123@@ -385,7 +385,7 @@
124 #OR if it starts between the given dates
125 clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
126 #OR if it starts before the date_from and finish after the date_end (or never finish)
127- clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
128+ clause_3 = ['&',('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
129 clause_final = [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
130 contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
131 return contract_ids
132
133=== modified file 'mail/res_partner.py'
134--- mail/res_partner.py 2013-03-13 12:51:24 +0000
135+++ mail/res_partner.py 2013-05-27 04:26:42 +0000
136@@ -43,7 +43,7 @@
137 }
138
139 _defaults = {
140- 'notification_email_send': lambda *args: 'comment'
141+ 'notification_email_send': lambda *args: 'none'
142 }
143
144 def message_get_suggested_recipients(self, cr, uid, ids, context=None):
145
146=== modified file 'mrp/mrp_view.xml'
147--- mrp/mrp_view.xml 2013-03-19 12:52:16 +0000
148+++ mrp/mrp_view.xml 2013-05-27 04:26:42 +0000
149@@ -461,7 +461,6 @@
150 <field name="field_parent">child_complete_ids</field>
151 <field name="arch" type="xml">
152 <tree string="BoM Structure" colors="blue:method">
153- <field name="sequence" invisible="1"/>
154 <field name="name" groups="base.group_no_one"/>
155 <field name="code"/>
156 <field name="product_id"/>
157
158=== modified file 'project_timesheet/project_timesheet.py'
159--- project_timesheet/project_timesheet.py 2012-12-18 22:50:15 +0000
160+++ project_timesheet/project_timesheet.py 2013-05-27 04:26:42 +0000
161@@ -200,7 +200,9 @@
162 if amount_unit and 'amount' in amount_unit.get('value',{}):
163 vals_line['amount'] = amount_unit['value']['amount']
164
165- self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
166+ if vals_line:
167+ self.pool.get('hr.analytic.timesheet').write(cr, uid,
168+ [line_id.id], vals_line, context=context)
169
170 return super(project_work,self).write(cr, uid, ids, vals, context)
171
172
173=== modified file 'report_webkit/__openerp__.py'
174--- report_webkit/__openerp__.py 2013-05-14 14:28:37 +0000
175+++ report_webkit/__openerp__.py 2013-05-27 04:26:42 +0000
176@@ -62,8 +62,9 @@
177 PDF. Version 0.9.9 or later is necessary, and can be found at
178 http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
179
180-After installing the library on the OpenERP Server machine, you need to set the
181-path to the ``wkthtmltopdf`` executable file on each Company.
182+After installing the library on the OpenERP Server machine, you need to set
183+the path to the ``wkthtmltopdf`` executable file in a system parameter named ``webkit_path``
184+in Settings -> Customization -> Low Level Object -> System Parameters
185
186 If you are experiencing missing header/footer problems on Linux, be sure to
187 install a 'static' version of the library. The default ``wkhtmltopdf`` on
188
189=== modified file 'stock/stock_view.xml'
190--- stock/stock_view.xml 2013-05-14 09:19:14 +0000
191+++ stock/stock_view.xml 2013-05-27 04:26:42 +0000
192@@ -337,16 +337,20 @@
193 <field name="model">stock.production.lot</field>
194 <field name="arch" type="xml">
195 <form string="Serial Number" version="7.0">
196- <div class="oe_button_box oe_right">
197- <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
198- <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
199- </div>
200- <div class="oe_title">
201- <label for="name" class="oe_edit_only"/>
202- <h1>
203- <field name="name"/>
204- </h1>
205- </div>
206+ <group>
207+ <div>
208+ <div class="oe_button_box oe_right">
209+ <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
210+ <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
211+ </div>
212+ <div class="oe_title">
213+ <label for="name" class="oe_edit_only"/>
214+ <h1>
215+ <field name="name"/>
216+ </h1>
217+ </div>
218+ </div>
219+ </group>
220 <group>
221 <group>
222 <field name="product_id"/>