[12.0][MIG] - contract variable quantity #211

sbejaoui · 2018-11-06T11:23:56Z

No description provided.

sbejaoui · 2018-11-06T11:28:05Z

FYI @gva-acsone

gva-acsone

Functional test 👍

AaronHForgeFlow · 2019-05-28T08:10:35Z

I am not sure what I am missing. I have a very simple formula in the template: result=15

When creating the invoice, the formula changes to result=0. Any ideas?

sbejaoui · 2019-05-28T08:18:36Z

I am not sure what I am missing. I have a very simple formula in the template: result=15

When creating the invoice, the formula changes to result=0. Any ideas?

Hi @aheficent ,
You are getting this in runbot?

AaronHForgeFlow · 2019-05-28T08:28:50Z

Hi @aheficent ,
You are getting this in runbot?

No, in my local. I am debugging into the code and in this line:

contract/contract_variable_quantity/models/contract_line.py

Line 38 in e7f5650

self.qty_formula_id.code.strip(),

I get result=0 as self.qty_formula_id.code

I am not sure if I am missing something

sbejaoui · 2019-05-28T08:56:30Z

Hi @aheficent ,
You are getting this in runbot?

No, in my local. I am debugging into the code and in this line:

contract/contract_variable_quantity/models/contract_line.py

Line 38 in e7f5650

self.qty_formula_id.code.strip(),

I get result=0 as self.qty_formula_id.code
I am not sure if I am missing something

Can you take a look in runbot how I configured the formula and some contracts
I create a formula with result=line.sequence and result=15.
And it works fine,

AaronHForgeFlow · 2019-05-28T09:04:54Z

@sbejaoui What runbot are you using?

I used this one in this PR: http://3371960-211-e7f565.runbot1-2.odoo-community.org/web

and I got the same thing than in my local. But this must be a different runbot you tested because I did not see any formula result=15 I had to create one

sbejaoui · 2019-05-28T09:35:09Z

@sbejaoui What runbot are you using?

I used this one in this PR: http://3371960-211-e7f565.runbot1-2.odoo-community.org/web

and I got the same thing than in my local. But this must be a different runbot you tested because I did not see any formula result=15 I had to create one

oh I see now,
you should set result=15 to code field not to the name.

-->

AaronHForgeFlow · 2019-05-28T09:40:19Z

@sbejaoui haha honestly as the field was not required and the background was white I thought that was part of the explanation and not anc actual editable field haha

sbejaoui · 2019-05-28T09:41:59Z

@sbejaoui haha honestly as the field was not required and the background was white I thought that was part of the explanation and not anc actual editable field haha

yes, it's confusing :D

AaronHForgeFlow

👍 Functional tests

pedrobaeza · 2019-06-04T13:47:00Z

Can you check Travis status?

hparfr

From my understanding there should be no dependencies to account.analytic because of the PR #207

contract_variable_quantity/models/abstract_contract_line.py

sbejaoui · 2019-09-30T13:09:46Z

@OCA/core-maintainers
This PR can be merged

moylop260 · 2019-09-30T13:53:57Z

/ocabot merge

OCA-git-bot · 2019-09-30T13:54:11Z

What a great day to merge this nice PR. Let's do it!
Prepared branch 12.0-ocabot-merge-pr-211-by-moylop260-bump-no, awaiting test results.

Signed-off-by moylop260

pedrobaeza · 2019-09-30T14:26:21Z

@sbejaoui please squash together adjacent OCA Transbot updated translations from Transifex commits, and also squash your migration commits.

================================================= Variable quantity in contract recurrent invoicing ================================================= With this module, you will be able to define in recurring contracts some lines with variable quantity according a provided formula. Configuration ============= * Go to Sales > Configuration > Contracts > Formulas (quantity). * Define any formula based on Python code that stores at some moment a float/integer value of the quantity to invoice in the variable 'result'. You can use these variables to compute your formula: * *env*: Environment variable for getting other models. * *context*: Current context dictionary. * *user*: Current user. * *line*: Contract recurring invoice line that triggers this formula. * *contract*: Contract whose line belongs to. * *invoice*: Invoice (header) being created. Usage ===== To use this module, you need to: * Go to Sales -> Contracts and select or create a new contract. * Check *Generate recurring invoices automatically*. * Add a new recurring invoicing line. * Select "Variable quantity" in column "Qty. type". * Select one of the possible formulas to use (previously created).

