audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-introduce module agreement_account

Browse Source 
Update agreement and agreement_sale to restore the behavior of v10
This commit is contained in:
Alexis de Lattre
2020-05-21 16:55:05 +02:00
parent d3bc6e12d3
commit 9b972c80df
25 changed files with 772 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
agreement/models/agreement.py
View File

@@ -10,11 +10,11 @@ class Agreement(models.Model):
_description = 'Agreement'
_inherit = ["mail.thread", "mail.activity.mixin"]
code = fields.Char(required=True)
name = fields.Char(required=True)
code = fields.Char(required=True, track_visibility='onchange')
name = fields.Char(required=True, track_visibility='onchange')
partner_id = fields.Many2one(
'res.partner', string='Partner', ondelete='restrict',
domain=[('parent_id', '=', False)])
domain=[('parent_id', '=', False)], track_visibility='onchange')
company_id = fields.Many2one(
'res.company', string='Company',
default=lambda self: self.env['res.company']._company_default_get())
@@ -30,10 +30,25 @@ class Agreement(models.Model):
string="Agreement Type",
help="Select the type of agreement",
)
domain = fields.Selection(
'_domain_selection', string='Domain', default='sale',
track_visibility='onchange')
active = fields.Boolean(default=True)
signature_date = fields.Date()
start_date = fields.Date()
end_date = fields.Date()
signature_date = fields.Date(track_visibility='onchange')
start_date = fields.Date(track_visibility='onchange')
end_date = fields.Date(track_visibility='onchange')
@api.model
def _domain_selection(self):
return [
('sale', _('Sale')),
('purchase', _('Purchase')),
]
@api.onchange('agreement_type_id')
def agreement_type_change(self):
if self.agreement_type_id and self.agreement_type_id.domain:
self.domain = self.agreement_type_id.domain
def name_get(self):
res = []

8
agreement/models/agreement_type.py
View File

@@ -1,7 +1,7 @@
# Copyright (C) 2018 - TODAY, Pavlov Media
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
from odoo import api, fields, models
class AgreementType(models.Model):
@@ -10,3 +10,9 @@ class AgreementType(models.Model):
name = fields.Char(string="Name", required=True)
active = fields.Boolean(default=True)
domain = fields.Selection(
'_domain_selection', string='Domain', default='sale')
@api.model
def _domain_selection(self):
return self.env['agreement']._domain_selection()

24
agreement/views/agreement.xml
View File

@@ -20,20 +20,26 @@
options='{"terminology": "archive"}'/>
</button>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only" string="Agreement Name"/>
<h1>
<field name="name"/>
</h1>
</div>
<group name="main">
<group name="left">
<field name="agreement_type_id"
groups="agreement.group_use_agreement_type"/>
<field name="is_template" groups="agreement.group_use_agreement_template"/>
<field name="code"/>
<field name="partner_id"
attrs="{'required': [('is_template', '=', False)]}"/>
<field name="name"/>
<field name="signature_date"/>
<field name="agreement_type_id"
groups="agreement.group_use_agreement_type"/>
<field name="domain" widget="radio"/>
<field name="is_template" groups="agreement.group_use_agreement_template"/>
</group>
<group name="right">
<field name="signature_date"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="code"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</group>
@@ -61,6 +67,7 @@
<field name="signature_date"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="domain"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
@@ -74,12 +81,17 @@
<field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Name or Number"/>
<field name="partner_id"/>
<separator/>
<filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]"/>
<filter name="purchase" string="Purchase" domain="[('domain', '=', 'purchase')]"/>
<separator/>
<filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
<group name="groupby">
<filter name="partner_groupby" string="Partner"
context="{'group_by': 'partner_id'}"/>
<filter name="signature_date_groupby" string="Signature Date"
context="{'group_by': 'signature_date'}"/>
<filter name="domain_groupby" string="Domain"
context="{'group_by': 'domain'}"/>
</group>
</search>
</field>

11
agreement/views/agreement_type.xml
View File

@@ -7,6 +7,7 @@
<field name="arch" type="xml">
<tree string="Agreement Types" default_order="name">
<field name="name" string="Type Name"/>
<field name="domain"/>
</tree>
</field>
</record>
@@ -29,6 +30,9 @@
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
<group name="main">
<field name="domain" widget="radio"/>
</group>
</sheet>
</form>
</field>
@@ -40,7 +44,14 @@
<field name="arch" type="xml">
<search string="Agreement Type">
<field name="name"/>
<separator/>
<filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]"/>
<filter name="purchase" string="Purchase" domain="[('domain', '=', 'purchase')]"/>
<separator/>
<filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
<group name="groupby">
<filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/>
</group>
</search>
</field>
</record>

