odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]:Apply reverse changes for wrong changes in branch 

bzr revid: ksa@tinyerp.co.in-20110818093036-unpfdhad8y6v2qz1
This commit is contained in:
ksa (Open ERP) 2011-08-18 15:00:36 +05:30
parent d1a4394225
commit d2879670a1
9 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/company.py
View File

@ -36,9 +36,9 @@ class res_company(osv.osv):
}
_defaults = {
'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.\
'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. \
\nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
}

13
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -202,17 +202,14 @@
<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">
<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"/>
<page string="Configuration" position="inside">
<separator string="Timesheets" colspan="4"/>
<field name="timesheet_range"/>
<field name="timesheet_max_difference"/>
<newline/>
</group>
</xpath>
</page>
</field>
</record>

6
addons/mrp/company_view.xml
View File

@ -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">24</field>
<field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<page string="Configuration" position="inside">
<field name="manufacturing_lead"/>
</xpath>
</page>
</field>
</record>

9
addons/pad/company_pad.xml
View File

@ -6,12 +6,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<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 expr="//page[@string='Configuration']" position="inside">
<separator string="Pad" colspan="4"/>
<field name="pad_index"/>
</xpath>
</field>
</record>

13
addons/point_of_sale/point_of_sale_view.xml
View File

@ -637,16 +637,13 @@
<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">
<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 name="currency_id" position="after">
<separator string="Point of Sale" colspan="4"/>
<field name="company_discount" />
<field name="max_diff" />
</field>
</field>
</record>

10
addons/procurement/company_view.xml
View File

@ -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">25</field>
<field name="priority">17</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<page string="Configuration" position="inside">
<separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
<field name="schedule_range"/>
</xpath>
</field>
<field name="schedule_range"/>
</page>
</field>
</record>
</data>

9
addons/project/project_view.xml
View File

@ -530,16 +530,13 @@
<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">
<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"/>
<page string="Configuration" position="inside">
<separator string="Project Management" colspan="4"/>
<field name="project_time_mode_id"/>
<newline/>
</group>
</xpath>
</page>
</field>
</record>

6
addons/purchase/company_view.xml
View File

@ -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">19</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<page string="Configuration" position="inside">
<field name="po_lead"/>
</xpath>
</page>
</field>
</record>

6
addons/sale/company_view.xml
View File

@ -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">20</field>
<field name="priority">24</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<page string="Configuration" position="inside">
<field name="security_lead"/>
</xpath>
</page>
</field>
</record>
</data>