Merge pull request #95 from akretion/10-agreement

[10.0] Add modules agreement_account and agreement_sale

agreement_account/README.rst

@@ -0,0 +1,75 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+===================
+Agreement (Account)
+===================
+
+This module adds an *Agreement* object with the following properties:
+
+* type (*Sale* or *Purchase*),
+* link to a partner,
+* name,
+* code,
+* signature date.
+
+You can link an invoice to an agreement.
+
+If you also install the module *agreement_sale*, you will be able to link a quotation/sale order to an agreement, and this information will be copied to the customer invoice.
+
+An *Agreement* can be used for:
+
+* Private business contracts
+* Public markets
+
+It will allow you to group all the orders and invoices related to the same agreement and display the references of this agreement on the documents where you have to display it. For example, the *code* property of the agreement is used in the module *account_invoice_factur-x* (from the `edi <https://github.com/OCA/edi>`_ project) in the XML tag */CrossIndustryInvoice/SupplyChainTradeTransaction/ApplicableHeaderTradeAgreement/ContractReferencedDocument/IssuerAssignedID*.
+
+The main differences with the *Contract* object of Odoo:
+
+* a contract is an analytic account; an agreement is not related to analytic accounting.
+* on the invoice, the contract/analytic account is per-line; an agreement is attached to the invoice (not to the lines).
+* an agreement is a very simple object with just a few basic fields; a contract has a lot of properties and a lot of related features.
+
+Configuration
+=============
+
+Go to the menu *Accounting > Configuration > Management > Agreements* to create new agreements.
+
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/110/10.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/contract/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Alexis de Lattre <alexis.delattre@akretion.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.

agreement_account/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models

agreement_account/__manifest__.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': u'Agreement (Account)',
+    'summary': "Adds an agreement object linked to an invoice",
+    'version': '10.0.1.0.0',
+    'category': 'Contract',
+    'author': "Akretion,Odoo Community Association (OCA)",
+    'website': 'http://www.akretion.com',
+    'license': 'AGPL-3',
+    'depends': ['account'],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/agreement_security.xml',
+        'views/agreement.xml',
+        'views/account_invoice.xml',
+        ],
+    'demo': ['demo/demo.xml'],
+    'installable': True,
+}

agreement_account/demo/demo.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo noupdate="1">
+
+
+<record id="market1" model="agreement">
+    <field name="code">C2C-IT0042</field>
+    <field name="name">Hardware IT</field>
+    <field name="partner_id" ref="base.res_partner_12"/>
+    <field name="agreement_type">sale</field>
+    <field name="signature_date">2017-09-10</field>
+</record>
+
+<record id="market2" model="agreement">
+    <field name="code">C2C-IT0043</field>
+    <field name="name">Fiber access office Lausanne</field>
+    <field name="partner_id" ref="base.res_partner_12"/>
+    <field name="agreement_type">sale</field>
+    <field name="signature_date" eval="time.strftime('%Y-01-01')"/>
+</record>
+
+<record id="market3" model="agreement">
+    <field name="code">AGR-VETO001</field>
+    <field name="name">Vétérinaire</field>
+    <field name="partner_id" ref="base.res_partner_2"/>
+    <field name="agreement_type">sale</field>
+    <field name="signature_date">2017-08-01</field>
+</record>
+
+<record id="market4" model="agreement">
+    <field name="code">AGR-TEL001</field>
+    <field name="name">Wazo IPBX deployment and maintenance</field>
+    <field name="partner_id" ref="base.res_partner_2"/>
+    <field name="agreement_type">sale</field>
+    <field name="signature_date">2017-05-05</field>
+</record>
+
+<record id="market5" model="agreement">
+    <field name="code">BUY-VOIP012</field>
+    <field name="name">SIP Phones supply</field>
+    <field name="partner_id" ref="base.res_partner_1"/>
+    <field name="agreement_type">purchase</field>
+    <field name="signature_date" eval="time.strftime('%Y-01-01')"/>
+</record>
+
+<record id="market6" model="agreement">
+    <field name="code">BUY-VOIP013</field>
+    <field name="name">SIP-ISDN gateways</field>
+    <field name="partner_id" ref="base.res_partner_3"/>
+    <field name="agreement_type">purchase</field>
+    <field name="signature_date">2017-09-02</field>
+</record>
+
+
+</odoo>

agreement_account/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import agreement
+from . import account_invoice

