fix(woocommerce integration): defaults in settings

(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)

erpnext/erpnext_integrations/connectors/woocommerce_connection.py

@@ -19,10 +19,11 @@ def verify_request():
 		frappe.get_request_header("X-Wc-Webhook-Signature") and \
 		not sig == bytes(frappe.get_request_header("X-Wc-Webhook-Signature").encode()):
 			frappe.throw(_("Unverified Webhook Data"))
-	frappe.set_user(woocommerce_settings.modified_by)
+	frappe.set_user(woocommerce_settings.creation_user)
 
 @frappe.whitelist(allow_guest=True)
 def order():
+	woocommerce_settings = frappe.get_doc("Woocommerce Settings")
 	if frappe.flags.woocomm_test_order_data:
 		fd = frappe.flags.woocomm_test_order_data
 		event = "created"
@@ -69,7 +70,7 @@ def order():
 
 		new_sales_order.po_no = fd.get("id")
 		new_sales_order.woocommerce_id = fd.get("id")
-		new_sales_order.naming_series = "SO-"
+		new_sales_order.naming_series = woocommerce_settings.sales_order_series or "SO-WOO-"
 
 		placed_order_date = created_date[0]
 		raw_date = datetime.datetime.strptime(placed_order_date, "%Y-%m-%d")
@@ -96,10 +97,10 @@ def order():
 				"item_name": found_item.item_name,
 				"description": found_item.item_name,
 				"delivery_date":order_delivery_date,
-				"uom": _("Nos"),
+				"uom": woocommerce_settings.uom or _("Nos"),
 				"qty": item.get("quantity"),
 				"rate": item.get("price"),
-				"warehouse": "Stores" + " - " + company_abbr
+				"warehouse": woocommerce_settings.warehouse or "Stores" + " - " + company_abbr
 				})
 
 			add_tax_details(new_sales_order,ordered_items_tax,"Ordered Item tax",0)
@@ -171,6 +172,7 @@ def link_customer_and_address(raw_billing_data,customer_status):
 	frappe.db.commit()
 
 def link_item(item_data,item_status):
+	woocommerce_settings = frappe.get_doc("Woocommerce Settings")
 
 	if item_status == 0:
 		#Create Item
@@ -185,7 +187,7 @@ def link_item(item_data,item_status):
 	item.item_code = "woocommerce - " + str(item_data.get("product_id"))
 	item.woocommerce_id = str(item_data.get("product_id"))
 	item.item_group = "WooCommerce Products"
-	item.stock_uom = _("Nos")
+	item.stock_uom = woocommerce_settings.uom or _("Nos")
 	item.save()
 	frappe.db.commit()
 

erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js

@@ -42,4 +42,15 @@ frappe.ui.form.on('Woocommerce Settings', {
 		frm.set_df_property("api_consumer_key", "reqd", frm.doc.enable_sync);
 		frm.set_df_property("api_consumer_secret", "reqd", frm.doc.enable_sync);
 	}
-});
+});
+
+frappe.ui.form.on("Woocommerce Settings", "onload", function () {
+	frappe.call({
+		method: "erpnext.erpnext_integrations.doctype.woocommerce_settings.woocommerce_settings.get_series",
+		callback: function (r) {
+			$.each(r.message, function (key, value) {
+				set_field_options(key, value);
+			});
+		}
+	});
+});

erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py

@@ -122,3 +122,9 @@ def generate_secret():
 	woocommerce_settings = frappe.get_doc("Woocommerce Settings")
 	woocommerce_settings.secret = frappe.generate_hash()
 	woocommerce_settings.save()
+
+@frappe.whitelist()
+def get_series():
+	return {
+		"sales_order_series" : frappe.get_meta("Sales Order").get_options("naming_series") or "SO-WOO-",
+	}

erpnext/patches.txt

@@ -596,3 +596,4 @@ erpnext.patches.v12_0.stock_entry_enhancements
 erpnext.patches.v10_0.item_barcode_childtable_migrate # 16-02-2019
 erpnext.patches.v12_0.move_item_tax_to_item_tax_template
 erpnext.patches.v11_1.set_variant_based_on
+erpnext.patches.v11_1.woocommerce_set_creation_user

erpnext/patches/v11_1/woocommerce_set_creation_user.py

@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	woocommerce_settings = frappe.get_doc("Woocommerce Settings")
+	if woocommerce_settings.enable_sync:
+		woocommerce_settings.creation_user = woocommerce_settings.modified_by
+		woocommerce_settings.save()