Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
diff --git a/erpnext/accounts/doctype/payment_gateway/__init__.py b/erpnext/accounts/doctype/payment_gateway/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/accounts/doctype/payment_gateway/__init__.py
+++ /dev/null
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
deleted file mode 100644
index 0eff5a5..0000000
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Payment Gateway', {
- refresh: function(frm) {
-
- }
-});
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json b/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
deleted file mode 100644
index ca4ba5d..0000000
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:gateway",
- "beta": 0,
- "creation": "2015-12-15 22:26:45.221162",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "fields": [
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "gateway",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Gateway",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 1,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-07-25 05:24:22.726993",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Gateway",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
- },
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Accounts Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
- }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
deleted file mode 100644
index 80799e3..0000000
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class PaymentGateway(Document):
- pass
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py b/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
deleted file mode 100644
index 2faf1a7..0000000
--- a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Payment Gateway')
-
-class TestPaymentGateway(unittest.TestCase):
- pass
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 99deb3f..fdb598e 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -10,7 +10,7 @@
from erpnext.accounts.party import get_party_account
from erpnext.accounts.utils import get_account_currency
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, get_company_defaults
-from frappe.integration_broker.doctype.integration_service.integration_service import get_integration_controller
+from frappe.integrations.utils import get_payment_gateway_controller
class PaymentRequest(Document):
def validate(self):
@@ -65,11 +65,11 @@
data = frappe.db.get_value(self.reference_doctype, self.reference_name,
["company", "customer_name"], as_dict=1)
- controller = get_integration_controller(self.payment_gateway)
+ controller = get_payment_gateway_controller(self.payment_gateway)
controller.validate_transaction_currency(self.currency)
return controller.get_payment_url(**{
- "amount": self.grand_total,
+ "amount": flt(self.grand_total, self.precision("grand_total")),
"title": data.company,
"description": self.subject,
"reference_doctype": "Payment Request",
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index c2812d4..4827e76 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -693,19 +693,9 @@
return acc
-def create_payment_gateway_and_account(gateway):
- create_payment_gateway(gateway)
+def create_payment_gateway_account(gateway):
create_payment_gateway_account(gateway)
-def create_payment_gateway(gateway):
- # NOTE: we don't translate Payment Gateway name because it is an internal doctype
- if not frappe.db.exists("Payment Gateway", gateway):
- payment_gateway = frappe.get_doc({
- "doctype": "Payment Gateway",
- "gateway": gateway
- })
- payment_gateway.insert(ignore_permissions=True)
-
def create_payment_gateway_account(gateway):
from erpnext.setup.setup_wizard.setup_wizard import create_bank_account
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 3e69340..514ee86 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -194,4 +194,4 @@
get_site_info = 'erpnext.utilities.get_site_info'
-payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_and_account"
+payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_account"
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
index 20fb2fd..fd37a15 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -101,6 +101,7 @@
student_toolbar.find(".btn-mark-att")
.html(__('Mark Attendence'))
.on("click", function() {
+ $(me.wrapper.find(".btn-mark-att")).attr("disabled", true);
var studs = [];
$(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
var $check = $(check);
@@ -122,22 +123,27 @@
});
frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
- <br>Absent: {1}", [students_present.length, students_absent.length]), function() {
- frappe.call({
- method: "erpnext.schools.api.mark_attendance",
- args: {
- "students_present": students_present,
- "students_absent": students_absent,
- "student_batch": frm.doc.student_batch,
- "course_schedule": frm.doc.course_schedule,
- "date": frm.doc.date
- },
- callback: function(r) {
- frm.trigger("student_batch");
- }
- });
- });
-
+ <br>Absent: {1}", [students_present.length, students_absent.length]),
+ function() { //ifyes
+ frappe.call({
+ method: "erpnext.schools.api.mark_attendance",
+ args: {
+ "students_present": students_present,
+ "students_absent": students_absent,
+ "student_batch": frm.doc.student_batch,
+ "course_schedule": frm.doc.course_schedule,
+ "date": frm.doc.date
+ },
+ callback: function(r) {
+ $(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+ frm.trigger("student_batch");
+ }
+ });
+ },
+ function() { //ifno
+ $(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+ }
+ );
});
var htmls = students.map(function(student) {