Merge branch 'staging' into production

Author: sahil28297

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/doctype/doctype.json

@@ -27,6 +27,7 @@
   "autoname",
   "name_case",
   "column_break_15",
+  "file_autoname",
   "description",
   "form_settings_section",
   "image_field",
@@ -189,7 +190,7 @@
    "label": "Naming"
   },
   {
-   "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}-{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
    "fieldname": "autoname",
    "fieldtype": "Data",
    "label": "Auto Name",
@@ -461,11 +462,17 @@
    "fieldname": "show_title_field_in_link",
    "fieldtype": "Check",
    "label": "Show Title in Link and Table MultiSelect Field"
+  },
+  {
+   "description": "File Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}-{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "fieldname": "file_autoname",
+   "fieldtype": "Data",
+   "label": "File Auto Name"
   }
  ],
  "icon": "fa fa-bolt",
  "idx": 6,
- "modified": "2020-11-09 18:40:33.094873",
+ "modified": "2021-05-17 03:02:46.435397",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",

frappe/core/doctype/report/report.js

@@ -1,27 +1,31 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if(!frappe.boot.developer_mode && frappe.session.user !== 'Administrator') {
+		if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
 			// make the document read-only
-			frm.set_read_only();
+			frm.disable_form();
+		} else {
+			frm.enable_save();
 		}
 
 		let doc = frm.doc;
-		frm.add_custom_button(__("Show Report"), function() {
-			switch(doc.report_type) {
-				case "Report Builder":
-					frappe.set_route('List', doc.ref_doctype, 'Report', doc.name);
-					break;
-				case "Query Report":
-					frappe.set_route("query-report", doc.name);
-					break;
-				case "Script Report":
-					frappe.set_route("query-report", doc.name);
-					break;
-				case "Custom Report":
-					frappe.set_route("query-report", doc.name);
-					break;
-			}
-		}, "fa fa-table");
+		if(!frm.is_new()) {
+			frm.add_custom_button(__("Show Report"), function() {
+				switch(doc.report_type) {
+					case "Report Builder":
+						frappe.set_route('List', doc.ref_doctype, 'Report', doc.name);
+						break;
+					case "Query Report":
+						frappe.set_route("query-report", doc.name);
+						break;
+					case "Script Report":
+						frappe.set_route("query-report", doc.name);
+						break;
+					case "Custom Report":
+						frappe.set_route("query-report", doc.name);
+						break;
+				}
+			}, "fa fa-table");
+		}
 
 		if (doc.is_standard === "Yes") {
 			frm.add_custom_button(doc.disabled ? __("Enable Report") : __("Disable Report"), function() {

frappe/custom/doctype/customize_form/customize_form.json

@@ -25,6 +25,10 @@
   "show_title_field_in_link",
   "image_field",
   "search_fields",
+  "auto_name_section_section",
+  "autoname",
+  "cb_autoname_column",
+  "file_autoname",
   "section_break_8",
   "sort_field",
   "column_break_10",
@@ -215,13 +219,36 @@
    "fieldname": "attach_document_print",
    "fieldtype": "Check",
    "label": "Attach Document Print"
+  },
+  {
+   "description": "File Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}-{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "fieldname": "autoname",
+   "fieldtype": "Data",
+   "label": "AutoName"
+  },
+  {
+   "depends_on": "doc_type",
+   "fieldname": "auto_name_section_section",
+   "fieldtype": "Section Break",
+   "label": "Naming"
+  },
+  {
+   "fieldname": "cb_autoname_column",
+   "fieldtype": "Column Break"
+  },
+  {
+   "description": "File Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}-{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "fieldname": "file_autoname",
+   "fieldtype": "Data",
+   "label": "File Auto Name"
   }
  ],
+ "file_auto_name": "format:SO-{YYYY}-{customer_name}-{####}",
  "hide_toolbar": 1,
  "icon": "fa fa-glass",
  "idx": 1,
  "issingle": 1,
- "modified": "2021-03-16 02:33:12.086754",
+ "modified": "2021-05-17 02:54:53.063554",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",
@@ -242,4 +269,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

frappe/custom/doctype/customize_form/customize_form.py

@@ -35,7 +35,9 @@
 	'show_title_field_in_link': 'Check',
 	'send_me_a_copy': 'Check',
 	'send_read_receipt': 'Check',
-	'attach_document_print': 'Check'
+	'attach_document_print': 'Check',
+	'file_autoname': 'Data',
+	'autoname': 'Data'
 }
 
 docfield_properties = {

frappe/desk/doctype/bulk_update/bulk_update.py

@@ -27,11 +27,11 @@ def update(doctype, field, value, condition='', limit=500):
 	)
 	data = {}
 	data[field] = value
-	return submit_cancel_or_update_docs(doctype, docnames, 'update', data)
+	return submit_cancel_delete_or_update_docs(doctype, docnames, 'update', data)
 
 
 @frappe.whitelist()
