openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06589
lp:~openerp-dev/openobject-addons/addons-training-link-custom-ysa into lp:~openobject-training/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-link-custom-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-link-custom-ysa/+merge/60590
MOVE+FIX] training :- remove link attribute in training module and add link attribute in training_custom moudle."
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-link-custom-ysa/+merge/60590
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-link-custom-ysa.
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-05-04 07:00:25 +0000
+++ training/training_view.xml 2011-05-11 08:38:30 +0000
@@ -1099,14 +1099,12 @@
<field name="job_id"
context="{'partner_id' : parent.partner_id}"
domain="[('name', '=', parent.partner_id)]"
- on_change="on_change_job(job_id)"
- link="0" />
+ on_change="on_change_job(job_id)"/>
<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)"
- link="0" />
+ on_change="on_change_session(session_id, price_list_id, parent.partner_id)"/>
<field name="session_date" />
<field name="kind" />
@@ -1132,10 +1130,10 @@
</form>
<tree string="Subscription Lines">
<field name="name" />
- <field name="session_id" link="0" />
+ <field name="session_id"/>
<field name="session_date" />
<field name="kind" />
- <field name="job_id" domain="[('name', '=', parent.partner_id)]" on_change="on_change_job(job_id)" link="0" />
+ <field name="job_id" domain="[('name', '=', parent.partner_id)]" on_change="on_change_job(job_id)"/>
<field name="price_list_id" groups="base.group_user" />
<field name="price" sum="Price"/>
<field name="invoice_line_id" widget="boolean" string="Invoiced" groups="base.group_user" />
@@ -1318,28 +1316,28 @@
<field name="arch" type="xml">
<form string="Subscription Line">
<field name="name" />
- <field name="subscription_id" on_change="on_change_subscription(subscription_id)" link="0" />
- <field name="partner_id" link="0" />
+ <field name="subscription_id" on_change="on_change_subscription(subscription_id)"/>
+ <field name="partner_id"/>
<field name="partner_hr_email" readonly="1" />
<field name="job_id" context="{'partner_id' : partner_id}"
domain="[('name', '=', partner_id)]"
- on_change="on_change_job(job_id)" link="0" />
+ on_change="on_change_job(job_id)"/>
<field name="job_email" />
<notebook colspan="4">
<page string="General">
<separator string="Session" colspan="4"/>
- <field name="session_id" on_change="on_change_session(session_id, price_list_id, partner_id)" link="0" />
+ <field name="session_id" on_change="on_change_session(session_id, price_list_id, partner_id)"/>
<field name="kind" />
<separator string="Invoicing" colspan="4" />
<group groups="training.group_training" colspan="2" col="2">
- <field name="price_list_id" on_change="on_change_price_list(session_id, price_list_id)" link="0" />
+ <field name="price_list_id" on_change="on_change_price_list(session_id, price_list_id)"/>
</group>
<field name="price" />
<group col="5" colspan="4" groups="training.group_training">
<field name="invoice_id" context="{'form_view_ref': 'account.invoice_form'}"/>
- <field name="invoice_line_id" link="0" />
+ <field name="invoice_line_id"/>
<group col="1" colspan="1">
<group attrs="{'invisible' : [('invoice_line_id', '=', False)]}" col="2" colspan="1">
<field name="paid" />
@@ -1421,7 +1419,7 @@
<tree string="Subscription Lines" colors="red:theoritical_disponibility < 0;darkgreen:theoritical_disponibility >= 0">
<field name="state" />
<field name="name" />
- <field name="session_id" link="0" />
+ <field name="session_id"/>
<field name="session_state" />
<field name="session_date"/>
<field name="kind" />
@@ -1455,12 +1453,12 @@
<tree string="Subscription Lines" colors="black:state == 'done';red:state=='draft';darkgreen:state=='confirmed'">
<field name="state" />
<field name="name" />
- <field name="session_id" link="0" />
+ <field name="session_id"/>
<field name="session_state" />
<field name="session_date"/>
<field name="kind" />
- <field name="partner_id" groups="base.group_user" link="0" />
- <field name="price_list_id" groups="base.group_user" link="0" />
+ <field name="partner_id" groups="base.group_user"/>
+ <field name="price_list_id" groups="base.group_user"/>
<field name="partner_hr_email" groups="base.group_user" />
<field name="contact_lastname" />
<field name="contact_firstname" />
@@ -1936,12 +1934,12 @@
<field name="arch" type="xml">
<form string="Participation">
<separator string="Participation Description" colspan="4"/>
- <field name="job_id" link="0"/>
- <field name="partner_id" link="0"/>
- <field name="seance_id" on_change="on_change_seance(seance_id)" link="0" />
- <field name="group_id" link="0"/>
+ <field name="job_id"/>
+ <field name="partner_id"/>
+ <field name="seance_id" on_change="on_change_seance(seance_id)"/>
+ <field name="group_id"/>
<field name="date" />
- <field name="course_id" link="0"/>
+ <field name="course_id"/>
<field name="present" />
<notebook colspan="4">
<page string="General" groups="base.group_user">
@@ -2031,10 +2029,10 @@
<form string="Participation Request">
<group colspan="4" col="6" attrs="{'readonly': [('state', '!=', 'draft')]}">
<field name="reference" colspan="6" />
- <field name="session_id" link="0" />
+ <field name="session_id"/>
<field name="kind" groups="training.group_training" />
<field name="date" groups="training.group_training" />
- <field name="job_id" link="0" />
+ <field name="job_id"/>
<field name="email" widget='email' />
</group>
<group colspan="4" col="7">
@@ -2052,9 +2050,9 @@
<field name="participation_ids" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" context="{'default_job_id': job_id, 'default_request_session_id': session_id}">
<tree string="Participations">
<field name="date" />
- <field name="seance_id" link="0" />
- <field name="group_id" link="0" />
- <field name="course_id" link="0" />
+ <field name="seance_id"/>
+ <field name="group_id"/>
+ <field name="course_id"/>
<field name="duration" />
<field name="paid" />
<field name="product_id" groups="training.group_training" />
@@ -2072,15 +2070,14 @@
<field name="seance_id"
attrs="{'readonly' : [('state', '!=', 'draft')]}"
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"/>
+ <field name="group_id"/>
<field name="kind" />
<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" />
+ <field name="course_id" colspan="4"/>
<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')]}">
@@ -2141,10 +2138,10 @@
<field name="arch" type="xml">
<tree string="Participation Requests">
<field name="reference" />
- <field name="session_id" link="0" />
+ <field name="session_id"/>
<field name="date" />
<field name="kind" />
- <field name="job_id" link="0" />
+ <field name="job_id"/>
<field name="price" />
<field name="payment_mode"/>
<field name="amount_to_pay" groups="training.group_training"/>
@@ -2208,16 +2205,15 @@
<field name="seance_id"
attrs="{'readonly' : [('state', '!=', 'draft')]}"
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"/>
+ <field name="group_id"/>
<field name="kind" />
<field name="date" />
<field name="duration" />
<field name="state_seance" groups="training.group_seance_manager,training.group_session_manager" />
<field name="request_id"/>
<separator string="Course Information" colspan="4" />
- <field name="course_id" colspan="4" link="0" />
+ <field name="course_id" colspan="4"/>
<separator string="Payment" colspan="4" />
<field name="purchase_order_id" groups="training.group_seance_manager,training.group_session_manager" />
@@ -2666,15 +2662,9 @@
<data>
<xpath expr="/form/notebook/page/field['product_id']" position="before">
<field name="seance_id_int" select="1" />
- <field name="seance_id" select="1" link="0" attrs="{'readonly': [('state','!=','draft')]}"/>
- <field name="course_id" select="1" link="0" attrs="{'readonly': [('state','!=','draft')]}"/>
+ <field name="seance_id" select="1" attrs="{'readonly': [('state','!=','draft')]}"/>
+ <field name="course_id" select="1" attrs="{'readonly': [('state','!=','draft')]}"/>
</xpath>
- <field name="product_id" position="attributes">
- <attribute name="link">0</attribute>
- </field>
- <field name="product_uom" position="attributes">
- <attribute name="link">0</attribute>
- </field>
</data>
</field>
</record>
=== added directory 'training_custom'
=== added file 'training_custom/__init__.py'
--- training_custom/__init__.py 1970-01-01 00:00:00 +0000
+++ training_custom/__init__.py 2011-05-11 08:38:30 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+# 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
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== added file 'training_custom/__openerp__.py'
--- training_custom/__openerp__.py 1970-01-01 00:00:00 +0000
+++ training_custom/__openerp__.py 2011-05-11 08:38:30 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+# 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
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+
+{
+ 'name' : 'Training Custom',
+ 'version' : '0.2',
+ 'author' : 'Tiny SPRL - Thamini S.Ã .R.L',
+ 'website' : 'http://www.openerp.com',
+ 'depends' : [
+ 'training',
+ ],
+ 'init_xml' : [ ],
+ 'demo_xml' : [
+ ],
+ 'update_xml' : [
+ 'training_view.xml',
+ ],
+ 'active' : False,
+ 'installable' : True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'training_custom/training_view.xml'
--- training_custom/training_view.xml 1970-01-01 00:00:00 +0000
+++ training_custom/training_view.xml 2011-05-11 08:38:30 +0000
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+ <data>
+
+ <record id="view_custom_training_subscription_form" model="ir.ui.view">
+ <field name="name">view.training.subscription.form</field>
+ <field name="model">training.subscription</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.training_subscription_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/notebook/page[@string='Subscription']/field[@name='subscription_line_ids']/form/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Subscription']/field[@name='subscription_line_ids']/form/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Subscription']/field[@name='subscription_line_ids']/tree/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Subscription']/field[@name='subscription_line_ids']/tree/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_training_subscription_line_form" model="ir.ui.view">
+ <field name="name">training.subscription.line.custom.form</field>
+ <field name="model">training.subscription.line</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.training_subscription_line_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/field[@name='subscription_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='partner_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='General']/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='General']/field[@name='price_list_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='General']/field[@name='invoice_line_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_training_subscription_line_tree" model="ir.ui.view">
+ <field name="name">training.subscription.line.custom.tree</field>
+ <field name="model">training.subscription.line</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="training.training_subscription_line_tree"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/tree/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/tree/field[@name='partner_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/tree/field[@name='price_list_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custome_training_participation_form" model="ir.ui.view">
+ <field name="name">training.participation..custom.form</field>
+ <field name="model">training.participation</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.view_training_participation_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='partner_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='seance_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='group_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='course_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_participation_stakeholder_request_form" model="ir.ui.view">
+ <field name="name">training.participation.stakeholder.request.custom.form</field>
+ <field name="model">training.participation.stakeholder.request</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.view_participation_stakeholder_request_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/tree/field[@name='seance_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/tree/field[@name='group_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/tree/field[@name='course_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/form/field[@name='seance_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/form/field[@name='group_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Participations']/field[@name='participation_ids']/form/field[@name='course_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_participation_stakeholder_request_tree" model="ir.ui.view">
+ <field name="name">training.participation.stakeholder.request.custom.tree</field>
+ <field name="model">training.participation.stakeholder.request</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="training.view_participation_stakeholder_request_tree"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/tree/field[@name='session_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/tree/field[@name='job_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_training_participation_stakeholder_form" model="ir.ui.view">
+ <field name="name">training.participation.stakeholder.custom.form</field>
+ <field name="model">training.participation.stakeholder</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.view_training_participation_stakeholder_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/field[@name='seance_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='group_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/field[@name='course_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_custom_purchase_order_line_form" model="ir.ui.view">
+ <field name="name">training.purchase.order.line.custom.form</field>
+ <field name="model">purchase.order.line</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="training.purchase_order_line_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/notebook/page/field[@name='seance_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <xpath expr="/form/notebook/page/field[@name='course_id']" position="attributes">
+ <attribute name="link">0</attribute>
+ </xpath>
+ <field name="product_id" position="attributes">
+ <attribute name="link">0</attribute>
+ </field>
+ <field name="product_uom" position="attributes">
+ <attribute name="link">0</attribute>
+ </field>
+ </data>
+ </field>
+ </record>
+ </data>
+</openerp>