OCA Transbot updated translations from Transifex

* Bump version * Change openerp references to odoo * Installable to True * Change permissions & views to accounting dependency OCA Transbot updated translations from Transifex

Add template functionality for contracts

* [IMP] Add variable qty to contract template view * Bump minor version OCA Transbot updated translations from Transifex

OCA Transbot updated translations from Transifex

… invoice lines

OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex

If you have contract lines with automatic price and your pricelist contains different prices per quantity, the price is not changed when computing quantity. This PR fixes this. OCA Transbot updated translations from Transifex [UPD] Update contract_variable_quantity.pot

Bug description --------------- `account.analytic.contract.line` inherits `account.analytic.invoice.line` `account.analytic.invoice.line` defines field `analytic_account_id`: - comodel='account.analytic.account' `account.analytic.contract.line` redefines field `analytic_account_id`: - comodel='account.analytic.contract' On attempt to extend `account.analytic.invoice.line` model adding field that depends on `analytic_account_id.date_start` Odoo fails to update, because it adds this field to `account.analytic.contract.line` through inheritance, and `account.analytic.contract` model have no this field. What is done ------------ Change inheritance order: - `account.analytic.invoice.line` inherits `account.analytic.contract.line` - no file renames at this stage (this wil be done in next commit) Update addon versions - contract - contract_variable_quantity [UPD] Update contract_variable_quantity.pot

[IMP] Adapt unit test [ADD] setup.py [IMP] - Add ace-widget with python mode [IMP] - Adapt contract_variable_quantity to contract new views [IMP] - refresh contract_variable_quantity.pot [REF] Contract: invoice in prepare_invoice_line is optional [IMP] - Skip zero should ignore lines with qty zero even for fixed qty [FIX] - Fix unit tests [FIX] fix unit tests [FIX] - fix check quantity = 0 [REF] - Use method _get_quantity_to_invoice.

sbejaoui · 2019-09-30T14:46:34Z

@sbejaoui please squash together adjacent OCA Transbot updated translations from Transifex commits, and also squash your migration commits.

Squash done.

rousseldenis

Code review. Do you plan to squash some commits?

OCA-git-bot · 2019-10-01T00:17:40Z

Congratulations, your PR was merged at f8fb4ff. Thanks a lot for contributing to OCA. ❤️

gva-acsone approved these changes Nov 7, 2018

View reviewed changes

rafaelbn added this to the 12.0 milestone Nov 22, 2018

sbejaoui force-pushed the 12.0-mig-contract_variable_quantity branch 2 times, most recently from ec6df19 to 88ada17 Compare November 26, 2018 11:53

emagdalenaC2i mentioned this pull request Dec 28, 2018

Migration to version 12.0 #189

Closed

19 tasks

sbejaoui mentioned this pull request Jan 24, 2019

New module product contract variable qty #265

Merged

sbejaoui force-pushed the 12.0-mig-contract_variable_quantity branch from ac76528 to e7f5650 Compare March 12, 2019 10:19

AaronHForgeFlow approved these changes May 28, 2019

View reviewed changes

OCA-git-bot added the approved label May 28, 2019

hparfr suggested changes Aug 12, 2019

View reviewed changes

contract_variable_quantity/models/abstract_contract_line.py Outdated Show resolved Hide resolved

OCA-git-bot removed the approved label Aug 12, 2019

sbejaoui force-pushed the 12.0-mig-contract_variable_quantity branch 2 times, most recently from 7a6bb93 to d42b146 Compare September 30, 2019 10:02

