Merge pull request #32913 from resilient-tech/fix-item-price-fetch
fix: set stock UOM in args to ensure item price is fetched
diff --git a/.github/workflows/server-tests-mariadb.yml b/.github/workflows/server-tests-mariadb.yml
index ed731b8..b40faa7 100644
--- a/.github/workflows/server-tests-mariadb.yml
+++ b/.github/workflows/server-tests-mariadb.yml
@@ -59,7 +59,7 @@
- name: Setup Python
uses: actions/setup-python@v2
with:
- python-version: '3.10'
+ python-version: '3.11'
- name: Check for valid Python & Merge Conflicts
run: |
diff --git a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
index 01bf1c2..83c206a 100644
--- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
+++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
@@ -52,7 +52,7 @@
if parent_company and (not allow_account_creation_against_child_company):
msg = _("{} is a child company.").format(frappe.bold(company)) + " "
msg += _("Please import accounts against parent company or enable {} in company master.").format(
- frappe.bold("Allow Account Creation Against Child Company")
+ frappe.bold(_("Allow Account Creation Against Child Company"))
)
frappe.throw(msg, title=_("Wrong Company"))
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index 83e6370..16602d3 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -23,6 +23,7 @@
"fetch_customers",
"column_break_6",
"primary_mandatory",
+ "show_net_values_in_party_account",
"column_break_17",
"customers",
"preferences",
@@ -291,10 +292,16 @@
"fieldname": "include_break",
"fieldtype": "Check",
"label": "Page Break After Each SoA"
+ },
+ {
+ "default": "0",
+ "fieldname": "show_net_values_in_party_account",
+ "fieldtype": "Check",
+ "label": "Show Net Values in Party Account"
}
],
"links": [],
- "modified": "2022-10-17 17:47:08.662475",
+ "modified": "2022-11-10 17:44:17.165991",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Process Statement Of Accounts",
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index c6b0c57..a48c027 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -95,6 +95,7 @@
"show_opening_entries": 0,
"include_default_book_entries": 0,
"tax_id": tax_id if tax_id else None,
+ "show_net_values_in_party_account": doc.show_net_values_in_party_account,
}
)
col, res = get_soa(filters)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 882a374..9a31aaf 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -1410,7 +1410,7 @@
self.repost_future_sle_and_gle()
self.update_project()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
unlink_inter_company_doc(self.doctype, self.name, self.inter_company_invoice_reference)
self.ignore_linked_doctypes = (
@@ -1463,6 +1463,7 @@
def update_billing_status_in_pr(self, update_modified=True):
updated_pr = []
+ po_details = []
for d in self.get("items"):
if d.pr_detail:
billed_amt = frappe.db.sql(
@@ -1480,7 +1481,10 @@
)
updated_pr.append(d.purchase_receipt)
elif d.po_detail:
- updated_pr += update_billed_amount_based_on_po(d.po_detail, update_modified)
+ po_details.append(d.po_detail)
+
+ if po_details:
+ updated_pr += update_billed_amount_based_on_po(po_details, update_modified)
for pr in set(updated_pr):
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_billing_percentage
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index e796c99..911440f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -373,7 +373,7 @@
if self.update_stock == 1:
self.repost_future_sle_and_gle()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
self.db_set("repost_required", 0)
if (
@@ -2399,7 +2399,7 @@
lp_details = get_loyalty_programs(customer)
if len(lp_details) == 1:
- frappe.db.set(customer, "loyalty_program", lp_details[0])
+ customer.db_set("loyalty_program", lp_details[0])
return lp_details
else:
return lp_details
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index c224b61..4c10b48 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -361,7 +361,7 @@
self.update_reserved_qty_for_subcontract()
self.check_on_hold_or_closed_status()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
self.update_prevdoc_status()
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index ee28eb6..a560bda 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -31,7 +31,7 @@
if self.docstatus < 1:
# after amend and save, status still shows as cancelled, until submit
- frappe.db.set(self, "status", "Draft")
+ self.db_set("status", "Draft")
def validate_duplicate_supplier(self):
supplier_list = [d.supplier for d in self.suppliers]
@@ -73,14 +73,14 @@
)
def on_submit(self):
- frappe.db.set(self, "status", "Submitted")
+ self.db_set("status", "Submitted")
for supplier in self.suppliers:
supplier.email_sent = 0
supplier.quote_status = "Pending"
self.send_to_supplier()
def on_cancel(self):
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
@frappe.whitelist()
def get_supplier_email_preview(self, supplier):
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index e0ee658..66eafe9 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -10,34 +10,37 @@
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
- "basic_info",
"naming_series",
"supplier_name",
"country",
- "default_bank_account",
- "tax_id",
- "tax_category",
- "tax_withholding_category",
- "image",
"column_break0",
"supplier_group",
"supplier_type",
- "allow_purchase_invoice_creation_without_purchase_order",
- "allow_purchase_invoice_creation_without_purchase_receipt",
- "is_internal_supplier",
- "represents_company",
- "disabled",
"is_transporter",
- "warn_rfqs",
- "warn_pos",
- "prevent_rfqs",
- "prevent_pos",
- "allowed_to_transact_section",
- "companies",
- "section_break_7",
+ "image",
+ "defaults_section",
"default_currency",
+ "default_bank_account",
"column_break_10",
"default_price_list",
+ "payment_terms",
+ "internal_supplier_section",
+ "is_internal_supplier",
+ "represents_company",
+ "column_break_16",
+ "companies",
+ "column_break2",
+ "supplier_details",
+ "column_break_30",
+ "website",
+ "language",
+ "dashboard_tab",
+ "tax_tab",
+ "tax_id",
+ "column_break_27",
+ "tax_category",
+ "tax_withholding_category",
+ "contact_and_address_tab",
"address_contacts",
"address_html",
"column_break1",
@@ -49,31 +52,26 @@
"column_break_44",
"supplier_primary_address",
"primary_address",
- "default_payable_accounts",
+ "accounting_tab",
"accounts",
- "section_credit_limit",
- "payment_terms",
- "cb_21",
+ "settings_tab",
+ "allow_purchase_invoice_creation_without_purchase_order",
+ "allow_purchase_invoice_creation_without_purchase_receipt",
+ "column_break_54",
+ "is_frozen",
+ "disabled",
+ "warn_rfqs",
+ "warn_pos",
+ "prevent_rfqs",
+ "prevent_pos",
+ "block_supplier_section",
"on_hold",
"hold_type",
- "release_date",
- "default_tax_withholding_config",
- "column_break2",
- "website",
- "supplier_details",
- "column_break_30",
- "language",
- "is_frozen"
+ "column_break_59",
+ "release_date"
],
"fields": [
{
- "fieldname": "basic_info",
- "fieldtype": "Section Break",
- "label": "Name and Type",
- "oldfieldtype": "Section Break",
- "options": "fa fa-user"
- },
- {
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
@@ -192,6 +190,7 @@
"default": "0",
"fieldname": "warn_rfqs",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Warn RFQs",
"read_only": 1
},
@@ -199,6 +198,7 @@
"default": "0",
"fieldname": "warn_pos",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Warn POs",
"read_only": 1
},
@@ -206,6 +206,7 @@
"default": "0",
"fieldname": "prevent_rfqs",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Prevent RFQs",
"read_only": 1
},
@@ -213,29 +214,18 @@
"default": "0",
"fieldname": "prevent_pos",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Prevent POs",
"read_only": 1
},
{
"depends_on": "represents_company",
- "fieldname": "allowed_to_transact_section",
- "fieldtype": "Section Break",
- "label": "Allowed To Transact With"
- },
- {
- "depends_on": "represents_company",
"fieldname": "companies",
"fieldtype": "Table",
"label": "Allowed To Transact With",
"options": "Allowed To Transact With"
},
{
- "collapsible": 1,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "label": "Currency and Price List"
- },
- {
"fieldname": "default_currency",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -255,22 +245,12 @@
"options": "Price List"
},
{
- "collapsible": 1,
- "fieldname": "section_credit_limit",
- "fieldtype": "Section Break",
- "label": "Payment Terms"
- },
- {
"fieldname": "payment_terms",
"fieldtype": "Link",
"label": "Default Payment Terms Template",
"options": "Payment Terms Template"
},
{
- "fieldname": "cb_21",
- "fieldtype": "Column Break"
- },
- {
"default": "0",
"fieldname": "on_hold",
"fieldtype": "Check",
@@ -316,13 +296,6 @@
"read_only": 1
},
{
- "collapsible": 1,
- "collapsible_depends_on": "accounts",
- "fieldname": "default_payable_accounts",
- "fieldtype": "Section Break",
- "label": "Default Payable Accounts"
- },
- {
"description": "Mention if non-standard payable account",
"fieldname": "accounts",
"fieldtype": "Table",
@@ -331,12 +304,6 @@
},
{
"collapsible": 1,
- "fieldname": "default_tax_withholding_config",
- "fieldtype": "Section Break",
- "label": "Default Tax Withholding Config"
- },
- {
- "collapsible": 1,
"collapsible_depends_on": "supplier_details",
"fieldname": "column_break2",
"fieldtype": "Section Break",
@@ -383,7 +350,7 @@
{
"fieldname": "primary_address_and_contact_detail_section",
"fieldtype": "Section Break",
- "label": "Primary Address and Contact Detail"
+ "label": "Primary Address and Contact"
},
{
"description": "Reselect, if the chosen contact is edited after save",
@@ -420,6 +387,64 @@
"fieldtype": "Link",
"label": "Supplier Primary Address",
"options": "Address"
+ },
+ {
+ "fieldname": "dashboard_tab",
+ "fieldtype": "Tab Break",
+ "label": "Dashboard",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "settings_tab",
+ "fieldtype": "Tab Break",
+ "label": "Settings"
+ },
+ {
+ "fieldname": "contact_and_address_tab",
+ "fieldtype": "Tab Break",
+ "label": "Contact & Address"
+ },
+ {
+ "fieldname": "accounting_tab",
+ "fieldtype": "Tab Break",
+ "label": "Accounting"
+ },
+ {
+ "fieldname": "defaults_section",
+ "fieldtype": "Section Break",
+ "label": "Defaults"
+ },
+ {
+ "fieldname": "tax_tab",
+ "fieldtype": "Tab Break",
+ "label": "Tax"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "internal_supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Internal Supplier"
+ },
+ {
+ "fieldname": "column_break_16",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_27",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_54",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "block_supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Block Supplier"
+ },
+ {
+ "fieldname": "column_break_59",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-user",
@@ -432,7 +457,7 @@
"link_fieldname": "party"
}
],
- "modified": "2022-04-16 18:02:27.838623",
+ "modified": "2022-11-09 18:02:59.075203",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 43152e8..bebff1c 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -145,7 +145,7 @@
def after_rename(self, olddn, newdn, merge=False):
if frappe.defaults.get_global_default("supp_master_name") == "Supplier Name":
- frappe.db.set(self, "supplier_name", newdn)
+ self.db_set("supplier_name", newdn)
@frappe.whitelist()
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index c19c1df..2dd748b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -30,11 +30,11 @@
self.validate_valid_till()
def on_submit(self):
- frappe.db.set(self, "status", "Submitted")
+ self.db_set("status", "Submitted")
self.update_rfq_supplier_status(1)
def on_cancel(self):
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
self.update_rfq_supplier_status(0)
def on_trash(self):
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 08eb472..f4b6e91 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -60,7 +60,7 @@
if not self.get(field) and frappe.db.field_exists(self.opportunity_from, field):
try:
value = frappe.db.get_value(self.opportunity_from, self.party_name, field)
- frappe.db.set(self, field, value)
+ self.db_set(field, value)
except Exception:
continue
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index e9fa2ad..8a185f8 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -576,8 +576,8 @@
loan_doc = frappe.get_doc("Loan", loan)
next_accrual_date = None
accrued_entries = 0
- last_repayment_amount = 0
- last_balance_amount = 0
+ last_repayment_amount = None
+ last_balance_amount = None
for term in reversed(loan_doc.get("repayment_schedule")):
if not term.is_accrued:
@@ -585,9 +585,9 @@
loan_doc.remove(term)
else:
accrued_entries += 1
- if not last_repayment_amount:
+ if last_repayment_amount is None:
last_repayment_amount = term.total_payment
- if not last_balance_amount:
+ if last_balance_amount is None:
last_balance_amount = term.balance_loan_amount
loan_doc.save()
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 3dc6b0f..95e2d69 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -119,7 +119,7 @@
event.add_participant(self.doctype, self.name)
event.insert(ignore_permissions=1)
- frappe.db.set(self, "status", "Submitted")
+ self.db_set("status", "Submitted")
def create_schedule_list(self, start_date, end_date, no_of_visit, sales_person):
schedule_list = []
@@ -245,7 +245,7 @@
self.generate_schedule()
def on_update(self):
- frappe.db.set(self, "status", "Draft")
+ self.db_set("status", "Draft")
def update_amc_date(self, serial_nos, amc_expiry_date=None):
for serial_no in serial_nos:
@@ -344,7 +344,7 @@
if d.serial_no:
serial_nos = get_valid_serial_nos(d.serial_no)
self.update_amc_date(serial_nos)
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
delete_events(self.doctype, self.name)
def on_trash(self):
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
index 66f4426..0d319bf 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
@@ -125,12 +125,12 @@
def on_submit(self):
self.update_customer_issue(1)
- frappe.db.set(self, "status", "Submitted")
+ self.db_set("status", "Submitted")
self.update_status_and_actual_date()
def on_cancel(self):
self.check_if_last_visit()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
self.update_status_and_actual_date(cancel=True)
def on_update(self):
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 580838e..ca4f63d 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -206,8 +206,8 @@
self.manage_default_bom()
def on_cancel(self):
- frappe.db.set(self, "is_active", 0)
- frappe.db.set(self, "is_default", 0)
+ self.db_set("is_active", 0)
+ self.db_set("is_default", 0)
# check if used in any other bom
self.validate_bom_links()
@@ -449,10 +449,10 @@
not frappe.db.exists(dict(doctype="BOM", docstatus=1, item=self.item, is_default=1))
and self.is_active
):
- frappe.db.set(self, "is_default", 1)
+ self.db_set("is_default", 1)
frappe.db.set_value("Item", self.item, "default_bom", self.name)
else:
- frappe.db.set(self, "is_default", 0)
+ self.db_set("is_default", 0)
item = frappe.get_doc("Item", self.item)
if item.default_bom == self.name:
frappe.db.set_value("Item", self.item, "default_bom", None)
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index fb94e8a..75e652e 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -54,6 +54,9 @@
self.set_onload("job_card_excess_transfer", excess_transfer)
self.set_onload("work_order_closed", self.is_work_order_closed())
+ def before_validate(self):
+ self.set_wip_warehouse()
+
def validate(self):
self.validate_time_logs()
self.set_status()
@@ -639,6 +642,12 @@
if update_status:
self.db_set("status", self.status)
+ def set_wip_warehouse(self):
+ if not self.wip_warehouse:
+ self.wip_warehouse = frappe.db.get_single_value(
+ "Manufacturing Settings", "default_wip_warehouse"
+ )
+
def validate_operation_id(self):
if (
self.get("operation_id")
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 1e6d982..8167385 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -146,7 +146,7 @@
frappe.throw(_("Sales Order {0} is {1}").format(self.sales_order, status))
def set_default_warehouse(self):
- if not self.wip_warehouse:
+ if not self.wip_warehouse and not self.skip_transfer:
self.wip_warehouse = frappe.db.get_single_value(
"Manufacturing Settings", "default_wip_warehouse"
)
@@ -373,7 +373,7 @@
def on_cancel(self):
self.validate_cancel()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
if self.production_plan and frappe.db.exists(
"Production Plan Item Reference", {"parent": self.production_plan}
diff --git a/erpnext/regional/united_states/setup.py b/erpnext/regional/united_states/setup.py
index b8f8572..47f24ef 100644
--- a/erpnext/regional/united_states/setup.py
+++ b/erpnext/regional/united_states/setup.py
@@ -49,7 +49,7 @@
dict(
fieldname="exempt_from_sales_tax",
fieldtype="Check",
- insert_after="represents_company",
+ insert_after="dn_required",
label="Is customer exempted from sales tax?",
)
],
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 7cba141..7482a33 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -14,30 +14,35 @@
"naming_series",
"salutation",
"customer_name",
+ "customer_type",
+ "customer_group",
+ "column_break0",
+ "territory",
"gender",
- "default_bank_account",
- "tax_id",
- "tax_category",
- "tax_withholding_category",
"lead_name",
"opportunity_name",
- "image",
- "column_break0",
- "customer_group",
- "customer_type",
- "territory",
"account_manager",
- "so_required",
- "dn_required",
+ "image",
+ "defaults_tab",
+ "default_price_list",
+ "default_bank_account",
+ "column_break_14",
+ "default_currency",
+ "internal_customer_section",
"is_internal_customer",
"represents_company",
- "disabled",
- "allowed_to_transact_section",
+ "column_break_70",
"companies",
- "currency_and_price_list",
- "default_currency",
- "column_break_14",
- "default_price_list",
+ "more_info",
+ "market_segment",
+ "industry",
+ "customer_pos_id",
+ "website",
+ "language",
+ "column_break_45",
+ "customer_details",
+ "dashboard_tab",
+ "contact_and_address_tab",
"address_contacts",
"address_html",
"column_break1",
@@ -49,34 +54,39 @@
"column_break_26",
"customer_primary_address",
"primary_address",
- "default_receivable_accounts",
- "accounts",
+ "tax_tab",
+ "taxation_section",
+ "tax_id",
+ "column_break_21",
+ "tax_category",
+ "tax_withholding_category",
+ "accounting_tab",
"credit_limit_section",
"payment_terms",
"credit_limits",
- "more_info",
- "customer_details",
- "column_break_45",
- "market_segment",
- "industry",
- "website",
- "language",
- "is_frozen",
- "column_break_38",
+ "default_receivable_accounts",
+ "accounts",
+ "loyalty_points_tab",
"loyalty_program",
+ "column_break_54",
"loyalty_program_tier",
- "sales_team_section_break",
- "default_sales_partner",
- "default_commission_rate",
- "sales_team_section",
+ "sales_team_tab",
"sales_team",
- "customer_pos_id"
+ "sales_team_section",
+ "default_sales_partner",
+ "column_break_66",
+ "default_commission_rate",
+ "settings_tab",
+ "so_required",
+ "dn_required",
+ "column_break_53",
+ "is_frozen",
+ "disabled"
],
"fields": [
{
"fieldname": "basic_info",
"fieldtype": "Section Break",
- "label": "Name and Type",
"oldfieldtype": "Section Break",
"options": "fa fa-user"
},
@@ -217,24 +227,12 @@
},
{
"depends_on": "represents_company",
- "fieldname": "allowed_to_transact_section",
- "fieldtype": "Section Break",
- "label": "Allowed To Transact With"
- },
- {
- "depends_on": "represents_company",
"fieldname": "companies",
"fieldtype": "Table",
"label": "Allowed To Transact With",
"options": "Allowed To Transact With"
},
{
- "collapsible": 1,
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "Currency and Price List"
- },
- {
"fieldname": "default_currency",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -295,7 +293,7 @@
"description": "Select, to make the customer searchable with these fields",
"fieldname": "primary_address_and_contact_detail",
"fieldtype": "Section Break",
- "label": "Primary Address and Contact Detail"
+ "label": "Primary Address and Contact"
},
{
"description": "Reselect, if the chosen contact is edited after save",
@@ -334,20 +332,18 @@
"read_only": 1
},
{
- "collapsible": 1,
"fieldname": "default_receivable_accounts",
"fieldtype": "Section Break",
"label": "Default Receivable Accounts"
},
{
- "description": "Mention if non-standard receivable account",
+ "description": "Mention if a non-standard receivable account",
"fieldname": "accounts",
"fieldtype": "Table",
- "label": "Accounts",
+ "label": "Receivable Accounts",
"options": "Party Account"
},
{
- "collapsible": 1,
"fieldname": "credit_limit_section",
"fieldtype": "Section Break",
"label": "Credit Limit and Payment Terms"
@@ -398,12 +394,6 @@
"label": "Is Frozen"
},
{
- "collapsible": 1,
- "fieldname": "column_break_38",
- "fieldtype": "Section Break",
- "label": "Loyalty Points"
- },
- {
"fieldname": "loyalty_program",
"fieldtype": "Link",
"label": "Loyalty Program",
@@ -418,15 +408,6 @@
"read_only": 1
},
{
- "collapsible": 1,
- "collapsible_depends_on": "default_sales_partner",
- "fieldname": "sales_team_section_break",
- "fieldtype": "Section Break",
- "label": "Sales Partner and Commission",
- "oldfieldtype": "Section Break",
- "options": "fa fa-group"
- },
- {
"fieldname": "default_sales_partner",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -446,13 +427,12 @@
"collapsible": 1,
"collapsible_depends_on": "sales_team",
"fieldname": "sales_team_section",
- "fieldtype": "Section Break",
- "label": "Sales Team"
+ "fieldtype": "Section Break"
},
{
"fieldname": "sales_team",
"fieldtype": "Table",
- "label": "Sales Team Details",
+ "label": "Sales Team",
"oldfieldname": "sales_team",
"oldfieldtype": "Table",
"options": "Sales Team"
@@ -498,6 +478,83 @@
"no_copy": 1,
"options": "Opportunity",
"print_hide": 1
+ },
+ {
+ "fieldname": "contact_and_address_tab",
+ "fieldtype": "Tab Break",
+ "label": "Contact & Address"
+ },
+ {
+ "fieldname": "defaults_tab",
+ "fieldtype": "Section Break",
+ "label": "Defaults"
+ },
+ {
+ "fieldname": "settings_tab",
+ "fieldtype": "Tab Break",
+ "label": "Settings"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "default_sales_partner",
+ "fieldname": "sales_team_tab",
+ "fieldtype": "Tab Break",
+ "label": "Sales Team",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-group"
+ },
+ {
+ "fieldname": "column_break_66",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_21",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "dashboard_tab",
+ "fieldtype": "Tab Break",
+ "label": "Dashboard",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "column_break_53",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "loyalty_points_tab",
+ "fieldtype": "Section Break",
+ "label": "Loyalty Points"
+ },
+ {
+ "fieldname": "taxation_section",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "accounting_tab",
+ "fieldtype": "Tab Break",
+ "label": "Accounting"
+ },
+ {
+ "fieldname": "tax_tab",
+ "fieldtype": "Tab Break",
+ "label": "Tax"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "is_internal_customer",
+ "fieldname": "internal_customer_section",
+ "fieldtype": "Section Break",
+ "label": "Internal Customer"
+ },
+ {
+ "fieldname": "column_break_70",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_54",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-user",
@@ -511,7 +568,7 @@
"link_fieldname": "party"
}
],
- "modified": "2022-04-16 20:32:34.000304",
+ "modified": "2022-11-08 15:52:34.462657",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 6605685..d0eb377 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -294,7 +294,7 @@
def after_rename(self, olddn, newdn, merge=False):
if frappe.defaults.get_global_default("cust_master_name") == "Customer Name":
- frappe.db.set(self, "customer_name", newdn)
+ self.db_set("customer_name", newdn)
def set_loyalty_program(self):
if self.loyalty_program:
diff --git a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
index 800cb57..2fd0c67 100644
--- a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
+++ b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
@@ -12,7 +12,7 @@
],
"fields": [
{
- "columns": 4,
+ "columns": 3,
"fieldname": "credit_limit",
"fieldtype": "Currency",
"in_list_view": 1,
@@ -31,6 +31,7 @@
"options": "Company"
},
{
+ "columns": 3,
"default": "0",
"fieldname": "bypass_credit_limit_check",
"fieldtype": "Check",
@@ -40,7 +41,7 @@
],
"istable": 1,
"links": [],
- "modified": "2019-12-31 15:43:05.822328",
+ "modified": "2022-11-08 15:19:13.927194",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer Credit Limit",
@@ -48,5 +49,6 @@
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py
index dd0b1e8..0ef4754 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.py
+++ b/erpnext/selling/doctype/installation_note/installation_note.py
@@ -87,13 +87,13 @@
frappe.throw(_("Please pull items from Delivery Note"))
def on_update(self):
- frappe.db.set(self, "status", "Draft")
+ self.db_set("status", "Draft")
def on_submit(self):
self.validate_serial_no()
self.update_prevdoc_status()
- frappe.db.set(self, "status", "Submitted")
+ self.db_set("status", "Submitted")
def on_cancel(self):
self.update_prevdoc_status()
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 96092b1..484b8c9 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -119,10 +119,10 @@
if not (self.is_fully_ordered() or self.is_partially_ordered()):
get_lost_reasons = frappe.get_list("Quotation Lost Reason", fields=["name"])
lost_reasons_lst = [reason.get("name") for reason in get_lost_reasons]
- frappe.db.set(self, "status", "Lost")
+ self.db_set("status", "Lost")
if detailed_reason:
- frappe.db.set(self, "order_lost_reason", detailed_reason)
+ self.db_set("order_lost_reason", detailed_reason)
for reason in lost_reasons_list:
if reason.get("lost_reason") in lost_reasons_lst:
@@ -247,7 +247,7 @@
"Quotation": {"doctype": "Sales Order", "validation": {"docstatus": ["=", 1]}},
"Quotation Item": {
"doctype": "Sales Order Item",
- "field_map": {"parent": "prevdoc_docname"},
+ "field_map": {"parent": "prevdoc_docname", "name": "quotation_item"},
"postprocess": update_item,
"condition": lambda doc: doc.qty > 0,
},
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 1f3419f..78e2370 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -193,6 +193,9 @@
{"Quotation": {"ref_dn_field": "prevdoc_docname", "compare_fields": [["company", "="]]}}
)
+ if cint(frappe.db.get_single_value("Selling Settings", "maintain_same_sales_rate")):
+ self.validate_rate_with_reference_doc([["Quotation", "prev_docname", "quotation_item"]])
+
def update_enquiry_status(self, prevdoc, flag):
enq = frappe.db.sql(
"select t2.prevdoc_docname from `tabQuotation` t1, `tabQuotation Item` t2 where t2.parent = t1.name and t1.name=%s",
@@ -246,7 +249,7 @@
self.update_project()
self.update_prevdoc_status("cancel")
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
self.update_blanket_order()
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index ea0b25f..8c7c552 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -70,6 +70,7 @@
"warehouse",
"target_warehouse",
"prevdoc_docname",
+ "quotation_item",
"col_break4",
"against_blanket_order",
"blanket_order",
@@ -838,12 +839,20 @@
"label": "Purchase Order Item",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "quotation_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "quotation_item",
+ "no_copy": 1,
+ "read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-10-26 16:05:02.712705",
+ "modified": "2022-11-10 18:20:30.137455",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 490504a..875f63d 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -207,15 +207,14 @@
frappe.local.flags.ignore_root_company_validation = True
create_charts(self.name, self.chart_of_accounts, self.existing_company)
- frappe.db.set(
- self,
+ self.db_set(
"default_receivable_account",
frappe.db.get_value(
"Account", {"company": self.name, "account_type": "Receivable", "is_group": 0}
),
)
- frappe.db.set(
- self,
+
+ self.db_set(
"default_payable_account",
frappe.db.get_value(
"Account", {"company": self.name, "account_type": "Payable", "is_group": 0}
@@ -491,12 +490,12 @@
cc_doc.flags.ignore_mandatory = True
cc_doc.insert()
- frappe.db.set(self, "cost_center", _("Main") + " - " + self.abbr)
- frappe.db.set(self, "round_off_cost_center", _("Main") + " - " + self.abbr)
- frappe.db.set(self, "depreciation_cost_center", _("Main") + " - " + self.abbr)
+ self.db_set("cost_center", _("Main") + " - " + self.abbr)
+ self.db_set("round_off_cost_center", _("Main") + " - " + self.abbr)
+ self.db_set("depreciation_cost_center", _("Main") + " - " + self.abbr)
def after_rename(self, olddn, newdn, merge=False):
- frappe.db.set(self, "company_name", newdn)
+ self.db_set("company_name", newdn)
frappe.db.sql(
"""update `tabDefaultValue` set defvalue=%s
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 2614a7f..817248e 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -120,7 +120,6 @@
self.title = _("{0} Request for {1}").format(self.material_request_type, items)[:100]
def on_submit(self):
- # frappe.db.set(self, 'status', 'Submitted')
self.update_requested_qty()
self.update_requested_qty_in_production_plan()
if self.material_request_type == "Purchase":
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index f02462c..f0a9499 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -216,7 +216,7 @@
po.load_from_db()
mr.update_status("Stopped")
self.assertRaises(frappe.InvalidStatusError, po.submit)
- frappe.db.set(po, "docstatus", 1)
+ po.db_set("docstatus", 1)
self.assertRaises(frappe.InvalidStatusError, po.cancel)
# resubmit and check for per complete
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index f85c478..673fcb5 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -6,7 +6,9 @@
from frappe import _, throw
from frappe.desk.notifications import clear_doctype_notifications
from frappe.model.mapper import get_mapped_doc
+from frappe.query_builder.functions import CombineDatetime
from frappe.utils import cint, flt, getdate, nowdate
+from pypika import functions as fn
import erpnext
from erpnext.accounts.utils import get_account_currency
@@ -750,48 +752,38 @@
def update_billing_status(self, update_modified=True):
updated_pr = [self.name]
+ po_details = []
for d in self.get("items"):
if d.get("purchase_invoice") and d.get("purchase_invoice_item"):
d.db_set("billed_amt", d.amount, update_modified=update_modified)
elif d.purchase_order_item:
- updated_pr += update_billed_amount_based_on_po(d.purchase_order_item, update_modified)
+ po_details.append(d.purchase_order_item)
+
+ if po_details:
+ updated_pr += update_billed_amount_based_on_po(po_details, update_modified)
for pr in set(updated_pr):
- pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr)
+ pr_doc = self if (pr == self.name) else frappe.get_cached_doc("Purchase Receipt", pr)
update_billing_percentage(pr_doc, update_modified=update_modified)
self.load_from_db()
-def update_billed_amount_based_on_po(po_detail, update_modified=True):
- # Billed against Sales Order directly
- billed_against_po = frappe.db.sql(
- """select sum(amount) from `tabPurchase Invoice Item`
- where po_detail=%s and (pr_detail is null or pr_detail = '') and docstatus=1""",
- po_detail,
- )
- billed_against_po = billed_against_po and billed_against_po[0][0] or 0
+def update_billed_amount_based_on_po(po_details, update_modified=True):
+ po_billed_amt_details = get_billed_amount_against_po(po_details)
- # Get all Purchase Receipt Item rows against the Purchase Order Item row
- pr_details = frappe.db.sql(
- """select pr_item.name, pr_item.amount, pr_item.parent
- from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
- where pr.name=pr_item.parent and pr_item.purchase_order_item=%s
- and pr.docstatus=1 and pr.is_return = 0
- order by pr.posting_date asc, pr.posting_time asc, pr.name asc""",
- po_detail,
- as_dict=1,
- )
+ # Get all Purchase Receipt Item rows against the Purchase Order Items
+ pr_details = get_purchase_receipts_against_po_details(po_details)
+
+ pr_items = [pr_detail.name for pr_detail in pr_details]
+ pr_items_billed_amount = get_billed_amount_against_pr(pr_items)
updated_pr = []
for pr_item in pr_details:
+ billed_against_po = flt(po_billed_amt_details.get(pr_item.purchase_order_item))
+
# Get billed amount directly against Purchase Receipt
- billed_amt_agianst_pr = frappe.db.sql(
- """select sum(amount) from `tabPurchase Invoice Item`
- where pr_detail=%s and docstatus=1""",
- pr_item.name,
- )
- billed_amt_agianst_pr = billed_amt_agianst_pr and billed_amt_agianst_pr[0][0] or 0
+ billed_amt_agianst_pr = flt(pr_items_billed_amount.get(pr_item.name, 0))
# Distribute billed amount directly against PO between PRs based on FIFO
if billed_against_po and billed_amt_agianst_pr < pr_item.amount:
@@ -803,19 +795,90 @@
billed_amt_agianst_pr += billed_against_po
billed_against_po = 0
- frappe.db.set_value(
- "Purchase Receipt Item",
- pr_item.name,
- "billed_amt",
- billed_amt_agianst_pr,
- update_modified=update_modified,
- )
+ po_billed_amt_details[pr_item.purchase_order_item] = billed_against_po
- updated_pr.append(pr_item.parent)
+ if pr_item.billed_amt != billed_amt_agianst_pr:
+ frappe.db.set_value(
+ "Purchase Receipt Item",
+ pr_item.name,
+ "billed_amt",
+ billed_amt_agianst_pr,
+ update_modified=update_modified,
+ )
+
+ updated_pr.append(pr_item.parent)
return updated_pr
+def get_purchase_receipts_against_po_details(po_details):
+ # Get Purchase Receipts against Purchase Order Items
+
+ purchase_receipt = frappe.qb.DocType("Purchase Receipt")
+ purchase_receipt_item = frappe.qb.DocType("Purchase Receipt Item")
+
+ query = (
+ frappe.qb.from_(purchase_receipt)
+ .inner_join(purchase_receipt_item)
+ .on(purchase_receipt.name == purchase_receipt_item.parent)
+ .select(
+ purchase_receipt_item.name,
+ purchase_receipt_item.parent,
+ purchase_receipt_item.amount,
+ purchase_receipt_item.billed_amt,
+ purchase_receipt_item.purchase_order_item,
+ )
+ .where(
+ (purchase_receipt_item.purchase_order_item.isin(po_details))
+ & (purchase_receipt.docstatus == 1)
+ & (purchase_receipt.is_return == 0)
+ )
+ .orderby(CombineDatetime(purchase_receipt.posting_date, purchase_receipt.posting_time))
+ .orderby(purchase_receipt.name)
+ )
+
+ return query.run(as_dict=True)
+
+
+def get_billed_amount_against_pr(pr_items):
+ # Get billed amount directly against Purchase Receipt
+
+ if not pr_items:
+ return {}
+
+ purchase_invoice_item = frappe.qb.DocType("Purchase Invoice Item")
+
+ query = (
+ frappe.qb.from_(purchase_invoice_item)
+ .select(fn.Sum(purchase_invoice_item.amount).as_("billed_amt"), purchase_invoice_item.pr_detail)
+ .where((purchase_invoice_item.pr_detail.isin(pr_items)) & (purchase_invoice_item.docstatus == 1))
+ .groupby(purchase_invoice_item.pr_detail)
+ ).run(as_dict=1)
+
+ return {d.pr_detail: flt(d.billed_amt) for d in query}
+
+
+def get_billed_amount_against_po(po_items):
+ # Get billed amount directly against Purchase Order
+ if not po_items:
+ return {}
+
+ purchase_invoice_item = frappe.qb.DocType("Purchase Invoice Item")
+
+ query = (
+ frappe.qb.from_(purchase_invoice_item)
+ .select(fn.Sum(purchase_invoice_item.amount).as_("billed_amt"), purchase_invoice_item.po_detail)
+ .where(
+ (purchase_invoice_item.po_detail.isin(po_items))
+ & (purchase_invoice_item.docstatus == 1)
+ & (purchase_invoice_item.pr_detail.isnull())
+ )
+ .groupby(purchase_invoice_item.po_detail)
+ ).run(as_dict=1)
+
+ return {d.po_detail: flt(d.billed_amt) for d in query}
+
+
def update_billing_percentage(pr_doc, update_modified=True):
# Reload as billed amount was set in db directly
pr_doc.load_from_db()
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index 5e2ea06..c86356f 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -35,7 +35,7 @@
lst1 = ",".join(x[0] for x in lst)
frappe.throw(_("Cancel Material Visit {0} before cancelling this Warranty Claim").format(lst1))
else:
- frappe.db.set(self, "status", "Cancelled")
+ self.db_set("status", "Cancelled")
def on_update(self):
pass