[FIX] sale: recompute delivered qty #33991
Closed
+3
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020
|
robodoo r+ |
pniederlag
pushed a commit
to pniederlag/odoo
that referenced
this pull request
Jun 11, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
|
Merged, thanks! |
|
It broke tests during forward-port to saas-11.3 2019-06-11 09:04:36 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write FAIL 2019-06-11 09:04:36 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write FAIL 2019-06-11 09:04:36 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write FAIL: test_at_cost (odoo.addons.sale.tests.test_reinvoice.TestReInvoice) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` Test vendor bill at cost for product based on ordered and delivered quantities. 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write Traceback (most recent call last): 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` File "/data/build/odoo/addons/sale/tests/test_reinvoice.py", line 111, in test_at_cost 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` self.assertEquals((sale_order_line3.price_unit, sale_order_line3.qty_delivered, sale_order_line3.product_uom_qty, sale_order_line3.qty_invoiced), (self.product_ordered_cost.standard_price, invoice_lineA1.quantity, 0, 0), 'Sale line is wrong after confirming vendor invoice') 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` AssertionError: Tuples differ: (8.0, 0.0, 0.0, 0.0) != (8.0, 3.0, 0, 0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` First differing element 1: 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 0.0 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 3.0 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` - (8.0, 0.0, 0.0, 0.0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` ? ^ -- -- 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` + (8.0, 3.0, 0, 0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` ? ^ 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` : Sale line is wrong after confirming vendor invoice 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write FAIL: test_sales_price (odoo.addons.sale.tests.test_reinvoice.TestReInvoice) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` Test invoicing vendor bill at sales price for products based on delivered and ordered quantities. Check no existing SO line is incremented, but when invoicing a second time, increment only the delivered so line. 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write Traceback (most recent call last): 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` File "/data/build/odoo/addons/sale/tests/test_reinvoice.py", line 214, in test_sales_price 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` self.assertEquals((sale_order_line3.price_unit, sale_order_line3.qty_delivered, sale_order_line3.product_uom_qty, sale_order_line3.qty_invoiced), (self.product_deliver_sales_price.list_price, invoice_lineA1.quantity, 0, 0), 'Sale line is wrong after confirming vendor invoice') 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` AssertionError: Tuples differ: (10.0, 0.0, 0.0, 0.0) != (10.0, 3.0, 0, 0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` First differing element 1: 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 0.0 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 3.0 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` - (10.0, 0.0, 0.0, 0.0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` ? ^ -- -- 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` + (10.0, 3.0, 0, 0) 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` ? ^ 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write ` : Sale line is wrong after confirming vendor invoice 2019-06-11 09:04:37 ERROR server odoo.addons.sale.tests.test_reinvoice:474 write FAILED 2019-06-11 09:04:37 ERROR server odoo.modules.module:505 run_unit_tests Module sale: 2 failures, 0 errors 2019-06-11 09:04:38 ERROR server odoo.addons.sale.tests.test_sale_order:474 write FAIL 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write FAIL: test_cost_invoicing (odoo.addons.sale.tests.test_sale_order.TestSaleOrder) 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` Test confirming a vendor invoice to reinvoice cost on the so 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write Traceback (most recent call last): 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` File "/data/build/odoo/addons/sale/tests/test_sale_order.py", line 198, in test_cost_invoicing 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` self.assertEquals((sol.price_unit, sol.qty_delivered, sol.product_uom_qty, sol.qty_invoiced), (160, 2, 0, 0), 'Sale: line is wrong after confirming vendor invoice') 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` AssertionError: Tuples differ: (160.0, 0.0, 0.0, 0.0) != (160, 2, 0, 0) 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` First differing element 1: 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` 0.0 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` 2 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` - (160.0, 0.0, 0.0, 0.0) 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write ` + (160, 2, 0, 0) : Sale: line is wrong after confirming vendor invoice 2019-06-11 09:04:42 ERROR server odoo.addons.sale.tests.test_sale_order:474 write FAILED Is your patch valid for non service products? |
|
I think it is safe to not forward-port it, service invoicing has changed dramatically in v12 (same for v11.3) |
TDu
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 17, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
grindtildeath
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 19, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 20, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 20, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 24, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 24, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 24, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 24, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Jun 27, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Tonow-c2c
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 13, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Tonow-c2c
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 16, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 16, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 17, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Tonow-c2c
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 17, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
i-vyshnevska
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Sep 21, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
vrenaville
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Oct 2, 2019
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
leemannd
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Dec 4, 2020
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
mmequignon
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Dec 4, 2020
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
santostelmo
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Dec 15, 2020
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
chroi
pushed a commit
to camptocamp/odoo
that referenced
this pull request
Dec 18, 2020
- Create a product A of type "Service", Invoice based on "Milestones", Service Tracking "Create a task in a new project". - Create a new SO with A, confirm. - Go the to task associated to the SO, go to "Timesheets" tab, add an entry - In the SO, edit the delivered quantity - Create invoice, validate Back to the SO, delivered quantity is reset to 0. We make sure to filter out SO lines which have a delivered quantity set manually. Introduced by d6ad222. opw-1982020 closes odoo#33991 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Service Tracking "Create a task in a new project".
entry
Back to the SO, delivered quantity is reset to 0.
We make sure to filter out SO lines which have a delivered quantity set
manually.
Introduced by d6ad222.
opw-1982020
Description of the issue/feature this PR addresses:
Current behavior before PR:
Desired behavior after PR is merged:
--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr