feat: granular controls (#1129)

Bloomstack · Mar 30, 2021 · 636de06 · 636de06
1 parent b5b553a
commit 636de06
Show file tree

Hide file tree

Showing 2 changed files with 203 additions and 31 deletions.
diff --git a/erpnext/compliance/doctype/compliance_company/compliance_company.json b/erpnext/compliance/doctype/compliance_company/compliance_company.json
@@ -5,10 +5,40 @@
  "engine": "InnoDB",
  "field_order": [
   "company",
-  "push_data",
-  "pull_data",
-  "pull_incoming_transfer",
-  "license_no"
+  "column_break_2",
+  "license_no",
+  "items_section",
+  "push_item",
+  "column_break_6",
+  "pull_item",
+  "package_tags_section",
+  "push_package_tag",
+  "column_break_10",
+  "pull_package_tag",
+  "transfers_section",
+  "pull_transfer",
+  "column_break_14",
+  "push_transfer",
+  "plants",
+  "pull_plant",
+  "column_break_18",
+  "push_plant",
+  "plant_batches_section",
+  "pull_plant_batch",
+  "column_break_22",
+  "push_plant_batch",
+  "strains_section",
+  "pull_strain",
+  "column_break_26",
+  "push_strain",
+  "harvests_section",
+  "pull_harvest",
+  "column_break_30",
+  "push_harvest",
+  "packages_section",
+  "pull_package",
+  "column_break_34",
+  "push_package"
  ],
  "fields": [
   {
@@ -19,36 +49,189 @@
    "options": "Company",
    "reqd": 1
   },
+  {
+   "fieldname": "license_no",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "License No"
+  },
+  {
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "label": "Items"
+  },
   {
    "default": "0",
-   "fieldname": "push_data",
+   "fieldname": "push_item",
    "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Push Data"
+   "label": "Push Item"
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
   },
   {
    "default": "0",
-   "fieldname": "pull_data",
+   "fieldname": "pull_item",
    "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Pull Data"
+   "label": "Pull Item"
+  },
+  {
+   "fieldname": "package_tags_section",
+   "fieldtype": "Section Break",
+   "label": "Package Tags"
   },
   {
    "default": "0",
-   "fieldname": "pull_incoming_transfer",
+   "fieldname": "push_package_tag",
    "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Pull Incoming Transfer"
+   "label": "Push Package Tag"
   },
   {
-   "fieldname": "license_no",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "License No"
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_package_tag",
+   "fieldtype": "Check",
+   "label": "Pull Package Tag"
+  },
+  {
+   "fieldname": "transfers_section",
+   "fieldtype": "Section Break",
+   "label": "Transfers"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_transfer",
+   "fieldtype": "Check",
+   "label": "Pull Transfer"
+  },
+  {
+   "default": "0",
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_transfer",
+   "fieldtype": "Check",
+   "label": "Push Transfer"
+  },
+  {
+   "fieldname": "plants",
+   "fieldtype": "Section Break",
+   "label": "Plants"
+  },
+  {
+   "fieldname": "column_break_18",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "plant_batches_section",
+   "fieldtype": "Section Break",
+   "label": "Plant Batches"
+  },
+  {
+   "fieldname": "column_break_22",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "strains_section",
+   "fieldtype": "Section Break",
+   "label": "Strains"
+  },
+  {
+   "fieldname": "column_break_26",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "harvests_section",
+   "fieldtype": "Section Break",
+   "label": "Harvests"
+  },
+  {
+   "fieldname": "column_break_30",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "packages_section",
+   "fieldtype": "Section Break",
+   "label": "Packages"
+  },
+  {
+   "fieldname": "column_break_34",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_plant",
+   "fieldtype": "Check",
+   "label": "Pull Plant"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_plant",
+   "fieldtype": "Check",
+   "label": "Push Plant"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_plant_batch",
+   "fieldtype": "Check",
+   "label": "Pull Plant Batch"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_plant_batch",
+   "fieldtype": "Check",
+   "label": "Push Plant Batch"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_strain",
+   "fieldtype": "Check",
+   "label": "Pull Strain"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_strain",
+   "fieldtype": "Check",
+   "label": "Push Strain"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_harvest",
+   "fieldtype": "Check",
+   "label": "Pull Harvest"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_harvest",
+   "fieldtype": "Check",
+   "label": "Push Harvest"
+  },
+  {
+   "default": "0",
+   "fieldname": "pull_package",
+   "fieldtype": "Check",
+   "label": "Pull Package"
+  },
+  {
+   "default": "0",
+   "fieldname": "push_package",
+   "fieldtype": "Check",
+   "label": "Push Package"
   }
  ],
  "istable": 1,
- "modified": "2020-11-22 22:36:52.407285",
+ "modified": "2021-03-29 23:45:58.623959",
  "modified_by": "Administrator",
  "module": "Compliance",
  "name": "Compliance Company",

diff --git a/erpnext/compliance/doctype/compliance_settings/compliance_settings.py b/erpnext/compliance/doctype/compliance_settings/compliance_settings.py
@@ -8,16 +8,5 @@
 
 class ComplianceSettings(Document):
 
-	def validate(self):
-		self.validate_companies()
-
-	def validate_companies(self):
-		companies = []
-
-		for company in self.company:
-			if company.company not in companies:
-				companies.append(company.company)
-			else:
-				frappe.throw(_("Company {0} already added to sync.").format(frappe.bold(company.company)))
-
-		frappe.cache().hset("compliance", "companies", companies)
+	def on_update(self):
+		frappe.clear_document_cache(self.doctype, self.name)