openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03692
lp:~openerp-dev/openobject-addons/6.0-training-fix-add-search-view-ysa into lp:~openerp/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-training-fix-add-search-view-ysa into lp:~openerp/openobject-addons/training.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-training-fix-add-search-view-ysa/+merge/52065
"[IMP+FIX] training :-Fix problem occur during training module installation in v6. Add search view in some model.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-training-fix-add-search-view-ysa/+merge/52065
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-training-fix-add-search-view-ysa.
=== modified file 'training/__terp__.py'
--- training/__terp__.py 2011-03-03 09:38:13 +0000
+++ training/__terp__.py 2011-03-03 13:27:11 +0000
@@ -41,6 +41,7 @@
'base',
'core_config',
'base_contact_team',
+ 'decimal_precision',
'base_iban',
'account',
'account_payment',
@@ -53,8 +54,8 @@
'sale',
'document',
'document_type',
+ 'procurement',
'account_analytic_plans',
- 'purchase_manual',
],
'init_xml' : [
@@ -68,8 +69,8 @@
'demo/training_course.xml',
'demo/training_offer.xml',
'demo/training_catalog.xml',
- 'demo/training_session.xml',
- 'demo/training_seance.xml',
+# 'demo/training_session.xml',
+# 'demo/training_seance.xml',
],
'update_xml' : [
'training_config.xml',
=== modified file 'training/document_price.py'
--- training/document_price.py 2011-03-03 09:38:13 +0000
+++ training/document_price.py 2011-03-03 13:27:11 +0000
@@ -27,6 +27,7 @@
import netsvc
from tools import config
from tools.translate import _
+import decimal_precision as dp
class document_price_component(osv.osv):
_name = 'document.price.component'
@@ -83,9 +84,9 @@
'attach_id' : fields.many2one('ir.attachment', 'Document', required=True, ondelete="cascade"),
'product_qty' : fields.integer('Quantity', required=True),
'product_id' : fields.many2one('product.product', 'Product', required=True),
- 'unit_price' : fields.related('product_id', 'standard_price', type='float', string='Unit Price', readonly=True, digits=(16, int(config['price_accuracy']))),
+ 'unit_price' : fields.related('product_id', 'standard_price', type='float', string='Unit Price', readonly=True, digits_compute=dp.get_precision('Account')),
'price' : fields.function(_price_compute, method=True, type='float', string='Price',
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
store = {
'product.product': (_store_get_products, ['standard_price'], 10),
'document.price.component': (_store_get_own, None, 9),
@@ -117,7 +118,7 @@
'component_ids' : fields.one2many('document.price.component', 'attach_id'),
'price' : fields.function(_price_compute, method=True,
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
string='Price',
type='float'),
'state' : fields.selection( [ ('draft', 'Draft'), ('validated', 'Validated'), ('pending', 'Pending') ], 'State', select=1, readonly=True),
=== modified file 'training/invoice.py'
--- training/invoice.py 2011-03-03 09:38:13 +0000
+++ training/invoice.py 2011-03-03 13:27:11 +0000
@@ -68,7 +68,7 @@
# Look for purchase journal, and corresponding analytic journal
a_journal_id = ''
- adist_id=''
+ adist_id= ''
journal_list = proxy_journal.search(cr, uid, [('type','=','purchase'),('refund_journal','=',False)])
if journal_list:
if proxy_journal.read(cr, uid, [ journal_list[0] ], ['analytic_journal_id'])[0]['analytic_journal_id']:
=== modified file 'training/security/ir.model.access.csv'
--- training/security/ir.model.access.csv 2011-03-03 09:38:13 +0000
+++ training/security/ir.model.access.csv 2011-03-03 13:27:11 +0000
@@ -87,8 +87,8 @@
"access_tr_part_reassign_wizard_session_man","training.participation.reassign.wizard","model_training_participation_reassign_wizard","training.group_session_manager",1,1,1,1
"access_tr_part_reassign_wizard_seance_man","training.participation.reassign.wizard","model_training_participation_reassign_wizard","training.group_seance_manager",1,1,1,1
"access_training_seance_purchase_error_ro","training.seance.purchase_errors","model_training_seance_purchase_errors","training.group_training",1,0,0,0
-"access_res_partner_function_training_ro","res.partner.function","base.model_res_partner_function","training.group_training",1,0,0,0
-"access_res_partner_function_training_sub_man_ro","res.partner.function","base.model_res_partner_function","training.group_subscription_manager",1,0,0,0
+"access_res_partner_function_training_ro","res.partner.function","base_contact.model_res_partner_function","training.group_training",1,0,0,0
+"access_res_partner_function_training_sub_man_ro","res.partner.function","base_contact.model_res_partner_function","training.group_subscription_manager",1,0,0,0
"access_training_content_review_user","training.content.review","training.model_training_content_review","training.group_content_review_user",1,0,0,0
"access_training_content_review_line_user","training.content.review.line","training.model_training_content_review_line","training.group_content_review_user",1,0,0,0
"access_training_content_review_writer_user","training.content.review.writer","training.model_training_content_review_writer","training.group_content_review_user",1,0,0,0
=== modified file 'training/security/training_security.xml'
--- training/security/training_security.xml 2011-03-03 09:38:13 +0000
+++ training/security/training_security.xml 2011-03-03 13:27:11 +0000
@@ -101,19 +101,5 @@
</record>
-->
- <record model="res.roles" id="role_course_manager">
- <field name="name">Training / Course Manager</field>
- <!--
- <field name="parent_id" ref="role_training" />
- -->
- </record>
-
- <record id="role_subscription_manager" model="res.roles">
- <field name="name">Training / Subscription Manager</field>
- <!--
- <field name="parent_id" ref="role_training" />
- -->
- </record>
-
</data>
</openerp>
=== modified file 'training/training.py'
--- training/training.py 2011-03-03 09:38:13 +0000
+++ training/training.py 2011-03-03 13:27:11 +0000
@@ -38,7 +38,7 @@
import re
from product import _get_product_procurement_trigger
from product import _get_product_procurement_methods
-
+import decimal_precision as dp
WRITABLE_ONLY_IN_DRAFT = dict(readonly=True, states={'draft': [('readonly', False)]})
@@ -175,9 +175,9 @@
help="The quantity of this product"),
'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True,
help="The unit of mesure for this product"),
- 'product_price' : fields.function(_fcalc_product_price, type='float', digits=(16, int(config['price_accuracy'])), string='Cost Price', method=True),
+ 'product_price' : fields.function(_fcalc_product_price, type='float', digits_compute=dp.get_precision('Account'), string='Cost Price', method=True),
'attachment_id' : fields.many2one('ir.attachment', 'Attachment'),
- 'attachment_price' : fields.related('attachment_id', 'price', type='float', digits=(16, int(config['price_accuracy'])), string='Attachment Price', readonly=True),
+ 'attachment_price' : fields.related('attachment_id', 'price', type='float', digits_compute=dp.get_precision('Account'), string='Attachment Price', readonly=True),
}
_defaults = {
@@ -428,7 +428,7 @@
method=True,
string='Price',
type='float',
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
#store = {
# 'ir.attachment' : (_get_support, None, 10),
#},
@@ -2959,7 +2959,7 @@
'course_id': fields.many2one('training.course', 'For Course'),
'description' : fields.char('Description', size=128, required=True),
'fix' : fields.selection(_get_product_procurement_methods, 'Invoiced Quantity', required=True),
- 'procurement_id' : fields.many2one('mrp.procurement', 'Procurement'),
+ 'procurement_id' : fields.many2one('procurement.order', 'Procurement'),
'proc_qty' : fields.function(_proc_qty_compute,
method=True,
string='Ordered Quantity',
@@ -3331,7 +3331,7 @@
'offer_id' : fields.related('session_id', 'offer_id', type='many2one', relation='training.offer', string='Offer', select=1, store=True, readonly=True),
'offer_product_line_id' : fields.related('session_id', 'offer_id', 'product_line_id', type='many2one', relation='training.course_category', select=1, string='Product Line'),
- 'price' : fields.float('Sales Price', digits=(16, int(config['price_accuracy'])), required=True, write=['base.group_user'], **WRITABLE_ONLY_IN_DRAFT),
+ 'price' : fields.float('Sales Price', digits_compute=dp.get_precision('Account'), required=True, write=['base.group_user'], **WRITABLE_ONLY_IN_DRAFT),
'partner_id' : fields.related('subscription_id', 'partner_id', type='many2one', store=True,
relation='res.partner', string="Partner", select=1, readonly=True),
'job_id' : fields.many2one('res.partner.job', 'Participant', select=1, required=True,
@@ -4067,7 +4067,7 @@
'price' : fields.function(_price_compute, method=True,
string='Remuneration',
type='float',
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
store={
'training.participation.stakeholder': (_store_get_requests, None, 25),
},
@@ -4403,11 +4403,11 @@
'paid' : fields.related('purchase_order_id', 'invoiced', type='boolean', string='Invoiced & Paid', readonly=True, select=1),
'manual_price': fields.boolean('Manual Price'),
- 'forced_price': fields.float('Renumeration', required=True, digits=(16, int(config['price_accuracy'])),),
+ 'forced_price': fields.float('Renumeration', required=True, digits_compute=dp.get_precision('Account')),
'price' : fields.function(_get_price, method=True,
string='Remuneration',
type='float',
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
store=True,
),
'product_id' : fields.many2one('product.product', 'Product', select=2),
=== modified file 'training/training_content_review.py'
--- training/training_content_review.py 2011-03-03 09:38:13 +0000
+++ training/training_content_review.py 2011-03-03 13:27:11 +0000
@@ -26,6 +26,7 @@
from osv import fields
from tools import config
from tools.translate import _
+import decimal_precision as dp
class training_content_review_line_advance(osv.osv):
_name = 'training.content.review.line'
@@ -410,14 +411,14 @@
'product_qty': fields.float('Quantity', required=True),
'product_uom': fields.many2one('product.uom', 'Product UoM'),
'unit_price': fields.float('Unit Price', required=True,
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
),
'price': fields.function(_price_compute,
method=True,
string='Price',
store=True,
select=2,
- digits=(16, int(config['price_accuracy'])),
+ digits_compute=dp.get_precision('Account'),
type='float'),
}
=== modified file 'training/training_content_review_view.xml'
--- training/training_content_review_view.xml 2011-03-03 09:38:13 +0000
+++ training/training_content_review_view.xml 2011-03-03 13:27:11 +0000
@@ -59,11 +59,26 @@
</field>
</record>
+ <record model="ir.ui.view" id="training_content_review_reason_search">
+ <field name="name">training.content.review.reason.search</field>
+ <field name="model">training.content.review.reason</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Content Review Reason">
+ <field name="code"/>
+ <field name="name"/>
+ <field name="type"/>
+ <field name="to_invoice"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_content_review_reason_action">
<field name="name">Content Review Reason</field>
<field name="res_model">training.content.review.reason</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_content_review_reason_search"/>
</record>
<menuitem id="training_configuration_content_review_mi"
=== modified file 'training/training_email_view.xml'
--- training/training_email_view.xml 2011-03-03 09:38:13 +0000
+++ training/training_email_view.xml 2011-03-03 13:27:11 +0000
@@ -32,20 +32,19 @@
<field name="notes" nolabel="1" colspan="4"/>
</page>
<page string='Help'>
- <label colspan='4'>Available objects: ${ctx}, ${time}, ${user}
-For 'Invoice': ${invoice}
-For 'Request For Lecturer (seance)': ${seance}
-For others: ${session}
-Participant and HR Emails: ${subline}
-Stakeholder Emails: ${sh}
- </label>
+ <label colspan='4' string="Available objects: ${ctx}, ${time}, ${user}
+ For 'Invoice': ${invoice}
+ For 'Request For Lecturer (seance)': ${seance}
+ For others: ${session}
+ Participant and HR Emails: ${subline}
+ Stakeholder Emails: ${sh}"/>
</page>
</notebook>
<group col="5" colspan="4">
<field name="state" />
- <button name="draft_cb" string="_Draft" type="object" states="deprecated" />
- <button name="validate_cb" string="_Validate" type="object" states="draft" />
- <button name="deprecate_cb" string="Deprecate" type="object" states="validated,draft" />
+ <button name="draft_cb" string="_Draft" type="object" icon="terp-document-new" states="deprecated" />
+ <button name="validate_cb" string="_Validate" type="object" icon="terp-accessories-archiver" states="draft" />
+ <button name="deprecate_cb" string="Deprecate" type="object" icon="terp-dialog-close" states="validated,draft" />
</group>
</form>
</field>
@@ -60,12 +59,44 @@
<field name="subject" />
<field name="trigger"/>
<field name="target"/>
+ <field name="smtp_client_id"/>
+ <field name="layout_id"/>
+ <field name="sign_id"/>
<field name="stylegroup_id"/>
<field name="state" />
</tree>
</field>
</record>
+ <record model="ir.ui.view" id="training_email_search">
+ <field name="name">training.email.search</field>
+ <field name="model">training.email</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Email">
+ <group col='10' colspan='4'>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
+ <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
+ <separator orientation="vertical"/>
+ <field name="subject"/>
+ <field name="trigger"/>
+ <field name="target"/>
+ <field name="stylegroup_id"/>
+ </group>
+ <newline/>
+ <group expand="0" string="Group By..." colspan="4" col="20">
+ <filter string="Smtp Client" icon="terp-personal" domain="[]" context="{'group_by':'smtp_client_id'}"/>
+ <filter string="Layout" icon="terp-report" domain="[]" context="{'group_by':'layout_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Trigger" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'trigger'}"/>
+ <filter string="Target" icon="terp-stage" domain="[]" context="{'group_by':'target'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="training_email_stylegroup_tree">
<field name="name">training.email.stylegroup.tree</field>
<field name="model">training.email.stylegroup</field>
@@ -90,6 +121,17 @@
</field>
</record>
+ <record model="ir.ui.view" id="training_email_stylegroup_search">
+ <field name="name">training.email.stylegroup.search</field>
+ <field name="model">training.email.stylegroup</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Email Style Group">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="training_email_sign_form">
<field name="name">training.email.sign.form</field>
<field name="model">training.email.sign</field>
@@ -97,7 +139,7 @@
<field name="arch" type="xml">
<form string="Email Sign">
<field name="name" colspan="4"/>
- <label colspan="4">The following objects are availables: ${ctx}, ${time}, ${user}</label>
+ <label colspan="4" string="The following objects are availables: ${ctx}, ${time}, ${user}"/>
<field name="sign" colspan="4"/>
</form>
</field>
@@ -114,6 +156,17 @@
</field>
</record>
+ <record model="ir.ui.view" id="training_email_sign_search">
+ <field name="name">training.email.sign.search</field>
+ <field name="model">training.email.sign</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Email Sign">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="training_email_layout_form">
<field name="name">training.email.layout.form</field>
<field name="model">training.email.layout</field>
@@ -121,7 +174,7 @@
<field name="arch" type="xml">
<form string="Email Layout">
<field name="name" colspan="4"/>
- <label colspan="4">The following objects are availables: ${ctx}, ${time}, ${user}, ${sign}, ${body}</label>
+ <label colspan="4" string="The following objects are availables: ${ctx}, ${time}, ${user}, ${sign}, ${body}"/>
<field name="layout" colspan="4"/>
</form>
</field>
@@ -138,11 +191,23 @@
</field>
</record>
+ <record model="ir.ui.view" id="training_email_layout_search">
+ <field name="name">training.email.layout.search</field>
+ <field name="model">training.email.layout</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Email Layout">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_email_all_act">
<field name="name">Emails</field>
<field name="res_model">training.email</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_email_search"/>
</record>
<record model="ir.actions.act_window" id="training_email_stylegroup_act">
@@ -150,12 +215,14 @@
<field name="res_model">training.email.stylegroup</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_email_stylegroup_search"/>
</record>
<record model="ir.actions.act_window" id="training_email_sign_act">
<field name="name">Email Sign</field>
<field name="res_model">training.email.sign</field>
<field name="view_type">form</field>
+ <field name="search_view_id" ref="training_email_sign_search"/>
<field name="view_mode">tree,form</field>
</record>
@@ -164,6 +231,7 @@
<field name="res_model">training.email.layout</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_email_layout_search"/>
</record>
<menuitem parent="training_config_mi" id="training_email_all_mi"
@@ -207,11 +275,25 @@
</field>
</record>
+ <record model="ir.ui.view" id="training_email_error_search">
+ <field name="name">training.email.error.search</field>
+ <field name="model">training.email.error</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Email Error">
+ <field name="name"/>
+ <field name="create_date" />
+ <field name="create_uid" />
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_email_error_all_act">
<field name="name">Errors</field>
<field name="res_model">training.email.error</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_email_error_search"/>
</record>
<menuitem id="training_email_error_all_mi" parent="training_email_all_mi" action="training_email_error_all_act"/>
@@ -267,8 +349,8 @@
</div>
<div id='footer'>
<div id='sign'>
-% if sign:
- ${sign}
+% if sign:
+ ${sign}
% endif
</div>
</div>
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-03-03 09:38:13 +0000
+++ training/training_view.xml 2011-03-03 13:27:11 +0000
@@ -8,37 +8,54 @@
<field name="arch" type="xml">
<form string="Theme">
<separator string="Theme" colspan="4"/>
- <field name="nr" />
+ <field name="nr"/>
<field name="parent_id"/>
- <field name="name" />
- <field name="priority" />
- <field name="active" />
+ <field name="name"/>
+ <field name="priority"/>
+ <field name="active"/>
<separator string="Partners" colspan="4"/>
<field name="partner_ids" nolabel="1" colspan="4"/>
</form>
</field>
</record>
+
<record model="ir.ui.view" id="course_theme_tree">
<field name="name">training.course.theme.tree</field>
<field name="model">training.course.theme</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Themes">
- <field name="nr" />
+ <field name="nr"/>
<field name="parent_id"/>
- <field name="name" />
+ <field name="name"/>
<field name="priority"/>
<field name="partner_ids"/>
- <field name="active" />
+ <field name="active"/>
</tree>
</field>
</record>
+ <record model="ir.ui.view" id="course_theme_search">
+ <field name="name">training.course.theme.search</field>
+ <field name="model">training.course.theme</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Course Theme">
+ <field name="name"/>
+ <field name="parent_id"/>
+ <field name="priority"/>
+ <field name="active"/>
+ <field name="nr"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="course_theme_all_act">
<field name="name">Themes of courses</field>
<field name="res_model">training.course.theme</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="course_theme_search"/>
</record>
<act_window id="link_theme_to_partner"
@@ -55,18 +72,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Product Line">
- <separator string="Product Line Description" colspan="4" />
- <field name="name" string="Code" select="1" />
- <field name="parent_id" string="Parent" />
+ <separator string="Product Line Description" colspan="4"/>
+ <field name="name" string="Code" select="1"/>
+ <field name="parent_id" string="Parent"/>
<notebook colspan="4">
<page string="Description">
- <field name="description" nolabel="1" colspan="4" />
+ <field name="description" nolabel="1" colspan="4"/>
</page>
<page string="Partners & Pricelist">
- <separator string="Pricelist" colspan="4" />
- <field name="price_list_id" />
- <separator string="Partners" colspan="4" />
- <field name="partner_ids" colspan="4" nolabel="1" />
+ <separator string="Pricelist" colspan="4"/>
+ <field name="price_list_id"/>
+ <separator string="Partners" colspan="4"/>
+ <field name="partner_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
@@ -80,26 +97,45 @@
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Product Lines">
- <field name="complete_name" string="Code" />
- <field name="description" />
+ <field name="complete_name" string="Code"/>
+ <field name="description"/>
+ <field name="parent_id" string="Parent"/>
+ <field name="price_list_id"/>
</tree>
</field>
</record>
+ <record model="ir.ui.view" id="training_course_category_search">
+ <field name="name">training.course_category.search</field>
+ <field name="model">training.course_category</field>
+ <field name="type">search</field>
+ <field name="field_parent">child_ids</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Course Category">
+ <field name="complete_name" string="Code"/>
+ <field name="price_list_id"/>
+ <field name="parent_id" string="Parent" widget="selection"/>
+ <field name="price_list_id" widget="selection"/>
+ <field name="description"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="open_training_course_by_category_all_act">
<field name="name">Courses</field>
<field name="res_model">training.course</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('category_id', '=', active_id)]</field>
+ <field name="search_view_id" ref="training_course_category_search"/>
</record>
<record model="ir.values" id="ir_action_course_by_category">
- <field name="key2" eval="'tree_but_open'" />
- <field name="model" eval="'training.course_category'" />
+ <field name="key2" eval="'tree_but_open'"/>
+ <field name="model" eval="'training.course_category'"/>
<field name="name">Courses By Product Line</field>
- <field name="value" eval="'ir.actions.act_window,%d'%open_training_course_by_category_all_act" />
- <field name="object" eval="True" />
+ <field name="value" eval="'ir.actions.act_window,%d'%open_training_course_by_category_all_act"/>
+ <field name="object" eval="True"/>
</record>
<record model="ir.actions.act_window" id="training_course_by_category_all_act">
@@ -124,20 +160,20 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Type">
- <separator string="Course Type Description" colspan="4" />
- <field name="name" />
+ <separator string="Course Type Description" colspan="4"/>
+ <field name="name"/>
<notebook colspan="4">
<page string="General">
- <separator string="Limits" colspan="4" />
- <field name="min_limit" />
- <field name="max_limit" />
+ <separator string="Limits" colspan="4"/>
+ <field name="min_limit"/>
+ <field name="max_limit"/>
<separator string="Description" colspan="4"/>
<field name="description" nolabel="1" colspan="4"/>
<separator string="Objective" colspan="4"/>
<field name="objective" nolabel="1" colspan="4"/>
</page>
<page string="Cost Prices">
- <field name="product_id" required="1" />
+ <field name="product_id" required="1"/>
</page>
</notebook>
</form>
@@ -150,19 +186,35 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Types">
- <field name="name" />
- <field name="min_limit" />
- <field name="max_limit" />
- <field name="description" />
+ <field name="name"/>
+ <field name="product_id"/>
+ <field name="min_limit"/>
+ <field name="max_limit"/>
+ <field name="description"/>
</tree>
</field>
</record>
+ <record model="ir.ui.view" id="training_course_type_search">
+ <field name="name">training.course_type.search</field>
+ <field name="model">training.course_type</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Course Type">
+ <field name="name"/>
+ <field name="product_id" widget="selection"/>
+ <field name="min_limit"/>
+ <field name="max_limit"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_course_type_all_act">
<field name="name">Levels</field>
<field name="res_model">training.course_type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_course_type_search"/>
</record>
<record model="ir.ui.view" id="training_course_form">
@@ -267,9 +319,9 @@
</notebook>
<group colspan="4" col="6">
<field name="state_course" />
- <button string="Deprecate" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
+ <button string="Deprecate" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
confirm="Do you want to deprecate this course ?" />
- <button string="Validate" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
+ <button string="Validate" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
confirm="Do you want to validate this course ?" />
<button string="Reset to Draft" type="object" name="reset_to_draft" attrs="{'invisible' : [('state_course', '!=', 'deprecated')]}" />
</group>
@@ -426,7 +478,7 @@
<button name="signal_cancel" string="Cancel" type="workflow" states="validated,inprogress"
confirm="Do you want to cancel this catalog ?"/>
<button name="signal_inprogress" string="In Progress" type="workflow" states="validated" />
- <button name="signal_deprecate" string="Deprecate" type="workflow" states="inprogress"
+ <button name="signal_deprecate" string="Deprecate" type="workflow" states="inprogress"
confirm="Do you want to deprecate this catalog ?"/>
</group>
</form>
@@ -537,14 +589,14 @@
context="{'default_session_id': id}">
<form string="Lecturer Requests">
<field name="session_id" invisible="1"/>
- <field name="job_id" on_change="on_change_job(job_id)" domain="[('name', '!=', False)]"
+ <field name="job_id" on_change="on_change_job(job_id)" domain="[('name', '!=', False)]"
context="{'offer_id': parent.offer_id, 'function': parent.kind}" />
<field name="email" />
<field name="participation_ids"
nolabel="1"
colspan="4"
context="{'default_job_id': job_id, 'default_request_session_id': session_id}"
- attrs="{'readonly': [('job_id', '=', False)]}"
+ attrs="{'readonly': [('job_id', '=', False)]}"
/>
<separator colspan="4"/>
<field name="state" />
@@ -729,7 +781,7 @@
</form>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="seance_generate_zip_wizard_act">
<field name="name">Generate Reports</field>
@@ -738,8 +790,8 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
-
-
+
+
<record model="ir.ui.view" id="training_seance_form">
<field name="name">training.seance.form</field>
<field name="model">training.seance</field>
@@ -1055,13 +1107,13 @@
<field name="job_id"
context="{'partner_id' : parent.partner_id}"
domain="[('name', '=', parent.partner_id)]"
- on_change="on_change_job(job_id)"
+ on_change="on_change_job(job_id)"
link="0" />
<field name="job_email" />
<separator string="Session" colspan="4"/>
<field name="session_id"
- on_change="on_change_session(session_id, price_list_id, parent.partner_id)"
+ on_change="on_change_session(session_id, price_list_id, parent.partner_id)"
link="0" />
<field name="session_date" />
<field name="kind" />
@@ -1107,9 +1159,9 @@
</notebook>
<group colspan="4" col="6">
<field name="state" />
- <button string="Confirm Request" type="workflow" name="signal_confirm" states="draft"
+ <button string="Confirm Request" type="workflow" name="signal_confirm" states="draft"
confirm="Do you want to confirm the request for this subscription ?" />
- <button string="Cancel" type="workflow" name="signal_cancel" states="draft"
+ <button string="Cancel" type="workflow" name="signal_cancel" states="draft"
confirm="Do you want to cancel this subscription ?" />
</group>
</form>
@@ -1209,8 +1261,8 @@
<group states="replacement" colspan="4">
<separator string="New Participant" colspan="4" />
- <field name="new_participant_id"
- on_change="on_change_new_participant(new_participant_id)"
+ <field name="new_participant_id"
+ on_change="on_change_new_participant(new_participant_id)"
context="{'partner_id' : partner_id}"
attrs="{'required' : [('state', '=', 'replacement')]}" />
<field name="new_participant_email" />
@@ -1232,8 +1284,8 @@
<separator string="Medical Certificate" colspan="4" />
<field name="cancellation_medical_certificate_toggle" />
<field name="cancellation_medical_certificate_name" invisible="1" />
- <field name="cancellation_medical_certificate"
- filename="cancellation_medical_certificate_name"
+ <field name="cancellation_medical_certificate"
+ filename="cancellation_medical_certificate_name"
attrs="{'readonly' : [('cancellation_medical_certificate_toogle', '=', False)]}" />
</group>
@@ -1250,7 +1302,7 @@
<label string="" />
<button name="action_cancellation" string="Cancellation" type="object" states="init" />
<button name="action_replacement" string="Replacement" type="object" states="init" />
- <button name="action_postponement" string="Postponement" type="object" states="init" />
+ <button name="action_postponement" string="Postponement" type="object" states="init" />
<label string="" />
<button name="action_apply" string="Apply" type="object" states="cancellation,replacement,postponement" icon="gtk-apply"/>
</group>
@@ -1300,7 +1352,7 @@
<field name="paid" />
</group>
<group states="confirmed,done" groups="training.group_training">
- <button name="action_create_invoice" string="Create Invoice" type="object"
+ <button name="action_create_invoice" string="Create Invoice" type="object"
attrs="{'invisible': [('invoice_line_id', '!=', False)]}" />
</group>
</group>
@@ -1339,25 +1391,25 @@
<button name="signal_invoice_and_send_emails" string="Cancel (Penalities)" type="workflow" states="confirmed"
confirm="Do you want to cancel this subscription line ?" />
<button name="%(training.subscription_cancellation_wizard_act)d"
- string="Cancel (Free)"
- type="action"
+ string="Cancel (Free)"
+ type="action"
groups="training.group_subscription_manager"
states="confirmed"
- context="{'default_state':'cancellation'}"
+ context="{'default_state':'cancellation'}"
confirm="Do you want to cancel this subscription line ?" />
<button name="%(training.subscription_cancellation_wizard_act)d"
string="Replacement"
type="action"
states="confirmed"
groups="training.group_subscription_manager"
- context="{'default_state':'replacement'}"
+ context="{'default_state':'replacement'}"
confirm="Do you want to do a replacement for this subscription line ?" />
<button name="%(training.subscription_cancellation_wizard_act)d"
string="Postponement"
type="action"
states="confirmed"
groups="training.group_subscription_manager"
- context="{'default_state':'postponement'}"
+ context="{'default_state':'postponement'}"
confirm="Do you want to postpone this subscription line ?" />
<button name="signal_done" string="Done" type="workflow" states="confirmed" />
</group>
@@ -1662,7 +1714,7 @@
<field name="state" />
<button name="signal_validate" string="Validate" type="workflow" states="draft"
confirm="Do you want to validate this offer ?"/>
- <button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
+ <button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
confirm="Do you want to deprecate this offer ?" />
<button name="draft_cb" string="Draft" type="object" states="validated,deprecated"
confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"
@@ -1969,7 +2021,7 @@
<menuitem id="present_participant_participation_mi" parent="training_participation_all_mi" action="action_training_participation_present_all" />
<menuitem id="absent_participant_participation_mi" parent="training_participation_all_mi" action="action_training_participation_absent_all" />
-
+
<record model='ir.ui.view' id='view_participation_stakeholder_request_form'>
<field name="name">training.participation.stakeholder.request.form</field>
<field name="model">training.participation.stakeholder.request</field>
@@ -1988,7 +2040,7 @@
<field name="payment_mode" />
<field name="price" />
<field name="purchase_order_id" groups="training.group_training" />
- <button type="object" name="action_create_purchase_order" string="Create Purchase Order"
+ <button type="object" name="action_create_purchase_order" string="Create Purchase Order"
attrs="{'invisible' : [('purchase_order_id', '!=', False)]}"
groups="training.group_training"/>
<field name="amount_to_pay" groups="training.group_training" />
@@ -2017,17 +2069,17 @@
</notebook>
<group colspan="4" col="10">
<field name="state"/>
- <button type="workflow" name="pshr_validate" string="Validate" states="draft"
+ <button type="workflow" name="pshr_validate" string="Validate" states="draft"
confirm="Do you want to validate this request ?" />
<button type="workflow" name="pshr_request" string="Send Request" states="valid" />
<button type="workflow" name="pshr_resend_email" string="Resend Request Email" states="requested" groups="training.group_training" />
- <button type="workflow" name="pshr_accept" string="Accept" states="requested,valid"
+ <button type="workflow" name="pshr_accept" string="Accept" states="requested,valid"
confirm="Do you want to confirm this request ?" />
- <button type="workflow" name="pshr_refuse" string="Refuse" states="requested"
+ <button type="workflow" name="pshr_refuse" string="Refuse" states="requested"
confirm="Do you want to refuse this request ?" />
<button type="workflow" name="pshr_cancel" string="Cancel"
- states="draft,valid,requested,accepted"
- groups="training.group_request_manager"
+ states="draft,valid,requested,accepted"
+ groups="training.group_request_manager"
confirm="Do you want to cancel this request ?" />
<button type="workflow" name="pshr_done" string="Done" states="accepted" groups="training.group_request_manager"/>
</group>
@@ -2039,7 +2091,7 @@
name="Purchase Order"
src_model="training.participation.stakeholder.request"
res_model="purchase.order"
- view_mode="tree,form"
+ view_mode="tree,form"
groups="base.group_user"
domain="[('id', '=', purchase_order_id)]" />
@@ -2056,7 +2108,7 @@
<field name="job_id" link="0" />
<field name="price" />
<field name="amount_to_pay" groups="training.group_training"/>
- <field name="purchase_paid" groups="training.group_training" select="2"/>
+ <field name="purchase_paid" groups="training.group_training" select="2"/>
<field name="state" />
</tree>
</field>
@@ -2068,7 +2120,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
-
+
<menuitem action="participation_stakeholder_request_act" id="stakeholder_participation_requests_mi" parent="training_request_mi" />
<record model="ir.actions.act_window" id="participation_stakeholder_request_draft_act">
@@ -2082,7 +2134,7 @@
<menuitem action="participation_stakeholder_request_draft_act"
id="participation_stakeholder_request_draft_mi"
parent="stakeholder_participation_requests_mi" />
-
+
<record model="ir.actions.act_window" id="participation_stakeholder_request_valid_act">
<field name="name">Requests to send</field>
<field name="res_model">training.participation.stakeholder.request</field>
@@ -2115,7 +2167,7 @@
<menuitem action="participation_stakeholder_request_accepted_act"
id="participation_stakeholder_request_accepted_mi"
parent="stakeholder_participation_requests_mi" />
-
+
<record model="ir.actions.act_window" id="participation_stakeholder_request_refused_act">
<field name="name">Refused Requests</field>
<field name="res_model">training.participation.stakeholder.request</field>
@@ -2150,12 +2202,12 @@
<separator string="Contact Information" colspan="4" />
<field name="job_id" colspan="4" />
</group>
-
+
<separator string="Seance Information" colspan="4" />
<field name="request_session_id" invisible="1" />
- <field name="seance_id"
+ <field name="seance_id"
attrs="{'readonly' : [('state', '!=', 'draft')]}"
- on_change='on_change_seance(job_id, seance_id)'
+ on_change='on_change_seance(job_id, seance_id)'
link="0"
context="{'request_session_id' : request_session_id, 'job_id' : job_id}" />
<field name="group_id" link="0"/>
@@ -2163,27 +2215,27 @@
<field name="date" />
<field name="duration" />
<field name="state_seance" groups="training.group_seance_manager,training.group_session_manager" />
-
+
<separator string="Course Information" colspan="4" />
<field name="course_id" colspan="4" link="0" />
-
+
<separator string="Payment" colspan="4" />
<field name="purchase_order_id" groups="training.group_seance_manager,training.group_session_manager" />
<group colspan="2" col="3" attrs="{'readonly': [('state', '!=', 'draft')]}">
- <group col="2" attrs="{'invisible': [('manual_price', '=', True)]}">
+ <group col="2" attrs="{'invisible': [('manual_price', '=', True)]}">
<field name="price" />
</group>
- <group col="2" attrs="{'invisible': [('manual_price', '=', False)]}">
+ <group col="2" attrs="{'invisible': [('manual_price', '=', False)]}">
<field name="forced_price" />
</group>
<group col="2" groups="training.group_training">
<field name="manual_price" nolabel="1" on_change='on_change_manual(manual_price, job_id, seance_id)'/>
- <label align="0.0">Manual</label>
+ <label align="0.0" string="Manual"/>
</group>
</group>
<field name="product_id" groups="training.group_seance_manager,training.group_session_manager" on_change='on_change_product(job_id, seance_id, product_id)'/>
<field name="paid" groups="training.group_training"/>
-
+
<separator colspan="4" />
<field name="state" colspan="4" />
</form>
@@ -2358,8 +2410,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Contact Function Configuration">
- <field name="kind" />
- <field name="function_id" />
+ <field name="kind"/>
+ <field name="function_id"/>
</tree>
</field>
</record>
@@ -2370,17 +2422,30 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Contact Function Configuration">
- <field name="kind" />
- <field name="function_id" />
+ <field name="kind"/>
+ <field name="function_id"/>
</form>
</field>
</record>
+ <record model="ir.ui.view" id="training_config_contact_function_search">
+ <field name="name">training.config.contact.function.search</field>
+ <field name="model">training.config.contact.function</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Config Contact Function">
+ <field name="kind"/>
+ <field name="function_id"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_config_contact_function_act">
<field name="name">Stakeholder functions</field>
<field name="res_model">training.config.contact.function</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_config_contact_function_search"/>
</record>
<menuitem id="training_config_contact_function_mi" action="training_config_contact_function_act" parent="training_config_library_mi" sequence='30'/>
@@ -2392,9 +2457,9 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Target Audience">
- <field name="name" colspan="4" />
- <separator string="Target Audience (Internet)" colspan="4" />
- <field name="note" nolabel="1" colspan="4" />
+ <field name="name" colspan="4" required="1"/>
+ <separator string="Target Audience (Internet)" colspan="4"/>
+ <field name="note" nolabel="1" colspan="4"/>
</form>
</field>
</record>
@@ -2409,11 +2474,24 @@
</tree>
</field>
</record>
+
+ <record model="ir.ui.view" id="training_offer_public_search">
+ <field name="name">training.offer.public.target.search</field>
+ <field name="model">training.offer.public.target</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Training Offer Public Target">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="training_offer_public_act">
<field name="name">Target Audience</field>
<field name="res_model">training.offer.public.target</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_offer_public_search"/>
</record>
<menuitem id="training_offer_public_mi" action="training_offer_public_act" parent="training_config_library_mi" sequence='20' />
@@ -2597,7 +2675,7 @@
<group col="2" colspan="4">
<button name="close_cb" string="Cancel" type="object" special="cancel" icon="gtk-cancel" />
- <button name="apply_cb" string="Apply" type="object" icon="gtk-apply"
+ <button name="apply_cb" string="Apply" type="object" icon="gtk-apply"
confirm="Are you sure to want to move this participation to this seance ?"/>
</group>
</form>
@@ -2615,6 +2693,6 @@
<menuitem action="training_participation_reassign_wiz_act"
parent="training_participation_all_mi"
id="training_participation_reassign_wiz_mi"
- groups="base.group_erp_manager" />
+ groups="base.group_erp_manager" />
</data>
</openerp>
=== modified file 'training/workflow/course.xml'
--- training/workflow/course.xml 2011-03-03 09:38:13 +0000
+++ training/workflow/course.xml 2011-03-03 13:27:11 +0000
@@ -34,7 +34,6 @@
<record model="workflow.transition" id="transition_course_draft_to_validated">
<field name="act_from" ref="activity_course_draft" />
<field name="act_to" ref="activity_course_validated" />
- <field name="role_id" ref="role_course_manager" />
<field name="signal">signal_validate</field>
</record>
=== modified file 'training/workflow/subscription.xml'
--- training/workflow/subscription.xml 2011-03-03 09:38:13 +0000
+++ training/workflow/subscription.xml 2011-03-03 13:27:11 +0000
@@ -41,8 +41,6 @@
<record model="workflow.transition" id="transition_subscription_confirm">
<field name="act_from" ref="activity_subscription_draft" />
<field name="act_to" ref="activity_subscription_confirm" />
- <!--<field name="role_id" ref="role_subscription_manager" />-->
- <field name="role_id" eval="False"/>
<field name="signal">signal_confirm</field>
</record>
=== modified file 'training/workflow/subscription_line.xml'
--- training/workflow/subscription_line.xml 2011-03-03 09:38:13 +0000
+++ training/workflow/subscription_line.xml 2011-03-03 13:27:11 +0000
@@ -57,28 +57,24 @@
<field name="act_to" ref="activity_subscription_line_send_confirm_emails" />
<field name="signal">signal_confirm</field>
<field name="condition">test_workflow_confirm()</field>
- <field name="role_id" ref="role_subscription_manager" />
</record>
-
+
<record model="workflow.transition" id="transition_subscription_line_confirm2">
<field name="act_from" ref="activity_subscription_line_send_confirm_emails" />
<field name="act_to" ref="activity_subscription_line_confirm" />
<field name="signal" eval="False"/>
- <field name="role_id" ref="role_subscription_manager" />
</record>
<record model="workflow.transition" id="transition_subscription_line_invoice_and_send_emails">
<field name="act_from" ref="activity_subscription_line_confirm" />
<field name="act_to" ref="activity_subscription_line_invoice_and_send_emails" />
<field name="signal">signal_invoice_and_send_emails</field>
- <field name="role_id" ref="role_subscription_manager" />
</record>
<record model="workflow.transition" id="transition_subscription_line_invoice_to_cancel">
<field name="act_from" ref="activity_subscription_line_invoice_and_send_emails" />
<field name="act_to" ref="activity_subscription_line_cancel" />
<field name="signal" eval="False"/>
- <field name="role_id" ref="role_subscription_manager" />
</record>
<record model="workflow.transition" id="transition_subscription_line_cancel">
@@ -91,14 +87,12 @@
<field name="act_from" ref="activity_subscription_line_confirm" />
<field name="act_to" ref="activity_subscription_line_cancel" />
<field name="signal">signal_cancel</field>
- <field name="role_id" ref="role_subscription_manager" />
</record>
<record model="workflow.transition" id="transition_subscription_line_done">
<field name="act_from" ref="activity_subscription_line_confirm" />
<field name="act_to" ref="activity_subscription_line_done" />
<field name="signal">signal_done</field>
- <field name="role_id" ref="role_subscription_manager" />
</record>
</data>
</openerp>
Follow ups
