refactor: fetch payment terms in account settings

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -23,6 +23,7 @@
    "columns": 0,
    "default": "1",
    "description": "If enabled, the system will post accounting entries for inventory automatically.",
+   "fetch_if_empty": 0,
    "fieldname": "auto_accounting_for_stock",
    "fieldtype": "Check",
    "hidden": 1,
@@ -55,6 +56,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
+   "fetch_if_empty": 0,
    "fieldname": "acc_frozen_upto",
    "fieldtype": "Date",
    "hidden": 0,
@@ -87,6 +89,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
+   "fetch_if_empty": 0,
    "fieldname": "frozen_accounts_modifier",
    "fieldtype": "Link",
    "hidden": 0,
@@ -119,6 +122,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -151,6 +155,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Role that is allowed to submit transactions that exceed credit limits set.",
+   "fetch_if_empty": 0,
    "fieldname": "credit_controller",
    "fieldtype": "Link",
    "hidden": 0,
@@ -183,6 +188,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "check_supplier_invoice_uniqueness",
    "fieldtype": "Check",
    "hidden": 0,
@@ -215,6 +221,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "make_payment_via_journal_entry",
    "fieldtype": "Check",
    "hidden": 0,
@@ -248,6 +255,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "unlink_payment_on_cancellation_of_invoice",
    "fieldtype": "Check",
    "hidden": 0,
@@ -281,6 +289,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "book_asset_depreciation_entry_automatically",
    "fieldtype": "Check",
    "hidden": 0,
@@ -313,6 +322,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "allow_cost_center_in_entry_of_bs_account",
    "fieldtype": "Check",
    "hidden": 0,
@@ -345,6 +355,40 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "automatically_fetch_payment_terms",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Automatically Fetch Payment Terms",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "print_settings",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -377,6 +421,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "show_inclusive_tax_in_print",
    "fieldtype": "Check",
    "hidden": 0,
@@ -409,6 +454,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_12",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -440,6 +486,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "show_payment_schedule_in_print",
    "fieldtype": "Check",
    "hidden": 0,
@@ -472,6 +519,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "currency_exchange_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -505,6 +553,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "allow_stale",
    "fieldtype": "Check",
    "hidden": 0,
@@ -539,6 +588,7 @@
    "columns": 0,
    "default": "1",
    "depends_on": "eval:doc.allow_stale==0",
+   "fetch_if_empty": 0,
    "fieldname": "stale_days",
    "fieldtype": "Int",
    "hidden": 0,
@@ -571,6 +621,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "report_settings_sb",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -605,6 +656,7 @@
    "columns": 0,
    "default": "0",
    "description": "Only select if you have setup Cash Flow Mapper documents",
+   "fetch_if_empty": 0,
    "fieldname": "use_custom_cash_flow",
    "fieldtype": "Check",
    "hidden": 0,
@@ -642,7 +694,7 @@
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-07 16:52:03.869199", 
+ "modified": "2019-04-17 05:58:23.012494",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/fetch_payment_terms/fetch_payment_terms.js

@@ -1,5 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Fetch Payment Terms', {
-});

erpnext/accounts/doctype/fetch_payment_terms/fetch_payment_terms.json

@@ -1,96 +0,0 @@
-{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2019-04-17 11:00:32.823034",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 0,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "fetch_payment_terms",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Always Fetch Payment Terms",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-04-17 11:06:02.216048",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Fetch Payment Terms",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "ASC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
-}

erpnext/accounts/doctype/fetch_payment_terms/fetch_payment_terms.py

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-from frappe.model.document import Document
-
-class FetchPaymentTerms(Document):
-	pass

erpnext/accounts/doctype/fetch_payment_terms/test_fetch_payment_terms.js

@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Fetch Payment Terms", function (assert) {
-	let done = assert.async();
-
-	// number of asserts
-	assert.expect(1);
-
-	frappe.run_serially([
-		// insert a new Fetch Payment Terms
-		() => frappe.tests.make('Fetch Payment Terms', [
-			// values to be set
-			{key: 'value'}
-		]),
-		() => {
-			assert.equal(cur_frm.doc.key, 'value');
-		},
-		() => done()
-	]);
-
-});

erpnext/accounts/doctype/fetch_payment_terms/test_fetch_payment_terms.py

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import unittest
-
-class TestFetchPaymentTerms(unittest.TestCase):
-	pass

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -419,7 +419,7 @@ def make_purchase_invoice(source_name, target_doc=None):
 		}
 	}
 
-	if frappe.get_single("Fetch Payment Terms").fetch_payment_terms == 1:
+	if frappe.get_single("Accounts Settings").automatically_fetch_payment_terms == 1:
 		fields["Payment Schedule"] = {
 			"doctype": "Payment Schedule",
 			"add_if_empty": True

erpnext/config/accounts.py

@@ -297,13 +297,7 @@ def get_data():
 					"name": "C-Form",
 					"description": _("C-Form records"),
 					"country": "India"
-				},
+				}
-				{
-					"type": "doctype",
-					"name": "Fetch Payment Terms",
-					"label": _("Fetch Payment Terms"),
-					"description": _("Fetch Payment Terms")
-				},
 			]
 		},
 		{