Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configrework3-crm-rename-mma into
lp:~openerp-dev/openobject-addons/trunk-configrework3-crm.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configrework3-crm-rename-mma/+merge/71984
Hello,
crm:field name is renamed
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configrework3-crm-rename-mma/+merge/71984
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-configrework3-crm.
=== modified file 'account/company.py'
--- account/company.py 2011-07-05 12:28:57 +0000
+++ account/company.py 2011-08-18 06:14:20 +0000
@@ -36,9 +36,9 @@
}
_defaults = {
- 'overdue_msg': 'Please note that the following payments are now due. If your payment \
- has been sent, kindly forward your payment details. If payment will be \
- delayed further, please contact us to discuss. \
+ 'overdue_msg': 'Please note that the following payments are now due.\
+ \nIf your payment has been sent, kindly forward your payment details.\
+ \nIf payment will be delayed further, please contact us to discuss.\
\nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
}
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-08-03 10:06:02 +0000
+++ crm/crm.py 2011-08-18 06:14:20 +0000
@@ -684,7 +684,7 @@
"true, it will allow you to hide the sales team without removing it."),
'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
'change_responsible': fields.boolean('Change Responsible', help="Thick this box if you want that on escalation, the responsible of this sale team automatically becomes responsible of the lead/opportunity escaladed"),
- 'user_id': fields.many2one('res.users', 'Responsible User'),
+ 'user_id': fields.many2one('res.users', 'Team Leader'),
'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
=== modified file 'crm/crm_meeting_menu.xml'
--- crm/crm_meeting_menu.xml 2011-06-01 10:39:49 +0000
+++ crm/crm_meeting_menu.xml 2011-08-18 06:14:20 +0000
@@ -13,7 +13,7 @@
/>
<record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
- <field name="name">Create Partner For Meeting</field>
+ <field name="name">Schedule a Meeting</field>
<field name="context" eval="{'default_state':'draft'}"/>
</record>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-07-13 11:44:34 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-08-18 06:14:20 +0000
@@ -202,14 +202,17 @@
<field name="name">res.company.sheet</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">18</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
- <separator string="Timesheets" colspan="4"/>
- <field name="timesheet_range"/>
- <field name="timesheet_max_difference"/>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+ <group col="2" colspan="2" name="hr_timesheet" sequence="25">
+ <separator string="Timesheets" colspan="4"/>
+ <field name="timesheet_range"/>
+ <field name="timesheet_max_difference"/>
<newline/>
- </page>
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'l10n_ch/company_view.xml'
--- l10n_ch/company_view.xml 2011-01-14 12:41:54 +0000
+++ l10n_ch/company_view.xml 2011-08-18 06:14:20 +0000
@@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <field name="rml_footer2" position="after">
+ <field name="vat" position="after">
<field name="bvr_delta_horz"/>
<field name="bvr_delta_vert"/>
<field name="bvr_background"/>
=== modified file 'mrp/company_view.xml'
--- mrp/company_view.xml 2011-01-14 00:11:01 +0000
+++ mrp/company_view.xml 2011-08-18 06:14:20 +0000
@@ -6,12 +6,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">22</field>
+ <field name="priority">24</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="manufacturing_lead"/>
- </page>
+ </xpath>
</field>
</record>
=== modified file 'pad/company_pad.xml'
--- pad/company_pad.xml 2011-01-14 00:11:01 +0000
+++ pad/company_pad.xml 2011-08-18 06:14:20 +0000
@@ -6,9 +6,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <xpath expr="//page[@string='Configuration']" position="inside">
- <separator string="Pad" colspan="4"/>
- <field name="pad_index"/>
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+ <newline/>
+ <group col="2" colspan="2" name="pad" sequence="100">
+ <separator string="Pad" colspan="4"/>
+ <field name="pad_index"/>
+ </group>
</xpath>
</field>
</record>
=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml 2011-07-26 10:59:01 +0000
+++ point_of_sale/point_of_sale_view.xml 2011-08-18 06:14:20 +0000
@@ -637,13 +637,16 @@
<field name="name">view.company.form.pos</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">25</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <field name="currency_id" position="after">
- <separator string="Point of Sale" colspan="4"/>
- <field name="company_discount" />
- <field name="max_diff" />
- </field>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after" >
+ <group col="2" colspan="2" name="pos" sequence="5">
+ <separator string="Point of Sale" colspan="2" />
+ <field name="company_discount" colspan="2" />
+ <field name="max_diff" />
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'procurement/company_view.xml'
--- procurement/company_view.xml 2011-01-14 00:11:01 +0000
+++ procurement/company_view.xml 2011-08-18 06:14:20 +0000
@@ -6,14 +6,14 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">17</field>
+ <field name="priority">25</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<separator string="MRP & Logistics Scheduler" colspan="4"/>
- <field name="schedule_range"/>
- </page>
- </field>
+ <field name="schedule_range"/>
+ </xpath>
+ </field>
</record>
</data>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-08-15 14:21:41 +0000
+++ project/project_view.xml 2011-08-18 06:14:20 +0000
@@ -530,13 +530,16 @@
<field name="name">res.company.task.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
- <separator string="Project Management" colspan="4"/>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+ <group col="2" colspan="2" name="project" sequence="15">
+ <separator string="Project Management" colspan="2"/>
<field name="project_time_mode_id"/>
<newline/>
- </page>
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'purchase/company_view.xml'
--- purchase/company_view.xml 2011-01-14 00:11:01 +0000
+++ purchase/company_view.xml 2011-08-18 06:14:20 +0000
@@ -6,12 +6,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">19</field>
+ <field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="po_lead"/>
- </page>
+ </xpath>
</field>
</record>
=== modified file 'sale/company_view.xml'
--- sale/company_view.xml 2011-01-14 00:11:01 +0000
+++ sale/company_view.xml 2011-08-18 06:14:20 +0000
@@ -5,12 +5,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">24</field>
+ <field name="priority">20</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="security_lead"/>
- </page>
+ </xpath>
</field>
</record>
</data>
_______________________________________________
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
