openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01667
[Merge] lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/44826
[FIX] account..l10n_ch: Pass return {'type': 'ir.actions.act_window_close'} instead of return {} in osv_memory/normal wizards.(lp:691544)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/44826
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py 2010-12-13 06:43:09 +0000
+++ account/wizard/account_change_currency.py 2010-12-29 06:26:19 +0000
@@ -72,7 +72,7 @@
new_price = (line.price_unit / old_rate ) * rate
obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_change_currency()
=== modified file 'account/wizard/account_fiscalyear_close.py'
--- account/wizard/account_fiscalyear_close.py 2010-11-16 12:16:58 +0000
+++ account/wizard/account_fiscalyear_close.py 2010-12-29 06:26:19 +0000
@@ -215,7 +215,7 @@
cr.execute('UPDATE account_fiscalyear ' \
'SET end_journal_period_id = %s ' \
'WHERE id = %s', (ids[0], old_fyear.id))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_fiscalyear_close()
=== modified file 'account/wizard/account_fiscalyear_close_state.py'
--- account/wizard/account_fiscalyear_close_state.py 2010-10-15 13:35:22 +0000
+++ account/wizard/account_fiscalyear_close_state.py 2010-12-29 06:26:19 +0000
@@ -57,7 +57,7 @@
fy_pool = self.pool.get('account.fiscalyear')
fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_fiscalyear_close_state()
=== modified file 'account/wizard/account_invoice_state.py'
--- account/wizard/account_invoice_state.py 2010-10-18 06:49:23 +0000
+++ account/wizard/account_invoice_state.py 2010-12-29 06:26:19 +0000
@@ -43,7 +43,7 @@
if record['state'] not in ('draft','proforma','proforma2'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_invoice_confirm()
@@ -67,7 +67,7 @@
if record['state'] in ('cancel','paid'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_invoice_cancel()
=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py 2010-12-13 06:43:09 +0000
+++ account/wizard/account_open_closed_fiscalyear.py 2010-12-29 06:26:19 +0000
@@ -42,7 +42,7 @@
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_open_closed_fiscalyear()
=== modified file 'account/wizard/account_period_close.py'
--- account/wizard/account_period_close.py 2010-10-18 06:49:23 +0000
+++ account/wizard/account_period_close.py 2010-12-29 06:26:19 +0000
@@ -50,7 +50,7 @@
# Log message for Period
for period_id, name in period_pool.name_get(cr, uid, [id]):
period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_period_close()
=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py 2010-11-04 12:42:42 +0000
+++ account/wizard/account_reconcile.py 2010-12-29 06:26:19 +0000
@@ -101,7 +101,7 @@
context.update({'stop_reconcile': True})
account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
period_id, journal_id, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_move_line_reconcile()
@@ -145,7 +145,7 @@
if context is None:
context = {}
account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def trans_rec_reconcile(self, cr, uid, ids, context=None):
account_move_line_obj = self.pool.get('account.move.line')
@@ -169,7 +169,7 @@
context.update({'stop_reconcile': True})
account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
period_id, journal_id, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_move_line_reconcile_writeoff()
=== modified file 'account/wizard/account_reconcile_partner_process.py'
--- account/wizard/account_reconcile_partner_process.py 2010-12-13 06:43:09 +0000
+++ account/wizard/account_reconcile_partner_process.py 2010-12-29 06:26:19 +0000
@@ -83,7 +83,7 @@
res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
#TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
#TODO: remove that comments when the client side dev is done
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_columns = {
'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'),
=== modified file 'account/wizard/account_state_open.py'
--- account/wizard/account_state_open.py 2010-10-21 05:47:10 +0000
+++ account/wizard/account_state_open.py 2010-12-29 06:26:19 +0000
@@ -37,7 +37,7 @@
raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
wf_service = netsvc.LocalService("workflow")
res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_state_open()
=== modified file 'account/wizard/account_unreconcile.py'
--- account/wizard/account_unreconcile.py 2010-12-13 06:43:09 +0000
+++ account/wizard/account_unreconcile.py 2010-12-29 06:26:19 +0000
@@ -31,7 +31,7 @@
context = {}
if context.get('active_ids', False):
obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_unreconcile()
@@ -46,7 +46,7 @@
rec_ids = context['active_ids']
if rec_ids:
obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_unreconcile_reconcile()
=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py 2010-12-13 06:43:09 +0000
+++ account/wizard/account_validate_account_move.py 2010-12-29 06:26:19 +0000
@@ -38,7 +38,7 @@
if not ids_move:
raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
obj_move.button_validate(cr, uid, ids_move, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
validate_account_move()
@@ -60,7 +60,7 @@
if not move_ids:
raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
obj_move.button_validate(cr, uid, move_ids, context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
validate_account_move_lines()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model.py'
--- account_analytic_plans/wizard/analytic_plan_create_model.py 2010-12-13 06:43:09 +0000
+++ account_analytic_plans/wizard/analytic_plan_create_model.py 2010-12-29 06:26:19 +0000
@@ -53,7 +53,7 @@
'target': 'new',
}
else:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
analytic_plan_create_model()
=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py 2010-12-13 06:43:09 +0000
+++ account_payment/wizard/account_payment_order.py 2010-12-29 06:26:19 +0000
@@ -65,7 +65,7 @@
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['entries']
if not line_ids:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
payment = order_obj.browse(cr, uid, context['active_id'], context=context)
t = None
@@ -90,7 +90,7 @@
'date': date_to_pay,
'currency': line.invoice and line.invoice.currency_id.id or False,
}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def search_entries(self, cr, uid, ids, context=None):
line_obj = self.pool.get('account.move.line')
=== modified file 'account_payment/wizard/account_payment_pay.py'
--- account_payment/wizard/account_payment_pay.py 2010-12-13 06:43:09 +0000
+++ account_payment/wizard/account_payment_pay.py 2010-12-29 06:26:19 +0000
@@ -37,7 +37,7 @@
# obj_act = self.pool.get('ir.actions.act_window')
# order = obj_payment_order.browse(cr, uid, context['active_id'], context)
obj_payment_order.set_done(cr, uid, [context['active_id']], context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
# t = order.mode and order.mode.type.code or 'manual'
# if t == 'manual':
# obj_payment_order.set_done(cr,uid,context['active_id'],context)
=== modified file 'account_payment/wizard/account_payment_populate_statement.py'
--- account_payment/wizard/account_payment_populate_statement.py 2010-12-17 04:37:32 +0000
+++ account_payment/wizard/account_payment_populate_statement.py 2010-12-29 06:26:19 +0000
@@ -65,7 +65,7 @@
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['lines']
if not line_ids:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py 2010-12-24 11:01:20 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py 2010-12-29 06:26:19 +0000
@@ -39,11 +39,11 @@
context = {}
statement_id = context.get('statement_id', False)
if not statement_id:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
data = self.read(cr, uid, ids, context=context)[0]
line_ids = data['line_ids']
if not line_ids:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
line_obj = self.pool.get('account.move.line')
statement_obj = self.pool.get('account.bank.statement')
@@ -115,7 +115,7 @@
'voucher_id': voucher_id,
'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_statement_from_invoice_lines()
=== modified file 'account_voucher/wizard/account_voucher_unreconcile.py'
--- account_voucher/wizard/account_voucher_unreconcile.py 2010-11-19 13:48:01 +0000
+++ account_voucher/wizard/account_voucher_unreconcile.py 2010-12-29 06:26:19 +0000
@@ -55,7 +55,7 @@
# wf_service = netsvc.LocalService("workflow")
# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
account_voucher_unreconcile()
=== modified file 'auction/wizard/auction_aie_send.py'
--- auction/wizard/auction_aie_send.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_aie_send.py 2010-12-29 06:26:19 +0000
@@ -220,7 +220,7 @@
def send_pdf(self, cr, uid, ids, context=None):
threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
threaded_calculation.start()
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_send_aie()
=== modified file 'auction/wizard/auction_aie_send_result.py'
--- auction/wizard/auction_aie_send_result.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_aie_send_result.py 2010-12-29 06:26:19 +0000
@@ -137,7 +137,7 @@
lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'], ['obj_num','obj_price'])
args = pickle.dumps(lots)
self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_pay()
=== modified file 'auction/wizard/auction_lots_able.py'
--- auction/wizard/auction_lots_able.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_lots_able.py 2010-12-29 06:26:19 +0000
@@ -41,6 +41,6 @@
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_able()
=== modified file 'auction/wizard/auction_lots_auction_move.py'
--- auction/wizard/auction_lots_auction_move.py 2010-11-23 07:05:05 +0000
+++ auction/wizard/auction_lots_auction_move.py 2010-12-29 06:26:19 +0000
@@ -52,7 +52,7 @@
rec_ids = auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
for current in self.browse(cr, uid, ids, context=context):
if not (current.auction_id and len(context.get('active_ids', []))):
- return {}
+ return {'type': 'ir.actions.act_window_close'}
for rec in rec_ids:
new_id = auction_lot_history_obj.create(cr, uid, {
@@ -70,7 +70,7 @@
'sel_inv_id': None,
'obj_num': None,
'state': 'draft'})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_auction_move()
=== modified file 'auction/wizard/auction_lots_buyer_map.py'
--- auction/wizard/auction_lots_buyer_map.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_lots_buyer_map.py 2010-12-29 06:26:19 +0000
@@ -90,7 +90,7 @@
for lots in lots_obj.browse(cr, uid, rec_ids, context=context):
if lots.ach_login == current.ach_login:
lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def fields_view_get(self, cr, uid, view_id=None, view_type='form',
context=None, toolbar=False, submenu=False):
=== modified file 'auction/wizard/auction_lots_cancel.py'
--- auction/wizard/auction_lots_cancel.py 2010-11-23 07:05:05 +0000
+++ auction/wizard/auction_lots_cancel.py 2010-12-29 06:26:19 +0000
@@ -49,7 +49,7 @@
supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
if lot.sel_inv_id:
customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id])
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_columns = {
}
=== modified file 'auction/wizard/auction_lots_enable.py'
--- auction/wizard/auction_lots_enable.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_lots_enable.py 2010-12-29 06:26:19 +0000
@@ -38,6 +38,6 @@
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_enable()
=== modified file 'auction/wizard/auction_lots_numerotate.py'
--- auction/wizard/auction_lots_numerotate.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_lots_numerotate.py 2010-12-29 06:26:19 +0000
@@ -178,7 +178,7 @@
for rec_id in rec_ids:
lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
nbr+=1
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_lots_numerotate()
=== modified file 'auction/wizard/auction_pay_buy.py'
--- auction/wizard/auction_pay_buy.py 2010-12-06 13:11:02 +0000
+++ auction/wizard/auction_pay_buy.py 2010-12-29 06:26:19 +0000
@@ -100,7 +100,7 @@
})
for lot in lots:
lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_pay_buy()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'auction/wizard/auction_pay_sel.py'
--- auction/wizard/auction_pay_sel.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_pay_sel.py 2010-12-29 06:26:19 +0000
@@ -52,6 +52,6 @@
journal_id = datas.get('journal_id', False)
if lot.sel_inv_id:
p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_pay_sel()
=== modified file 'auction/wizard/auction_payer_sel.py'
--- auction/wizard/auction_payer_sel.py 2010-12-13 06:43:09 +0000
+++ auction/wizard/auction_payer_sel.py 2010-12-29 06:26:19 +0000
@@ -29,7 +29,7 @@
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_payer()
@@ -50,7 +50,7 @@
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_payer_sel()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'auction/wizard/auction_transfer_unsold_object.py'
--- auction/wizard/auction_transfer_unsold_object.py 2010-11-23 07:05:05 +0000
+++ auction/wizard/auction_transfer_unsold_object.py 2010-12-29 06:26:19 +0000
@@ -82,6 +82,6 @@
'ach_inv_id':None,
'sel_inv_id':None,
'state':'draft'})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
auction_transfer_unsold_object()
\ No newline at end of file
=== modified file 'base_calendar/wizard/base_calendar_invite_attendee.py'
--- base_calendar/wizard/base_calendar_invite_attendee.py 2010-11-23 07:05:05 +0000
+++ base_calendar/wizard/base_calendar_invite_attendee.py 2010-12-29 06:26:19 +0000
@@ -68,7 +68,7 @@
model = False
context_id = context and context.get('active_id', False) or False
if not context or not context.get('model'):
- return {}
+ return {'type': 'ir.actions.act_window_close'}
else:
model = context.get('model')
@@ -89,7 +89,7 @@
if context_id:
ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
else:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
if type == 'internal':
if not datas.get('user_ids'):
@@ -144,7 +144,7 @@
att_obj._send_mail(cr, uid, attendees, mail_to, \
email_from = current_user.user_email or tools.config.get('email_from', False))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
=== modified file 'base_calendar/wizard/base_calendar_set_exrule.py'
--- base_calendar/wizard/base_calendar_set_exrule.py 2010-12-13 06:43:09 +0000
+++ base_calendar/wizard/base_calendar_set_exrule.py 2010-12-29 06:26:19 +0000
@@ -150,7 +150,7 @@
+ enddate + monthstring + yearstring
model_obj.write(cr, uid, ex_id,{'exrule': exrule_string})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_defaults = {
'freq': lambda *x: 'None',
=== modified file 'base_calendar/wizard/calendar_event_edit_all.py'
--- base_calendar/wizard/calendar_event_edit_all.py 2010-11-23 07:05:05 +0000
+++ base_calendar/wizard/calendar_event_edit_all.py 2010-12-29 06:26:19 +0000
@@ -78,7 +78,7 @@
model = context.get('model', False)
model_obj = self.pool.get(model)
model_obj.modify_all(cr, uid, [context_id], datas, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_name = "calendar.event.edit.all"
_description = "Calendar Edit all event"
=== modified file 'base_module_doc_rst/wizard/generate_relation_graph.py'
--- base_module_doc_rst/wizard/generate_relation_graph.py 2010-11-23 07:05:05 +0000
+++ base_module_doc_rst/wizard/generate_relation_graph.py 2010-12-29 06:26:19 +0000
@@ -35,7 +35,7 @@
module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
if module_data['module_file']:
mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
class create_graph(wizard.interface):
states = {
=== modified file 'base_module_record/wizard/base_module_record_data.py'
--- base_module_record/wizard/base_module_record_data.py 2010-10-28 06:54:18 +0000
+++ base_module_record/wizard/base_module_record_data.py 2010-12-29 06:26:19 +0000
@@ -100,7 +100,7 @@
for s_id in search_ids:
args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
mod.recording_data.append(('query',args, {}, s_id))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def _check(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
=== modified file 'base_module_record/wizard/base_module_record_objects.py'
--- base_module_record/wizard/base_module_record_objects.py 2010-03-10 10:02:54 +0000
+++ base_module_record/wizard/base_module_record_objects.py 2010-12-29 06:26:19 +0000
@@ -90,7 +90,7 @@
for s_id in search_ids:
args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
mod.recording_data.append(('query',args, {}, s_id))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def inter_call(self,cr,uid,data,context):
res=base_module_save._create_module(self,cr, uid, data, context)
=== modified file 'base_report_creator/wizard/report_menu_create.py'
--- base_report_creator/wizard/report_menu_create.py 2010-12-13 06:43:09 +0000
+++ base_report_creator/wizard/report_menu_create.py 2010-12-29 06:26:19 +0000
@@ -49,7 +49,7 @@
if context_id:
data = self.browse(cr, uid, ids, context=context)
if not data:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
data = data[0]
board = obj_board.browse(cr, uid, context_id, context=context)
@@ -77,7 +77,7 @@
'action': 'ir.actions.act_window, ' + str(action_id)
}, context=context)
obj_board.write(cr, uid, context_id, {'menu_id': menu_id})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
report_menu_create()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'base_report_creator/wizard/wiz_set_filter_fields.py'
--- base_report_creator/wizard/wiz_set_filter_fields.py 2010-08-19 11:51:57 +0000
+++ base_report_creator/wizard/wiz_set_filter_fields.py 2010-12-29 06:26:19 +0000
@@ -145,7 +145,7 @@
'condition' : form_data['condition']
}
pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def _set_form_value(self, cr, uid, data, context):
field_id = data['form']['field_id']
@@ -199,7 +199,7 @@
elif field.ttype in ('boolean', 'selection'):
operator.append(('=','Equals'))
operator.append(('<>','Not Equals'))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
class set_filter_fields(wizard.interface):
states = {
=== modified file 'board/wizard/board_menu_create.py'
--- board/wizard/board_menu_create.py 2010-11-23 07:05:05 +0000
+++ board/wizard/board_menu_create.py 2010-12-29 06:26:19 +0000
@@ -78,7 +78,7 @@
'action': 'ir.actions.act_window,' + str(action_id)
}, context=context)
#End Loop
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_name = "board.menu.create"
_description = "Menu Create"
=== modified file 'crm/wizard/crm_add_note.py'
--- crm/wizard/crm_add_note.py 2010-11-23 07:05:05 +0000
+++ crm/wizard/crm_add_note.py 2010-12-29 06:26:19 +0000
@@ -50,7 +50,7 @@
act = 'case_' + obj.state
getattr(case_pool, act)(cr, uid, [case.id])
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def default_get(self, cr, uid, fields, context=None):
"""
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py 2010-12-20 09:13:55 +0000
+++ crm/wizard/crm_lead_to_opportunity.py 2010-12-29 06:26:19 +0000
@@ -48,7 +48,7 @@
"""
record_id = context and context.get('active_id') or False
if not record_id:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
leads = self.pool.get('crm.lead')
models_data = self.pool.get('ir.model.data')
=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py 2010-07-29 11:15:22 +0000
+++ crm/wizard/crm_merge_opportunities.py 2010-12-29 06:26:19 +0000
@@ -108,7 +108,7 @@
elif this.state in ['cancel', 'open', 'pending']:
act = 'case_' + this.state
getattr(opp_obj, act)(cr, uid, [record_id])
- return {}
+ return {'type': 'ir.actions.act_window_close'}
_columns = {
'opportunity_ids' : fields.many2many('crm.lead', 'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
=== modified file 'crm/wizard/crm_send_email.py'
--- crm/wizard/crm_send_email.py 2010-12-06 13:11:02 +0000
+++ crm/wizard/crm_send_email.py 2010-12-29 06:26:19 +0000
@@ -156,7 +156,7 @@
act = 'case_' + obj.state
getattr(case_pool, act)(cr, uid, [case.id])
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def default_get(self, cr, uid, fields, context=None):
"""
@@ -217,7 +217,7 @@
# In the case where the crm.case does not exist in the database
if not model:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
model_pool = self.pool.get(model)
res_id = hist.res_id
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner.py'
--- crm_partner_assign/wizard/crm_forward_to_partner.py 2010-11-23 07:05:05 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner.py 2010-12-29 06:26:19 +0000
@@ -198,7 +198,7 @@
to_write.update({'email_cc' : ', '.join(new_cc) })
case_pool.write(cr, uid, case.id, to_write, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def get_lead_details(self, cr, uid, lead_id, context=None):
body = []
=== modified file 'delivery/wizard/delivery_sale_order.py'
--- delivery/wizard/delivery_sale_order.py 2010-11-23 07:05:05 +0000
+++ delivery/wizard/delivery_sale_order.py 2010-12-29 06:26:19 +0000
@@ -113,7 +113,7 @@
'type': 'make_to_stock'
})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
make_delivery()
=== modified file 'event/wizard/event_confirm.py'
--- event/wizard/event_confirm.py 2010-10-27 04:29:13 +0000
+++ event/wizard/event_confirm.py 2010-12-29 06:26:19 +0000
@@ -30,7 +30,7 @@
def confirm(self, cr, uid, ids, context=None):
self.pool.get('event.event').do_confirm(cr, uid, context.get('event_ids', []), context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
event_confirm()
=== modified file 'event/wizard/event_confirm_registration.py'
--- event/wizard/event_confirm_registration.py 2010-11-11 06:52:42 +0000
+++ event/wizard/event_confirm_registration.py 2010-12-29 06:26:19 +0000
@@ -63,7 +63,7 @@
registration_pool = self.pool.get('event.registration')
registration_ids = context.get('registration_ids', [])
registration_pool.do_open(cr, uid, registration_ids, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
event_confirm_registration()
=== modified file 'event_project/wizard/event_project_retro.py'
--- event_project/wizard/event_project_retro.py 2010-11-23 07:05:05 +0000
+++ event_project/wizard/event_project_retro.py 2010-12-29 06:26:19 +0000
@@ -76,7 +76,7 @@
})
event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
- return {}
+ return {'type': 'ir.actions.act_window_close'}
event_project()
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out.py'
--- hr_attendance/wizard/hr_attendance_sign_in_out.py 2010-12-13 06:43:09 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out.py 2010-12-29 06:26:19 +0000
@@ -160,7 +160,7 @@
success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
except:
raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
- return {} # To do: Return Success message
+ return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
def sign_out(self, cr, uid, data, context=None):
emp_id = data['emp_id']
@@ -172,7 +172,7 @@
success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
except:
raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
- return {} # To do: Return Success message
+ return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
hr_sign_in_out()
=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2010-12-13 06:43:09 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2010-12-29 06:26:19 +0000
@@ -93,7 +93,7 @@
emp_id = data.emp_id.id
emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
self._write(cr, uid, data, emp_id, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def sign_out_result(self, cr, uid, ids, context=None):
emp_obj = self.pool.get('hr.employee')
@@ -101,7 +101,7 @@
emp_id = data.emp_id.id
emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
self._write(cr, uid, data, emp_id, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
hr_so_project()
@@ -157,7 +157,7 @@
for data in self.browse(cr, uid, ids, context=context):
emp_id = data.emp_id.id
emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def default_get(self, cr, uid, fields_list, context=None):
res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
=== modified file 'idea/wizard/idea_post_vote.py'
--- idea/wizard/idea_post_vote.py 2010-12-13 06:43:09 +0000
+++ idea/wizard/idea_post_vote.py 2010-12-29 06:26:19 +0000
@@ -126,7 +126,7 @@
idea_pool._vote_save(cr, uid, vote_id, None, score, context)
#vote = vote_pool.create(cr, uid, vote)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
idea_post_vote()
=== modified file 'l10n_ch/wizard/bvr_import.py'
--- l10n_ch/wizard/bvr_import.py 2010-10-26 15:06:32 +0000
+++ l10n_ch/wizard/bvr_import.py 2010-12-29 06:26:19 +0000
@@ -256,7 +256,7 @@
if res:
data['form']['file'] = res['file']
_import(self, cr, uid, data, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
bvr_import_wizard()
Follow ups
