Merge branch 'staging' into production

Author: sahil28297

erpnext/__init__.py

@@ -6,7 +6,7 @@
 from frappe.utils import getdate
 
 __erpnext_version__ = '12.10.1'
-__version__ = '2.3.1'
+__version__ = '2.3.2'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/bank/bank.js

@@ -1,12 +1,19 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
+frappe.provide('erpnext.integrations');
 
 frappe.ui.form.on('Bank', {
 	onload: function(frm) {
 		add_fields_to_mapping_table(frm);
 	},
 	refresh: function(frm) {
 		add_fields_to_mapping_table(frm);
+
+		if (frm.doc.plaid_access_token) {
+			frm.add_custom_button(__('Refresh Plaid Link'), () => {
+				new erpnext.integrations.refreshPlaidLink(frm.doc.plaid_access_token);
+			});
+		}
 	}
 });
 
@@ -27,4 +34,79 @@ let add_fields_to_mapping_table = function (frm) {
 		frm.doc.name).options = options;
 
 	frm.fields_dict.bank_transaction_mapping.grid.refresh();
+};
+
+erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
+	constructor(access_token) {
+		this.access_token = access_token;
+		this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
+		this.init_config();
+	}
+
+	async init_config() {
+		this.plaid_env = await frappe.db.get_single_value('Plaid Settings', 'plaid_env');
+		this.token = await this.get_link_token_for_update();
+		this.init_plaid();
+	}
+
+	async get_link_token_for_update() {
+		const token = frappe.xcall(
+			'erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
+			{ access_token: this.access_token }
+		)
+		if (!token) {
+			frappe.throw(__('Cannot retrieve link token for update. Check Error Log for more information'));
+		}
+		return token;
+	}
+
+	init_plaid() {
+		const me = this;
+		me.loadScript(me.plaidUrl)
+			.then(() => {
+				me.onScriptLoaded(me);
+			})
+			.then(() => {
+				if (me.linkHandler) {
+					me.linkHandler.open();
+				}
+			})
+			.catch((error) => {
+				me.onScriptError(error);
+			});
+	}
+
+	loadScript(src) {
+		return new Promise(function (resolve, reject) {
+			if (document.querySelector("script[src='" + src + "']")) {
+				resolve();
+				return;
+			}
+			const el = document.createElement('script');
+			el.type = 'text/javascript';
+			el.async = true;
+			el.src = src;
+			el.addEventListener('load', resolve);
+			el.addEventListener('error', reject);
+			el.addEventListener('abort', reject);
+			document.head.appendChild(el);
+		});
+	}
+
+	onScriptLoaded(me) {
+		me.linkHandler = Plaid.create({
+			env: me.plaid_env,
+			token: me.token,
+			onSuccess: me.plaid_success
+		});
+	}
+
+	onScriptError(error) {
+		frappe.msgprint(__("There was an issue connecting to Plaid's authentication server. Check browser console for more information"));
+		console.log(error);
+	}
+
+	plaid_success(token, response) {
+		frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
+	}
 };

…ort/item_wise_sales_register/__init__.py …eport/sales_register_by_item/__init__.pyerpnext/accounts/report/item_wise_sales_register/__init__.py renamed to erpnext/accounts/report/sales_register_by_item/__init__.py erpnext/accounts/report/item_wise_sales_register/__init__.py renamed to erpnext/accounts/report/sales_register_by_item/__init__.py

@@ -1,13 +1,20 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.query_reports["Item-wise Sales Register"] = {
+frappe.query_reports["Sales Register By Item"] = {
 	"filters": [
 		{
-			"fieldname": "date_range",
-			"label": __("Date Range"),
-			"fieldtype": "DateRange",
-			"default": [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()],
+			"fieldname": "start_date",
+			"label": __("Start Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.add_months(frappe.datetime.get_today(),-1),
+			"reqd": 1
+		},
+		{
+			"fieldname": "end_date",
+			"label": __("End Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.get_today(),
 			"reqd": 1
 		},
 		{
@@ -16,6 +23,13 @@ frappe.query_reports["Item-wise Sales Register"] = {
 			"fieldtype": "Link",
 			"options": "Customer"
 		},
+		{
+			"fieldname": "item_name",
+			"label": __("Item Name"),
+			"fieldtype": "Link",
+			"options": "Item"
+
+		},
 		{
 			"fieldname": "company",
 			"label": __("Company"),
@@ -35,23 +49,11 @@ frappe.query_reports["Item-wise Sales Register"] = {
 			"fieldtype": "Link",
 			"options": "Warehouse"
 		},
-		{
-			"fieldname": "brand",
-			"label": __("Brand"),
-			"fieldtype": "Link",
-			"options": "Brand"
-		},
-		{
-			"fieldname": "item_group",
-			"label": __("Item Group"),
-			"fieldtype": "Link",
-			"options": "Item Group"
-		},
 		{
 			"label": __("Group By"),
 			"fieldname": "group_by",
 			"fieldtype": "Select",
-			"options": ["Customer Group", "Customer", "Item Group", "Item", "Territory", "Invoice"]
+			"options": ["Customer", "Item"]
 		}
 	],
 	"formatter": function(value, row, column, data, default_formatter) {

…les_register/item_wise_sales_register.js …gister_by_item/sales_register_by_item.jserpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js renamed to erpnext/accounts/report/sales_register_by_item/sales_register_by_item.js erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js renamed to erpnext/accounts/report/sales_register_by_item/sales_register_by_item.js

@@ -10,10 +10,10 @@
  "modified": "2017-02-24 20:17:17.638545", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
- "name": "Item-wise Sales Register", 
+ "name": "Sales Register By Item", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
- "report_name": "Item-wise Sales Register", 
+ "report_name": "Sales Register By Item", 
  "report_type": "Script Report", 
  "roles": [
   {