1
agreement_account/__init__.py Normal file
View File

@@ -0,0 +1 @@
from . import models

28
agreement_account/__manifest__.py Normal file
View File

@@ -0,0 +1,28 @@
# Copyright 2017-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
'name': 'Agreement Account',
'summary': "Agreement on invoices",
'version': '12.0.1.0.0',
'category': 'Contract',
'author': 'Akretion, Odoo Community Association (OCA)',
'website': 'https://github.com/OCA/contract',
'license': 'AGPL-3',
'depends': [
'agreement',
'account',
],
'data': [
'security/ir.model.access.csv',
'views/agreement.xml',
'views/account_invoice.xml',
],
'development_status': 'Beta',
'maintainers': [
'alexis-via',
'bealdav',
],
'installable': True,
}

2
agreement_account/models/__init__.py Normal file
View File

@@ -0,0 +1,2 @@
from . import agreement
from . import account_invoice

15
agreement_account/models/account_invoice.py Normal file
View File

@@ -0,0 +1,15 @@
# Copyright 2017-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class AccountInvoice(models.Model):
_inherit = 'account.invoice'
agreement_id = fields.Many2one(
comodel_name='agreement', string='Agreement', ondelete='restrict',
track_visibility='onchange', readonly=True, copy=False,
states={'draft': [('readonly', False)]})

36
agreement_account/models/agreement.py Normal file
View File

@@ -0,0 +1,36 @@
# Copyright 2017-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class Agreement(models.Model):
_inherit = 'agreement'
invoice_ids = fields.One2many(
'account.invoice', 'agreement_id', string='Invoices', readonly=True)
out_invoice_count = fields.Integer(
compute='_compute_invoice_count', string='# of Customer Invoices')
in_invoice_count = fields.Integer(
compute='_compute_invoice_count', string='# of Vendor Bills')
def _compute_invoice_count(self):
base_domain = [
('agreement_id', 'in', self.ids),
('state', 'not in', ('draft', 'cancel'))]
aio = self.env['account.invoice']
out_rg_res = aio.read_group(
base_domain + [('type', 'in', ('out_invoice', 'out_refund'))],
['agreement_id'], ['agreement_id'])
out_data = dict(
[(x['agreement_id'][0], x['agreement_id_count']) for x in out_rg_res])
in_rg_res = aio.read_group(
base_domain + [('type', 'in', ('in_invoice', 'in_refund'))],
['agreement_id'], ['agreement_id'])
in_data = dict(
[(x['agreement_id'][0], x['agreement_id_count']) for x in in_rg_res])
for agreement in self:
agreement.out_invoice_count = out_data.get(agreement.id, 0)
agreement.in_invoice_count = in_data.get(agreement.id, 0)

1
agreement_account/readme/CONTRIBUTORS.rst Normal file
View File

@@ -0,0 +1 @@
* Alexis de Lattre <alexis.delattre@akretion.com>

1
agreement_account/readme/DESCRIPTION.rst Normal file
View File

@@ -0,0 +1 @@
This module adds *Agreement* field on invoices.

3
agreement_account/security/ir.model.access.csv Normal file
View File

@@ -0,0 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_agreement_full,Full access on agreement to Financial mgr,agreement.model_agreement,account.group_account_manager,1,1,1,1
access_agreement_type_full,Full access on agreement type to Financial mgr,agreement.model_agreement_type,account.group_account_manager,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_agreement_full Full access on agreement to Financial mgr agreement.model_agreement account.group_account_manager 1 1 1 1
3 access_agreement_type_full Full access on agreement type to Financial mgr agreement.model_agreement_type account.group_account_manager 1 1 1 1

BIN
agreement_account/static/description/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

430
agreement_account/static/description/index.html Normal file
View File

