diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py index 773458fe3cb..a026a077c85 100644 --- a/addons/base_report_creator/base_report_creator.py +++ b/addons/base_report_creator/base_report_creator.py @@ -23,33 +23,15 @@ from osv import fields, osv from tools.translate import _ from tools import ustr -class report_creator(osv.osv): +class report_result(osv.osv): """ Report Creator """ - _name = "base_report_creator.report" + _name = "base_report_creator_report.result" _description = "Report" - model_set_id = False # # Should request only used fields # - def export_data(self, cr, uid, ids, fields_to_export, context=None): - if context is None: - context = {} - data_l = self.read(cr, uid, ids, ['sql_query'], context=context) - final_datas = [] - #start Loop - for record in data_l: - datas = [] - for key in fields_to_export: - value = record.get(key,'') - if isinstance(value, tuple): - datas.append(ustr(value[1])) - else: - datas.append(ustr(value)) - final_datas += [datas] - #End Loop - return {'datas': final_datas} def fields_get(self, cr, user, fields=None, context=None): """ @@ -64,9 +46,9 @@ class report_creator(osv.osv): data = context and context.get('report_id', False) or False if (not context) or 'report_id' not in context: - return super(report_creator, self).fields_get(cr, user, fields, context) + return super(report_result, self).fields_get(cr, user, fields, context) if data: - report = self.browse(cr, user, data) + report = self.pool.get('base_report_creator.report').browse(cr, user, data,context=context) models = {} #Start Loop for model in report.model_ids: @@ -80,12 +62,8 @@ class report_creator(osv.osv): i += 1 else: fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'} - return fields - # - # Should Call self.fields_get ! - # def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): """ Overrides orm field_view_get. @@ -98,8 +76,8 @@ class report_creator(osv.osv): data = context and context.get('report_id', False) or False if (not context) or 'report_id' not in context: - return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) - report = self.browse(cr, user, data) + return super(report_result, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + report = self.pool.get('base_report_creator.report').browse(cr, user, context.get('report_id'), context=context) models = {} for model in report.model_ids: models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context) @@ -192,31 +170,11 @@ class report_creator(osv.osv): """ if context is None: context = {} - data = context.get('report_id', False) - res = super(report_creator, self).read(cr, user, ids, fields, context, load) - if (not context) or 'report_id' not in context: - return res - wp = '' - for data in res: - if not data.get('sql_query'): - return res - if self.model_set_id: - wp = [self._id_get(cr, user, data, context) + (' in (%s)' % (','.join(map(lambda x: "'" + str(x) + "'", ids))))] - cr.execute(data['sql_query']) - res = cr.dictfetchall() - fields_get = self.fields_get(cr, user, None, context) - for r in res: - for k in r: - r[k] = r[k] or False - field_dict = fields_get.get(k) - field_type = field_dict and field_dict.get('type', False) or False - if field_type and field_type == 'many2one': - if r[k] == False: - continue - related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)[0] - r[k] = related_name - - return res + report_id = context.get('active_id', False) + report = self.pool.get('base_report_creator.report').browse(cr, user, context.get('report_id'), context=context) + cr.execute(report.sql_query) + result = cr.dictfetchall() + return result def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False): """ @@ -231,9 +189,9 @@ class report_creator(osv.osv): context_id = context.get('report_id', False) if (not context) or 'report_id' not in context: - return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count) + return {} if context_id: - report = self.browse(cr, user, context_id) + report = self.pool.get('base_report_creator.report').browse(cr, user, context_id, context=context) i = 0 fields = {} for f in report.field_ids: @@ -254,10 +212,42 @@ class report_creator(osv.osv): ctx = context or {} ctx['getid'] = True sql_query = report.sql_query - cr.execute(sql_query, newargs2) + cr.execute(sql_query) # TODO: FILTER result = cr.fetchall() return map(lambda x: x[0], result) +report_result() + + +class report_creator(osv.osv): + """ + Report Creator + """ + _name = "base_report_creator.report" + _description = "Report" + model_set_id = False + # + # Should request only used fields + # + def export_data(self, cr, uid, ids, fields_to_export, context=None): + if context is None: + context = {} + data_l = self.read(cr, uid, ids, ['sql_query'], context=context) + final_datas = [] + #start Loop + for record in data_l: + datas = [] + for key in fields_to_export: + value = record.get(key,'') + if isinstance(value, tuple): + datas.append(ustr(value[1])) + else: + datas.append(ustr(value)) + final_datas += [datas] + #End Loop + return {'datas': final_datas} + + def _path_get(self, cr, uid, models, filter_ids=[]): """ @param cr: the current row, from the database cursor, @@ -465,7 +455,7 @@ class report_creator(osv.osv): 'name': rep.name, 'view_type': 'form', 'view_mode': view_mode, - 'res_model': 'base_report_creator.report', + 'res_model': 'base_report_creator_report.result', 'type': 'ir.actions.act_window', 'context': "{'report_id':%d}" % (rep.id,), 'nodestroy': True, @@ -596,3 +586,4 @@ class report_creator_filter(osv.osv): } report_creator_filter() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 74eb1a95b23..af2b53d1c93 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -41,7 +41,7 @@ appropriate staff, and make sure all future correspondence gets to the right place. The CRM module has a email gateway for the synchronisation interface -between mails and OpenERP. +between mails and OpenERP. Create dashboard for CRM that includes: * My Leads (list) * Leads by Stage (graph) @@ -95,6 +95,7 @@ Create dashboard for CRM that includes: 'crm_meeting_view.xml', 'crm_meeting_menu.xml', + 'crm_meeting_shortcut_data.xml', 'crm_phonecall_view.xml', 'crm_phonecall_menu.xml', @@ -106,12 +107,12 @@ Create dashboard for CRM that includes: 'report/crm_phonecall_report_view.xml', 'process/crm_configuration_process.xml', - 'crm_installer_view.xml', - + 'crm_installer_view.xml', + 'res_partner_view.xml', 'board_crm_view.xml', 'board_crm_statistical_view.xml', - + ], 'demo_xml': [ 'crm_demo.xml', diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index a75528810e0..35ff86cb5b8 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -92,12 +92,6 @@ action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1" /> - - Meetings - ir.ui.menu - - - Meeting Invitations ir.actions.act_window diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml new file mode 100644 index 00000000000..fcba36f7a61 --- /dev/null +++ b/addons/crm/crm_meeting_shortcut_data.xml @@ -0,0 +1,13 @@ + + + + + + Meetings + ir.ui.menu + + + + + + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index a57b76bf2ce..1f06815078e 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -342,7 +342,7 @@ class mrp_bom(osv.osv): if context is None: context = {} bom_data = self.read(cr, uid, id, [], context=context) - default.update({'name': bom_data['name'] + ' ' + _('Copy')}) + default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False}) return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context) mrp_bom() @@ -444,7 +444,7 @@ class mrp_production(osv.osv): 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."), - 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, + 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict", help="This is the internal picking list that brings the finished product to the production plan"), 'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True), 'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), @@ -602,12 +602,18 @@ class mrp_production(osv.osv): workcenter_line_obj.create(cr, uid, line) return len(results) - def action_cancel(self, cr, uid, ids): + def action_cancel(self, cr, uid, ids, context=None): """ Cancels the production order and related stock moves. @return: True """ + if context is None: + context = {} move_obj = self.pool.get('stock.move') - for production in self.browse(cr, uid, ids): + for production in self.browse(cr, uid, ids, context=context): + if production.state == 'confirmed' and production.picking_id.state not in ('draft', 'cancel'): + raise osv.except_osv( + _('Could not cancel manufacturing order !'), + _('You must first cancel related internal picking attached to this manufacturing order.')) if production.move_created_ids: move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids]) move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines]) @@ -664,7 +670,7 @@ class mrp_production(osv.osv): """ stock_mov_obj = self.pool.get('stock.move') production = self.browse(cr, uid, production_id, context=context) - + final_product_todo = [] produced_qty = 0 diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index a2249ca4925..26a8c643573 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -630,7 +630,8 @@ -