nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update test case

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-26 09:03:18 +05:30
parent 3d51d125bf
commit 7df829f9cc
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/erpnext_integrations/connectors/shopify_connection.py
View File

@@ -4,6 +4,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.utils import cint, cstr, flt, get_datetime, get_request_session, getdate, nowdate from frappe.utils import cint, cstr, flt, get_datetime, get_request_session, getdate, nowdate
from erpnext import get_company_currency
from erpnext.erpnext_integrations.doctype.shopify_log.shopify_log import ( from erpnext.erpnext_integrations.doctype.shopify_log.shopify_log import (
dump_request_data, dump_request_data,
make_shopify_log, make_shopify_log,
@@ -143,6 +144,10 @@ def create_sales_order(shopify_order, shopify_settings, company=None):
"taxes": get_order_taxes(shopify_order, shopify_settings), "taxes": get_order_taxes(shopify_order, shopify_settings),
"apply_discount_on": "Grand Total", "apply_discount_on": "Grand Total",
"discount_amount": get_discounted_amount(shopify_order), "discount_amount": get_discounted_amount(shopify_order),
"currency": frappe.get_value(
"Customer", customer or shopify_settings.default_customer, "default_currency"
)
or get_company_currency(shopify_settings.company),
} }
) )
@@ -178,6 +183,7 @@ def create_sales_invoice(shopify_order, shopify_settings, so, old_order_sync=Fal
si.set_posting_time = 1 si.set_posting_time = 1
si.posting_date = posting_date si.posting_date = posting_date
si.due_date = posting_date si.due_date = posting_date
si.currency = so.currency
si.naming_series = shopify_settings.sales_invoice_series or "SI-Shopify-" si.naming_series = shopify_settings.sales_invoice_series or "SI-Shopify-"
si.flags.ignore_mandatory = True si.flags.ignore_mandatory = True
set_cost_center(si.items, shopify_settings.cost_center) set_cost_center(si.items, shopify_settings.cost_center)

1
erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
View File

@@ -58,6 +58,7 @@ class ShopifySettings(unittest.TestCase):
"warehouse": "_Test Warehouse - _TC", "warehouse": "_Test Warehouse - _TC",
"cash_bank_account": "Cash - _TC", "cash_bank_account": "Cash - _TC",
"account": "Cash - _TC", "account": "Cash - _TC",
"company": "_Test Company",
"customer_group": "_Test Customer Group", "customer_group": "_Test Customer Group",
"cost_center": "Main - _TC", "cost_center": "Main - _TC",
"taxes": [{"shopify_tax": "International Shipping", "tax_account": "Legal Expenses - _TC"}], "taxes": [{"shopify_tax": "International Shipping", "tax_account": "Legal Expenses - _TC"}],