openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01666
[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#695038 OpenOfficeReportDesigner Group to Remove in Trunk
https://bugs.launchpad.net/bugs/695038
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44825
Hello,
Changes in this Merge proposal
+ Wizard return type improvements.
+ lp:695038
Kindly review it.
Thank you
--
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44825
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.
=== modified file 'base_report_designer/__openerp__.py'
--- base_report_designer/__openerp__.py 2010-11-01 06:13:43 +0000
+++ base_report_designer/__openerp__.py 2010-12-29 06:12:09 +0000
@@ -36,8 +36,7 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base'],
- 'init_xml': ['security/base_report_security.xml',
- 'wizard/base_report_design_view.xml'],
+ 'init_xml': ['wizard/base_report_design_view.xml'],
'update_xml': ['base_report_designer_installer.xml'],
'demo_xml': [],
'installable': True,
=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
Binary files base_report_designer/plugin/openerp_report_designer.zip 2010-12-20 12:01:55 +0000 and base_report_designer/plugin/openerp_report_designer.zip 2010-12-29 06:12:09 +0000 differ
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py 2010-12-08 13:36:50 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py 2010-12-29 06:12:09 +0000
@@ -140,28 +140,16 @@
ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
self.win.endExecute()
try:
-
- ids = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' , 'search', [('name','=','OpenOfficeReportDesigner')])
ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
- dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
except :
import traceback,sys
info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
self.logobj.log_write('ServerParameter', LOG_ERROR, info)
- if not len(ids) :
- ErrorDialog("Group Not Found!!! Create a group named \n\n"'"OpenOfficeReportDesigner"'" \n\n ","","Group Name Error")
- self.logobj.log_write('Group Error',LOG_WARNING, ':Create a group OpenOfficeReportDesigner using database %s' % (sDatabase))
- self.win.endExecute()
if not len(ids_module):
ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in database %s' % (sDatabase))
self.win.endExecute()
-
- if UID not in dict_groups[0]['users']:
- ErrorDialog("Connection Refuse...","You have not access these Report Designer")
- self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
- self.win.endExecute()
else:
desktop=getDesktop()
doc = desktop.getCurrentComponent()
=== removed directory 'base_report_designer/security'
=== removed file 'base_report_designer/security/base_report_security.xml'
--- base_report_designer/security/base_report_security.xml 2010-09-15 15:18:41 +0000
+++ base_report_designer/security/base_report_security.xml 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data noupdate="1">
- <record id="res_groups_openofficereportdesigner0" model="res.groups">
- <field eval="[(6,0,[])]" name="menu_access"/>
- <field eval="[(6,0,[])]" name="rule_groups"/>
- <field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
- <field eval=""""OpenOfficeReportDesigner"""" name="name"/>
- </record>
-
- <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
- <field name="model_id" ref="base.model_ir_actions_report_xml"/>
- <field eval="1" name="perm_read"/>
- <field eval=""""OpenOfficeReportDesigner"""" name="name"/>
- <field eval="1" name="perm_unlink"/>
- <field eval="1" name="perm_write"/>
- <field eval="1" name="perm_create"/>
- <field name="group_id" ref="res_groups_openofficereportdesigner0"/>
- </record>
- </data>
-
-</openerp>
=== modified file 'lunch/wizard/lunch_cashbox_clean.py'
--- lunch/wizard/lunch_cashbox_clean.py 2010-11-23 07:05:05 +0000
+++ lunch/wizard/lunch_cashbox_clean.py 2010-12-29 06:12:09 +0000
@@ -57,7 +57,7 @@
# 'box': box_id,
# 'active': True,
# })
- return {}
+ return {'type': 'ir.actions.act_window_close'}
lunch_cashbox_clean()
=== modified file 'lunch/wizard/lunch_order_confirm.py'
--- lunch/wizard/lunch_order_confirm.py 2010-11-23 07:05:05 +0000
+++ lunch/wizard/lunch_order_confirm.py 2010-12-29 06:12:09 +0000
@@ -48,7 +48,7 @@
for confirm_obj in self.read(cr, uid, ids):
order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
lunch_order_confirm()
=== modified file 'mrp/wizard/mrp_track_prod.py'
--- mrp/wizard/mrp_track_prod.py 2010-11-23 07:05:05 +0000
+++ mrp/wizard/mrp_track_prod.py 2010-12-29 06:12:09 +0000
@@ -121,7 +121,7 @@
new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (record_id, idx+1), 'product_id': move.product_id.id})
update_val['prodlot_id'] = new_prodlot
move_obj.write(cr, uid, [current_move], update_val)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
mrp_track_move()
=== modified file 'mrp_repair/wizard/cancel_repair.py'
--- mrp_repair/wizard/cancel_repair.py 2010-11-23 07:05:05 +0000
+++ mrp_repair/wizard/cancel_repair.py 2010-12-29 06:12:09 +0000
@@ -48,7 +48,7 @@
else:
raise osv.except_osv(_('Warning!'),_('Repair order is not invoiced.'))
- 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):
""" Changes the view dynamically
=== modified file 'procurement/wizard/orderpoint_procurement.py'
--- procurement/wizard/orderpoint_procurement.py 2010-11-23 07:05:05 +0000
+++ procurement/wizard/orderpoint_procurement.py 2010-12-29 06:12:09 +0000
@@ -63,7 +63,7 @@
"""
threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
threaded_calculation.start()
- return {}
+ return {'type': 'ir.actions.act_window_close'}
procurement_compute()
=== modified file 'procurement/wizard/schedulers_all.py'
--- procurement/wizard/schedulers_all.py 2010-11-23 07:05:05 +0000
+++ procurement/wizard/schedulers_all.py 2010-12-29 06:12:09 +0000
@@ -59,8 +59,8 @@
"""
threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
threaded_calculation.start()
- return {}
+ return {'type': 'ir.actions.act_window_close'}
procurement_compute_all()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'project_gtd/wizard/project_gtd_fill.py'
--- project_gtd/wizard/project_gtd_fill.py 2010-12-13 06:43:09 +0000
+++ project_gtd/wizard/project_gtd_fill.py 2010-12-29 06:12:09 +0000
@@ -54,7 +54,7 @@
if not data[0]['task_ids']:
return {}
self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
project_timebox_fill()
=== modified file 'project_long_term/wizard/project_schedule_tasks.py'
--- project_long_term/wizard/project_schedule_tasks.py 2010-12-13 06:43:09 +0000
+++ project_long_term/wizard/project_schedule_tasks.py 2010-12-29 06:12:09 +0000
@@ -44,7 +44,7 @@
if context is None:
context = {}
if not 'active_id' in context:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
return phase_pool.schedule_tasks(cr, uid, [context['active_id']], context=context)
project_schedule_task()
=== modified file 'project_scrum/wizard/project_scrum_backlog_merger.py'
--- project_scrum/wizard/project_scrum_backlog_merger.py 2010-08-13 12:20:05 +0000
+++ project_scrum/wizard/project_scrum_backlog_merger.py 2010-12-29 06:12:09 +0000
@@ -97,7 +97,7 @@
#To assing a new product backlog to merged tasks
task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
project_scrum_backlog_merge()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py 2010-08-27 15:04:44 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py 2010-12-29 06:12:09 +0000
@@ -62,7 +62,7 @@
message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
self.log(cr, uid, backlog.id, message)
backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
backlog_sprint_assign()
=== modified file 'project_scrum/wizard/project_scrum_email.py'
--- project_scrum/wizard/project_scrum_email.py 2010-11-23 07:05:05 +0000
+++ project_scrum/wizard/project_scrum_email.py 2010-12-29 06:12:09 +0000
@@ -103,5 +103,5 @@
tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
if data.product_owner_email:
tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
project_scrum_email()
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py 2010-12-16 04:33:35 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py 2010-12-29 06:12:09 +0000
@@ -139,7 +139,7 @@
'order_id': purchase_id
})
order_line_obj.create(cr,uid,order_line)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
purchase_requisition_partner()
=== modified file 'report_webkit/wizard/report_webkit_actions.py'
--- report_webkit/wizard/report_webkit_actions.py 2010-12-13 06:43:09 +0000
+++ report_webkit/wizard/report_webkit_actions.py 2010-12-29 06:12:09 +0000
@@ -128,7 +128,7 @@
)
if res[0]:
if not current.open_action:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
return {
'name': _('Client Actions Connections'),
=== modified file 'sale/wizard/sale_line_invoice.py'
--- sale/wizard/sale_line_invoice.py 2010-12-17 04:37:32 +0000
+++ sale/wizard/sale_line_invoice.py 2010-12-29 06:12:09 +0000
@@ -110,8 +110,8 @@
if not invoices:
raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
sale_order_line_make_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-12-17 04:37:32 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-12-29 06:12:09 +0000
@@ -112,7 +112,7 @@
if make.close:
case_obj.case_close(cr, uid, data)
if not new_ids:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
if len(new_ids)<=1:
value = {
'domain': str([('id', 'in', new_ids)]),
=== modified file 'stock/wizard/stock_change_standard_price.py'
--- stock/wizard/stock_change_standard_price.py 2010-11-23 07:05:05 +0000
+++ stock/wizard/stock_change_standard_price.py 2010-12-29 06:12:09 +0000
@@ -113,6 +113,6 @@
'stock_journal' : res[0].stock_journal.id
}
prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
change_standard_price()
=== modified file 'stock/wizard/stock_fill_inventory.py'
--- stock/wizard/stock_fill_inventory.py 2010-12-28 17:07:18 +0000
+++ stock/wizard/stock_fill_inventory.py 2010-12-29 06:12:09 +0000
@@ -66,7 +66,7 @@
if ids and len(ids):
ids = ids[0]
else:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
fill_inventory = self.browse(cr, uid, ids, context=context)
res = {}
res_location = {}
@@ -113,7 +113,7 @@
if(len(product_ids) == 0):
raise osv.except_osv(_('Message !'), _('No product in this location.'))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_fill_inventory()
=== modified file 'stock/wizard/stock_inventory_merge.py'
--- stock/wizard/stock_inventory_merge.py 2010-11-23 07:05:05 +0000
+++ stock/wizard/stock_inventory_merge.py 2010-12-29 06:12:09 +0000
@@ -84,7 +84,7 @@
'product_qty': quantity,
})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_inventory_merge()
=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py 2010-12-06 13:11:02 +0000
+++ stock/wizard/stock_move.py 2010-12-29 06:12:09 +0000
@@ -46,7 +46,7 @@
datas = self.read(cr, uid, ids)[0]
move_obj = self.pool.get('stock.move')
move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_move_track()
@@ -102,7 +102,7 @@
move_obj.action_consume(cr, uid, move_ids,
data['product_qty'], data['location_id'],
context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_move_consume()
@@ -163,7 +163,7 @@
move_obj.action_scrap(cr, uid, move_ids,
data['product_qty'], data['location_id'],
context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_move_scrap()
@@ -218,7 +218,7 @@
if context is None:
context = {}
self.split(cr, uid, ids, context.get('active_ids'), context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
def split(self, cr, uid, ids, move_ids, context=None):
""" To split stock moves into production lot
=== modified file 'stock/wizard/stock_partial_move.py'
--- stock/wizard/stock_partial_move.py 2010-12-23 10:21:04 +0000
+++ stock/wizard/stock_partial_move.py 2010-12-29 06:12:09 +0000
@@ -226,7 +226,7 @@
print partial_datas
move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_partial_move()
stock_partial_move_memory_out()
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py 2010-12-23 10:21:04 +0000
+++ stock/wizard/stock_partial_picking.py 2010-12-29 06:12:09 +0000
@@ -174,7 +174,7 @@
'product_currency': p_moves[move.id].currency.id,
})
pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
=== modified file 'stock/wizard/stock_split_move.py'
--- stock/wizard/stock_split_move.py 2010-12-06 13:11:02 +0000
+++ stock/wizard/stock_split_move.py 2010-12-29 06:12:09 +0000
@@ -116,7 +116,7 @@
new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
uos_qty = quantity / move.product_qty * move.product_uos_qty
move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_split_move_line()
=== modified file 'stock/wizard/stock_splitinto.py'
--- stock/wizard/stock_splitinto.py 2010-12-16 04:33:35 +0000
+++ stock/wizard/stock_splitinto.py 2010-12-29 06:12:09 +0000
@@ -79,6 +79,6 @@
inventory_obj.write(cr, uid, inventory_id, {'move_ids': [(4, current_move)]}, context=context)
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_split_into()
=== modified file 'stock/wizard/stock_ups.py'
--- stock/wizard/stock_ups.py 2010-11-22 10:37:53 +0000
+++ stock/wizard/stock_ups.py 2010-12-29 06:12:09 +0000
@@ -87,7 +87,7 @@
report = netsvc._group['report']['report.stock.move.lot.ups_xml']
data['report_type'] = 'raw'
fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
- return {}
+ return {'type': 'ir.actions.act_window_close'}
stock_ups_upload()
=== modified file 'stock_invoice_directly/wizard/stock_invoice.py'
--- stock_invoice_directly/wizard/stock_invoice.py 2010-11-23 07:05:05 +0000
+++ stock_invoice_directly/wizard/stock_invoice.py 2010-12-29 06:12:09 +0000
@@ -48,7 +48,7 @@
'type': 'ir.actions.act_window',
'target': 'new',
}
- return {}
+ return {'type': 'ir.actions.act_window_close'}
invoice_directly()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'wiki/wizard/wiki_create_menu.py'
--- wiki/wizard/wiki_create_menu.py 2010-12-28 17:07:18 +0000
+++ wiki/wizard/wiki_create_menu.py 2010-12-29 06:12:09 +0000
@@ -47,14 +47,14 @@
obj_action = self.pool.get('ir.actions.act_window')
group_id = context.get('active_id', False)
if not group_id:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
datas = self.browse(cr, uid, ids, context=context)
data = False
if datas:
data = datas[0]
if not data:
- return {}
+ return {'type': 'ir.actions.act_window_close'}
value = {
'name': 'Wiki Page',
'view_type': 'form',
@@ -86,7 +86,7 @@
'action': 'ir.actions.act_window,'+ str(action_id),
}, context)
obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
wiki_create_menu()
=== modified file 'wiki/wizard/wiki_make_index.py'
--- wiki/wizard/wiki_make_index.py 2010-11-23 07:05:05 +0000
+++ wiki/wizard/wiki_make_index.py 2010-12-29 06:12:09 +0000
@@ -87,7 +87,7 @@
for rs in result:
wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
- return {}
+ return {'type': 'ir.actions.act_window_close'}
wiki_make_index()
Follow ups
