Merge pull request #102 from guewen/credit_control-view-fix

Credit control: fields not displayed with labels
This commit is contained in:
Pedro M. Baeza
2014-12-11 17:26:09 +01:00
7 changed files with 23 additions and 28 deletions

View File

@@ -13,7 +13,6 @@
<field name="name">invoice.followup.form.view</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form" />
<field name="type">form</field>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Credit Control"

View File

@@ -3,7 +3,6 @@
<record id="credit_control_company_form" model="ir.ui.view">
<field name="name">credit.control.company.form</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<field name="currency_id" position="after">

View File

@@ -3,7 +3,6 @@
<record id="credit_control_line_form" model="ir.ui.view">
<field name="name">credit.control.line.form</field>
<field name="model">credit.control.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Control Credit Lines">
<header>
@@ -48,7 +47,6 @@
<record id="credit_control_line_search" model="ir.ui.view">
<field name="name">Credit Control Lines</field>
<field name="model">credit.control.line</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Control Credit Lines">
<group string="Filters">
@@ -121,7 +119,6 @@
<record id="credit_control_line_tree" model="ir.ui.view">
<field name="name">credit.control.line.tree</field>
<field name="model">credit.control.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'email_error');">
<field name="date"/>

View File

@@ -4,7 +4,6 @@
<field name="name">partner.credit_control.form.view</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="type">form</field>
<field name="arch" type="xml">
<field name="credit_limit" position="after">
<field name="credit_policy_id" widget="selection"

View File

@@ -4,7 +4,6 @@
<record id="credit_control_policy_form" model="ir.ui.view">
<field name="name">credit.control.policy.form</field>
<field name="model">credit.control.policy</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Credit control policy">
<group>
@@ -28,17 +27,21 @@
<field name="name"/>
<notebook colspan="4">
<page string="Delay Setting">
<field name="level"/>
<field name="channel"/>
<field name="delay_days"/>
<field name="computation_mode"/>
<group>
<field name="level"/>
<field name="channel"/>
<field name="delay_days"/>
<field name="computation_mode"/>
</group>
</page>
<page string="Mail and reporting">
<field name="email_template_id"/>
<newline/>
<field name="custom_text" colspan="4"/>
<newline/>
<field name="custom_mail_text" colspan="4"/>
<group>
<field name="email_template_id"/>
<newline/>
<field name="custom_text" colspan="4"/>
<newline/>
<field name="custom_mail_text" colspan="4"/>
</group>
</page>
</notebook>
</form>
@@ -55,7 +58,6 @@
<record id="credit_control_policy_tree" model="ir.ui.view">
<field name="name">credit.control.policy.tree</field>
<field name="model">credit.control.policy</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Credit control policy">
<field name="name"/>
@@ -88,20 +90,23 @@
<record id="credit_mangement_policy_level_form" model="ir.ui.view">
<field name="name">credit.mangement.policy.level.form</field>
<field name="model">credit.control.policy.level</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Policy level">
<field name="name"/>
<notebook colspan="4">
<page string="Delay Setting">
<field name="level"/>
<field name="channel"/>
<field name="delay_days"/>
<field name="computation_mode"/>
<group>
<field name="level"/>
<field name="channel"/>
<field name="delay_days"/>
<field name="computation_mode"/>
</group>
</page>
<page string="Mail and reporting">
<field name="email_template_id"/>
<field name="custom_text"/>
<group>
<field name="email_template_id"/>
<field name="custom_text"/>
</group>
</page>
</notebook>
</form>
@@ -111,7 +116,6 @@
<record id="credit_control_policy_level_tree" model="ir.ui.view">
<field name="name">credit.control.policy.level.tree</field>
<field name="model">credit.control.policy.level</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Credit control policy level">
<field name="name"/>

View File

@@ -4,7 +4,6 @@
<record id="credit_control_run_tree" model="ir.ui.view">
<field name="name">credit.control.run.tree</field>
<field name="model">credit.control.run</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Credit control run">
<field name="date"/>
@@ -16,7 +15,6 @@
<record id="credit_control_run_form" model="ir.ui.view">
<field name="name">credit.control.run.form</field>
<field name="model">credit.control.run</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Credit control run">
<header>

View File

@@ -4,7 +4,6 @@
<record id="credit_line_printer_form" model="ir.ui.view">
<field name="name">credit.line.printer.form</field>
<field name="model">credit.control.printer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Lines report" version="7.0">
<separator string="Print the selected lines" colspan="4"/>