@@ -0,0 +1,430 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<title>Agreement Sale</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
.subscript {
vertical-align: sub;
font-size: smaller }
.superscript {
vertical-align: super;
font-size: smaller }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left, table.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right, table.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
table.align-center {
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
.align-top {
vertical-align: top }
.align-middle {
vertical-align: middle }
.align-bottom {
vertical-align: bottom }
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="agreement-sale">
<h1 class="title">Agreement Sale</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/contract/tree/12.0/agreement_sale"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_sale"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/110/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module adds <em>Agreement</em> field to Sales Orders</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#known-issues-roadmap" id="id1">Known issues / Roadmap</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="known-issues-roadmap">
<h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1>
<p>Features to evaluate before implementation</p>
<ul class="simple">
<li>add smart button on agreement to access implied sales</li>
<li>add module agreement_account: agreement_sale’ll depends on it</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/contract/issues/new?body=module:%20agreement_sale%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<ul class="simple">
<li>Akretion</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
<p><a class="reference external" href="https://github.com/alexis-via"><img alt="alexis-via" src="https://github.com/alexis-via.png?size=40px" /></a> <a class="reference external" href="https://github.com/bealdav"><img alt="bealdav" src="https://github.com/bealdav.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/12.0/agreement_sale">OCA/contract</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
</div>
</body>
</html>

54
agreement_account/views/account_invoice.xml Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0"?>
<!--
Copyright 2017-2020 Akretion France (http://www.akretion.com/)
@author: 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[@name='other_info']/group/group/field[@name='name']" position="after">
<field name="agreement_id"
domain="[('partner_id', 'child_of', commercial_partner_id), ('domain', '=', 'sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_domain': '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), ('domain', '=', 'purchase')]"
context="{'default_partner_id': commercial_partner_id, 'default_domain': 'purchase'}"/>
</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">
<field name="date" position="after">
<field name="agreement_id"/>
</field>
<group expand="0" position="inside">
<filter string="Agreement" name="agreement_groupby"
context="{'group_by': 'agreement_id'}"/>
</group>
</field>
</record>
</odoo>

61
agreement_account/views/agreement.xml Normal file
View File

@@ -0,0 +1,61 @@
<?xml version="1.0"?>
<odoo>
<record id="agreement.agreement_menu" model="ir.ui.menu">
<field name="parent_id" ref="account.account_management_menu"/>
<field name="sequence">150</field>
</record>
<menuitem id="agreement_type_menu" action="agreement.agreement_type_action"
parent="account.account_management_menu" sequence="155"
groups="agreement.group_use_agreement_type"/>
<record id="account_invoice_in_invoice_refund_action" model="ir.actions.act_window">
<field name="name">Vendor Bills</field>
<field name="res_model">account.invoice</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('type','in', ('in_invoice', 'in_refund')), ('state', 'not in', ('draft', 'cancel'))]</field>
<field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
</record>
<record id="account_invoice_in_invoice_refund_action_tree" model="ir.actions.act_window.view">
<field name="sequence" eval="10"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="account.invoice_supplier_tree"/>
<field name="act_window_id" ref="account_invoice_in_invoice_refund_action"/>
</record>
<record id="account_invoice_in_invoice_refund_action_form" model="ir.actions.act_window.view">
<field name="sequence" eval="20"/>
<field name="view_mode">form</field>
<field name="view_id" ref="account.invoice_supplier_form"/>
<field name="act_window_id" ref="account_invoice_in_invoice_refund_action"/>
</record>
<record id="agreement_form" model="ir.ui.view">
<field name="name">invoice.button.agreement.form</field>
<field name="model">agreement</field>
<field name="inherit_id" ref="agreement.agreement_form"/>
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button class="oe_stat_button" type="action"
name="%(account.action_invoice_refund_out_tree)d"
context="{'search_default_agreement_id': active_id, 'default_agreement_id': active_id, 'default_partner_id': partner_id}"
attrs="{'invisible': [('domain', '!=', 'sale')]}"
icon="fa-pencil-square-o">
<field string="Customer Invoices" name="out_invoice_count" widget="statinfo"/>
</button>
<button class="oe_stat_button" type="action"
name="%(account_invoice_in_invoice_refund_action)d"
context="{'search_default_agreement_id': active_id, 'default_agreement_id': active_id, 'default_partner_id': partner_id}"
attrs="{'invisible': [('domain', '!=', 'purchase')]}"
icon="fa-pencil-square-o">
<field string="Vendor Bills" name="in_invoice_count" widget="statinfo"/>
</button>
</div>
</field>
</record>
</odoo>

3
agreement_sale/__manifest__.py
View File

@@ -12,7 +12,8 @@
'license': 'AGPL-3',
'depends': [
'sale_management',
'agreement',
'agreement_account',
'sale_commercial_partner',
],
'data': [
'security/ir.model.access.csv',

1
agreement_sale/models/__init__.py
View File

@@ -1,2 +1,3 @@
from . import agreement
from . import sale
from . import res_config_settings

27
agreement_sale/models/agreement.py Normal file
View File

@@ -0,0 +1,27 @@
# Copyright 2017-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class Agreement(models.Model):
_inherit = 'agreement'
sale_ids = fields.One2many(
'sale.order', 'agreement_id', string='Sale Orders', readonly=True)
sale_count = fields.Integer(
compute='_compute_sale_count', string='# of Sale Orders')
def _compute_sale_count(self):
rg_res = self.env['sale.order'].read_group(
[
('agreement_id', 'in', self.ids),
('state', 'not in', ('draft', 'sent', 'cancel')),
],
['agreement_id'], ['agreement_id'])
mapped_data = dict(
[(x['agreement_id'][0], x['agreement_id_count']) for x in rg_res])
for agreement in self:
agreement.sale_count = mapped_data.get(agreement.id, 0)

8
agreement_sale/models/sale.py
View File

@@ -1,4 +1,5 @@
# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2017-2020 Akretion France
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@@ -18,3 +19,8 @@ class SaleOrder(models.Model):
ondelete="restrict",
track_visibility='onchange', readonly=True, copy=True,
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
def _prepare_invoice(self):
vals = super()._prepare_invoice()
vals['agreement_id'] = self.agreement_id.id or False
return vals

2
agreement_sale/readme/DESCRIPTION.rst
View File

@@ -1 +1 @@
This module adds *Agreement* field to Sales Orders
This module adds *Agreement* field to Sales Orders. Upon invoice creation, that field is copied to the invoice.

1
agreement_sale/security/ir.model.access.csv
View File

@@ -1,4 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1
agreement_sale.access_agreement_type_full,Full access on agreement type grp,agreement.model_agreement_type,sales_team.group_sale_manager,1,1,1,1
agreement_sale.access_agreement_type_read,Read access on agreement grp,agreement.model_agreement_type,base.group_user,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 agreement.access_agreement_full Full access on agreement grp agreement.model_agreement sales_team.group_sale_manager 1 1 1 1
3 agreement_sale.access_agreement_type_full Full access on agreement type grp agreement.model_agreement_type sales_team.group_sale_manager 1 1 1 1
agreement_sale.access_agreement_type_read Read access on agreement grp agreement.model_agreement_type base.group_user 1 0 0 0

31
agreement_sale/views/agreement.xml
View File

@@ -2,9 +2,32 @@
<odoo>
<menuitem id="agreement.agreement_menu" action="agreement.agreement_action"
parent="sale.menu_sale_config" sequence="100"/>
<menuitem id="agreement.agreement_type_menu" action="agreement.agreement_type_action"
parent="sale.menu_sale_config" sequence="101" groups="agreement.group_use_agreement_type"/>
<record id="agreement.agreement_menu_root" model="ir.ui.menu">
<field name="parent_id" ref="sale.menu_sale_config"/>
<field name="sequence">150</field>
</record>
<menuitem id="sale_agreement_menu" action="agreement.agreement_action"
parent="agreement.agreement_menu_root" sequence="10"/>
<menuitem id="sale_agreement_type_menu" action="agreement.agreement_type_action"
parent="agreement.agreement_menu_root" sequence="20"
groups="agreement.group_use_agreement_type"/>
<record id="agreement_form" model="ir.ui.view">
<field name="name">sale.button.agreement.form</field>
<field name="model">agreement</field>
<field name="inherit_id" ref="agreement.agreement_form"/>
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button class="oe_stat_button" type="action"
name="%(sale.action_orders)d"
context="{'search_default_agreement_id': active_id, 'default_agreement_id': active_id, 'default_partner_id': partner_id}"
attrs="{'invisible': [('domain', '!=', 'sale')]}"
icon="fa-usd">
<field string="Sale Orders" name="sale_count" widget="statinfo"/>
</button>
</div>
</field>
</record>
</odoo>

18
agreement_sale/views/sale_order.xml
View File

@@ -6,7 +6,9 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="agreement_id"/>
<field name="agreement_id"
domain="[('partner_id', 'child_of', commercial_partner_id), ('domain', '=', 'sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_domain': 'sale'}"/>
</field>
<field name="partner_id" position="after">
<field name="agreement_type_id"
@@ -16,4 +18,18 @@
</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">
<field name="order_line" position="after">
<field name="agreement_id" />
</field>
<group expand="0" position="inside">
<filter string="Agreement" name="agreement_groupby" context="{'group_by': 'agreement_id'}"/>
</group>
</field>
</record>
</odoo>

1
oca_dependencies.txt
View File

@@ -4,3 +4,4 @@ field-service
sale-reporting
account-invoicing
account-closing
sale-workflow