Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-board-training-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews: OpenObject Training (openobject-training) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/addons-board-training-ysa/+merge/54827 board_training :- module convert into v6. training_report :- improve reporting menu. -- https://code.launchpad.net/~openerp-dev/openobject-addons/addons-board-training-ysa/+merge/54827 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-board-training-ysa.
=== modified file 'board_training/__init__.py' --- board_training/__init__.py 2011-02-25 12:33:02 +0000 +++ board_training/__init__.py 2011-03-25 09:43:26 +0000 @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################################ # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved # Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved # Copyright (C) 2010-2011 Thamini S.Ã .R.L (<http://www.thamini.com>). All Rights Reserved @@ -23,3 +23,5 @@ ############################################################################################ import board_training + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === renamed file 'board_training/__terp__.py' => 'board_training/__openerp__.py' --- board_training/__terp__.py 2011-02-25 12:33:02 +0000 +++ board_training/__openerp__.py 2011-03-25 09:43:26 +0000 @@ -29,6 +29,7 @@ 'board', 'training', 'training_exam', + 'training_room', ], 'init_xml' : [], 'demo_xml' : [], @@ -42,3 +43,6 @@ 'active' : False, 'installable' : True, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + === modified file 'board_training/board_orders.xml' --- board_training/board_orders.xml 2010-09-11 13:31:46 +0000 +++ board_training/board_orders.xml 2011-03-25 09:43:26 +0000 @@ -97,7 +97,7 @@ Dashboard ZONE: Seance with Purchase in Errors --> <record model="ir.actions.act_window" id="seance_with_purchase_in_errors_action"> - <field name="name">Seance with Purchase in Errors</field> + <field name="name">Seance with Purchase in Errors</field> <field name="res_model">training.seance</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> @@ -131,9 +131,9 @@ <action name="%(seance_with_purchase_in_errors_action)d" string="Seance with Purchase in Errors"/> </child1> <child2> - <action name="%(purchase_order_line_disapproved_action)d" string="Disapproved Order Lines"/> + <action name="%(purchase_order_line_disapproved_action)d" string="Disapproved Order Lines"/> </child2> - </vpaned> + </vpaned> </child2> </vpaned> </form> === modified file 'board_training/board_training.py' --- board_training/board_training.py 2011-02-25 12:33:02 +0000 +++ board_training/board_training.py 2011-03-25 09:43:26 +0000 @@ -22,18 +22,20 @@ # ############################################################################################ -from osv import osv, fields -import mx.DateTime +from osv import osv +from osv import fields import tools from tools.func import partial FMT = '%Y-%m-%d' class act_window(osv.osv): + _inherit = 'ir.actions.act_window' _columns = { 'domain': fields.char('Domain Value', size=512), # bigger size... } + act_window() @@ -41,19 +43,18 @@ _inherit = 'training.session' def _has_confirmed_stakeholder_compute(self, cr, uid, ids, fields, args, context=None): - res = dict.fromkeys(ids, 0) + if context is None: + context = {} + result = dict.fromkeys(ids, 0) for obj in self.browse(cr, uid, ids, context=context): - res[obj.id] = all(any(part.state == 'accepted' for part in seance.contact_ids) + result[obj.id] = all(any(part.state == 'accepted' for part in seance.contact_ids) for seance in obj.seance_ids) - return res + return result _columns = { - 'has_confirmed_stakeholder' : fields.function(_has_confirmed_stakeholder_compute, - method=True, - string='Stakeholder', - type='boolean'), + 'has_confirmed_stakeholder' : fields.function(_has_confirmed_stakeholder_compute, method=True, string='Stakeholder', type='boolean'), } training_session() @@ -78,9 +79,11 @@ _inherit = 'training.session' def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False): + if context is None: + context = {} _super = partial(super(training_session, self).search, cr=cr, uid=uid, domain=domain, offset=offset, limit=limit, order=order, context=context, count=count) - min_limit_confirmed = context and context.get('min_limit_confirmed', False) or False + min_limit_confirmed = context.get('min_limit_confirmed', False) if min_limit_confirmed: ids = _super(order='date desc', count=False) ids = [session.id for session in self.browse(cr, uid, ids, context=context) if session.min_limit < (session.manual and session.participant_count_manual or session.participant_count)] @@ -88,7 +91,7 @@ return len(ids) return ids - working_days = context and context.get('working_days', False) or False + working_days = context.get('working_days', False) if working_days is not False: # 0 is for today cr.execute("select id from training_session where date::date in %s" % (_generate_sql_working_days(working_days),)) @@ -104,6 +107,8 @@ _inherit = 'training.seance' def _valid_participant_count(self, cr, uid, ids, fn, args, context=None): + if context is None: + context = {} result = dict.fromkeys(ids, False) for seance in self.browse(cr, uid, ids, context=context): count = ['participant_count_manual', 'participant_count'][seance.manual] @@ -111,12 +116,16 @@ return result def _course_has_attachments(self, cr, uid, ids, fn, args, context=None): + if context is None: + context = {} result = dict.fromkeys(ids, False) for seance in self.browse(cr, uid, ids, context=context): result[seance.id] = seance.kind == 'standard' and len(seance.course_id.attachment_ids) > 0 or False return result def _course_has_attachments_search(self, cr, uid, obj, name, domain, context=None): + if context is None: + context = {} if not len(domain): return [] @@ -142,22 +151,17 @@ _columns = { - 'valid_participant_count': fields.function(_valid_participant_count, - method=True, - string='Valid Participant Count', - store=True), - 'course_has_attachments': fields.function(_course_has_attachments, - method=True, - fnct_search=_course_has_attachments_search, - string='Couse Has Attachements?'), + 'valid_participant_count': fields.function(_valid_participant_count, method=True, string='Valid Participant Count', store=True), + 'course_has_attachments': fields.function(_course_has_attachments, method=True, fnct_search=_course_has_attachments_search, string='Couse Has Attachements?'), 'course_forced_nosupport': fields.related('course_id', 'forced_nosupport', type='boolean', string='Course Forced No Support'), } - def search(self, cr, uid, domain, offset=0, limit=None, order=None,context=None, count=False): + if context is None: + context = {} _super = partial(super(training_seance, self).search, cr=cr, uid=uid, domain=domain, offset=offset, limit=limit, order=order, context=context, count=count) - working_days = context and context.get('working_days', False) or False + working_days = context.get('working_days', False) if working_days is not False: # 0 is for today cr.execute("select id from training_seance where date::date in %s" % (_generate_sql_working_days(working_days),)) @@ -187,7 +191,9 @@ _inherit = 'training.participation.stakeholder' def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False): - condition = context and context.get('condition', False) or False + if context is None: + context = {} + condition = context.get('condition', False) if condition and condition in ('yes', 'no'): # To check the condition for the payment of the lecturer # 1. Check the evaluation form @@ -241,11 +247,7 @@ ('refused', 'Refused'), ('cancelled', 'Cancelled'), ('done', 'Done'), - ], - 'State', - readonly=True, - select=1 - ), + ], 'State', readonly=True, select=1), } def init(self, cr): @@ -316,3 +318,6 @@ """) training_participation_doublon() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + === modified file 'board_training/board_training_view.xml' --- board_training/board_training_view.xml 2011-02-23 12:45:17 +0000 +++ board_training/board_training_view.xml 2011-03-25 09:43:26 +0000 @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <openerp> <data> - <menuitem parent="board.dashboard_menu" id="board_mi" name="Training"/> + + <menuitem id="base.menu_training_report" name="Reporting" parent="training.training_mi" sequence="60"/> + <menuitem parent="base.menu_training_report" id="board_mi" name="Dashboard" sequence="1"/> <record model="ir.ui.view" id="seance_list_board"> <field name="name">training.seance.list.dashboard</field> @@ -123,7 +125,7 @@ </tree> </field> </record> - + <record model="ir.actions.act_window" id="today_training_to_start_act"> <field name="name">Today's Trainings To Start</field> <field name="res_model">training.seance</field> @@ -141,7 +143,7 @@ <field name="view_id" ref='seance_list_board_2'/> <field name="domain">[('state', 'in', ['inprogress']), ('original_session_id.kind', 'in', ['standard', 'exam']), ('date','<',time.strftime('%Y-%m-%d 23:59:59'))]</field> </record> - + <record model="ir.actions.act_window" id="today_training_to_done_act"> <field name="name">Today's Trainings To Finalize</field> <field name="res_model">training.seance</field> @@ -192,7 +194,7 @@ <field name="view_id" ref="session_list_min_limit_confirm_board" /> <field name="domain">['&', ('state', '=', 'opened'), '|', ('min_limit_reached', '=', True), ('date','<',(datetime.datetime.today() + datetime.timedelta(days=30)).strftime('%Y-%m-%d 23:59:59'))]</field> </record> - + <record model="ir.actions.act_window" id="board_seances_to_confirm_standard_act"> <field name="name">Standard Seances To Confirm</field> <field name="res_model">training.seance</field> @@ -228,6 +230,21 @@ <field name="domain">[('state', 'in', ['draft', 'valid'])]</field> </record> + <record model="ir.actions.act_window" id="training_subscription_to_validate_act"> + <field name="name">Subscriptions to Validate</field> + <field name="res_model">training.subscription</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('state', '=', 'draft')]</field> + </record> + + <record model="ir.actions.act_window" id="training_subscription_line_draft_act"> + <field name="name">Subscription Lines to Validate</field> + <field name="res_model">training.subscription.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]</field> + </record> <record model="ir.ui.view" id="planification_board"> <field name="name">training.planification.dashboard</field> @@ -257,10 +274,10 @@ </child1> <child2 col="2"> <group col="1" expand="1"> - <action name="%(training.training_subscription_to_validate_act)d" string="Subscriptions to Validate"/> + <action name="%(training_subscription_to_validate_act)d" string="Subscriptions to Validate"/> </group> <group col="1"> - <action name="%(training.training_subscription_line_draft_act)d" string="Subscription Lines to Validate"/> + <action name="%(training_subscription_line_draft_act)d" string="Subscription Lines to Validate"/> </group> </child2> </vpaned> @@ -305,11 +322,26 @@ </field> </record> + <record model="ir.ui.view" id="participation_stakeholder_doublon_search"> + <field name="name">training.participation.stakeholder.doublon.search</field> + <field name="model">training.participation.stakeholder.doublon</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Doublon"> + <field name="contact_id"/> + <field name="seance_id"/> + <field name="state"/> + <field name="date"/> + </search> + </field> + </record> + <record model="ir.actions.act_window" id="participation_stakeholder_doublon_act"> <field name="name">Participations (Doublons)</field> <field name="res_model">training.participation.stakeholder.doublon</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> + <field name="search_view_id" ref="participation_stakeholder_doublon_search"/> </record> <!-- @@ -343,13 +375,27 @@ </form> </field> </record> - + + <record model="ir.ui.view" id="participation_doublon_search"> + <field name="name">training.participation.doublon.search</field> + <field name="model">training.participation.doublon</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Doublon"> + <field name="contact_id"/> + <field name="seance_id"/> + <field name="subscription_line_id"/> + <field name="date"/> + </search> + </field> + </record> <record model="ir.actions.act_window" id="participation_doublon_act"> <field name="name">Seances Participations (Doublons)</field> <field name="res_model">training.participation.doublon</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> + <field name="search_view_id" ref="participation_doublon_search"/> </record> <!-- === modified file 'training_report/report_training_view.xml' --- training_report/report_training_view.xml 2011-03-25 07:15:30 +0000 +++ training_report/report_training_view.xml 2011-03-25 09:43:26 +0000 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem id="menu_training_report" name="Reporting" parent="training.training_mi" sequence="60"/> + <menuitem id="base.menu_training_report" name="Reporting" parent="training.training_mi" sequence="60"/> <record model="ir.ui.view" id="training_report_wizard_form"> <field name="name">training_report_wizard</field> @@ -37,7 +37,7 @@ <field name="target">new</field> </record> - <menuitem id="training_report_wizard_mi" parent="menu_training_report" action="training_report_wizard_act" /> + <menuitem id="training_report_wizard_mi" parent="base.menu_training_report" action="training_report_wizard_act" /> <record model="ir.ui.view" id="view_report_confirmed_subscription_count_tree"> <field name="name">training.report.confirmed.subscription.count.tree</field> === modified file 'training_report/wizard/training_report_session_volume_view.xml' --- training_report/wizard/training_report_session_volume_view.xml 2011-03-17 10:30:53 +0000 +++ training_report/wizard/training_report_session_volume_view.xml 2011-03-25 09:43:26 +0000 @@ -31,7 +31,7 @@ <field name="target">new</field> </record> - <menuitem id="training_report_volume_mi" parent="menu_training_report" action="action_training_report_session_volume_form_act"/> + <menuitem id="training_report_volume_mi" parent="base.menu_training_report" action="action_training_report_session_volume_form_act"/> </data> </openerp>
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
