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

Merge branch 'fix/12.0/H9214_delivery_fedex_hibou__shipper_warehouse' into '12.0'

Browse Source 
fix/12.0/H9214_delivery_fedex_hibou__shipper_warehouse into 12.0

See merge request hibou-io/hibou-odoo/suite!1191
This commit is contained in:
Cedric Collins
2021-11-29 19:33:13 +00:00
parent fd62e72014 8d8916082e
commit 37fd210fd5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
delivery_fedex_hibou/models/delivery_fedex.py
View File

@@ -267,7 +267,7 @@ class DeliveryFedex(models.Model):
commodity_country_of_manufacture = picking.picking_type_id.warehouse_id.partner_id.country_id.code
for operation in picking.move_line_ids:
commodity_amount = operation.move_id.sale_line_id.price_unit or operation.product_id.list_price
commodity_amount = operation.move_id.sale_line_id.price_unit or operation.product_id.lst_price
total_commodities_amount += (commodity_amount * operation.qty_done)
commodity_description = operation.product_id.name
commodity_number_of_piece = '1'
@@ -282,7 +282,7 @@ class DeliveryFedex(models.Model):
commodity_harmonized_code = ''
srm._commodities(_convert_curr_iso_fdx(commodity_currency.name), commodity_amount, commodity_number_of_piece, commodity_weight_units, commodity_weight_value, commodity_description, commodity_country_of_manufacture, commodity_quantity, commodity_quantity_units, commodity_harmonized_code)
srm.customs_value(_convert_curr_iso_fdx(commodity_currency.name), total_commodities_amount, "NON_DOCUMENTS")
srm.duties_payment(shipper_warehouse.partner_id.country_id.code, acc_number)
srm.duties_payment(shipper_warehouse.country_id.code, acc_number)
package_count = len(picking.package_ids) or 1