Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
0b1e797
[IMP] - Adapt contract sale to contract new views
sbejaoui Nov 23, 2018
4927517
[IMP] - Make recurrence mechanism on contract line
sbejaoui Oct 30, 2018
3cae23d
[FIX] - Keep contract_cron on account_analytic_account model
sbejaoui Nov 2, 2018
4058bb8
[IMP] - Fix recurring_next_date default value
sbejaoui Nov 2, 2018
34585d5
[FIX] - Fix test check no journal
sbejaoui Nov 2, 2018
14242a5
[IMP] - Return created invoices on recurring_create_invoice
sbejaoui Nov 5, 2018
1d8f601
[IMP] - Specific process to compute recurring_next_date for monthly-…
sbejaoui Nov 5, 2018
a4fe7b4
[ADD] - Add Post-migration script to bring recurrence info from contr…
sbejaoui Nov 5, 2018
fadec33
[ADD] - Add search filter based on date_end and recurring_next_date
sbejaoui Nov 5, 2018
c5d3593
[ADD] - Add unit tests
sbejaoui Nov 5, 2018
3f31a75
[IMP] - Improve Unit tests
sbejaoui Nov 7, 2018
c8f003e
[12.0][IMP] - Add strat/stop wizard to contract line
sbejaoui Nov 13, 2018
6143cc2
[12.0][IMP] - Add pause button to contract line
sbejaoui Nov 14, 2018
6b6b30e
[IMP] - Add state filed in contract line form
sbejaoui Nov 15, 2018
cd05ac9
[FIX] - stop don't change date_end for finished contract line
sbejaoui Nov 15, 2018
38400ac
[IMP] - Change contract line buttons visibility
sbejaoui Nov 16, 2018
49d2d79
[FIX] - don't consider stop_date If it is after the contract line end…
sbejaoui Nov 20, 2018
7dbf78c
[IMP] - consider more cases in stop_plan_successor
sbejaoui Nov 20, 2018
e5a3141
[IMP] - cancel upcoming line on stop
sbejaoui Nov 20, 2018
77f6f84
[IMP] - Chnage next invoice date on un-cancel
sbejaoui Nov 21, 2018
d9b398f
[IMP] - Post message in contract on contract line actions
sbejaoui Nov 21, 2018
2c07136
[IMP] - check contract line overlap
sbejaoui Nov 21, 2018
99638fe
[FIX] - invoice last period for post-paid case
sbejaoui Nov 22, 2018
a6f3bf1
[IMP] - Add primary views for contract
sbejaoui Nov 23, 2018
3d69125
[IMP] - don't use related filed for partner_id and pricelist_id
sbejaoui Nov 28, 2018
ad468d9
[FIX] - fix stop_plan_successor case 5
sbejaoui Nov 28, 2018
125ac02
[IMP] - improve cancel/uncancel process
sbejaoui Nov 28, 2018
b8475d0
[FIX] - Test if start_date is set before compute
sbejaoui Nov 28, 2018
b341f86
[FIX] - date_end include in the period in auto_renew case
sbejaoui Nov 28, 2018
9f7c347
[FIX] - in suspension case, contract line should start a day after th…
sbejaoui Nov 29, 2018
1905ce9
[IMP] - confirm message on contract line cancel
sbejaoui Nov 29, 2018
f24379d
[IMP] - hide recurring_invoicing_type if recurring_rule_type is month…
sbejaoui Nov 29, 2018
cfb72fb
[IMP] - Improve unit tests
sbejaoui Nov 29, 2018
affb8be
[IMP] - store last_date_invoiced on contract_line
sbejaoui Nov 29, 2018
89a60f9
[IMP] - code improvement
sbejaoui Nov 29, 2018
64e80a4
[IMP] - Use last_date_invoiced to set marker in invoice description
sbejaoui Nov 29, 2018
c3ce47a
[IMP] - add migration script to init last_day_invoiced and some other…
sbejaoui Nov 30, 2018
5d88bf9
[FIX] - a contract line suspended should start a day after the suspen…
sbejaoui Nov 30, 2018
fcf5ec2
[IMP] - don't allow to unlink uncnaceled contrac line
sbejaoui Nov 30, 2018
8048b35
[FIX] - check date_start before onchange
sbejaoui Nov 30, 2018
5d17aa8
[FIX] - compute recurring_next_date for contract
sbejaoui Dec 3, 2018
ce37821
[IMP] - get contract line default data onchange product_id
sbejaoui Dec 4, 2018
f90a7f8
[IMP] - Add responsible to contract form view
sbejaoui Dec 4, 2018
74a64ad
[FIX] - contract recurring_next_date ignore canceled lines
sbejaoui Dec 13, 2018
7d74c24
[FIX] - fix _get_invoiced_period if recurring_next_date manually updated
sbejaoui Dec 14, 2018
b9f3373
[IMP] - archive contract_line on contract archive
sbejaoui Dec 14, 2018
b8d00ee
[REF] Contract: invoice creation
ThomasBinsfeld Dec 18, 2018
9a05ee3
Merge pull request #4 from acsone/12.0-ref_contract_invoice_creation_tbi
sbejaoui Dec 19, 2018
8731aff
Merge pull request #5 from sbejaoui/12.0-adjust-contract-sale-to-new-…
sbejaoui Dec 19, 2018
d62cf39
[FIX] - Fix typo
sbejaoui Dec 20, 2018
9a3d356
[IMP] - date start required for contract line
sbejaoui Dec 20, 2018
25a7a6c
[REF] Gitignore: .eggs
ThomasBinsfeld Dec 20, 2018
82ea7b4
[REF] Contract: invoice creation
ThomasBinsfeld Dec 19, 2018
5b94c91
[REF] Contract Unit Tests: base the cron check on invoice lines inste…
ThomasBinsfeld Dec 20, 2018
f9f889c
[FIX] - as date_start is required, constraints on it become useless
sbejaoui Dec 20, 2018
34fc584
[FIX] - for finished contract _get_lines_to_invoice should return False
sbejaoui Dec 20, 2018
479f5dd
[FIX] - default value for active field in contract line
sbejaoui Dec 20, 2018
d34b555
Merge pull request #6 from acsone/12.0-ref_contract_invoice_creation_…
sbejaoui Dec 20, 2018
c6b33fc
[FIX] - fix flake8
sbejaoui Dec 20, 2018
338cad5
[ADD] Contract: payment term
ThomasBinsfeld Dec 21, 2018
52606f6
Merge pull request #7 from acsone/12.0-add_contract_payment_term_tbi
sbejaoui Dec 21, 2018
3adfd6c
[12.0][IMP] - check invoice line vals before assignment
sbejaoui Dec 28, 2018
8c9e4f5
[FIX] - Fix unit tests.
sbejaoui Jan 3, 2019
1d0a403
[FIX] - do not copy last_date_invoiced on plan_successor
sbejaoui Jan 4, 2019
d55662b
[FIX] - renew only recurring_invoices contract
sbejaoui Jan 4, 2019
697d142
[FIX] - filter by termination_notice for contract line to renew
sbejaoui Jan 4, 2019
4199637
[IMP] - Improve inprogress search filter
sbejaoui Jan 4, 2019
db4f8b9
[IMP] - Link invoice line to contract lines
sbejaoui Jan 4, 2019
341a3df
[IMP] - Add index on contract line
sbejaoui Jan 9, 2019
bd07d41
[IMP] - Add is_suspended flag and _search_state
sbejaoui Jan 9, 2019
114b2e2
[IMP] - Add is_suspended flag to stop contract line
sbejaoui Jan 9, 2019
d37a6de
[MV] - move onchange method to contract_product module
sbejaoui Jan 10, 2019
0bee0ad
[RMV] - Remove useless check
sbejaoui Jan 10, 2019
b42de11
[IMP] - Replace is_suspended flag by manual_renew_needed
sbejaoui Jan 10, 2019
6e066ba
[IMP] - Improve unit tests
sbejaoui Jan 10, 2019
ee1882f
[FIX] Contract: copy payment term on generated invoice
ThomasBinsfeld Jan 11, 2019
d3d553c
[IMP] - Should be able to stop a past contract line
sbejaoui Jan 11, 2019
ec1464c
[ADD] Contract: fiscal position
ThomasBinsfeld Jan 16, 2019
f5f0aca
[ADD] Contract: new contributor
ThomasBinsfeld Jan 16, 2019
23be840
[REF] Contract: indexes
ThomasBinsfeld Jan 16, 2019
220c28b
[FIX] - recurring_next_date is required if date_end is null
sbejaoui Jan 17, 2019
f0d0d5c
[IMP] - rename recurring_interval to Invoice Every
sbejaoui Jan 21, 2019
b938681
[IMP] Contract: matching invoice view depending on contract type
ThomasBinsfeld Jan 21, 2019
6a90aa6
[ADD] Contract: invoice partner
ThomasBinsfeld Jan 23, 2019
a1173f3
[ADD] - Add more value for auto_renew_rule_type
sbejaoui Jan 24, 2019
03472f8
[REF] - refactoring for compute_first_date_end
sbejaoui Feb 1, 2019
1403bdc
[RMV] - remove auto_renew_rule_type option monthlylastday
sbejaoui Feb 1, 2019
c14b5f7
[IMP] - rename manual_renew_needed label
sbejaoui Feb 1, 2019
fc6a68e
[IMP] - use get_product_multiline_description_sale to get contract li…
sbejaoui Feb 15, 2019
6925462
[FIX] Contract to Invoice: take contract vendor instead of partner's
ThomasBinsfeld Feb 20, 2019
a398ce1
[FIX] - manual_renew_needed should be visible to all contract users
sbejaoui Feb 28, 2019
85abfac
[REF] - add _get_next_invoiced_period method
sbejaoui Mar 6, 2019
ef0accb
[FIX] - Fix In progress contract filter
sbejaoui Mar 8, 2019
f3526db
[REF] - add method to get quantity to invoice
sbejaoui Mar 11, 2019
7b33936
[FIX] - Onchange contract line don't reste contract lines
sbejaoui Mar 12, 2019
b0b4b0c
[FIX] - Rename _get_invoiced_period to _get_period_to_invoice
sbejaoui Mar 12, 2019
98fab47
[ADD] - Add stop_at_date_end to _get_period_to_invoice
sbejaoui Mar 14, 2019
d195c8a
[FIX] - Remove useless filter
sbejaoui Mar 14, 2019
e9e3e90
[FIX] - don't play onchange date_start for old lines on contract temp…
sbejaoui Mar 14, 2019
3e4e72b
[FIX] - Fix stop post message
sbejaoui Mar 14, 2019
1bca018
[FIX] - Fix sale_contract_count should count all partner contract
sbejaoui Mar 21, 2019
c8d9441
[FIX] - set recurring_next_date to False if contract line stoped at l…
sbejaoui Mar 26, 2019
25f9da4
[FIX] - Group by next_invoice also considers dates in the past
qgroulard Mar 26, 2019
c97989c
[IMP] - A canceled contract line can't be set to auto-renew
sbejaoui Apr 2, 2019
54ab1b7
[REF] Contract: pep8
ThomasBinsfeld May 27, 2019
16c2cd7
[IMP] Contract: update USAGE section of README
ThomasBinsfeld May 27, 2019
a3b7e52
[IMP]call onchange_is_auto_renew when changing template
AaronHForgeFlow May 27, 2019
7aa943a
[FIX] Vocabulary changes
May 27, 2019
ed8cc59
Merge pull request #11 from Eficent/12.0-fix-contract-onchange-auto-r…
sbejaoui May 27, 2019
a084039
Merge pull request #12 from QubiQ/12.0-recurrence-mechanism-on-contra…
sbejaoui May 27, 2019
83c2a95
Merge branch '12.0' into 12.0-recurrence-mechanism-on-contract-line
AaronHForgeFlow May 27, 2019
b0ac8b9
[IMP]pass the payment term to the contract from the partner
AaronHForgeFlow May 28, 2019
a9f9d7b
Merge pull request #13 from Eficent/12.0-contract-payment-term
sbejaoui May 28, 2019
e1d8539
[REF] Contract: use context_today instead of time in filters
ThomasBinsfeld May 28, 2019
5c52de7
[REF] Contract: split from analytic account
ThomasBinsfeld May 28, 2019
2ee8a25
[REF] Contract Sale: split from analytic account
ThomasBinsfeld May 28, 2019
033d1bc
[REF] Contract: update translations
ThomasBinsfeld May 29, 2019
dd83232
[REF] Contract Sale: update translations
ThomasBinsfeld May 29, 2019
fa83ddb
[ADD] Analytic Account on lines
May 29, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
*.eggs

