openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04380
[Merge] lp:~openerp-dev/openobject-addons/training_xml_raise into lp:~openobject-training/openobject-addons/training_with_history
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training_xml_raise into lp:~openobject-training/openobject-addons/training_with_history.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/training_xml_raise/+merge/53974
added missing xml file and solved error
--
https://code.launchpad.net/~openerp-dev/openobject-addons/training_xml_raise/+merge/53974
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training_xml_raise.
=== modified file 'training/training.py'
--- training/training.py 2011-03-18 08:57:04 +0000
+++ training/training.py 2011-03-18 11:23:29 +0000
@@ -2932,6 +2932,9 @@
def _get_product(self, cr, uid, ids, context=None):
assert len(ids) == 1
seance = self.browse(cr, uid, ids[0], context)
+ if not seance.course_id.course_type_id:
+ raise osv.except_osv(_('Warning'),
+ _("You have to selcet course type in the seance of course"))
return seance.course_id.course_type_id.product_id
training_seance()
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-03-18 10:16:47 +0000
+++ training/training_view.xml 2011-03-18 11:23:29 +0000
@@ -2123,7 +2123,7 @@
<form string="Participation">
<group colspan="4" col="4" groups="base.group_user">
<separator string="Contact Information" colspan="4" />
- <field name="job_id" colspan="4" />
+ <field name="job_id" />
</group>
<separator string="Seance Information" colspan="4" />
=== added file 'training_degree/wizard/training_validate_degree.xml'
--- training_degree/wizard/training_validate_degree.xml 1970-01-01 00:00:00 +0000
+++ training_degree/wizard/training_validate_degree.xml 2011-03-18 11:23:29 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="training_validate_degree_form">
+ <field name="name">validate.degree.form</field>
+ <field name="model">validate.degree</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Eligible Contacts">
+ <label string="Do you want to confirm all selected degrees ?" />
+ <newline/>
+ <group colspan="2" col="2">
+ <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button type="object" name="validate_all_degrees" string="Validate Assigned Degrees" icon="gtk-apply"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <act_window name="Validate Assigned Degrees"
+ res_model="validate.degree"
+ src_model="training.degree.contact"
+ view_mode="form"
+ target="new"
+ key2="client_action_multi"
+ id="action_training_validate_degree"/>
+
+ </data>
+</openerp>
Follow ups