diff options
| author | Damien Bouvy <dbo@odoo.com> | 2015-03-03 14:25:44 +0100 |
|---|---|---|
| committer | Damien Bouvy <dbo@odoo.com> | 2015-07-23 11:40:30 +0200 |
| commit | ecdb8a60cb8645d400a06bcf80f49484bbe671b7 (patch) | |
| tree | 0d30644fc280f043d9ea7b1e78222dce0fb30427 /addons/analytic/views/analytic_view.xml | |
| parent | d8f0231afc5ce94e2feb91b11fbfb45c52ae849e (diff) | |
[IMP] sale_contract: recurring view refactoring, new fields and unit of measure
- add contract_type field on account.analytic.account and real_quantity on account.analytic.invoice.line
- refactor contract form and list views for better clarity (hide unnecessary fields depending on the type of contract)
- divide account_analityc_account class according to contract type for future work
- divide contract template menu in 3 menus depending on contract_type
- add on_change_uom behaviour on account recurring lines
- rewrite tests in python
- add new report (pivot & graph)
- end date of contract is now computed from the template recurring rules
- small fixes & usability improvements
Diffstat (limited to 'addons/analytic/views/analytic_view.xml')
| -rw-r--r-- | addons/analytic/views/analytic_view.xml | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml index 22620c0d7c3..a848b3d0a24 100644 --- a/addons/analytic/views/analytic_view.xml +++ b/addons/analytic/views/analytic_view.xml @@ -6,7 +6,7 @@ <field name="name">analytic.analytic.account.form</field> <field name="model">account.analytic.account</field> <field name="arch" type="xml"> - <form string="Analytic Account" version="7.0"> + <form string="Analytic Account"> <sheet string="Analytic Account"> <div class="oe_button_box" name="button_box"/> @@ -20,39 +20,28 @@ <group name="main"> <group> - <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/> - <field name="manager_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_manager']}"/> - <field name="currency_id" attrs="{'invisible': ['|',('type', '<>', 'view'), ('company_id', '<>', False)]}"/> + <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/> + <field name="manager_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_manager']}" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/> + <field name="contract_type" widget="radio" attrs="{'invisible': ['|',('template_id','!=',False),('type','in',['view','normal'])]}"/> </group> <group> <field name="type" invisible="context.get('default_type', False)"/> - <field name="template_id" on_change="on_change_template(template_id, date_start)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/> - <field name="code"/> - <field name="parent_id" on_change="on_change_parent(parent_id)"/> + <field name="template_id" on_change="on_change_template(template_id, date_start)" domain="[('type','=','template'),('state','=','open')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/> + <field name="code" attrs="{'invisible': [('type','=','template')]}"/> + <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/> + <field name="currency_id" attrs="{'invisible': ['|',('type', '<>', 'view'), ('company_id', '<>', False)]}"/> <field name="company_id" on_change="on_change_company(company_id)" options="{'no_create': True}" groups="base.group_multi_company" attrs="{'required': [('type','<>','view')]}"/> + <field name="date_start" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/> + <label for="date" string="End Date" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/> + <div name="duration" attrs="{'invisible': [('type','=','template')]}"> + <field name="date" class="oe_inline"/> + </div> </group> </group> <notebook> - <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}"> - <group string="Renewal" name="contract"> - <p colspan="2" class="oe_grey oe_edit_only"> - Once the end date of the contract is - passed or the maximum number of service - units (e.g. support contract) is - reached, the account manager is notified - by email to renew the contract with the - customer. - </p> - <field name="date_start"/> - <label for="date" string="End Date"/> - <div name="duration"> - <field name="date" class="oe_inline"/> - </div> - </group> - <separator string="Terms and Conditions" name="description"/> - <field name="description"/> - </page> </notebook> + <separator string="Terms and Conditions" name="description" attrs="{'invisible': [('type','in',['view','normal'])]}"/> + <field name="description" attrs="{'invisible': [('type','in',['view','normal'])]}"/> </sheet> <div class="oe_chatter"> <field name="message_follower_ids" widget="mail_followers"/> |