agreement_account/models/account_invoice.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (http://www.akretion.com)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields, api
+
+
+class AccountInvoice(models.Model):
+    _inherit = 'account.invoice'
+
+    agreement_id = fields.Many2one(
+        'agreement', string='Agreement', ondelete='restrict',
+        readonly=True, states={'draft': [('readonly', False)]},
+        track_visibility='onchange')
+
+    @api.model
+    def _prepare_refund(
+            self, invoice, date_invoice=None, date=None, description=None,
+            journal_id=None):
+        values = super(AccountInvoice, self)._prepare_refund(
+            invoice, date_invoice=date_invoice, date=date,
+            description=description, journal_id=journal_id)
+        if invoice.agreement_id:
+            values['agreement_id'] = invoice.agreement_id.id
+        return values

agreement_account/models/agreement.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from odoo import models, fields
+
+
+class Agreement(models.Model):
+    _name = 'agreement'
+    _description = 'Agreement'
+
+    code = fields.Char(required=True, copy=False)
+    name = fields.Char(required=True)
+    agreement_type = fields.Selection([
+        ('sale', 'Sale'),
+        ('purchase', 'Purchase'),
+        ], string='Type', required=True)
+    partner_id = fields.Many2one(
+        'res.partner', string='Partner', ondelete='restrict', required=True,
+        domain=[('parent_id', '=', False)])
+    company_id = fields.Many2one(
+        'res.company', string='Company',
+        default=lambda self: self.env['res.company']._company_default_get(
+            'agreement'))
+    active = fields.Boolean(default=True)
+    signature_date = fields.Date()
+    out_invoice_ids = fields.One2many(
+        'account.invoice', 'agreement_id', string='Customer Invoices',
+        readonly=True, domain=[('type', 'in', ('out_invoice', 'out_refund'))])
+    in_invoice_ids = fields.One2many(
+        'account.invoice', 'agreement_id', string='Supplier Invoices',
+        readonly=True, domain=[('type', 'in', ('in_invoice', 'in_refund'))])
+
+    def name_get(self):
+        res = []
+        for agr in self:
+            name = agr.name
+            if agr.code:
+                name = u'[%s] %s' % (agr.code, agr.name)
+            res.append((agr.id, name))
+        return res
+
+    _sql_constraints = [(
+        'code_partner_company_unique',
+        'unique(code, partner_id, company_id)',
+        'This agreement code already exists for this partner!'
+        )]

agreement_account/security/agreement_security.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo noupdate="1">
+
+
+<record id="agreement_rule" model="ir.rule">
+    <field name="name">Agreement multi-company</field>
+    <field name="model_id" ref="model_agreement"/>
+    <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+</record>
+
+
+</odoo>

agreement_account/security/ir.model.access.csv

@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_agreement_read,Read access on agreement to Employees,model_agreement,base.group_user,1,0,0,0
+access_agreement_full,Full access on agreement to Invoicing and Payment grp,model_agreement,account.group_account_invoice,1,1,1,1

agreement_account/views/account_invoice.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+
+<record id="invoice_form" model="ir.ui.view">
+    <field name="name">agreement.customer.invoice.form</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.invoice_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//page/group/group/field[@name='name']" position="after">
+            <field name="agreement_id"
+                domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'sale')]"
+                context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'sale'}"/>
+            <field name="commercial_partner_id" invisible="1"/>
+        </xpath>
+    </field>
+</record>
+
+<record id="invoice_supplier_form" model="ir.ui.view">
+    <field name="name">agreement.supplier.invoice.form</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.invoice_supplier_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//page/group/group/field[@name='company_id']" position="after">
+            <field name="agreement_id"
+                domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'purchase')]"
+                context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'purchase'}"/>
+            <field name="commercial_partner_id" invisible="1"/>
+        </xpath>
+    </field>
+</record>
+
+<record id="view_account_invoice_filter" model="ir.ui.view">
+    <field name="name">agreement.account.invoice.search</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+    <field name="arch" type="xml">
+        <group expand="0" position="inside">
+            <filter string="Agreement" name="agreement_groupby"
+                context="{'group_by': 'agreement_id'}"/>
+        </group>
+    </field>
+</record>
+
+
+</odoo>

agreement_account/views/agreement.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+
+<record id="agreement_form" model="ir.ui.view">
+    <field name="name">agreement.form</field>
+    <field name="model">agreement</field>
+    <field name="arch" type="xml">
+        <form string="Agreement">
+            <div class="oe_button_box" name="button_box">
+                <button name="toggle_active" type="object"
+                    class="oe_stat_button" icon="fa-archive">
+                    <field name="active" widget="boolean_button"
+                        options='{"terminology": "archive"}'/>
+                </button>
+            </div>
+            <group name="main">
+                <field name="partner_id"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="agreement_type"/>
+                <field name="signature_date"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </group>
+            <group string="Customer Invoices" name="out_invoices" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
+                <field name="out_invoice_ids" nolabel="1"/>
+            </group>
+            <group string="Supplier Invoices" name="in_invoices" attrs="{'invisible': [('agreement_type', '!=', 'purchase')]}">
+                <field name="in_invoice_ids" nolabel="1"/>
+            </group>
+        </form>
+    </field>
+</record>
+
+<record id="agreement_tree" model="ir.ui.view">
+    <field name="name">agreement.tree</field>
+    <field name="model">agreement</field>
+    <field name="arch" type="xml">
+        <tree string="Agreements">
+            <field name="partner_id"/>
+            <field name="code"/>
+            <field name="name"/>
+            <field name="agreement_type"/>
+            <field name="signature_date"/>
+            <field name="company_id" groups="base.group_multi_company"/>
+        </tree>
+    </field>
+</record>
+
+<record id="agreement_search" model="ir.ui.view">
+    <field name="name">agreement.search</field>
+    <field name="model">agreement</field>
+    <field name="arch" type="xml">
+        <search string="Search Agreements">
+            <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Name or Number"/>
+            <field name="partner_id"/>
+            <filter name="sale" string="Sale" domain="[('agreement_type', '=', 'sale')]"/>
+            <filter name="purchase" string="Purchase" domain="[('agreement_type', '=', 'purchase')]"/>
+            <separator/>
+            <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
+            <group name="groupby">
+                <filter name="partner_groupby" string="Customer"
+                    context="{'group_by': 'partner_id'}"/>
+                <filter name="signature_date_groupby" string="Signature Date"
+                    context="{'group_by': 'signature_date'}"/>
+                <filter name="agreement_type_groupby" string="Type"
+                    context="{'group_by': 'agreement_type'}"/>
+            </group>
+        </search>
+    </field>
+</record>
+
+<record id="agreement_action" model="ir.actions.act_window">
+    <field name="name">Agreements</field>
+    <field name="res_model">agreement</field>
+    <field name="view_mode">tree,form</field>
+</record>
+
+<menuitem id="agreement_menu" action="agreement_action"
+    parent="account.account_management_menu" sequence="100"/>
+
+</odoo>

