Merge lp:~openerp-dev/openobject-addons/trunk-remove-nodestroy-rga into lp:openobject-addons

Proposed by Ravi Gadhia (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-remove-nodestroy-rga
Merge into: lp:openobject-addons
Diff against target: 292 lines (+2/-27)
19 files modified
account/account_invoice.py (+0/-1)
account_analytic_analysis/account_analytic_analysis.py (+0/-2)
account_check_writing/account_voucher.py (+0/-1)
account_check_writing/wizard/account_check_batch_printing.py (+0/-1)
account_voucher/invoice.py (+0/-1)
analytic_contract_hr_expense/analytic_contract_hr_expense.py (+0/-1)
fleet/fleet.py (+0/-1)
hr_expense/hr_expense.py (+0/-1)
hr_payroll/hr_payroll.py (+0/-1)
hr_recruitment/hr_recruitment.py (+0/-1)
marketing_campaign/marketing_campaign.py (+0/-1)
point_of_sale/point_of_sale.py (+0/-2)
project/project.py (+0/-1)
project_issue/project_issue.py (+0/-1)
purchase/purchase.py (+1/-2)
sale/sale.py (+1/-4)
stock/stock.py (+0/-2)
stock/wizard/stock_traceability.py (+0/-1)
survey/survey.py (+0/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-remove-nodestroy-rga
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Pending
Review via email: mp+168958@code.launchpad.net

Description of the change

Remove GTK client specific attribute 'nodestroy'

'nodestroy' was introduce for stop crashing GTK client when form view button(type object) return action. if we not return 'nodestroy':True in action it will crash client for osv object but web client gracefully handle it

To post a comment you must log in.

Unmerged revisions

8757. By RGA(OpenERP)

Remove GTK client specific attribute 'nodestroy'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice.py'
2--- account/account_invoice.py 2013-06-07 10:23:59 +0000
3+++ account/account_invoice.py 2013-06-12 14:00:39 +0000
4@@ -415,7 +415,6 @@
5 'type': 'ir.actions.report.xml',
6 'report_name': 'account.invoice',
7 'datas': datas,
8- 'nodestroy' : True
9 }
10
11 def action_invoice_sent(self, cr, uid, ids, context=None):
12
13=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
14--- account_analytic_analysis/account_analytic_analysis.py 2013-06-07 10:23:59 +0000
15+++ account_analytic_analysis/account_analytic_analysis.py 2013-06-12 14:00:39 +0000
16@@ -539,7 +539,6 @@
17 'context': context,
18 'domain' : [('order_id','in',sale_ids)],
19 'res_model': 'sale.order.line',
20- 'nodestroy': True,
21 }
22
23 def on_change_template(self, cr, uid, ids, template_id, context=None):
24@@ -642,7 +641,6 @@
25 'view_mode': 'tree,form',
26 'domain' : domain,
27 'res_model': 'account.analytic.line',
28- 'nodestroy': True,
29 }
30
31 def _prepare_invoice(self, cr, uid, contract, context=None):
32
33=== modified file 'account_check_writing/account_voucher.py'
34--- account_check_writing/account_voucher.py 2013-04-15 10:23:49 +0000
35+++ account_check_writing/account_voucher.py 2013-06-12 14:00:39 +0000
36@@ -78,7 +78,6 @@
37 'ids': ids and ids or [],
38 'report_type': 'pdf'
39 },
40- 'nodestroy': True
41 }
42
43 def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
44
45=== modified file 'account_check_writing/wizard/account_check_batch_printing.py'
46--- account_check_writing/wizard/account_check_batch_printing.py 2013-04-15 10:23:49 +0000
47+++ account_check_writing/wizard/account_check_batch_printing.py 2013-06-12 14:00:39 +0000
48@@ -80,7 +80,6 @@
49 'ids': voucher_ids,
50 'report_type': 'pdf'
51 },
52- 'nodestroy': True
53 }
54
55
56
57=== modified file 'account_voucher/invoice.py'
58--- account_voucher/invoice.py 2013-05-21 12:23:59 +0000
59+++ account_voucher/invoice.py 2013-06-12 14:00:39 +0000
60@@ -37,7 +37,6 @@
61 'view_type': 'form',
62 'res_model': 'account.voucher',
63 'type': 'ir.actions.act_window',
64- 'nodestroy': True,
65 'target': 'new',
66 'domain': '[]',
67 'context': {
68
69=== modified file 'analytic_contract_hr_expense/analytic_contract_hr_expense.py'
70--- analytic_contract_hr_expense/analytic_contract_hr_expense.py 2013-04-29 15:14:10 +0000
71+++ analytic_contract_hr_expense/analytic_contract_hr_expense.py 2013-06-12 14:00:39 +0000
72@@ -149,7 +149,6 @@
73 'view_mode': 'tree,form',
74 'domain' : domain,
75 'res_model': 'account.analytic.line',
76- 'nodestroy': True,
77 }
78
79
80
81=== modified file 'fleet/fleet.py'
82--- fleet/fleet.py 2013-01-18 14:39:02 +0000
83+++ fleet/fleet.py 2013-06-12 14:00:39 +0000
84@@ -745,7 +745,6 @@
85 'view_type': 'tree,form',
86 'res_model': 'fleet.vehicle.log.contract',
87 'type': 'ir.actions.act_window',
88- 'nodestroy': True,
89 'domain': '[]',
90 'res_id': newid,
91 'context': {'active_id':newid},
92
93=== modified file 'hr_expense/hr_expense.py'
94--- hr_expense/hr_expense.py 2013-05-28 10:45:00 +0000
95+++ hr_expense/hr_expense.py 2013-06-12 14:00:39 +0000
96@@ -384,7 +384,6 @@
97 'view_id': view_id,
98 'res_model': 'account.move',
99 'type': 'ir.actions.act_window',
100- 'nodestroy': True,
101 'target': 'current',
102 'res_id': expense.account_move_id.id,
103 }
104
105=== modified file 'hr_payroll/hr_payroll.py'
106--- hr_payroll/hr_payroll.py 2013-04-29 15:14:10 +0000
107+++ hr_payroll/hr_payroll.py 2013-06-12 14:00:39 +0000
108@@ -347,7 +347,6 @@
109 'view_type': 'form',
110 'res_model': 'hr.payslip',
111 'type': 'ir.actions.act_window',
112- 'nodestroy': True,
113 'target': 'current',
114 'domain': "[('id', 'in', %s)]" % [id_copy],
115 'views': [(tree_res, 'tree'), (form_res, 'form')],
116
117=== modified file 'hr_recruitment/hr_recruitment.py'
118--- hr_recruitment/hr_recruitment.py 2013-05-30 10:08:52 +0000
119+++ hr_recruitment/hr_recruitment.py 2013-06-12 14:00:39 +0000
120@@ -556,7 +556,6 @@
121 'report_name': 'survey.form',
122 'datas': datas,
123 'context' : context,
124- 'nodestroy':True,
125 }
126
127 class applicant_category(osv.osv):
128
129=== modified file 'marketing_campaign/marketing_campaign.py'
130--- marketing_campaign/marketing_campaign.py 2013-04-15 10:23:49 +0000
131+++ marketing_campaign/marketing_campaign.py 2013-06-12 14:00:39 +0000
132@@ -794,7 +794,6 @@
133 'views': [(view_id and view_id[1] or 0, 'form')],
134 'type': 'ir.actions.act_window',
135 'target': 'new',
136- 'nodestroy':True,
137 'context': "{'template_id':%d,'default_res_id':%d}"%
138 (wi_obj.activity_id.email_template_id.id,
139 wi_obj.res_id)
140
141=== modified file 'point_of_sale/point_of_sale.py'
142--- point_of_sale/point_of_sale.py 2013-04-29 07:15:57 +0000
143+++ point_of_sale/point_of_sale.py 2013-06-12 14:00:39 +0000
144@@ -813,7 +813,6 @@
145 'view_id': False,
146 'context':context,
147 'type': 'ir.actions.act_window',
148- 'nodestroy': True,
149 'target': 'current',
150 }
151 return abs
152@@ -889,7 +888,6 @@
153 'res_model': 'account.invoice',
154 'context': "{'type':'out_invoice'}",
155 'type': 'ir.actions.act_window',
156- 'nodestroy': True,
157 'target': 'current',
158 'res_id': inv_ids and inv_ids[0] or False,
159 }
160
161=== modified file 'project/project.py'
162--- project/project.py 2013-06-07 10:23:59 +0000
163+++ project/project.py 2013-06-12 14:00:39 +0000
164@@ -425,7 +425,6 @@
165 'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
166 'type': 'ir.actions.act_window',
167 'search_view_id': search_view['res_id'],
168- 'nodestroy': True
169 }
170
171 # set active value for a project, its sub projects and its tasks
172
173=== modified file 'project_issue/project_issue.py'
174--- project_issue/project_issue.py 2013-06-05 09:04:53 +0000
175+++ project_issue/project_issue.py 2013-06-12 14:00:39 +0000
176@@ -377,7 +377,6 @@
177 'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
178 'type': 'ir.actions.act_window',
179 'search_view_id': res['res_id'],
180- 'nodestroy': True
181 }
182
183 def copy(self, cr, uid, id, default=None, context=None):
184
185=== modified file 'purchase/purchase.py'
186--- purchase/purchase.py 2013-05-21 12:23:59 +0000
187+++ purchase/purchase.py 2013-06-12 14:00:39 +0000
188@@ -358,7 +358,6 @@
189 'res_model': 'account.invoice',
190 'context': "{'type':'in_invoice', 'journal_type': 'purchase'}",
191 'type': 'ir.actions.act_window',
192- 'nodestroy': True,
193 'target': 'current',
194 'res_id': inv_ids and inv_ids[0] or False,
195 }
196@@ -450,7 +449,7 @@
197 'ids': ids,
198 'form': self.read(cr, uid, ids[0], context=context),
199 }
200- return {'type': 'ir.actions.report.xml', 'report_name': 'purchase.quotation', 'datas': datas, 'nodestroy': True}
201+ return {'type': 'ir.actions.report.xml', 'report_name': 'purchase.quotation', 'datas': datas}
202
203 #TODO: implement messages system
204 def wkf_confirm_order(self, cr, uid, ids, context=None):
205
206=== modified file 'sale/sale.py'
207--- sale/sale.py 2013-06-07 10:23:59 +0000
208+++ sale/sale.py 2013-06-12 14:00:39 +0000
209@@ -290,7 +290,6 @@
210 'view_mode': 'form',
211 'view_id': view_id,
212 'target': 'current',
213- 'nodestroy': True,
214 }
215
216 def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context=None):
217@@ -432,7 +431,7 @@
218 'ids': ids,
219 'form': self.read(cr, uid, ids[0], context=context),
220 }
221- return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True}
222+ return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas }
223
224 def manual_invoice(self, cr, uid, ids, context=None):
225 """ create invoices for the given sales orders (ids), and open the form
226@@ -458,7 +457,6 @@
227 'res_model': 'account.invoice',
228 'context': "{'type':'out_invoice'}",
229 'type': 'ir.actions.act_window',
230- 'nodestroy': True,
231 'target': 'current',
232 'res_id': new_inv_ids and new_inv_ids[0] or False,
233 }
234@@ -596,7 +594,6 @@
235 'view_mode': 'form',
236 'view_id': view_id,
237 'target': 'current',
238- 'nodestroy': True,
239 }
240
241 def action_wait(self, cr, uid, ids, context=None):
242
243=== modified file 'stock/stock.py'
244--- stock/stock.py 2013-06-07 10:23:59 +0000
245+++ stock/stock.py 2013-06-12 14:00:39 +0000
246@@ -692,7 +692,6 @@
247 'type': 'ir.actions.act_window',
248 'target': 'new',
249 'context': context,
250- 'nodestroy': True,
251 }
252
253 def copy(self, cr, uid, id, default=None, context=None):
254@@ -1543,7 +1542,6 @@
255 'res_model': 'stock.partial.move',
256 'res_id': partial_id,
257 'type': 'ir.actions.act_window',
258- 'nodestroy': True,
259 'target': 'new',
260 'domain': '[]',
261 'context': context
262
263=== modified file 'stock/wizard/stock_traceability.py'
264--- stock/wizard/stock_traceability.py 2013-04-15 10:23:49 +0000
265+++ stock/wizard/stock_traceability.py 2013-06-12 14:00:39 +0000
266@@ -58,7 +58,6 @@
267 'field_parent': type1,
268 'view_id': (view_id,'View'),
269 'type': 'ir.actions.act_window',
270- 'nodestroy':True,
271 }
272 return value
273
274
275=== modified file 'survey/survey.py'
276--- survey/survey.py 2013-04-15 10:23:49 +0000
277+++ survey/survey.py 2013-06-12 14:00:39 +0000
278@@ -127,7 +127,6 @@
279 'report_name': 'survey.browse.response',
280 'datas': datas,
281 'context' : context,
282- 'nodestroy':True,
283 }
284 else:
285
286@@ -138,7 +137,6 @@
287 'report_name': 'survey.form',
288 'datas': datas,
289 'context' : context,
290- 'nodestroy':True,
291 }
292 return report
293

Subscribers

People subscribed via source and target branches

to all changes: