Merge branch 'staging'

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '1.4.3'
+__version__ = '1.4.4'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py

@@ -14,6 +14,9 @@ class SepaDirectDebit(Document):
 		for entry in self.payment_entries:
 			self.total_amount += flt(entry.amount)
 
+	def on_submit(self):
+		self.generate_xml_file()
+
 	def get_payment_entries(self):
 		if not (self.from_date and self.to_date):
 			frappe.throw(_("From Date and To Date are Mandatory"))

erpnext/accounts/doctype/sepa_mandate/sepa_mandate.json

 {
+ "actions": [],
  "autoname": "field:mandate",
  "creation": "2018-02-08 11:33:15.721919",
  "doctype": "DocType",
@@ -19,6 +20,7 @@
    "default": "Submitted",
    "fieldname": "status",
    "fieldtype": "Select",
+   "in_standard_filter": 1,
    "label": "Status",
    "options": "\nPending Customer Approval\nPending Submission\nActive\nCancelled\nFailed\nExpired\nSubmitted",
    "reqd": 1
@@ -34,6 +36,7 @@
    "fieldname": "customer",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Customer",
    "options": "Customer",
    "reqd": 1
@@ -46,6 +49,7 @@
    "default": "0",
    "fieldname": "registered_on_gocardless",
    "fieldtype": "Check",
+   "in_standard_filter": 1,
    "label": "Registered on GoCardless"
   },
   {
@@ -64,7 +68,8 @@
    "label": "Creation Date"
   }
  ],
- "modified": "2019-10-11 11:09:05.977726",
+ "links": [],
+ "modified": "2020-05-22 12:01:58.712402",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sepa Mandate",

erpnext/assets/doctype/location/location.json

@@ -141,7 +141,7 @@
  ],
  "is_tree": 1,
  "links": [],
- "modified": "2020-03-18 18:00:08.885805",
+ "modified": "2020-05-20 18:00:08.885805",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Location",
@@ -196,32 +196,9 @@
    "role": "Stock Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Agriculture Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Agriculture User",
-   "share": 1,
-   "write": 1
   }
  ],
  "quick_entry": 1,
- "restrict_to_domain": "Agriculture",
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",

erpnext/patches/dokos/v1_0/move_gocardless_mandate_to_sepa_mandate.py

 import frappe
 
 def execute():
+	if frappe.db.exists("DocType", "Sepa Mandate"):
+		return
+
 	frappe.rename_doc("DocType", "GoCardless Mandate", "Sepa Mandate", force=True)
 	frappe.reload_doc("accounts", "doctype", "sepa_mandate")