Merge pull request #90 from Tecnativa/10.0-contract-view_fix

[10.0] contract: Be totally deterministic about which views to use + copyright

contract/__manifest__.py

@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
-# © 2004-2010 OpenERP SA
-# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# Copyright 2004-2010 OpenERP SA
+# Copyright 2014-2017 Tecnativa - Pedro M. Baeza
+# Copyright 2015 Domatix
+# Copyright 2016 Tecnativa - Carlos Dauden
+# Copyright 2017 Tecnativa - Vicent Cubells
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Contracts Management - Recurring',
-    'version': '10.0.2.0.0',
+    'version': '10.0.2.1.0',
     'category': 'Contract Management',
     'license': 'AGPL-3',
     'author': "OpenERP SA, "

contract/views/account_analytic_account_view.xml

@@ -2,10 +2,11 @@
 <odoo>
 
     <record id="account_analytic_account_recurring_form_form" model="ir.ui.view">
-        <field name="name">account.analytic.account.invoice.recurring.form.inherit</field>
+        <field name="name">Contract form</field>
         <field name="model">account.analytic.account</field>
         <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
         <field name="mode">primary</field>
+        <field name="priority" eval="9999"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']/.." position="before">
                 <header>
@@ -79,9 +80,11 @@
 
     <!-- Inherited Analytic Account list for contracts -->
     <record id="view_account_analytic_account_journal_tree" model="ir.ui.view">
-        <field name="name">account.analytic.account.journal.list</field>
+        <field name="name">Contract list</field>
         <field name="model">account.analytic.account</field>
         <field name="inherit_id" ref="analytic.view_account_analytic_account_list" />
+        <field name="mode">primary</field>
+        <field name="priority" eval="9999"/>
         <field name="arch" type="xml">
             <field name="partner_id" position="before">
                 <field name="journal_id" groups="account.group_account_user"/>
@@ -94,7 +97,7 @@
 
     <!-- Analytic Account search view for contract -->
     <record id="view_account_analytic_account_contract_search" model="ir.ui.view">
-        <field name="name">account.analytic.account.contract.search</field>
+        <field name="name">Contract search</field>
         <field name="model">account.analytic.account</field>
         <field name="inherit_id" ref="analytic.view_account_analytic_account_search"/>
         <field name="arch" type="xml">
@@ -130,6 +133,20 @@
         </field>
     </record>
 
+    <record id="action_account_analytic_overdue_all_tree" model="ir.actions.act_window.view">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_account_analytic_account_journal_tree"/>
+        <field name="act_window_id" ref="action_account_analytic_overdue_all"/>
+    </record>
+
+    <record id="action_account_analytic_overdue_all_form" model="ir.actions.act_window.view">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account_analytic_account_recurring_form_form"/>
+        <field name="act_window_id" ref="action_account_analytic_overdue_all"/>
+    </record>
+
     <menuitem id="menu_action_account_analytic_overdue_all"
               parent="account.menu_finance_receivables"
               action="action_account_analytic_overdue_all"