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

IMP delivery_stamps by using the new delivery_hibou methods.

Browse Source
This commit is contained in:
Jared Kipe
2018-09-23 14:30:50 -07:00
parent 2134e6b163
commit d2c840fcf9
1 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
delivery_stamps/models/delivery_stamps.py
View File

@@ -109,36 +109,17 @@ class ProviderStamps(models.Model):
ret_val = service.create_shipping() ret_val = service.create_shipping()
ret_val.ShipDate = date_planned.split()[0] if date_planned else date.today().isoformat() ret_val.ShipDate = date_planned.split()[0] if date_planned else date.today().isoformat()
ret_val.FromZIPCode = order.warehouse_id.partner_id.zip ret_val.FromZIPCode = self.get_shipper_warehouse(order=order).zip
ret_val.ToZIPCode = order.partner_shipping_id.zip ret_val.ToZIPCode = order.partner_shipping_id.zip
ret_val.PackageType = self._stamps_package_type() ret_val.PackageType = self._stamps_package_type()
ret_val.ServiceType = self.stamps_service_type ret_val.ServiceType = self.stamps_service_type
ret_val.WeightLb = weight ret_val.WeightLb = weight
return ret_val return ret_val
def _get_order_for_picking(self, picking):
if picking.sale_id:
return picking.sale_id
return None
def _get_company_for_order(self, order):
company = order.company_id
if order.team_id and order.team_id.subcompany_id:
company = order.team_id.subcompany_id.company_id
elif order.analytic_account_id and order.analytic_account_id.subcompany_id:
company = order.analytic_account_id.subcompany_id.company_id
return company
def _get_company_for_picking(self, picking):
order = self._get_order_for_picking(picking)
if order:
return self._get_company_for_order(order)
return picking.company_id
def _stamps_get_addresses_for_picking(self, picking): def _stamps_get_addresses_for_picking(self, picking):
company = self._get_company_for_picking(picking) company = self.get_shipper_company(picking=picking)
from_ = picking.picking_type_id.warehouse_id.partner_id from_ = self.get_shipper_warehouse(picking=picking)
to = picking.partner_id to = self.get_recipient(picking=picking)
return company, from_, to return company, from_, to
def _stamps_get_shippings_for_picking(self, service, picking): def _stamps_get_shippings_for_picking(self, service, picking):
@@ -251,7 +232,7 @@ class ProviderStamps(models.Model):
company, from_partner, to_partner = self._stamps_get_addresses_for_picking(picking) company, from_partner, to_partner = self._stamps_get_addresses_for_picking(picking)
from_address = service.create_address() from_address = service.create_address()
from_address.FullName = company.partner_id.name from_address.FullName = company.name
from_address.Address1 = from_partner.street from_address.Address1 = from_partner.street
if from_partner.street2: if from_partner.street2:
from_address.Address2 = from_partner.street2 from_address.Address2 = from_partner.street2