[ADD] purchase_order_line_merge: merge PO lines into a new purchase order - #2981
[ADD] purchase_order_line_merge: merge PO lines into a new purchase order#2981rjaraspearhead wants to merge 1 commit into
Conversation
|
Ping: @celm1990 |
96cd0b3 to
c1b1891
Compare
|
@mymage could you please review your changes again? Also, could you please review the changes in sale_purchase_force_vendor as well? |
|
|
||
|
|
||
| @tagged("post_install", "-at_install") | ||
| class TestPurchaseOrderLineMerge(TransactionCase): |
There was a problem hiding this comment.
| class TestPurchaseOrderLineMerge(TransactionCase): | |
| class TestPurchaseOrderLineMerge(BaseCommon): |
| @classmethod | ||
| def setUpClass(cls): | ||
| super().setUpClass() | ||
| cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) |
There was a problem hiding this comment.
Inheriting from BaseCommon, this line is not necessary.
| "product_uom": cls.product_1.uom_id.id, | ||
| "product_qty": 8.0, | ||
| "price_unit": 100.0, | ||
| "taxes_id": [(6, 0, cls.tax.ids)], |
There was a problem hiding this comment.
| "taxes_id": [(6, 0, cls.tax.ids)], | |
| "taxes_id": [Command.set(cls.tax.ids)], |
| ( | ||
| 0, | ||
| 0, | ||
| self._prepare_default_line_vals(line), | ||
| ) |
There was a problem hiding this comment.
| ( | |
| 0, | |
| 0, | |
| self._prepare_default_line_vals(line), | |
| ) | |
| Command.create( | |
| self._prepare_default_line_vals(line) | |
| ) |
| """Return the purchase lines eligible for merge initialization.""" | ||
| # Placeholder: if needed, filter out lines whose order is not in draft. | ||
| # Example: po_lines.filtered(lambda ln: ln.order_id.state == "draft") | ||
| return po_lines |
There was a problem hiding this comment.
I think you must exclude at least the canceled lines.
| "product_qty": vals["quantity"], | ||
| "price_unit": vals["price_unit"], | ||
| "date_planned": self.date_order, | ||
| "taxes_id": [(6, 0, vals["taxes_id"].ids)], |
There was a problem hiding this comment.
| "taxes_id": [(6, 0, vals["taxes_id"].ids)], | |
| "taxes_id": [Command.set(vals["taxes_id"].ids)], |
| def _action_view_purchase_order(self, purchase_order): | ||
| action = { | ||
| "name": self.env._("Purchase Order"), | ||
| "type": "ir.actions.act_window", | ||
| "res_model": "purchase.order", | ||
| "context": {"create": False}, | ||
| } | ||
| if len(purchase_order) == 1: | ||
| action.update( | ||
| { | ||
| "view_mode": "form", | ||
| "res_id": purchase_order.id, | ||
| } | ||
| ) | ||
| else: | ||
| action.update( | ||
| { | ||
| "view_mode": "list,form", | ||
| "domain": [("id", "in", purchase_order.ids)], | ||
| } | ||
| ) | ||
| return action |
There was a problem hiding this comment.
Odoo has a generic function to do this. Please review this function; I think it can be reused:
https://github.com/odoo/odoo/blob/8295abd79ec50646cc833916d7c8995fae905665/odoo/addons/base/models/ir_ui_view.py#L2899C9-L2899C28
| def _get_merge_key(self): | ||
| self.ensure_one() | ||
| return ( | ||
| self.product_id.id, | ||
| self.price_unit, | ||
| self.product_uom.id, | ||
| tuple(sorted(self.taxes_id.ids)), | ||
| ) |
There was a problem hiding this comment.
Now the discount field is native in Odoo. I think you must consider the discount when merging lines: merge the lines only if they have the same discount, or do not merge them if the discount is different.
| <field name="name">purchase.order.line.merge.form</field> | ||
| <field name="model">purchase.order.line.merge</field> | ||
| <field name="arch" type="xml"> | ||
| <form string="Merge Purchase Order Lines"> |
There was a problem hiding this comment.
| <form string="Merge Purchase Order Lines"> | |
| <form> |
| "license": "AGPL-3", | ||
| "category": "Inventory/Purchase", | ||
| "summary": "Merge purchase order lines into a new purchase order", | ||
| "depends": ["purchase", "purchase_order_line_menu", "purchase_stock"], |
There was a problem hiding this comment.
| "depends": ["purchase", "purchase_order_line_menu", "purchase_stock"], | |
| "depends": ["purchase_order_line_menu", "purchase_stock"], |
b3fe6d0 to
1974013
Compare
celm1990
left a comment
celm1990
left a comment
There was a problem hiding this comment.
Please review the older comments. Some of them are still pending your review.
| @api.depends("quantity", "price_unit") | ||
| def _compute_price_subtotal(self): | ||
| for line in self: | ||
| line.price_subtotal = line.quantity * line.price_unit |
There was a problem hiding this comment.
What about the discount? I think it should be taken into account when computing the value.
| self.discount, | ||
| ) | ||
|
|
||
| def _is_mergeable_for_merge(self): |
There was a problem hiding this comment.
| def _is_mergeable_for_merge(self): | |
| def _is_mergeable(self): |
1974013 to
a085d93
Compare
OCA-git-bot
added
series:18.0
mod:purchase_order_line_merge
Could you please help me review it again? |
4 participants
Adds a new module that allows users to select purchase order lines from
the list view and merge them into a single new purchase order.
Unlike
purchase_mergewhich works at the order level, this moduleoperates at the line level, providing granular control over which
lines to consolidate and how much quantity to move.