[IMP] sale config: simplify structure of wizard form
bzr revid: rco@openerp.com-20120320142759-meyt05reg0sd886l
This commit is contained in:
Raphael Collet
parent
0e526bd329
commit
403211c254
|
|
@ -117,12 +117,10 @@
|
|||
<field name="inherit_id" ref="sale.view_sales_config"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<group name="sale_order" position="after">
|
||||
<group col="4" colspan="4">
|
||||
<separator string="Contracts" colspan="4"/>
|
||||
<field name="module_analytic_user_function" attrs="{'invisible': [('module_account_analytic_analysis','=',False)]}"/>
|
||||
<field name="module_analytic_journal_billing_rate" attrs="{'invisible': [('module_account_analytic_analysis','=',False)]}"/>
|
||||
</group>
|
||||
<group name="contracts" position="inside">
|
||||
<separator string="Contracts" colspan="4"/>
|
||||
<field name="module_analytic_user_function"/>
|
||||
<field name="module_analytic_journal_billing_rate"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -148,12 +148,13 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Configure Sales & CRM">
|
||||
<group name="sales" colspan="4">
|
||||
</group>
|
||||
<group name="crm" colspan="4">
|
||||
<group name="plugin" colspan="4">
|
||||
</group>
|
||||
</group>
|
||||
<group name="invoice_policy" colspan="4"/>
|
||||
<group name="sale_order" colspan="4"/>
|
||||
<group name="contracts" colspan="4"/>
|
||||
<group name="emails" colspan="4"/>
|
||||
<group name="synchronization" colspan="4"/>
|
||||
<group name="documents" colspan="4"/>
|
||||
<group name="customer_form" colspan="4"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -8,49 +8,38 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="mail.view_sales_config_plugin"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//form/group[@name='crm']/group[@name='plugin']/group[@name='plugins']" position="after">
|
||||
<group col="2" colspan="2" name="emails">
|
||||
<separator string="Emails" colspan="2"/>
|
||||
<field name="fetchmail_crm"/>
|
||||
<group name="emails" position="inside">
|
||||
<separator string="Emails" colspan="4"/>
|
||||
<field name="fetchmail_crm"/>
|
||||
<group colspan="2" attrs="{'invisible': [('fetchmail_crm','=',False)]}">
|
||||
<field name="default_server" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_type" nolabel="1" on_change="onchange_server_type(default_type, default_is_ssl)" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_port" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_is_ssl" on_change="onchange_server_type(default_type, default_is_ssl)"/>
|
||||
<newline/>
|
||||
<group col="4" colspan="2" attrs="{'invisible': [('fetchmail_crm','=',False)]}">
|
||||
<field name="default_server" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_type" nolabel="1" on_change="onchange_server_type(default_type, default_is_ssl)" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_port" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_is_ssl" on_change="onchange_server_type(default_type, default_is_ssl)"/>
|
||||
<newline/>
|
||||
<field name="default_user" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_password" password="True" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
</group>
|
||||
<field name="default_user" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
<field name="default_password" password="True" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
|
||||
</group>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//form/group[@name='crm']/group[@name='plugin']" position="after">
|
||||
<group colspan="4" col="4" name="synchronization">
|
||||
<separator string="Import and Synchronize data from an other application" colspan="4"/>
|
||||
<group colspan="2" col="2">
|
||||
<field name="module_import_sugarcrm"/>
|
||||
<newline/>
|
||||
<field name="module_import_google"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="module_crm_caldav"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="synchronization" position="inside">
|
||||
<separator string="Import and Synchronize data from an other application" colspan="4"/>
|
||||
<group colspan="2" col="2">
|
||||
<field name="module_import_sugarcrm"/>
|
||||
<field name="module_import_google"/>
|
||||
</group>
|
||||
|
||||
<group colspan="4" col="4">
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Documents and Wiki" colspan="2"/>
|
||||
<field name="module_wiki_sale_faq" />
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Customer Form" colspan="2"/>
|
||||
<field name="module_base_contact"/>
|
||||
<newline/>
|
||||
<field name="module_google_map"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="module_crm_caldav"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</group>
|
||||
<group name="documents" position="inside">
|
||||
<separator string="Documents and Wiki" colspan="4"/>
|
||||
<field name="module_wiki_sale_faq" />
|
||||
</group>
|
||||
<group name="customer_form" position="inside">
|
||||
<separator string="Customer Form" colspan="4"/>
|
||||
<field name="module_base_contact"/>
|
||||
<field name="module_google_map"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,15 +7,12 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//form/group[@name='crm']/group[@name='plugin']" position="inside">
|
||||
<group col="4" colspan="2" name="plugins">
|
||||
<separator string="Plugins" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="module_plugin_thunderbird"/>
|
||||
<newline/>
|
||||
<field name="module_plugin_outlook"/>
|
||||
</group>
|
||||
</xpath>
|
||||
<group name="emails" position="inside">
|
||||
<separator string="Plugins" colspan="4"/>
|
||||
<field name="module_plugin_thunderbird"/>
|
||||
<newline/>
|
||||
<field name="module_plugin_outlook"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,61 +8,41 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="sales" position="inside">
|
||||
<group name="invoice_policy" position="inside">
|
||||
<separator string="Picking and Invoice Policy" colspan="4"/>
|
||||
<group colspan="4" col="8">
|
||||
<group colspan="4" col="4">
|
||||
<group colspan="4">
|
||||
<group colspan="2" col="2">
|
||||
<field name="sale_orders"/>
|
||||
<newline/>
|
||||
<field name="deli_orders"/>
|
||||
<newline/>
|
||||
<field name="task_work" on_change="onchange_task_work(task_work)"/>
|
||||
<field name="module_project_timesheet" invisible="1"/>
|
||||
<field name="module_project_mrp" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="module_account_analytic_analysis"/>
|
||||
<newline/>
|
||||
</group>
|
||||
<group colspan="4" col="4">
|
||||
<group colspan="2" col="2">
|
||||
<field name="default_order_policy" attrs="{'invisible':['|',('sale_orders','=',False),('deli_orders','=',False)]}"/>
|
||||
<newline/>
|
||||
<field name="module_delivery" attrs="{'invisible':[('sale_orders','=',False), ('deli_orders','=',False)]}"/>
|
||||
<newline/>
|
||||
<field name="default_picking_policy" attrs="{'invisible':[('deli_orders','=',False)]}"/>
|
||||
<newline/>
|
||||
<field name="time_unit" domain="[('category_id.name','=','Working Time')]" attrs="{'invisible':[('task_work','=',False),('module_account_analytic_analysis','=',False)],'required': [('module_account_analytic_analysis','=',True)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
<group name="sale_order" position="inside">
|
||||
<separator string="Sale Order" colspan="4"/>
|
||||
<group colspan="4" col="8" name="sale_order">
|
||||
<group colspan="4" col="4">
|
||||
<field name="group_sale_pricelist_per_customer"/>
|
||||
<newline/>
|
||||
<group col="2" colspan="1">
|
||||
<field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
|
||||
</group>
|
||||
<field name="group_sale_taxes_global_on_order" invisible="1"/>
|
||||
<field name="group_sale_taxes_on_order_line" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="module_sale_margin"/>
|
||||
<newline/>
|
||||
<field name="module_warning"/>
|
||||
<newline/>
|
||||
</group>
|
||||
<group colspan="4" col="4">
|
||||
<newline/>
|
||||
<field name="group_sale_uom_per_product"/>
|
||||
<newline/>
|
||||
<field name="group_sale_delivery_address"/>
|
||||
<newline/>
|
||||
<field name="group_sale_disc_per_sale_order_line"/>
|
||||
<newline/>
|
||||
<field name="module_sale_layout"/>
|
||||
<newline/>
|
||||
<field name="module_sale_journal"/>
|
||||
<newline/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="group_sale_pricelist_per_customer"/>
|
||||
<field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
|
||||
<field name="group_sale_taxes_global_on_order" invisible="1"/>
|
||||
<field name="group_sale_taxes_on_order_line" invisible="1"/>
|
||||
<field name="module_sale_margin"/>
|
||||
<field name="module_warning"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="group_sale_uom_per_product"/>
|
||||
<field name="group_sale_delivery_address"/>
|
||||
<field name="group_sale_disc_per_sale_order_line"/>
|
||||
<field name="module_sale_layout"/>
|
||||
<field name="module_sale_journal"/>
|
||||
</group>
|
||||
</group>
|
||||
</field>
|
||||
|
|
|
|||
Loading…
Reference in New Issue