audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #330 into 15.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-12-09 16:25:02 +00:00
parent 563ee07d5e a54bd1bd16
commit 750a1d8b40
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rma_sale/models/rma.py
View File

@@ -21,7 +21,10 @@ class Rma(models.Model):
comodel_name="stock.picking", comodel_name="stock.picking",
compute="_compute_allowed_picking_ids", compute="_compute_allowed_picking_ids",
) )
picking_id = fields.Many2one(domain="[('id', 'in', allowed_picking_ids)]") picking_id = fields.Many2one(
domain="(order_id or partner_id) and [('id', 'in', allowed_picking_ids)] or "
"[('state', '=', 'done'), ('picking_type_id.code', '=', 'outgoing')] "
)
allowed_move_ids = fields.Many2many( allowed_move_ids = fields.Many2many(
comodel_name="sale.order.line", comodel_name="sale.order.line",
compute="_compute_allowed_move_ids", compute="_compute_allowed_move_ids",
@@ -34,18 +37,25 @@ class Rma(models.Model):
comodel_name="product.product", comodel_name="product.product",
compute="_compute_allowed_product_ids", compute="_compute_allowed_product_ids",
) )
product_id = fields.Many2one(domain="[('id', 'in', allowed_product_ids)]") product_id = fields.Many2one(
domain="order_id and [('id', 'in', allowed_product_ids)] or "
"[('type', 'in', ['consu', 'product'])]"
)
@api.depends("partner_id", "order_id") @api.depends("partner_id", "order_id")
def _compute_allowed_picking_ids(self): def _compute_allowed_picking_ids(self):
domain = [("state", "=", "done"), ("picking_type_id.code", "=", "outgoing")] domain = [("state", "=", "done"), ("picking_type_id.code", "=", "outgoing")]
for rec in self: for rec in self:
domain2 = domain.copy()
if rec.partner_id: if rec.partner_id:
commercial_partner = rec.partner_id.commercial_partner_id commercial_partner = rec.partner_id.commercial_partner_id
domain.append(("partner_id", "child_of", commercial_partner.id)) domain2.append(("partner_id", "child_of", commercial_partner.id))
if rec.order_id: if rec.order_id:
domain.append(("sale_id", "=", rec.order_id.id)) domain2.append(("sale_id", "=", rec.order_id.id))
rec.allowed_picking_ids = self.env["stock.picking"].search(domain) if domain2 != domain:
rec.allowed_picking_ids = self.env["stock.picking"].search(domain2)
else:
rec.allowed_picking_ids = False # don't populate a big list
@api.depends("order_id", "picking_id") @api.depends("order_id", "picking_id")
def _compute_allowed_move_ids(self): def _compute_allowed_move_ids(self):
@@ -67,11 +77,7 @@ class Rma(models.Model):
lambda r: r.type in ["consu", "product"] lambda r: r.type in ["consu", "product"]
).ids ).ids
else: else:
rec.allowed_product_ids = ( rec.allowed_product_ids = False # don't populate a big list
self.env["product.product"]
.search([("type", "in", ["consu", "product"])])
.ids
)
@api.onchange("partner_id") @api.onchange("partner_id")
def _onchange_partner_id(self): def _onchange_partner_id(self):