Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Amazon integration issues

Browse Source
This commit is contained in:
pawan 2019-03-11 14:47:57 +05:30
parent 703a597478
commit 7c3e017ac3
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
View File

@ -162,6 +162,8 @@ def create_item_code(amazon_item_json, sku):
igroup.parent_item_group = mws_settings.item_group igroup.parent_item_group = mws_settings.item_group
igroup.insert() igroup.insert()
item.append("item_defaults", {'company':mws_settings.company})
item.insert(ignore_permissions=True) item.insert(ignore_permissions=True)
create_item_price(amazon_item_json, item.item_code) create_item_price(amazon_item_json, item.item_code)
@ -213,7 +215,7 @@ def get_orders(after_date):
fulfillment_channels=["MFN", "AFN"], fulfillment_channels=["MFN", "AFN"],
lastupdatedafter=after_date, lastupdatedafter=after_date,
orderstatus=statuses, orderstatus=statuses,
max_results='20') max_results='50')
while True: while True:
orders_list = [] orders_list = []
@ -432,8 +434,7 @@ def get_order_items(market_place_order_id):
return final_order_items return final_order_items
def get_item_code(order_item): def get_item_code(order_item):
asin = order_item.ASIN item_code = frappe.db.get_value("Item", {"item_code": sku}, "item_code")
item_code = frappe.db.get_value("Item", {"amazon_item_code": asin}, "item_code")
if item_code: if item_code:
return item_code return item_code
@ -451,11 +452,16 @@ def get_charges_and_fees(market_place_order_id):
shipment_item_list = return_as_list(shipment_event.ShipmentEvent.ShipmentItemList.ShipmentItem) shipment_item_list = return_as_list(shipment_event.ShipmentEvent.ShipmentItemList.ShipmentItem)
for shipment_item in shipment_item_list: for shipment_item in shipment_item_list:
charges = return_as_list(shipment_item.ItemChargeList.ChargeComponent) charges, fees = []
fees = return_as_list(shipment_item.ItemFeeList.FeeComponent)
if 'ItemChargeList' in shipment_item.keys():
charges = return_as_list(shipment_item.ItemChargeList.ChargeComponent)
if 'ItemFeeList' in shipment_item.keys():
fees = return_as_list(shipment_item.ItemFeeList.FeeComponent)
for charge in charges: for charge in charges:
if(charge.ChargeType != "Principal"): if(charge.ChargeType != "Principal") and float(charge.ChargeAmount.CurrencyAmount) != 0:
charge_account = get_account(charge.ChargeType) charge_account = get_account(charge.ChargeType)
charges_fees.get("charges").append({ charges_fees.get("charges").append({
"charge_type":"Actual", "charge_type":"Actual",
@ -465,13 +471,14 @@ def get_charges_and_fees(market_place_order_id):
}) })
for fee in fees: for fee in fees:
fee_account = get_account(fee.FeeType) if float(fee.FeeAmount.CurrencyAmount) != 0:
charges_fees.get("fees").append({ fee_account = get_account(fee.FeeType)
"charge_type":"Actual", charges_fees.get("fees").append({
"account_head": fee_account, "charge_type":"Actual",
"tax_amount": fee.FeeAmount.CurrencyAmount, "account_head": fee_account,
"description": fee.FeeType + " for " + shipment_item.SellerSKU "tax_amount": fee.FeeAmount.CurrencyAmount,
}) "description": fee.FeeType + " for " + shipment_item.SellerSKU
})
return charges_fees return charges_fees