Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-27661

2021-10-05 11:34:02 +05:30
parent c0b17edbbf 91d269fe1a
commit 5e34cdf00f
7 changed files with 98 additions and 35 deletions
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -0,0 +1,58 @@
+pull_request_rules:
+  - name: Auto-close PRs on stable branch
+    conditions:
+      - and:
+        - and:
+          - author!=surajshetty3416
+          - author!=gavindsouza
+          - author!=rohitwaghchaure
+          - author!=nabinhait
+        - or:
+          - base=version-13
+          - base=version-12
+    actions:
+      close:
+      comment:
+          message: |
+            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch. 
+            https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
+
+  - name: backport to version-13-hotfix
+    conditions:
+      - label="backport version-13-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-13-hotfix
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-13-pre-release
+    conditions:
+      - label="backport version-13-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-13-pre-release
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-hotfix
+    conditions:
+      - label="backport version-12-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-12-hotfix
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-pre-release
+    conditions:
+      - label="backport version-12-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-12-pre-release
+        assignees:
+          - "{{ author }}"
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -446,12 +446,15 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 	},

 	currency() {
+		var me = this;
 		this._super();
-		$.each(cur_frm.doc.timesheets, function(i, d) {
-			let row = frappe.get_doc(d.doctype, d.name)
-			set_timesheet_detail_rate(row.doctype, row.name, cur_frm.doc.currency, row.timesheet_detail)
-		});
-		calculate_total_billing_amount(cur_frm)
+		if (this.frm.doc.timesheets) {
+			this.frm.doc.timesheets.forEach((d) => {
+				let row = frappe.get_doc(d.doctype, d.name)
+				set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail)
+			});
+			frm.trigger("calculate_timesheet_totals");
+		}
 	}
 });

@@ -999,7 +1002,7 @@ frappe.ui.form.on('Sales Invoice', {


 frappe.ui.form.on("Sales Invoice Timesheet", {
-	timesheets_remove(frm, cdt, cdn) {
+	timesheets_remove(frm) {
 		frm.trigger("calculate_timesheet_totals");
 	}
 });
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1990,16 +1990,6 @@
   "label": "Additional Discount Account",
   "options": "Account"
  },
-  {
-   "default": "0",
-   "fieldname": "ignore_default_payment_terms_template",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Ignore Default Payment Terms Template",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "dispatch_address_name",
@@ -2015,6 +2005,14 @@
   "label": "Dispatch Address",
   "read_only": 1
  },
+  {
+   "default": "0",
+   "fieldname": "ignore_default_payment_terms_template",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Ignore Default Payment Terms Template",
+   "read_only": 1
+  },
  {
   "fieldname": "total_billing_hours",
   "fieldtype": "Float",
@@ -2033,7 +2031,7 @@
   "link_fieldname": "consolidated_invoice"
  }
 ],
- "modified": "2021-09-28 13:09:34.391799",
+ "modified": "2021-10-02 03:36:10.251715",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice",
@@ -2088,4 +2086,4 @@
 "title_field": "title",
 "track_changes": 1,
 "track_seen": 1
-}
+}
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -16,9 +16,9 @@
  "column_break_9",
  "billing_amount",
  "section_break_11",
-  "timesheet_detail",
-  "column_break_5",
  "time_sheet",
+  "timesheet_detail",
+  "column_break_13",
  "project_name"
 ],
 "fields": [
@@ -91,7 +91,6 @@
   "fieldtype": "Column Break"
  },
  {
-
   "fieldname": "section_break_7",
   "fieldtype": "Section Break",
   "label": "Totals"
@@ -110,11 +109,15 @@
   "fieldtype": "Data",
   "label": "Project Name",
   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_13",
+   "fieldtype": "Column Break"
  }
 ],
 "istable": 1,
 "links": [],
- "modified": "2021-08-15 18:37:08.084930",
+ "modified": "2021-10-02 03:48:44.979777",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice Timesheet",
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -225,7 +225,6 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to

 	query = f"""
 		SELECT
-
 			tsd.name as name,
 			tsd.parent as time_sheet,
 			tsd.from_time as from_time,
@@ -235,21 +234,16 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to
 			tsd.activity_type as activity_type,
 			tsd.description as description,
 			ts.currency as currency,
-      tsd.project_name as project_name
-
+			tsd.project_name as project_name
 		FROM `tabTimesheet Detail` tsd
-
 			INNER JOIN `tabTimesheet` ts
 			ON ts.name = tsd.parent
-
 		WHERE
-
 			tsd.parenttype = 'Timesheet'
 			AND tsd.docstatus = 1
 			AND tsd.is_billable = 1
 			AND tsd.sales_invoice is NULL
 			{condition}
-
 		ORDER BY tsd.from_time ASC
 	"""

--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -116,14 +116,15 @@ frappe.ui.form.on("Customer", {
 			frappe.contacts.render_address_and_contact(frm);

 			// custom buttons
-			frm.add_custom_button(__('Accounting Ledger'), function() {
-				frappe.set_route('query-report', 'General Ledger',
-					{party_type:'Customer', party:frm.doc.name});
-			});

-			frm.add_custom_button(__('Accounts Receivable'), function() {
+			frm.add_custom_button(__('Accounts Receivable'), function () {
 				frappe.set_route('query-report', 'Accounts Receivable', {customer:frm.doc.name});
-			});
+			}, __('View'));
+
+			frm.add_custom_button(__('Accounting Ledger'), function () {
+				frappe.set_route('query-report', 'General Ledger',
+					{party_type: 'Customer', party: frm.doc.name});
+			}, __('View'));

 			frm.add_custom_button(__('Pricing Rule'), function () {
 				erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -323,6 +323,12 @@ frappe.ui.form.on('Stock Entry', {
 		attach_bom_items(frm.doc.bom_no)
 	},

+	before_save: function(frm) {
+		frm.doc.items.forEach((item) => {
+			item.uom = item.uom || item.stock_uom;
+		})
+	},
+
 	stock_entry_type: function(frm){
 		frm.remove_custom_button('Bill of Materials', "Get Items From");
 		frm.events.show_bom_custom_button(frm);