Browse Source

[MIG] contract_sale_generation: Migraiton to 11.0

pull/329/head
Sylvain Van Hoof 6 years ago
parent
commit
6d0007aa73
  1. 69
      contract_sale_generation/README.rst
  2. 1
      contract_sale_generation/__init__.py
  3. 5
      contract_sale_generation/__manifest__.py
  4. 9
      contract_sale_generation/data/contract_cron.xml
  5. 2
      contract_sale_generation/models/__init__.py
  6. 58
      contract_sale_generation/models/account_analytic_account.py
  7. 1
      contract_sale_generation/models/account_analytic_contract.py
  8. 14
      contract_sale_generation/models/sale_order.py
  9. 3
      contract_sale_generation/readme/CONTRIBUTORS.rst
  10. 2
      contract_sale_generation/readme/DESCRIPTION.rst
  11. 12
      contract_sale_generation/readme/USAGE.rst
  12. 438
      contract_sale_generation/static/description/index.html
  13. 1
      contract_sale_generation/tests/__init__.py
  14. 22
      contract_sale_generation/tests/test_contract_sale.py
  15. 4
      contract_sale_generation/views/account_analytic_account_view.xml
  16. 29
      contract_sale_generation/views/sale_view.xml

69
contract_sale_generation/README.rst

@ -1,14 +1,38 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
======================================
Contracts Management - Recurring Sales
======================================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3 :alt: License: AGPL-3
=============================
Contracts for recurrent sales
=============================
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github
:target: https://github.com/OCA/contract/tree/11.0/contract_sale_generation
:alt: OCA/contract
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/contract-11-0/contract-11-0-contract_sale_generation
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/110/11.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
This module extends functionality of contracts to be able to generate sales This module extends functionality of contracts to be able to generate sales
orders instead of invoices. orders instead of invoices.
**Table of contents**
.. contents::
:local:
Usage Usage
===== =====
@ -21,38 +45,45 @@ To use this module, you need to:
* Type defines document that contract will generate, can be "Sales" or "Invoices" * Type defines document that contract will generate, can be "Sales" or "Invoices"
* Sale Autoconfirm, validate Sales Orders if type is "Sales" * Sale Autoconfirm, validate Sales Orders if type is "Sales"
.. 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 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.
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 <https://github.com/OCA/contract/issues/new?body=module:%20contract_sale_generation%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
Credits Credits
======= =======
Authors
~~~~~~~
* PESOL
* Okia
Contributors Contributors
------------
~~~~~~~~~~~~
* Angel Moya <angel.moya@pesol.es> * Angel Moya <angel.moya@pesol.es>
* Florent THOMAS <florent.thomas@mind-and-go.com> * Florent THOMAS <florent.thomas@mind-and-go.com>
* Sylvain Van Hoof <sylvain@okia.be>
Maintainers
~~~~~~~~~~~
Maintainer
----------
This module is maintained by the OCA.
.. image:: https://odoo-community.org/logo.png .. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association :alt: Odoo Community Association
:target: https://odoo-community.org :target: https://odoo-community.org
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use. promote its widespread use.
To contribute to this module, please visit https://odoo-community.org.
This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/11.0/contract_sale_generation>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

1
contract_sale_generation/__init__.py

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

