Merge branch 'unizone-mobile-app' into unizone-migration

erpnext/buying/doctype/supplier/supplier.js

@@ -111,6 +111,7 @@ frappe.ui.form.on("Supplier", {
 					"address_dict": frm.doc.supplier_primary_address
 				},
 				callback: function(r) {
+
 					frm.set_value("primary_address", r.message);
 				}
 			});

erpnext/selling/doctype/customer/customer.json

@@ -25,6 +25,7 @@
   "image",
   "column_break0",
   "account_manager",
+  "category",
   "contact",
   "disable_sdm",
   "customer_group",
@@ -594,6 +595,14 @@
    "fieldname": "disable_sdm",
    "fieldtype": "Check",
    "label": "Disable Sales Data Module?"
+   },
+   {
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "Customer Category"
   }
  ],
  "hide_toolbar": 1,

erpnext/selling/doctype/customer_category/customer_category.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Customer Category', {
+	// refresh: function(frm) {
+
+	// }
+});

erpnext/selling/doctype/customer_category/customer_category.json

@@ -0,0 +1,52 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:category_name",
+ "creation": "2024-07-04 01:16:38.292654",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "category_name",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "category_name",
+   "fieldtype": "Data",
+   "label": "Category Name",
+   "unique": 1
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-07-10 01:50:49.784045",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Customer Category",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

erpnext/selling/doctype/customer_category/customer_category.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class CustomerCategory(Document):
+	pass

erpnext/selling/doctype/customer_category/test_customer_category.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestCustomerCategory(unittest.TestCase):
+	pass

erpnext/selling/doctype/faq/faq.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('FAQ', {
+	// refresh: function(frm) {
+
+	// }
+});

erpnext/selling/doctype/faq/faq.json

@@ -0,0 +1,57 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:title",
+ "creation": "2024-07-04 01:30:47.638726",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "question",
+  "answer"
+ ],
+ "fields": [
+  {
+   "fieldname": "question",
+   "fieldtype": "Small Text",
+   "label": "Question"
+  },
+  {
+   "fieldname": "answer",
+   "fieldtype": "Small Text",
+   "label": "Answer"
+  },
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "unique": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-07-08 07:08:48.911524",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "FAQ",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

erpnext/selling/doctype/faq/faq.py

@@ -0,0 +1,12 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+from frappe.model.naming import make_autoname
+
+class FAQ(Document):
+	def autoname(self):
+		pass
+		# self.name =make_autoname("FAQ"+self.question)
+		# self.name=

erpnext/selling/doctype/faq/test_faq.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestFAQ(unittest.TestCase):
+	pass

erpnext/stock/doctype/item/item.json

@@ -16,6 +16,7 @@
   "variant_of",
   "item_code",
   "item_name",
+  "product_type",
   "price_list_rate",
   "dossiers",
   "shelf_life",
@@ -38,6 +39,8 @@
   "physical_parameter",
   "column_break_25",
   "additioanl_description",
+  "section_break_29",
+  "product_image",
   "product_artwork_doc_section",
   "product_artwork_doc",
   "product_pack_insert_doc_section",
@@ -1156,6 +1159,23 @@
    "fieldname": "section_break_37",
    "fieldtype": "Section Break",
    "hidden": 1
+  },
+  {
+   "fieldname": "section_break_29",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "product_image",
+   "fieldtype": "Attach Image",
+   "label": "Product Image"
+  },
+  {
+   "fieldname": "product_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Product Type",
+   "options": "Product Type"
   }
  ],
  "hide_toolbar": 1,
@@ -1164,7 +1184,7 @@
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-04-04 10:16:58.820724",
+ "modified": "2024-07-08 07:44:04.604951",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",

erpnext/stock/doctype/product_type/product_type.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Product Type', {
+	// refresh: function(frm) {
+
+	// }
+});

erpnext/stock/doctype/product_type/product_type.json

@@ -0,0 +1,51 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:product_type",
+ "creation": "2024-07-04 04:53:34.391306",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "product_type",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "product_type",
+   "fieldtype": "Data",
+   "label": "Product Type",
+   "unique": 1
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "label": "Description"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-07-04 04:56:57.694955",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Product Type",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

erpnext/stock/doctype/product_type/product_type.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+class ProductType(Document):
+	pass

erpnext/stock/doctype/product_type/test_product_type.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestProductType(unittest.TestCase):
+	pass