diff --git a/agreement_account/README.rst b/agreement_account/README.rst index f8aac0db..2137e98c 100644 --- a/agreement_account/README.rst +++ b/agreement_account/README.rst @@ -6,34 +6,35 @@ Agreement (Account) =================== -This module adds a *Sale Agreement* object with the following properties: +This module adds an *Agreement* object with the following properties: -* link to a customer, +* type (*Sale* or *Purchase*), +* link to a partner, * name, * code, * signature date. -You can link a customer invoice to a sale agreement. +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 invoice. +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. -A *Sale Agreement* can be used for: +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 sale agreement is used in the module *account_invoice_factur-x* (from the `edi `_ project) in the XML tag */CrossIndustryInvoice/SupplyChainTradeTransaction/ApplicableHeaderTradeAgreement/ContractReferencedDocument/IssuerAssignedID*. +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 `_ 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; a sale agreement is not related to analytic accounting. -* on the invoice, the contract/analytic account is per-line; a sale agreement is attached to the invoice (not to the lines). -* a sale 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. +* 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 > Sale Agreements* to create new agreements. +Go to the menu *Accounting > Configuration > Management > Agreements* to create new agreements. Usage ===== diff --git a/agreement_account/__manifest__.py b/agreement_account/__manifest__.py index 21658f06..d1b7a17b 100644 --- a/agreement_account/__manifest__.py +++ b/agreement_account/__manifest__.py @@ -4,7 +4,7 @@ { 'name': u'Agreement (Account)', - 'summary': "Adds a sale agreement object linked to a customer invoice", + 'summary': "Adds an agreement object linked to an invoice", 'version': '10.0.1.0.0', 'category': 'Contract', 'author': "Akretion,Odoo Community Association (OCA)", @@ -13,8 +13,8 @@ 'depends': ['account'], 'data': [ 'security/ir.model.access.csv', - 'security/sale_agreement_security.xml', - 'views/sale_agreement.xml', + 'security/agreement_security.xml', + 'views/agreement.xml', 'views/account_invoice.xml', ], 'demo': ['demo/demo.xml'], diff --git a/agreement_account/demo/demo.xml b/agreement_account/demo/demo.xml index d45cd2d8..2d08d890 100644 --- a/agreement_account/demo/demo.xml +++ b/agreement_account/demo/demo.xml @@ -7,28 +7,52 @@ - + C2C-IT0042 Hardware IT + sale + 2017-09-10 - + C2C-IT0043 Fiber access office Lausanne + sale + - + AGR-VETO001 Vétérinaire + sale + 2017-08-01 - + AGR-TEL001 Wazo IPBX deployment and maintenance + sale + 2017-05-05 + + + + BUY-VOIP012 + SIP Phones supply + + purchase + + + + + BUY-VOIP013 + SIP-ISDN gateways + + purchase + 2017-09-02 diff --git a/agreement_account/models/__init__.py b/agreement_account/models/__init__.py index 16999ee3..55d56700 100644 --- a/agreement_account/models/__init__.py +++ b/agreement_account/models/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -from . import sale_agreement +from . import agreement from . import account_invoice diff --git a/agreement_account/models/account_invoice.py b/agreement_account/models/account_invoice.py index 33db902e..5b9d4d79 100644 --- a/agreement_account/models/account_invoice.py +++ b/agreement_account/models/account_invoice.py @@ -9,8 +9,8 @@ from odoo import models, fields, api class AccountInvoice(models.Model): _inherit = 'account.invoice' - sale_agreement_id = fields.Many2one( - 'sale.agreement', string='Sale Agreement', ondelete='restrict', + agreement_id = fields.Many2one( + 'agreement', string='Agreement', ondelete='restrict', readonly=True, states={'draft': [('readonly', False)]}, track_visibility='onchange') @@ -21,6 +21,6 @@ class AccountInvoice(models.Model): values = super(AccountInvoice, self)._prepare_refund( invoice, date_invoice=date_invoice, date=date, description=description, journal_id=journal_id) - if invoice.sale_agreement_id: - values['sale_agreement_id'] = invoice.sale_agreement_id.id + if invoice.agreement_id: + values['agreement_id'] = invoice.agreement_id.id return values diff --git a/agreement_account/models/sale_agreement.py b/agreement_account/models/agreement.py similarity index 55% rename from agreement_account/models/sale_agreement.py rename to agreement_account/models/agreement.py index 1749bf6c..5e8d8900 100644 --- a/agreement_account/models/sale_agreement.py +++ b/agreement_account/models/agreement.py @@ -6,25 +6,32 @@ from odoo import models, fields -class SaleAgreement(models.Model): - _name = 'sale.agreement' - _description = 'Sale Agreement' +class Agreement(models.Model): + _name = 'agreement' + _description = 'Agreement' code = fields.Char( string='Code', required=True, copy=False) name = fields.Char(string='Name', required=True) + type = fields.Selection([ + ('sale', 'Sale'), + ('purchase', 'Purchase'), + ], string='Type', required=True) partner_id = fields.Many2one( - 'res.partner', string='Customer', ondelete='restrict', required=True, - domain=[('customer', '=', True), ('parent_id', '=', False)]) + '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( - 'sale.agreement')) + 'agreement')) active = fields.Boolean(string='Active', default=True) signature_date = fields.Date(string='Signature Date') - invoice_ids = fields.One2many( - 'account.invoice', 'sale_agreement_id', string='Invoices', - readonly=True) + 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 = [] @@ -38,5 +45,5 @@ class SaleAgreement(models.Model): _sql_constraints = [( 'code_partner_company_unique', 'unique(code, partner_id, company_id)', - 'This sale agreement code already exists for this customer!' + 'This agreement code already exists for this partner!' )] diff --git a/agreement_account/security/sale_agreement_security.xml b/agreement_account/security/agreement_security.xml similarity index 67% rename from agreement_account/security/sale_agreement_security.xml rename to agreement_account/security/agreement_security.xml index 48960ca6..d645ef6d 100644 --- a/agreement_account/security/sale_agreement_security.xml +++ b/agreement_account/security/agreement_security.xml @@ -7,9 +7,9 @@ - - Sale Agreement multi-company - + + Agreement multi-company + ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] diff --git a/agreement_account/security/ir.model.access.csv b/agreement_account/security/ir.model.access.csv index b5940477..fd23275e 100644 --- a/agreement_account/security/ir.model.access.csv +++ b/agreement_account/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_sale_agreement_read,Read access on sale.agreement to Employees,model_sale_agreement,base.group_user,1,0,0,0 -access_sale_agreement_full,Full access on sale.agreement to Invoicing and Payment grp,model_sale_agreement,account.group_account_invoice,1,1,1,1 +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 diff --git a/agreement_account/views/account_invoice.xml b/agreement_account/views/account_invoice.xml index 6e9100b5..ddef6e28 100644 --- a/agreement_account/views/account_invoice.xml +++ b/agreement_account/views/account_invoice.xml @@ -8,27 +8,41 @@ - sale.agreement.account.invoice.form + agreement.customer.invoice.form account.invoice - + + + + + + + + agreement.supplier.invoice.form + account.invoice + + + + - sale.agreement.account.invoice.search + agreement.account.invoice.search account.invoice - + diff --git a/agreement_account/views/sale_agreement.xml b/agreement_account/views/agreement.xml similarity index 57% rename from agreement_account/views/sale_agreement.xml rename to agreement_account/views/agreement.xml index b002047e..e6a789a8 100644 --- a/agreement_account/views/sale_agreement.xml +++ b/agreement_account/views/agreement.xml @@ -7,11 +7,11 @@ - - sale.agreement.form - sale.agreement + + agreement.form + agreement -
+