-def submit_cancel_or_update_docs(doctype, docnames, action='submit', data=None):
+def submit_cancel_delete_or_update_docs(doctype, docnames, action='submit', data=None):
 	docnames = frappe.parse_json(docnames)
 
 	if data:
@@ -55,6 +55,10 @@ def submit_cancel_or_update_docs(doctype, docnames, action='submit', data=None):
 				doc.save()
 				message = _('Updating {0}').format(doctype)
 
+			elif action == 'delete':
+				doc.delete()
+				message = _('Deleting {0}').format(doctype)
+
 			frappe.db.commit()
 			show_progress(docnames, message, i, d)
 

frappe/model/naming.py

@@ -75,6 +75,7 @@ def set_name_from_naming_options(autoname, doc):
 		doc.name = _format_autoname(autoname, doc)
 	elif "#" in autoname:
 		doc.name = make_autoname(autoname, doc=doc)
+	return doc.name
 
 def set_name_by_naming_series(doc):
 	"""Sets name by the `naming_series` property"""

frappe/public/js/frappe/list/bulk_operations.js

@@ -65,14 +65,16 @@ export default class BulkOperations {
 	}
 
 	delete(docnames, done = null) {
+		let action = "delete";
 		frappe
 			.call({
-				method: 'frappe.desk.reportview.delete_items',
+				method: 'frappe.desk.doctype.bulk_update.bulk_update.submit_cancel_delete_or_update_docs',
 				freeze: true,
 				args: {
-					items: docnames,
-					doctype: this.doctype
-				}
+					doctype: this.doctype,
+					action: action,
+					docnames: docnames
+				},
 			})
 			.then((r) => {
 				let failed = r.message;
@@ -81,7 +83,11 @@ export default class BulkOperations {
 				if (failed.length && !r._server_messages) {
 					frappe.throw(__('Cannot delete {0}', [failed.map(f => f.bold()).join(', ')]));
 				}
-				if (failed.length < docnames.length) {
+				if (!(Object.keys(failed).length)) {
+					frappe.show_alert({
+						message: __("Deleted Successfully"),
+						indicator: "green"
+					});
 					frappe.utils.play_sound('delete');
 					if (done) done();
 				}
@@ -119,7 +125,7 @@ export default class BulkOperations {
 		action = action.toLowerCase();
 		frappe
 			.call({
-				method: 'frappe.desk.doctype.bulk_update.bulk_update.submit_cancel_or_update_docs',
+				method: 'frappe.desk.doctype.bulk_update.bulk_update.submit_cancel_delete_or_update_docs',
 				args: {
 					doctype: this.doctype,
 					action: action,
@@ -180,7 +186,7 @@ export default class BulkOperations {
 				const fieldname = field_mappings[dialog.get_value('field')].fieldname;
 				dialog.disable_primary_action();
 				frappe.call({
-					method: 'frappe.desk.doctype.bulk_update.bulk_update.submit_cancel_or_update_docs',
+					method: 'frappe.desk.doctype.bulk_update.bulk_update.submit_cancel_delete_or_update_docs',
 					args: {
 						doctype: this.doctype,
 						freeze: true,

frappe/public/js/frappe/ui/messages.js

@@ -34,22 +34,16 @@ frappe.confirm = function(message, ifyes, ifno) {
 		primary_action: function() {
 			if(ifyes) ifyes();
 			d.hide();
+
 		},
-		secondary_action_label: __("No")
+		secondary_action_label: __("No"),
+		secondary_action: ifno
 	});
 	d.show();
 
 	// flag, used to bind "okay" on enter
 	d.confirm_dialog = true;
 
-	// no if closed without primary action
-	if(ifno) {
-		d.onhide = function() {
-			if(!d.primary_action_fulfilled) {
-				ifno();
-			}
-		};
-	}
 	return d;
 }
 

frappe/utils/print_format.py

@@ -6,6 +6,7 @@
 from frappe.utils.pdf import get_pdf,cleanup
 from frappe.core.doctype.access_log.access_log import make_access_log
 from PyPDF2 import PdfFileWriter
+from frappe.model.naming import set_name_from_naming_options
 
 no_cache = 1
 
@@ -88,6 +89,16 @@ def read_multi_pdf(output):
 @frappe.whitelist()
 def download_pdf(doctype, name, format=None, doc=None, no_letterhead=0):
 	html = frappe.get_print(doctype, name, format, doc=doc, no_letterhead=no_letterhead)
+	# fetch file auto name format from doctype.
+	file_autoname = frappe.get_meta(doctype).file_autoname
+
+	if not doc:
+		doc = frappe.get_doc(doctype, name)
+
+	if file_autoname:
+		# based on type of format used set_name_form_naming_option return result.
+		name = set_name_from_naming_options(file_autoname, doc)
+
 	frappe.local.response.filename = "{name}.pdf".format(name=name.replace(" ", "-").replace("/", "-"))
 	frappe.local.response.filecontent = get_pdf(html)
 	frappe.local.response.type = "pdf"