diff --git a/agreement_account/README.rst b/agreement_account/README.rst new file mode 100644 index 000000000..2137e98ca --- /dev/null +++ b/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 `_ 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 +`_. 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 + +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. diff --git a/agreement_account/__init__.py b/agreement_account/__init__.py new file mode 100644 index 000000000..cde864bae --- /dev/null +++ b/agreement_account/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import models diff --git a/agreement_account/__manifest__.py b/agreement_account/__manifest__.py new file mode 100644 index 000000000..d1b7a17bf --- /dev/null +++ b/agreement_account/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# 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, +} diff --git a/agreement_account/demo/demo.xml b/agreement_account/demo/demo.xml new file mode 100644 index 000000000..3dd2a014a --- /dev/null +++ b/agreement_account/demo/demo.xml @@ -0,0 +1,59 @@ + + + + + + + + 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 new file mode 100644 index 000000000..55d567003 --- /dev/null +++ b/agreement_account/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import agreement +from . import account_invoice diff --git a/agreement_account/models/account_invoice.py b/agreement_account/models/account_invoice.py new file mode 100644 index 000000000..5b9d4d791 --- /dev/null +++ b/agreement_account/models/account_invoice.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (http://www.akretion.com) +# @author: Alexis de Lattre +# 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 diff --git a/agreement_account/models/agreement.py b/agreement_account/models/agreement.py new file mode 100644 index 000000000..008c63af1 --- /dev/null +++ b/agreement_account/models/agreement.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# 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!' + )] diff --git a/agreement_account/security/agreement_security.xml b/agreement_account/security/agreement_security.xml new file mode 100644 index 000000000..d645ef6d6 --- /dev/null +++ b/agreement_account/security/agreement_security.xml @@ -0,0 +1,17 @@ + + + + + + + + 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 new file mode 100644 index 000000000..fd23275eb --- /dev/null +++ b/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 diff --git a/agreement_account/views/account_invoice.xml b/agreement_account/views/account_invoice.xml new file mode 100644 index 000000000..0f46bcc14 --- /dev/null +++ b/agreement_account/views/account_invoice.xml @@ -0,0 +1,51 @@ + + + + + + + + agreement.customer.invoice.form + account.invoice + + + + + + + + + + + agreement.supplier.invoice.form + account.invoice + + + + + + + + + + + agreement.account.invoice.search + account.invoice + + + + + + + + + + diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml new file mode 100644 index 000000000..655c18c1f --- /dev/null +++ b/agreement_account/views/agreement.xml @@ -0,0 +1,87 @@ + + + + + + + + agreement.form + agreement + +
+
+ +
+ + + + + + + + + + + + + + +
+ + + + + agreement.tree + agreement + + + + + + + + + + + + + + agreement.search + agreement + + + + + + + + + + + + + + + + + + + Agreements + agreement + tree,form + + + + + diff --git a/agreement_sale/README.rst b/agreement_sale/README.rst new file mode 100644 index 000000000..4726a7c80 --- /dev/null +++ b/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 +`_. 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 + +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. diff --git a/agreement_sale/__init__.py b/agreement_sale/__init__.py new file mode 100644 index 000000000..35e7c9600 --- /dev/null +++ b/agreement_sale/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import models +from . import wizard diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py new file mode 100644 index 000000000..51a05213a --- /dev/null +++ b/agreement_sale/__manifest__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# 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, +} diff --git a/agreement_sale/models/__init__.py b/agreement_sale/models/__init__.py new file mode 100644 index 000000000..1f8384244 --- /dev/null +++ b/agreement_sale/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import sale_order +from . import agreement diff --git a/agreement_sale/models/agreement.py b/agreement_sale/models/agreement.py new file mode 100644 index 000000000..da0efd128 --- /dev/null +++ b/agreement_sale/models/agreement.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# 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'))]) diff --git a/agreement_sale/models/sale_order.py b/agreement_sale/models/sale_order.py new file mode 100644 index 000000000..c54eb1a24 --- /dev/null +++ b/agreement_sale/models/sale_order.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (http://www.akretion.com) +# @author: Alexis de Lattre +# 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 diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml new file mode 100644 index 000000000..68629b553 --- /dev/null +++ b/agreement_sale/views/agreement.xml @@ -0,0 +1,24 @@ + + + + + + + + agreement.form + agreement + + + + + + + + + + + + diff --git a/agreement_sale/views/sale_order.xml b/agreement_sale/views/sale_order.xml new file mode 100644 index 000000000..89c7fb219 --- /dev/null +++ b/agreement_sale/views/sale_order.xml @@ -0,0 +1,35 @@ + + + + + + + + agreement.sale.order.form + sale.order + + + + + + + + + + agreement.sale.order.search + sale.order + + + + + + + + + + diff --git a/agreement_sale/wizard/__init__.py b/agreement_sale/wizard/__init__.py new file mode 100644 index 000000000..1eb17ffa1 --- /dev/null +++ b/agreement_sale/wizard/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import sale_make_invoice_advance diff --git a/agreement_sale/wizard/sale_make_invoice_advance.py b/agreement_sale/wizard/sale_make_invoice_advance.py new file mode 100644 index 000000000..29a98f4ab --- /dev/null +++ b/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 +# 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 diff --git a/oca_dependencies.txt b/oca_dependencies.txt index 98a804d46..4ac83d710 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1 +1,2 @@ -bank-payment \ No newline at end of file +bank-payment +sale-workflow