sbejaoui requested review from pedrobaeza, sbidoul and hparfr September 30, 2019 13:09

OCA-git-bot added a commit that referenced this pull request Sep 30, 2019

Merge PR #211 into 12.0

5b43192

Signed-off-by moylop260

sbejaoui force-pushed the 12.0-mig-contract_variable_quantity branch from d42b146 to 54a4052 Compare September 30, 2019 14:41

pedrobaeza and others added 20 commits September 30, 2019 16:45

[IMP] contract_variable_quantity: Screenshot

cbc5c8a

[IMP] contract_variable_quantity: Spanish translation

476731f

Update README.rst

fa6908d

OCA Transbot updated translations from Transifex

[IMP] contract: Add past receipt type. Fix yearly. Add month last day

0088827

[MIG] Make modules uninstallable

10f8abf

[MIG] Rename manifest files

585b096

OCA Transbot updated translations from Transifex

[MIG] contract_variable_quantity: Migrate to v10

961d8e6

* Bump version * Change openerp references to odoo * Installable to True * Change permissions & views to accounting dependency OCA Transbot updated translations from Transifex

[IMP][10.0] contract: Add templating (OCA#42)

9d4833d

Add template functionality for contracts

OCA Transbot updated translations from Transifex

2a54f58

[10.0][IMP] Add variable qty to contract template view (OCA#66)

402bb56

* [IMP] Add variable qty to contract template view * Bump minor version OCA Transbot updated translations from Transifex

[FIX] contract_payment_auto: Fix freze wkhtmltopdf freezed

7cdac21

OCA Transbot updated translations from Transifex

[MIG] contract_variable_quantity: Migration to 11.0

4983a88

[FIX] contract_variable_quantity: Correct README menus references

dbee10c

OCA Transbot updated translations from Transifex

[IMP] contract_variable_quantity: Add option to don't create zero qty…

44512b1

… invoice lines

[IMP] contract_variable_quantity: Make name translatable

2b8cca4

OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex

[12.0][REF] - Contract Variable quantity: split from analytic accoun

43a1d84

sbejaoui force-pushed the 12.0-mig-contract_variable_quantity branch from 54a4052 to 43a1d84 Compare September 30, 2019 14:45

rousseldenis approved these changes Sep 30, 2019

View reviewed changes

OCA-git-bot added the merged 🎉 label Oct 1, 2019

OCA-git-bot closed this Oct 1, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[12.0][MIG] - contract variable quantity #211

[12.0][MIG] - contract variable quantity #211

sbejaoui commented Nov 6, 2018 •

edited

Loading

sbejaoui commented Nov 6, 2018

gva-acsone left a comment

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow left a comment

pedrobaeza commented Jun 4, 2019

hparfr left a comment

sbejaoui commented Sep 30, 2019

moylop260 commented Sep 30, 2019

OCA-git-bot commented Sep 30, 2019

pedrobaeza commented Sep 30, 2019

sbejaoui commented Sep 30, 2019

rousseldenis left a comment

OCA-git-bot commented Oct 1, 2019

[12.0][MIG] - contract variable quantity #211

[12.0][MIG] - contract variable quantity #211

Conversation

sbejaoui commented Nov 6, 2018 • edited Loading

sbejaoui commented Nov 6, 2018

gva-acsone left a comment

Choose a reason for hiding this comment

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow commented May 28, 2019

sbejaoui commented May 28, 2019

AaronHForgeFlow left a comment

Choose a reason for hiding this comment

pedrobaeza commented Jun 4, 2019

hparfr left a comment

Choose a reason for hiding this comment

sbejaoui commented Sep 30, 2019

moylop260 commented Sep 30, 2019

OCA-git-bot commented Sep 30, 2019

pedrobaeza commented Sep 30, 2019

sbejaoui commented Sep 30, 2019

rousseldenis left a comment

Choose a reason for hiding this comment

OCA-git-bot commented Oct 1, 2019

sbejaoui commented Nov 6, 2018 •

edited

Loading