Skip to content

Commit

Permalink
[IMP] purchase_picking_state: black, isort, prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
victoralmau committed Mar 10, 2022
1 parent cb5ca20 commit 9b105a3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
12 changes: 4 additions & 8 deletions purchase_picking_state/models/purchase.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2016 Chafique DELLI @ Akretion
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from odoo import models, fields, api
from odoo import api, fields, models
from odoo.tools.translate import _


Expand All @@ -22,14 +22,10 @@ def get_picking_state(self):
def _compute_picking_state(self):
for purchase in self:
if purchase.picking_ids:
pickings_state = set(
[picking.state for picking in purchase.picking_ids]
)
if pickings_state == set(["cancel"]):
pickings_state = {picking.state for picking in purchase.picking_ids}
if pickings_state == {"cancel"}:
purchase.picking_state = "cancel"
elif pickings_state == set(
["cancel", "done"]
) or pickings_state == set(["done"]):
elif pickings_state == {"cancel", "done"} or pickings_state == {"done"}:
purchase.picking_state = "done"
elif "done" in pickings_state:
purchase.picking_state = "partially_received"
Expand Down
10 changes: 4 additions & 6 deletions purchase_picking_state/tests/test_purchase_picking_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from datetime import datetime

from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as DTF

from odoo.addons.account.tests.account_test_classes import AccountingTestCase


Expand All @@ -16,9 +18,7 @@ def setUp(self):
self.product_id_1 = self.env.ref("product.product_product_8")
self.product_id_2 = self.env.ref("product.product_product_11")

(self.product_id_1 | self.product_id_2).write(
{"purchase_method": "purchase"}
)
(self.product_id_1 | self.product_id_2).write({"purchase_method": "purchase"})
self.po_vals = {
"partner_id": self.partner_id.id,
"order_line": [
Expand Down Expand Up @@ -62,9 +62,7 @@ def test_picking_state_in_purchase_order(self):
self.po.button_cancel()
self.po.button_draft()
self.po.button_confirm()
pick = self.po.picking_ids.filtered(
lambda x: x.state not in ("done", "cancel")
)
pick = self.po.picking_ids.filtered(lambda x: x.state not in ("done", "cancel"))
pick.move_line_ids.write({"qty_done": 2})
pick.action_done()
self.assertEqual(self.po.picking_state, "partially_received")
Expand Down
2 changes: 1 addition & 1 deletion purchase_picking_state/views/purchase_view.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>

<record id="purchase_order_form" model="ir.ui.view">
Expand Down
6 changes: 6 additions & 0 deletions setup/purchase_picking_state/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

0 comments on commit 9b105a3

Please sign in to comment.