agreement_sale/README.rst

@@ -0,0 +1,49 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+================
+Agreement (Sale)
+================
+
+This module is an extension of the module *agreement_account* for sale orders.
+
+With this module, you will be able to link a quotation/sale order to a sale agreement. Upon invoice creation, this information will be copied to the customer invoice.
+
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/110/10.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/contract/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Alexis de Lattre <alexis.delattre@akretion.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.

agreement_sale/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import wizard

agreement_sale/__manifest__.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': u'Agreement (Sale)',
+    'summary': "Link an agreement to a sale order and copy to invoice",
+    'version': '10.0.1.0.0',
+    'category': 'Contract',
+    'author': "Akretion,Odoo Community Association (OCA)",
+    'website': 'http://www.akretion.com',
+    'license': 'AGPL-3',
+    'depends': [
+        'agreement_account',
+        'sale_commercial_partner',
+        ],
+    'data': [
+        'views/sale_order.xml',
+        'views/agreement.xml',
+        ],
+    'installable': True,
+    'auto_install': True,
+}

agreement_sale/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import sale_order
+from . import agreement

agreement_sale/models/agreement.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from odoo import models, fields
+
+
+class Agreement(models.Model):
+    _inherit = 'agreement'
+
+    sale_ids = fields.One2many(
+        'sale.order', 'agreement_id', string='Sale Orders', readonly=True,
+        domain=[('state', 'not in', ('draft', 'sent', 'cancel'))])

agreement_sale/models/sale_order.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (http://www.akretion.com)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    agreement_id = fields.Many2one(
+        'agreement', string='Agreement', ondelete='restrict',
+        track_visibility='onchange', readonly=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
+
+    def _prepare_invoice(self):
+        vals = super(SaleOrder, self)._prepare_invoice()
+        vals['agreement_id'] = self.agreement_id.id or False
+        return vals

agreement_sale/views/agreement.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+
+<record id="agreement_form" model="ir.ui.view">
+    <field name="name">agreement.form</field>
+    <field name="model">agreement</field>
+    <field name="inherit_id" ref="agreement_account.agreement_form"/>
+    <field name="arch" type="xml">
+        <group name="in_invoices" position="after">
+            <group name="sale_orders" string="Sales Orders" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
+                <field name="sale_ids" nolabel="1"/>
+            </group>
+        </group>
+    </field>
+</record>
+
+
+</odoo>

agreement_sale/views/sale_order.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+
+<record id="view_order_form" model="ir.ui.view">
+    <field name="name">agreement.sale.order.form</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale_commercial_partner.view_order_form"/>
+    <field name="arch" type="xml">
+        <field name="client_order_ref" position="after">
+            <field name="agreement_id"
+                domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'sale')]"
+                context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'sale'}"/>
+        </field>
+    </field>
+</record>
+
+<record id="view_sales_order_filter" model="ir.ui.view">
+    <field name="name">agreement.sale.order.search</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+    <field name="arch" type="xml">
+        <group expand="0" position="inside">
+            <filter string="Agreement" name="agreement_groupby" context="{'group_by': 'agreement_id'}"/>
+        </group>
+    </field>
+</record>
+
+
+</odoo>

agreement_sale/wizard/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import sale_make_invoice_advance

agreement_sale/wizard/sale_make_invoice_advance.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (http://www.akretion.com)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class SaleAdvancePaymentInv(models.TransientModel):
+    _inherit = 'sale.advance.payment.inv'
+
+    def _create_invoice(self, order, so_line, amount):
+        inv = super(SaleAdvancePaymentInv, self)._create_invoice(
+            order, so_line, amount)
+        if order.agreement_id:
+            inv.agreement_id = order.agreement_id.id
+        return inv

oca_dependencies.txt

@@ -1 +1,2 @@
-bank-payment
+bank-payment
+sale-workflow