Merge pull request #40062 from GursheenK/sales-person-target-contributions
fix: sales person / partner achieved targets in report
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index abc0694..3a930e0 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -270,7 +270,7 @@
super(SalesInvoice, self).validate()
self.validate_auto_set_posting_time()
- if not self.is_pos:
+ if not (self.is_pos or self.is_debit_note):
self.so_dn_required()
self.set_tax_withholding()
@@ -1478,9 +1478,7 @@
"credit_in_account_currency": payment_mode.base_amount
if self.party_account_currency == self.company_currency
else payment_mode.amount,
- "against_voucher": self.return_against
- if cint(self.is_return) and self.return_against
- else self.name,
+ "against_voucher": self.name,
"against_voucher_type": self.doctype,
"cost_center": self.cost_center,
},
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 8c3aede..c6a8362 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1105,6 +1105,44 @@
self.assertEqual(pos.grand_total, 100.0)
self.assertEqual(pos.write_off_amount, 10)
+ def test_ledger_entries_of_return_pos_invoice(self):
+ make_pos_profile()
+
+ pos = create_sales_invoice(do_not_save=True)
+ pos.is_pos = 1
+ pos.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 100})
+ pos.save().submit()
+ self.assertEqual(pos.outstanding_amount, 0.0)
+ self.assertEqual(pos.status, "Paid")
+
+ from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
+
+ pos_return = make_sales_return(pos.name)
+ pos_return.save().submit()
+ pos_return.reload()
+ pos.reload()
+ self.assertEqual(pos_return.is_return, 1)
+ self.assertEqual(pos_return.return_against, pos.name)
+ self.assertEqual(pos_return.outstanding_amount, 0.0)
+ self.assertEqual(pos_return.status, "Return")
+ self.assertEqual(pos.outstanding_amount, 0.0)
+ self.assertEqual(pos.status, "Credit Note Issued")
+
+ expected = (
+ ("Cash - _TC", 0.0, 100.0, pos_return.name, None),
+ ("Debtors - _TC", 0.0, 100.0, pos_return.name, pos_return.name),
+ ("Debtors - _TC", 100.0, 0.0, pos_return.name, pos_return.name),
+ ("Sales - _TC", 100.0, 0.0, pos_return.name, None),
+ )
+ res = frappe.db.get_all(
+ "GL Entry",
+ filters={"voucher_no": pos_return.name, "is_cancelled": 0},
+ fields=["account", "debit", "credit", "voucher_no", "against_voucher"],
+ order_by="account, debit, credit",
+ as_list=1,
+ )
+ self.assertEqual(expected, res)
+
def test_pos_with_no_gl_entry_for_change_amount(self):
frappe.db.set_single_value("Accounts Settings", "post_change_gl_entries", 0)
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index 3f178f4..eaeaa62 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -163,7 +163,7 @@
"""select
voucher_type, voucher_no, party_type, party, posting_date, debit, credit, remarks, against_voucher
from `tabGL Entry`
- where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') {0}
+ where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') and is_cancelled = 0 {0}
""".format(
get_conditions(filters)
),
diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
index 0e3acd7..b18570b 100644
--- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
+++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
@@ -242,7 +242,7 @@
"width": 120,
},
{
- "label": _("Tax Amount"),
+ "label": _("TDS Amount") if filters.get("party_type") == "Supplier" else _("TCS Amount"),
"fieldname": "tax_amount",
"fieldtype": "Float",
"width": 120,
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 063c1e3..32a5a61 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -216,7 +216,8 @@
)
)
- if self.get("is_return") and self.get("return_against"):
+ if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
+ # if self.get("is_return") and self.get("return_against"):
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint(
_(
@@ -345,6 +346,12 @@
ple = frappe.qb.DocType("Payment Ledger Entry")
frappe.qb.from_(ple).delete().where(
(ple.voucher_type == self.doctype) & (ple.voucher_no == self.name)
+ | (
+ (ple.against_voucher_type == self.doctype)
+ & (ple.against_voucher_no == self.name)
+ & ple.delinked
+ == 1
+ )
).run()
frappe.db.sql(
"delete from `tabGL Entry` where voucher_type=%s and voucher_no=%s", (self.doctype, self.name)
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index dc49023..c8d40ed 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -28,7 +28,8 @@
def validate(self):
super(SellingController, self).validate()
self.validate_items()
- self.validate_max_discount()
+ if not self.get("is_debit_note"):
+ self.validate_max_discount()
self.validate_selling_price()
self.set_qty_as_per_stock_uom()
self.set_po_nos(for_validate=True)
diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
index dea3f2d..4f7436f 100644
--- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
+++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
@@ -41,7 +41,9 @@
month_list = self.get_month_list()
for month in month_list:
- self.columns.append({"fieldname": month, "fieldtype": based_on, "label": month, "width": 200})
+ self.columns.append(
+ {"fieldname": month, "fieldtype": based_on, "label": _(month), "width": 200}
+ )
elif self.filters.get("range") == "Quarterly":
for quarter in range(1, 5):
@@ -156,7 +158,7 @@
for column in self.columns:
if column["fieldname"] != "opportunity_owner" and column["fieldname"] != "sales_stage":
- labels.append(column["fieldname"])
+ labels.append(_(column["fieldname"]))
self.chart = {"data": {"labels": labels, "datasets": datasets}, "type": "line"}
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 3daec20..35aebb9 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -239,12 +239,12 @@
for row in self.sub_operations:
self.total_completed_qty += row.completed_qty
- def get_overlap_for(self, args, check_next_available_slot=False):
+ def get_overlap_for(self, args):
time_logs = []
- time_logs.extend(self.get_time_logs(args, "Job Card Time Log", check_next_available_slot))
+ time_logs.extend(self.get_time_logs(args, "Job Card Time Log"))
- time_logs.extend(self.get_time_logs(args, "Job Card Scheduled Time", check_next_available_slot))
+ time_logs.extend(self.get_time_logs(args, "Job Card Scheduled Time"))
if not time_logs:
return {}
@@ -269,7 +269,7 @@
self.workstation = workstation_time.get("workstation")
return workstation_time
- return time_logs[-1]
+ return time_logs[0]
def has_overlap(self, production_capacity, time_logs):
overlap = False
@@ -308,7 +308,7 @@
return True
return overlap
- def get_time_logs(self, args, doctype, check_next_available_slot=False):
+ def get_time_logs(self, args, doctype):
jc = frappe.qb.DocType("Job Card")
jctl = frappe.qb.DocType(doctype)
@@ -318,9 +318,6 @@
((jctl.from_time >= args.from_time) & (jctl.to_time <= args.to_time)),
]
- if check_next_available_slot:
- time_conditions.append(((jctl.from_time >= args.from_time) & (jctl.to_time >= args.to_time)))
-
query = (
frappe.qb.from_(jctl)
.from_(jc)
@@ -395,18 +392,28 @@
def validate_overlap_for_workstation(self, args, row):
# get the last record based on the to time from the job card
- data = self.get_overlap_for(args, check_next_available_slot=True)
+ data = self.get_overlap_for(args)
+
if not self.workstation:
workstations = get_workstations(self.workstation_type)
if workstations:
# Get the first workstation
self.workstation = workstations[0]
+ if not data:
+ row.planned_start_time = args.from_time
+ return
+
if data:
if data.get("planned_start_time"):
- row.planned_start_time = get_datetime(data.planned_start_time)
+ args.planned_start_time = get_datetime(data.planned_start_time)
else:
- row.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
+ args.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
+
+ args.from_time = args.planned_start_time
+ args.to_time = add_to_date(args.planned_start_time, minutes=row.remaining_time_in_mins)
+
+ self.validate_overlap_for_workstation(args, row)
def check_workstation_time(self, row):
workstation_doc = frappe.get_cached_doc("Workstation", self.workstation)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index fdef8fe..517b2b0 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -1507,19 +1507,17 @@
frappe.throw(_("For row {0}: Enter Planned Qty").format(data.get("idx")))
if bom_no:
- if (
- data.get("include_exploded_items")
- and doc.get("sub_assembly_items")
- and doc.get("skip_available_sub_assembly_item")
- ):
- item_details = get_raw_materials_of_sub_assembly_items(
- item_details,
- company,
- bom_no,
- include_non_stock_items,
- sub_assembly_items,
- planned_qty=planned_qty,
- )
+ if data.get("include_exploded_items") and doc.get("skip_available_sub_assembly_item"):
+ item_details = {}
+ if doc.get("sub_assembly_items"):
+ item_details = get_raw_materials_of_sub_assembly_items(
+ item_details,
+ company,
+ bom_no,
+ include_non_stock_items,
+ sub_assembly_items,
+ planned_qty=planned_qty,
+ )
elif data.get("include_exploded_items") and include_subcontracted_items:
# fetch exploded items from BOM
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 1c748a8..53537f9 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -1232,6 +1232,35 @@
if row.item_code == "SubAssembly2 For SUB Test":
self.assertEqual(row.quantity, 10)
+ def test_sub_assembly_and_their_raw_materials_exists(self):
+ from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+ bom_tree = {
+ "FG1 For SUB Test": {
+ "SAB1 For SUB Test": {"CP1 For SUB Test": {}},
+ "SAB2 For SUB Test": {},
+ }
+ }
+
+ parent_bom = create_nested_bom(bom_tree, prefix="")
+ for item in ["SAB1 For SUB Test", "SAB2 For SUB Test"]:
+ make_stock_entry(item_code=item, qty=10, rate=100, target="_Test Warehouse - _TC")
+
+ plan = create_production_plan(
+ item_code=parent_bom.item,
+ planned_qty=10,
+ ignore_existing_ordered_qty=1,
+ do_not_submit=1,
+ skip_available_sub_assembly_item=1,
+ warehouse="_Test Warehouse - _TC",
+ )
+
+ items = get_items_for_material_requests(
+ plan.as_dict(), warehouses=[{"warehouse": "_Test Warehouse - _TC"}]
+ )
+
+ self.assertFalse(items)
+
def test_transfer_and_purchase_mrp_for_purchase_uom(self):
from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index efe9f53..c72232a 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -1822,6 +1822,113 @@
valuation_rate = sum([item.valuation_rate * item.transfer_qty for item in mce.items]) / 10
self.assertEqual(me.items[0].valuation_rate, valuation_rate)
+ def test_capcity_planning_for_workstation(self):
+ frappe.db.set_single_value(
+ "Manufacturing Settings",
+ {
+ "disable_capacity_planning": 0,
+ "capacity_planning_for_days": 1,
+ "mins_between_operations": 10,
+ },
+ )
+
+ properties = {"is_stock_item": 1, "valuation_rate": 100}
+ fg_item = make_item("Test FG Item For Capacity Planning", properties).name
+
+ rm_item = make_item("Test RM Item For Capacity Planning", properties).name
+
+ workstation = "Test Workstation For Capacity Planning"
+ if not frappe.db.exists("Workstation", workstation):
+ make_workstation(workstation=workstation, production_capacity=1)
+
+ operation = "Test Operation For Capacity Planning"
+ if not frappe.db.exists("Operation", operation):
+ make_operation(operation=operation, workstation=workstation)
+
+ bom_doc = make_bom(
+ item=fg_item,
+ source_warehouse="Stores - _TC",
+ raw_materials=[rm_item],
+ with_operations=1,
+ do_not_submit=True,
+ )
+
+ bom_doc.append(
+ "operations",
+ {"operation": operation, "time_in_mins": 1420, "hour_rate": 100, "workstation": workstation},
+ )
+ bom_doc.submit()
+
+ # 1st Work Order,
+ # Capacity to run parallel the operation 'Test Operation For Capacity Planning' is 2
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ wo_doc.submit()
+ job_cards = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name},
+ )
+
+ self.assertEqual(len(job_cards), 1)
+
+ # 2nd Work Order,
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ wo_doc.submit()
+ job_cards = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name},
+ )
+
+ self.assertEqual(len(job_cards), 1)
+
+ # 3rd Work Order, capacity is full
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ self.assertRaises(CapacityError, wo_doc.submit)
+
+ frappe.db.set_single_value(
+ "Manufacturing Settings", {"disable_capacity_planning": 1, "mins_between_operations": 0}
+ )
+
+
+def make_operation(**kwargs):
+ kwargs = frappe._dict(kwargs)
+
+ operation_doc = frappe.get_doc(
+ {
+ "doctype": "Operation",
+ "name": kwargs.operation,
+ "workstation": kwargs.workstation,
+ }
+ )
+ operation_doc.insert()
+
+ return operation_doc
+
+
+def make_workstation(**kwargs):
+ kwargs = frappe._dict(kwargs)
+
+ workstation_doc = frappe.get_doc(
+ {
+ "doctype": "Workstation",
+ "workstation_name": kwargs.workstation,
+ "workstation_type": kwargs.workstation_type,
+ "production_capacity": kwargs.production_capacity or 0,
+ "hour_rate": kwargs.hour_rate or 100,
+ }
+ )
+ workstation_doc.insert()
+
+ return workstation_doc
+
def prepare_boms_for_sub_assembly_test():
if not frappe.db.exists("BOM", {"item": "Test Final SF Item 1"}):
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 39beb36..5e22707 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -242,8 +242,12 @@
def calculate_operating_cost(self):
self.planned_operating_cost, self.actual_operating_cost = 0.0, 0.0
for d in self.get("operations"):
- d.planned_operating_cost = flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0)
- d.actual_operating_cost = flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0)
+ d.planned_operating_cost = flt(
+ flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0), d.precision("planned_operating_cost")
+ )
+ d.actual_operating_cost = flt(
+ flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0), d.precision("actual_operating_cost")
+ )
self.planned_operating_cost += flt(d.planned_operating_cost)
self.actual_operating_cost += flt(d.actual_operating_cost)
@@ -588,7 +592,6 @@
def prepare_data_for_job_card(self, row, index, plan_days, enable_capacity_planning):
self.set_operation_start_end_time(index, row)
- original_start_time = row.planned_start_time
job_card_doc = create_job_card(
self, row, auto_create=True, enable_capacity_planning=enable_capacity_planning
)
@@ -597,11 +600,15 @@
row.planned_start_time = job_card_doc.scheduled_time_logs[-1].from_time
row.planned_end_time = job_card_doc.scheduled_time_logs[-1].to_time
- if date_diff(row.planned_start_time, original_start_time) > plan_days:
+ if date_diff(row.planned_end_time, self.planned_start_date) > plan_days:
frappe.message_log.pop()
frappe.throw(
- _("Unable to find the time slot in the next {0} days for the operation {1}.").format(
- plan_days, row.operation
+ _(
+ "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}."
+ ).format(
+ plan_days,
+ row.operation,
+ get_link_to_form("Manufacturing Settings", "Manufacturing Settings"),
),
CapacityError,
)
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 05198e2..775bdb4 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -106,7 +106,6 @@
frappe.ui.form.on(this.frm.doctype + " Item", {
items_add: function(frm, cdt, cdn) {
- debugger
var item = frappe.get_doc(cdt, cdn);
if (!item.warehouse && frm.doc.set_warehouse) {
item.warehouse = frm.doc.set_warehouse;
@@ -166,7 +165,7 @@
}
if(this.frm.fields_dict["items"]) {
- this["items_remove"] = this.calculate_net_weight;
+ this["items_remove"] = this.process_item_removal;
}
if(this.frm.fields_dict["recurring_print_format"]) {
@@ -942,25 +941,35 @@
due_date() {
// due_date is to be changed, payment terms template and/or payment schedule must
// be removed as due_date is automatically changed based on payment terms
- if (this.frm.doc.due_date && !this.frm.updating_party_details && !this.frm.doc.is_pos) {
- if (this.frm.doc.payment_terms_template ||
- (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) {
- var message1 = "";
- var message2 = "";
- var final_message = __("Please clear the") + " ";
-
- if (this.frm.doc.payment_terms_template) {
- message1 = __("selected Payment Terms Template");
- final_message = final_message + message1;
- }
-
- if ((this.frm.doc.payment_schedule || []).length) {
- message2 = __("Payment Schedule Table");
- if (message1.length !== 0) message2 = " and " + message2;
- final_message = final_message + message2;
- }
- frappe.msgprint(final_message);
+ if (
+ this.frm.doc.due_date &&
+ !this.frm.updating_party_details &&
+ !this.frm.doc.is_pos &&
+ (
+ this.frm.doc.payment_terms_template ||
+ this.frm.doc.payment_schedule?.length
+ )
+ ) {
+ const to_clear = [];
+ if (this.frm.doc.payment_terms_template) {
+ to_clear.push("Payment Terms Template");
}
+
+ if (this.frm.doc.payment_schedule?.length) {
+ to_clear.push("Payment Schedule Table");
+ }
+
+ frappe.confirm(
+ __(
+ "Do you want to clear the selected {0}?",
+ [frappe.utils.comma_and(to_clear.map(dt => __(dt)))]
+ ),
+ () => {
+ this.frm.set_value("payment_terms_template", "");
+ this.frm.clear_table("payment_schedule");
+ this.frm.refresh_field("payment_schedule");
+ }
+ );
}
}
@@ -1288,6 +1297,11 @@
}
}
+ process_item_removal() {
+ this.frm.trigger("calculate_taxes_and_totals");
+ this.frm.trigger("calculate_net_weight");
+ }
+
calculate_net_weight(){
/* Calculate Total Net Weight then further applied shipping rule to calculate shipping charges.*/
var me = this;
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 68bcafc..aee761f 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -40,7 +40,10 @@
is_perpetual_inventory_enabled: function(company) {
if(company) {
- return frappe.get_doc(":Company", company).enable_perpetual_inventory
+ let company_local = locals[":Company"] && locals[":Company"][company];
+ if(company_local) {
+ return cint(company_local.enable_perpetual_inventory);
+ }
}
},
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 47153a8..a8ebccd 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -297,11 +297,35 @@
if credit_limit > outstanding_amt:
set_credit_limit("_Test Customer", "_Test Company", credit_limit)
- # Makes Sales invoice from Sales Order
- so.save(ignore_permissions=True)
- si = make_sales_invoice(so.name)
- si.save(ignore_permissions=True)
- self.assertRaises(frappe.ValidationError, make_sales_order)
+ def test_customer_credit_limit_after_submit(self):
+ from erpnext.controllers.accounts_controller import update_child_qty_rate
+ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+
+ outstanding_amt = self.get_customer_outstanding_amount()
+ credit_limit = get_credit_limit("_Test Customer", "_Test Company")
+
+ if outstanding_amt <= 0.0:
+ item_qty = int((abs(outstanding_amt) + 200) / 100)
+ make_sales_order(qty=item_qty)
+
+ if credit_limit <= 0.0:
+ set_credit_limit("_Test Customer", "_Test Company", outstanding_amt + 100)
+
+ so = make_sales_order(rate=100, qty=1)
+ # Update qty in submitted Sales Order to trigger Credit Limit validation
+ fields = ["name", "item_code", "delivery_date", "conversion_factor", "qty", "rate", "uom", "idx"]
+ modified_item = frappe._dict()
+ for x in fields:
+ modified_item[x] = so.items[0].get(x)
+ modified_item["docname"] = so.items[0].name
+ modified_item["qty"] = 2
+ self.assertRaises(
+ frappe.ValidationError,
+ update_child_qty_rate,
+ so.doctype,
+ frappe.json.dumps([modified_item]),
+ so.name,
+ )
def test_customer_credit_limit_on_change(self):
outstanding_amt = self.get_customer_outstanding_amount()
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 9661bac..ac392e7 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -515,6 +515,9 @@
def on_update(self):
pass
+ def on_update_after_submit(self):
+ self.check_credit_limit()
+
def before_update_after_submit(self):
self.validate_po()
self.validate_drop_ship()
diff --git a/erpnext/setup/demo.py b/erpnext/setup/demo.py
index df2c49b..688d45a 100644
--- a/erpnext/setup/demo.py
+++ b/erpnext/setup/demo.py
@@ -95,7 +95,17 @@
def make_transactions(company):
frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
- start_date = get_fiscal_year(date=getdate())[1]
+ from erpnext.accounts.utils import FiscalYearError
+
+ try:
+ start_date = get_fiscal_year(date=getdate())[1]
+ except FiscalYearError:
+ # User might have setup fiscal year for previous or upcoming years
+ active_fiscal_years = frappe.db.get_all("Fiscal Year", filters={"disabled": 0}, as_list=1)
+ if active_fiscal_years:
+ start_date = frappe.db.get_value("Fiscal Year", active_fiscal_years[0][0], "year_start_date")
+ else:
+ frappe.throw(_("There are no active Fiscal Years for which Demo Data can be generated."))
for doctype in frappe.get_hooks("demo_transaction_doctypes"):
data = read_data_file_using_hooks(doctype)
@@ -159,6 +169,7 @@
if i % 2 != 0:
payment = get_payment_entry(invoice.doctype, invoice.name)
+ payment.posting_date = order.transaction_date
payment.reference_no = invoice.name
payment.submit()
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
index 5de2c2e..844270b 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -68,7 +68,7 @@
{
"fieldname": "incoming_rate",
"fieldtype": "Float",
- "label": "Incoming Rate",
+ "label": "Valuation Rate",
"no_copy": 1,
"read_only": 1,
"read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\""
@@ -76,6 +76,7 @@
{
"fieldname": "outgoing_rate",
"fieldtype": "Float",
+ "hidden": 1,
"label": "Outgoing Rate",
"no_copy": 1,
"read_only": 1
@@ -95,6 +96,7 @@
"default": "0",
"fieldname": "is_outward",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Is Outward",
"read_only": 1
},
@@ -120,7 +122,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-12-10 19:47:48.227772",
+ "modified": "2024-02-23 12:44:18.054270",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial and Batch Entry",
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index c698283..fb8089e 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -424,6 +424,7 @@
},
{
"default": "1",
+ "description": "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields.",
"fieldname": "use_serial_batch_fields",
"fieldtype": "Check",
"label": "Use Serial / Batch Fields"
@@ -434,7 +435,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2024-02-04 12:01:31.931864",
+ "modified": "2024-02-24 12:50:51.740097",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index fc1cca4..52c5b00 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -144,7 +144,7 @@
if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"):
if sn_doc.has_serial_no:
- values_to_update["serial_no"] = "\n".join(cstr(d.serial_no) for d in sn_doc.entries)
+ values_to_update["serial_no"] = ",".join(cstr(d.serial_no) for d in sn_doc.entries)
elif sn_doc.has_batch_no and len(sn_doc.entries) == 1:
values_to_update["batch_no"] = sn_doc.entries[0].batch_no