audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] delivery_hibou: unsafe new kwarg, use context instead, better domain on packaging

Browse Source
This commit is contained in:
Jared Kipe
2021-09-21 15:01:14 -07:00
committed by Leo Pinedo
parent 9d1d85e2a4
commit 8830995f5c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
delivery_hibou/models/stock.py
View File

@@ -17,11 +17,11 @@ class StockQuantPackage(models.Model):
def send_to_shipper(self): def send_to_shipper(self):
picking = self._get_active_picking() picking = self._get_active_picking()
picking.send_to_shipper(packages=self) picking.with_context(packages=self).send_to_shipper()
def cancel_shipment(self): def cancel_shipment(self):
picking = self._get_active_picking() picking = self._get_active_picking()
picking.cancel_shipment(packages=self) picking.with_context(packages=self).cancel_shipment()
class StockPicking(models.Model): class StockPicking(models.Model):
@@ -83,7 +83,8 @@ class StockPicking(models.Model):
picking.carrier_tracking_ref = picking.package_carrier_tracking_ref picking.carrier_tracking_ref = picking.package_carrier_tracking_ref
# Override to send to specific packaging carriers # Override to send to specific packaging carriers
def send_to_shipper(self, packages=None): def send_to_shipper(self):
packages = self._context.get('packages')
self.ensure_one() self.ensure_one()
if not packages: if not packages:
packages = self.package_ids packages = self.package_ids
@@ -130,7 +131,8 @@ class StockPicking(models.Model):
self._add_delivery_cost_to_so() self._add_delivery_cost_to_so()
# Override to provide per-package versions... # Override to provide per-package versions...
def cancel_shipment(self, packages=None): def cancel_shipment(self):
packages = self._context.get('packages')
pickings_with_package_tracking = self.filtered(lambda p: p.package_carrier_tracking_ref) pickings_with_package_tracking = self.filtered(lambda p: p.package_carrier_tracking_ref)
for picking in pickings_with_package_tracking: for picking in pickings_with_package_tracking:
if packages: if packages:

2
delivery_hibou/views/delivery_views.xml
View File

@@ -18,7 +18,7 @@
<field name="inherit_id" ref="delivery.choose_delivery_package_view_form" /> <field name="inherit_id" ref="delivery.choose_delivery_package_view_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='delivery_packaging_id']" position="attributes"> <xpath expr="//field[@name='delivery_packaging_id']" position="attributes">
<attribute name="domain">[('package_carrier_type', '!=', False)]</attribute> <attribute name="domain">[('product_id', '=', False)]</attribute>
</xpath> </xpath>
</field> </field>
</record> </record>