# Installer logs
pip-log.txt
Expand Down
4 changes: 2 additions & 2 deletions contract/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Contracts Management - Recurring
:target: https://runbot.odoo-community.org/runbot/110/12.0
:alt: Try me on Runbot

|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module enables contracts management with recurring
invoicing functions. Also you can print and send by email contract report.
Expand Down Expand Up @@ -66,7 +66,7 @@ To use this module, you need to:
#. Choosing between pre-paid and post-paid, you modify the dates that are shown
with the markers.
#. A cron is created with daily interval, but if you are in debug mode, you can
click on *Create invoices* to force this action.
click on *Create next invoice* to force this action.
#. Click *Show recurring invoices* link to show all invoices created by the
contract.
#. Click on *Print > Contract* menu to print contract report.
Expand Down
1 change: 1 addition & 0 deletions contract/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from . import models
from . import wizards
25 changes: 16 additions & 9 deletions contract/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,36 @@
# Copyright 2016-2018 Tecnativa - Carlos Dauden
# Copyright 2017 Tecnativa - Vicent Cubells
# Copyright 2016-2017 LasLabs Inc.
# Copyright 2018 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

{
'name': 'Contracts Management - Recurring',
'version': '12.0.1.0.0',
'name': 'Recurring - Contracts Management',
'version': '12.0.4.0.0',
'category': 'Contract Management',
'license': 'AGPL-3',
'author': "OpenERP SA, "
"Tecnativa, "
"LasLabs, "
"Odoo Community Association (OCA)",
"Tecnativa, "
"LasLabs, "
"ACSONE SA/NV, "
"Odoo Community Association (OCA)",
'website': 'https://github.com/oca/contract',
'depends': ['base', 'account', 'analytic'],
'depends': ['base', 'account', 'product'],
"external_dependencies": {"python": ["dateutil"]},
'data': [
'security/ir.model.access.csv',
'security/contract_security.xml',
'report/report_contract.xml',
'report/contract_views.xml',
'data/contract_cron.xml',
'data/contract_renew_cron.xml',
'data/mail_template.xml',
'views/account_analytic_account_view.xml',
'views/account_analytic_contract_view.xml',
'views/account_invoice_view.xml',
'wizards/contract_line_wizard.xml',
'views/abstract_contract_line.xml',
'views/contract.xml',
'views/contract_line.xml',
'views/contract_template.xml',
'views/contract_template_line.xml',
'views/res_partner_view.xml',
],
'installable': True,
Expand Down
4 changes: 2 additions & 2 deletions contract/data/contract_cron.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding='UTF-8'?>
<odoo noupdate="1">

<record model="ir.cron" id="account_analytic_cron_for_invoice">
<record model="ir.cron" id="contract_cron_for_invoice">
<field name="name">Generate Recurring Invoices from Contracts</field>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
<field name="model_id" ref="model_contract_contract"/>
<field name="state">code</field>
<field name="code">model.cron_recurring_create_invoice()</field>
<field name="user_id" ref="base.user_root" />
Expand Down
16 changes: 16 additions & 0 deletions contract/data/contract_renew_cron.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding='UTF-8'?>
<odoo noupdate="1">

<record model="ir.cron" id="contract_line_cron_for_renew">
<field name="name">Renew Contract lines</field>
<field name="model_id" ref="model_contract_line"/>
<field name="state">code</field>
<field name="code">model.cron_renew_contract_line()</field>
<field name="user_id" ref="base.user_root" />
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field eval="False" name="doall" />
</record>

</odoo>
2 changes: 1 addition & 1 deletion contract/data/mail_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<field name="email_from">${(object.user_id.email and '%s &lt;%s&gt;' % (object.user_id.name, object.user_id.email) or '')|safe}</field>
<field name="subject">${object.company_id.name} Contract (Ref ${object.name or 'n/a'})</field>
<field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="contract.model_account_analytic_account"/>
<field name="model_id" ref="model_contract_contract"/>
<field name="auto_delete" eval="True"/>
<field name="report_template" ref="contract.report_contract"/>
<field name="report_name">Contract</field>
Expand Down
Loading