Merge pull request #34876 from shariquerik/selling-workspace-fix
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index d2659d4..e79fb66 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -18,7 +18,6 @@
"root_type",
"report_type",
"account_currency",
- "inter_company_account",
"column_break1",
"parent_account",
"account_type",
@@ -34,15 +33,11 @@
{
"fieldname": "properties",
"fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "oldfieldtype": "Section Break"
},
{
"fieldname": "column_break0",
"fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1,
"width": "50%"
},
{
@@ -53,9 +48,7 @@
"no_copy": 1,
"oldfieldname": "account_name",
"oldfieldtype": "Data",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "account_number",
@@ -63,17 +56,13 @@
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Account Number",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"default": "0",
"fieldname": "is_group",
"fieldtype": "Check",
- "label": "Is Group",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Is Group"
},
{
"fieldname": "company",
@@ -85,9 +74,7 @@
"options": "Company",
"read_only": 1,
"remember_last_selected_value": 1,
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "root_type",
@@ -95,9 +82,7 @@
"in_standard_filter": 1,
"label": "Root Type",
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "report_type",
@@ -105,32 +90,18 @@
"in_standard_filter": 1,
"label": "Report Type",
"options": "\nBalance Sheet\nProfit and Loss",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"depends_on": "eval:doc.is_group==0",
"fieldname": "account_currency",
"fieldtype": "Link",
"label": "Currency",
- "options": "Currency",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "default": "0",
- "fieldname": "inter_company_account",
- "fieldtype": "Check",
- "label": "Inter Company Account",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Currency"
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1,
"width": "50%"
},
{
@@ -142,9 +113,7 @@
"oldfieldtype": "Link",
"options": "Account",
"reqd": 1,
- "search_index": 1,
- "show_days": 1,
- "show_seconds": 1
+ "search_index": 1
},
{
"description": "Setting Account Type helps in selecting this Account in transactions.",
@@ -154,9 +123,7 @@
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
- "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
- "show_days": 1,
- "show_seconds": 1
+ "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary"
},
{
"description": "Rate at which this tax is applied",
@@ -164,9 +131,7 @@
"fieldtype": "Float",
"label": "Rate",
"oldfieldname": "tax_rate",
- "oldfieldtype": "Currency",
- "show_days": 1,
- "show_seconds": 1
+ "oldfieldtype": "Currency"
},
{
"description": "If the account is frozen, entries are allowed to restricted users.",
@@ -175,17 +140,13 @@
"label": "Frozen",
"oldfieldname": "freeze_account",
"oldfieldtype": "Select",
- "options": "No\nYes",
- "show_days": 1,
- "show_seconds": 1
+ "options": "No\nYes"
},
{
"fieldname": "balance_must_be",
"fieldtype": "Select",
"label": "Balance must be",
- "options": "\nDebit\nCredit",
- "show_days": 1,
- "show_seconds": 1
+ "options": "\nDebit\nCredit"
},
{
"fieldname": "lft",
@@ -194,9 +155,7 @@
"label": "Lft",
"print_hide": 1,
"read_only": 1,
- "search_index": 1,
- "show_days": 1,
- "show_seconds": 1
+ "search_index": 1
},
{
"fieldname": "rgt",
@@ -205,9 +164,7 @@
"label": "Rgt",
"print_hide": 1,
"read_only": 1,
- "search_index": 1,
- "show_days": 1,
- "show_seconds": 1
+ "search_index": 1
},
{
"fieldname": "old_parent",
@@ -215,33 +172,27 @@
"hidden": 1,
"label": "Old Parent",
"print_hide": 1,
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"default": "0",
"depends_on": "eval:(doc.report_type == 'Profit and Loss' && !doc.is_group)",
"fieldname": "include_in_gross",
"fieldtype": "Check",
- "label": "Include in gross",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Include in gross"
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "label": "Disable",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Disable"
}
],
"icon": "fa fa-money",
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2020-06-11 15:15:54.338622",
+ "modified": "2023-04-11 16:08:46.983677",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
@@ -301,5 +252,6 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 2cc5378..f7297d1 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -287,10 +287,6 @@
jv.submit()
def test_inter_company_jv(self):
- frappe.db.set_value("Account", "Sales Expenses - _TC", "inter_company_account", 1)
- frappe.db.set_value("Account", "Buildings - _TC", "inter_company_account", 1)
- frappe.db.set_value("Account", "Sales Expenses - _TC1", "inter_company_account", 1)
- frappe.db.set_value("Account", "Buildings - _TC1", "inter_company_account", 1)
jv = make_journal_entry(
"Sales Expenses - _TC",
"Buildings - _TC",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index f8969b8..ed6d0a7 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -970,29 +970,47 @@
},
callback: function(r, rt) {
if(r.message) {
- var write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
+ const write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
return t.account==r.message[account] ? t : null; });
- var row = [];
-
- var difference_amount = flt(frm.doc.difference_amount,
+ const difference_amount = flt(frm.doc.difference_amount,
precision("difference_amount"));
- if (!write_off_row.length && difference_amount) {
- row = frm.add_child("deductions");
- row.account = r.message[account];
- row.cost_center = r.message["cost_center"];
- } else {
- row = write_off_row[0];
- }
+ const add_deductions = (details) => {
+ if (!write_off_row.length && difference_amount) {
+ row = frm.add_child("deductions");
+ row.account = details[account];
+ row.cost_center = details["cost_center"];
+ } else {
+ row = write_off_row[0];
+ }
- if (row) {
- row.amount = flt(row.amount) + difference_amount;
- } else {
- frappe.msgprint(__("No gain or loss in the exchange rate"))
- }
+ if (row) {
+ row.amount = flt(row.amount) + difference_amount;
+ } else {
+ frappe.msgprint(__("No gain or loss in the exchange rate"))
+ }
+ refresh_field("deductions");
+ };
- refresh_field("deductions");
+ if (!r.message[account]) {
+ frappe.prompt({
+ label: __("Please Specify Account"),
+ fieldname: account,
+ fieldtype: "Link",
+ options: "Account",
+ get_query: () => ({
+ filters: {
+ company: frm.doc.company,
+ }
+ })
+ }, (values) => {
+ const details = Object.assign({}, r.message, values);
+ add_deductions(details);
+ }, __(frappe.unscrub(account)));
+ } else {
+ add_deductions(r.message);
+ }
frm.events.set_unallocated_amount(frm);
}
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index c34bddd..f8a2653 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -1594,17 +1594,7 @@
@frappe.whitelist()
def get_company_defaults(company):
fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
- ret = frappe.get_cached_value("Company", company, fields, as_dict=1)
-
- for fieldname in fields:
- if not ret[fieldname]:
- frappe.throw(
- _("Please set default {0} in Company {1}").format(
- frappe.get_meta("Company").get_label(fieldname), company
- )
- )
-
- return ret
+ return frappe.get_cached_value("Company", company, fields, as_dict=1)
def get_outstanding_on_journal_entry(name):
diff --git a/erpnext/accounts/report/general_ledger/test_general_ledger.py b/erpnext/accounts/report/general_ledger/test_general_ledger.py
index c563785..a8c362e 100644
--- a/erpnext/accounts/report/general_ledger/test_general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/test_general_ledger.py
@@ -24,7 +24,6 @@
"root_type": "Asset",
"report_type": "Balance Sheet",
"account_currency": "USD",
- "inter_company_account": 0,
"parent_account": "Bank Accounts - _TC",
"account_type": "Bank",
"doctype": "Account",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index a347323..7fcc28b 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -515,7 +515,6 @@
parent_dict.update({"customer": parent_dict.get("party_name")})
self.pricing_rules = []
- basic_item_details_map = {}
for item in self.get("items"):
if item.get("item_code"):
@@ -535,17 +534,7 @@
if self.get("is_subcontracted"):
args["is_subcontracted"] = self.is_subcontracted
- basic_details = basic_item_details_map.get(item.item_code)
- ret, basic_item_details = get_item_details(
- args,
- self,
- for_validate=True,
- overwrite_warehouse=False,
- return_basic_details=True,
- basic_details=basic_details,
- )
-
- basic_item_details_map.setdefault(item.item_code, basic_item_details)
+ ret = get_item_details(args, self, for_validate=True, overwrite_warehouse=False)
for fieldname, value in ret.items():
if item.meta.get_field(fieldname) and value is not None:
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 077e7fa..0cb8824 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -2,6 +2,7 @@
"actions": [],
"allow_events_in_timeline": 1,
"allow_import": 1,
+ "allow_rename": 1,
"autoname": "naming_series:",
"creation": "2022-02-08 13:14:41.083327",
"doctype": "DocType",
@@ -515,7 +516,7 @@
"idx": 5,
"image_field": "image",
"links": [],
- "modified": "2023-01-24 18:20:05.044791",
+ "modified": "2023-04-14 18:20:05.044791",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",
@@ -582,4 +583,4 @@
"states": [],
"subject_field": "title",
"title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 5750914..3532d6b 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -581,6 +581,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -1339,6 +1344,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -2097,6 +2107,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -2849,6 +2864,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 6e1e0d4..7989b1a 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -410,10 +410,10 @@
"fieldtype": "Link",
"label": "Company",
"options": "Company",
- "read_only": 1,
"remember_last_selected_value": 1,
"reqd": 1,
- "search_index": 1
+ "search_index": 1,
+ "set_only_once": 1
},
{
"fieldname": "status",
@@ -433,7 +433,7 @@
"icon": "fa fa-barcode",
"idx": 1,
"links": [],
- "modified": "2021-12-23 10:44:30.299450",
+ "modified": "2023-04-14 15:58:46.139887",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
@@ -461,7 +461,6 @@
"read": 1,
"report": 1,
"role": "Stock Manager",
- "set_user_permissions": 1,
"write": 1
},
{
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 2cf3797..ce85702 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -35,14 +35,7 @@
@frappe.whitelist()
-def get_item_details(
- args,
- doc=None,
- for_validate=False,
- overwrite_warehouse=True,
- return_basic_details=False,
- basic_details=None,
-):
+def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=True):
"""
args = {
"item_code": "",
@@ -80,12 +73,7 @@
if doc.get("doctype") == "Purchase Invoice":
args["bill_date"] = doc.get("bill_date")
- if not basic_details:
- out = get_basic_details(args, item, overwrite_warehouse)
- else:
- out = basic_details
-
- basic_details = out.copy()
+ out = get_basic_details(args, item, overwrite_warehouse)
get_item_tax_template(args, item, out)
out["item_tax_rate"] = get_item_tax_map(
@@ -154,11 +142,7 @@
out.amount = flt(args.qty) * flt(out.rate)
out = remove_standard_fields(out)
-
- if return_basic_details:
- return out, basic_details
- else:
- return out
+ return out
def remove_standard_fields(details):