5
contract_sale_generation/__manifest__.py

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Pesol (<http://pesol.es>) # Copyright 2017 Pesol (<http://pesol.es>)
# Copyright 2017 Angel Moya <angel.moya@pesol.es> # Copyright 2017 Angel Moya <angel.moya@pesol.es>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
@ -6,10 +5,10 @@
{ {
'name': 'Contracts Management - Recurring Sales', 'name': 'Contracts Management - Recurring Sales',
'version': '10.0.3.0.0',
'version': '11.0.1.0.0',
'category': 'Contract Management', 'category': 'Contract Management',
'license': 'AGPL-3', 'license': 'AGPL-3',
'author': "PESOL, "
'author': "PESOL, Okia, "
"Odoo Community Association (OCA)", "Odoo Community Association (OCA)",
'website': 'https://github.com/oca/contract', 'website': 'https://github.com/oca/contract',
'depends': ['contract', 'sale'], 'depends': ['contract', 'sale'],

9
contract_sale_generation/data/contract_cron.xml

@ -1,14 +1,15 @@
<?xml version="1.0" encoding='UTF-8'?> <?xml version="1.0" encoding='UTF-8'?>
<odoo> <odoo>
<record model="ir.cron" id="account_analytic_cron_for_sale">
<record id="account_analytic_cron_for_sale" model="ir.cron">
<field name="name">Generate Recurring sales from Contracts</field> <field name="name">Generate Recurring sales from Contracts</field>
<field name="interval_number">1</field> <field name="interval_number">1</field>
<field name="interval_type">days</field> <field name="interval_type">days</field>
<field name="numbercall">-1</field> <field name="numbercall">-1</field>
<field name="model" eval="'account.analytic.account'"/>
<field name="function" eval="'cron_recurring_create_sale'"/>
<field name="args" eval="'()'"/>
<field name="user_id" ref="base.user_root"/>
<field name="state">code</field>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
<field name="code">model.cron_recurring_create_sale()</field>
</record> </record>
</odoo> </odoo>

2
contract_sale_generation/models/__init__.py

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import account_analytic_contract from . import account_analytic_contract
from . import account_analytic_account from . import account_analytic_account
from . import sale_order

58
contract_sale_generation/models/account_analytic_account.py

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
# © 2004-2010 OpenERP SA
# © 2014 Angel Moya <angel.moya@domatix.com>
# © 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
# Copyright 2004-2010 OpenERP SA
# Copyright 2014 Angel Moya <angel.moya@domatix.com>
# Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# Copyright 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
# Copyright 2016-2017 LasLabs Inc. # Copyright 2016-2017 LasLabs Inc.
# Copyright 2017 Pesol (<http://pesol.es>) # Copyright 2017 Pesol (<http://pesol.es>)
# Copyright 2017 Angel Moya <angel.moya@pesol.es> # Copyright 2017 Angel Moya <angel.moya@pesol.es>
# Copyright 2018 Therp BV <https://therp.nl>. # Copyright 2018 Therp BV <https://therp.nl>.
# Copyright 2019 Sylvain Van Hoof <sylvain@okia.be>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import api, models, fields from odoo import api, models, fields
@ -30,7 +30,12 @@ class AccountAnalyticAccount(models.Model):
sale_line.product_id_change() sale_line.product_id_change()
sale_line_vals = sale_line._convert_to_write(sale_line._cache) sale_line_vals = sale_line._convert_to_write(sale_line._cache)
# Insert markers # Insert markers
name = self._insert_markers(line.name)
contract = line.analytic_account_id
lang_obj = self.env['res.lang']
lang = lang_obj.search(
[('code', '=', contract.partner_id.lang)])
date_format = lang.date_format or '%m/%d/%Y'
name = self._insert_markers(line, date_format)
sale_line_vals.update({ sale_line_vals.update({
'name': name, 'name': name,
'discount': line.discount, 'discount': line.discount,
@ -51,14 +56,14 @@ class AccountAnalyticAccount(models.Model):
'origin': self.name, 'origin': self.name,
'company_id': self.company_id.id, 'company_id': self.company_id.id,
'user_id': self.partner_id.user_id.id, 'user_id': self.partner_id.user_id.id,
'project_id': self.id
'contract_id': self.id
}) })
# Get other invoice values from partner onchange # Get other invoice values from partner onchange
sale.onchange_partner_id() sale.onchange_partner_id()
return sale._convert_to_write(sale._cache) return sale._convert_to_write(sale._cache)
@api.multi @api.multi
def _create_invoice(self):
def _create_invoice(self, invoice=False):
""" """
Create invoices Create invoices
@param self: single record of account.invoice @param self: single record of account.invoice
@ -66,7 +71,8 @@ class AccountAnalyticAccount(models.Model):
""" """
self.ensure_one() self.ensure_one()
if self.type == 'invoice': if self.type == 'invoice':
return super(AccountAnalyticAccount, self)._create_invoice()
return super(AccountAnalyticAccount, self).\
_create_invoice(invoice=invoice)
else: else:
return self.env['account.invoice'] return self.env['account.invoice']
@ -92,28 +98,46 @@ class AccountAnalyticAccount(models.Model):
@api.multi @api.multi
def recurring_create_sale(self): def recurring_create_sale(self):
"""
Create sales from contracts
"""Create sales from contracts
:param int limit:
Max of sales to create.
:return: sales created :return: sales created
""" """
sales = self.env['sale.order'] sales = self.env['sale.order']
for contract in self: for contract in self:
if not contract.check_dates_valid():
continue
# Re-read contract with correct company
ctx = contract.get_invoice_context()
ref_date = contract.recurring_next_date or fields.Date.today()
if (contract.date_start > ref_date or
contract.date_end and contract.date_end < ref_date):
if self.env.context.get('cron'):
continue # Don't fail on cron jobs
raise ValidationError(
_("You must review start and end dates!\n%s") %
contract.name
)
old_date = fields.Date.from_string(ref_date)
new_date = old_date + self.get_relative_delta(
contract.recurring_rule_type, contract.recurring_interval)
ctx = self.env.context.copy()
ctx.update({
'old_date': old_date,
'next_date': new_date,
# Force company for correct evaluation of domain access rules
'force_company': contract.company_id.id,
})
sales |= contract.with_context(ctx)._create_sale() sales |= contract.with_context(ctx)._create_sale()
contract.write({ contract.write({
'recurring_next_date': fields.Date.to_string(ctx['next_date'])
'recurring_next_date': fields.Date.to_string(new_date)
}) })
return sales return sales
@api.model @api.model
def cron_recurring_create_sale(self): def cron_recurring_create_sale(self):
today = fields.Date.today() today = fields.Date.today()
contracts = self.search([
contracts = self.with_context(cron=True).search([
('recurring_invoices', '=', True), ('recurring_invoices', '=', True),
('recurring_next_date', '<=', today), ('recurring_next_date', '<=', today),
('type', '=', 'sale'),
'|', '|',
('date_end', '=', False), ('date_end', '=', False),
('date_end', '>=', today), ('date_end', '>=', today),

1
contract_sale_generation/models/account_analytic_contract.py

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Pesol (<http://pesol.es>) # Copyright 2017 Pesol (<http://pesol.es>)
# Copyright 2017 Angel Moya <angel.moya@pesol.es> # Copyright 2017 Angel Moya <angel.moya@pesol.es>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

14
contract_sale_generation/models/sale_order.py

@ -0,0 +1,14 @@
# Copyright 2019 Sylvain Van Hoof <sylvain@okia.be>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class SaleOrder(models.Model):
_inherit = 'sale.order'
contract_id = fields.Many2one(
'account.analytic.account',
string='Contract',
readonly=True
)

3
contract_sale_generation/readme/CONTRIBUTORS.rst

@ -0,0 +1,3 @@
* Angel Moya <angel.moya@pesol.es>
* Florent THOMAS <florent.thomas@mind-and-go.com>
* Sylvain Van Hoof <sylvain@okia.be>

2
contract_sale_generation/readme/DESCRIPTION.rst

@ -0,0 +1,2 @@
This module extends functionality of contracts to be able to generate sales
orders instead of invoices.

12
contract_sale_generation/readme/USAGE.rst

@ -0,0 +1,12 @@
To use this module, you need to:
#. Go to Accounting -> Contracts and select or create a new contract.
#. Check *Generate recurring invoices automatically*.
#. Fill fields for selecting the recurrency and invoice parameters:
* Type defines document that contract will generate, can be "Sales" or "Invoices"
* Sale Autoconfirm, validate Sales Orders if type is "Sales"
.. 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

438
contract_sale_generation/static/description/index.html

@ -0,0 +1,438 @@
<?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.14: http://docutils.sourceforge.net/" />
<title>Contracts Management - Recurring Sales</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="contracts-management-recurring-sales">
<h1 class="title">Contracts Management - Recurring Sales</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/11.0/contract_sale_generation"><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-11-0/contract-11-0-contract_sale_generation"><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/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module extends functionality of contracts to be able to generate sales
orders instead of invoices.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="id1">Usage</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="usage">
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<p>To use this module, you need to:</p>
<ol class="arabic simple">
<li>Go to Accounting -&gt; Contracts and select or create a new contract.</li>
<li>Check <em>Generate recurring invoices automatically</em>.</li>
<li>Fill fields for selecting the recurrency and invoice parameters:<ul>
<li>Type defines document that contract will generate, can be “Sales” or “Invoices”</li>
<li>Sale Autoconfirm, validate Sales Orders if type is “Sales”</li>
</ul>
</li>
</ol>
<a class="reference external image-reference" href="https://runbot.odoo-community.org/runbot/110/10.0"><img alt="Try me on Runbot" src="https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas" /></a>
</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:%20contract_sale_generation%0Aversion:%2011.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>PESOL</li>
<li>Okia</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Angel Moya &lt;<a class="reference external" href="mailto:angel.moya&#64;pesol.es">angel.moya&#64;pesol.es</a>&gt;</li>
<li>Florent THOMAS &lt;<a class="reference external" href="mailto:florent.thomas&#64;mind-and-go.com">florent.thomas&#64;mind-and-go.com</a>&gt;</li>
<li>Sylvain Van Hoof &lt;<a class="reference external" href="mailto:sylvain&#64;okia.be">sylvain&#64;okia.be</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>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/11.0/contract_sale_generation">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>

1
contract_sale_generation/tests/__init__.py

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import test_contract_sale from . import test_contract_sale

22
contract_sale_generation/tests/test_contract_sale.py

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
# Copyright 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
# Copyright 2017 Pesol (<http://pesol.es>) # Copyright 2017 Pesol (<http://pesol.es>)
# Copyright 2017 Angel Moya <angel.moya@pesol.es> # Copyright 2017 Angel Moya <angel.moya@pesol.es>
# Copyright 2019 Sylvain Van Hoof <sylvain@okia.be>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
@ -59,14 +59,14 @@ class TestContractSale(TransactionCase):
self.contract_line.price_unit = 100.0 self.contract_line.price_unit = 100.0
self.contract.recurring_create_sale() self.contract.recurring_create_sale()
self.sale_monthly = self.env['sale.order'].search( self.sale_monthly = self.env['sale.order'].search(
[('project_id', '=', self.contract.id),
[('contract_id', '=', self.contract.id),
('state', '=', 'draft')]) ('state', '=', 'draft')])
self.assertTrue(self.sale_monthly) self.assertTrue(self.sale_monthly)
self.assertEqual(self.contract.recurring_next_date, '2017-02-28') self.assertEqual(self.contract.recurring_next_date, '2017-02-28')
self.sale_line = self.sale_monthly.order_line[0] self.sale_line = self.sale_monthly.order_line[0]
self.assertAlmostEqual(self.sale_line.price_subtotal, 50.0) self.assertAlmostEqual(self.sale_line.price_subtotal, 50.0)
self.assertEqual(self.contract.partner_id.user_id,
self.sale_monthly.user_id)
self.assertEqual(self.contract.partner_id.user_id.id or self.env.uid,
self.sale_monthly.user_id.id)
def test_contract_autoconfirm(self): def test_contract_autoconfirm(self):
self.contract.sale_autoconfirm = True self.contract.sale_autoconfirm = True
@ -76,15 +76,15 @@ class TestContractSale(TransactionCase):
self.contract_line.price_unit = 100.0 self.contract_line.price_unit = 100.0
self.contract.recurring_create_sale() self.contract.recurring_create_sale()
self.sale_monthly = self.env['sale.order'].search( self.sale_monthly = self.env['sale.order'].search(
[('project_id', '=', self.contract.id),
[('contract_id', '=', self.contract.id),
('state', '=', 'sale')]) ('state', '=', 'sale')])
self.assertTrue(self.sale_monthly) self.assertTrue(self.sale_monthly)
self.assertEqual(self.contract.recurring_next_date, '2017-02-28') self.assertEqual(self.contract.recurring_next_date, '2017-02-28')
self.sale_line = self.sale_monthly.order_line[0] self.sale_line = self.sale_monthly.order_line[0]
self.assertAlmostEqual(self.sale_line.price_subtotal, 50.0) self.assertAlmostEqual(self.sale_line.price_subtotal, 50.0)
self.assertEqual(self.contract.partner_id.user_id,
self.sale_monthly.user_id)
self.assertEqual(self.contract.partner_id.user_id.id or self.env.uid,
self.sale_monthly.user_id.id)
def test_onchange_contract_template_id(self): def test_onchange_contract_template_id(self):
""" It should change the contract values to match the template. """ """ It should change the contract values to match the template. """
@ -106,3 +106,9 @@ class TestContractSale(TransactionCase):
sale_orders = self.contract.with_context( sale_orders = self.contract.with_context(
cron=True).recurring_create_sale() cron=True).recurring_create_sale()
self.assertFalse(sale_orders) self.assertFalse(sale_orders)
def test_create_invoice(self):
""" The method _create_invoice should never
create an invoice from a sale contract """
self.assertFalse(self.contract._create_invoice())

4
contract_sale_generation/views/account_analytic_account_view.xml

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<record id="account_analytic_account_recurring_sale_form" model="ir.ui.view">
<record id="account_analytic_account_recurring_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.recurring.sale.form</field> <field name="name">account.analytic.account.invoice.recurring.sale.form</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/> <field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/>
@ -26,7 +26,7 @@
<attribute name="attrs">{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','invoice')]}</attribute> <attribute name="attrs">{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','invoice')]}</attribute>
</xpath> </xpath>
<xpath expr="//button[@name='contract.act_recurring_invoices']" position="before"> <xpath expr="//button[@name='contract.act_recurring_invoices']" position="before">
<button name="contract_sale_generation.act_recurring_sales"
<button name="contract_sale_generation.sale_order_action"
type="action" type="action"
attrs="{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','sale')]}" attrs="{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','sale')]}"
string="⇒ Show recurring sales" string="⇒ Show recurring sales"

29
contract_sale_generation/views/sale_view.xml

@ -1,10 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<record id="act_recurring_sales" model="ir.actions.act_window">
<field name="context">{'search_default_project_id':
<record id="view_order_form" model="ir.ui.view">
<field name="name">view.order.form.inherit</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="contract_id"/>
</field>
</field>
</record>
<record id="view_sales_order_filter" model="ir.ui.view">
<field name="name">view.sales.order.filter.inherit</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_sales_order_filter"/>
<field name="arch" type="xml">
<field name="product_id" position="after">
<separator/>
<field name="contract_id"/>
</field>
</field>
</record>
<record id="sale_order_action" model="ir.actions.act_window">
<field name="context">{'search_default_contract_id':
[active_id], [active_id],
'default_project_id': active_id}
'default_contract_id': active_id}
</field> </field>
<field name="name">Sales</field> <field name="name">Sales</field>
<field name="res_model">sale.order</field> <field name="res_model">sale.order</field>

Loading…
Cancel
Save