Merge branch 'develop' into bom-update-tool
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cba6759..dc3011f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,6 +30,7 @@
rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
hooks:
- id: black
+ additional_dependencies: ['click==8.0.4']
- repo: https://github.com/timothycrosley/isort
rev: 5.9.1
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 808b766..6c38a7e 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -945,12 +945,55 @@
)
pos.append("payments", {"mode_of_payment": "Cash", "account": "Cash - TCP1", "amount": 60})
- pos.change_amount = 5.0
+ pos.write_off_outstanding_amount_automatically = 1
pos.insert()
pos.submit()
self.assertEqual(pos.grand_total, 100.0)
- self.assertEqual(pos.write_off_amount, -5)
+ self.assertEqual(pos.write_off_amount, 0)
+
+ def test_auto_write_off_amount(self):
+ make_pos_profile(
+ company="_Test Company with perpetual inventory",
+ income_account="Sales - TCP1",
+ expense_account="Cost of Goods Sold - TCP1",
+ warehouse="Stores - TCP1",
+ cost_center="Main - TCP1",
+ write_off_account="_Test Write Off - TCP1",
+ )
+
+ make_purchase_receipt(
+ company="_Test Company with perpetual inventory",
+ item_code="_Test FG Item",
+ warehouse="Stores - TCP1",
+ cost_center="Main - TCP1",
+ )
+
+ pos = create_sales_invoice(
+ company="_Test Company with perpetual inventory",
+ debit_to="Debtors - TCP1",
+ item_code="_Test FG Item",
+ warehouse="Stores - TCP1",
+ income_account="Sales - TCP1",
+ expense_account="Cost of Goods Sold - TCP1",
+ cost_center="Main - TCP1",
+ do_not_save=True,
+ )
+
+ pos.is_pos = 1
+ pos.update_stock = 1
+
+ pos.append(
+ "payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - TCP1", "amount": 50}
+ )
+ pos.append("payments", {"mode_of_payment": "Cash", "account": "Cash - TCP1", "amount": 40})
+
+ pos.write_off_outstanding_amount_automatically = 1
+ pos.insert()
+ pos.submit()
+
+ self.assertEqual(pos.grand_total, 100.0)
+ self.assertEqual(pos.write_off_amount, 10)
def test_pos_with_no_gl_entry_for_change_amount(self):
frappe.db.set_value("Accounts Settings", None, "post_change_gl_entries", 0)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index ce58d5b..8183b6e 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -679,7 +679,11 @@
)
if self.doc.docstatus == 0:
+ if self.doc.get("write_off_outstanding_amount_automatically"):
+ self.doc.write_off_amount = 0
+
self.calculate_outstanding_amount()
+ self.calculate_write_off_amount()
def is_internal_invoice(self):
"""
@@ -731,7 +735,6 @@
change_amount = 0
if self.doc.doctype == "Sales Invoice" and not self.doc.get("is_return"):
- self.calculate_write_off_amount()
self.calculate_change_amount()
change_amount = (
self.doc.change_amount
@@ -791,28 +794,26 @@
and not self.doc.is_return
and any(d.type == "Cash" for d in self.doc.payments)
):
-
self.doc.change_amount = flt(
- self.doc.paid_amount - grand_total + self.doc.write_off_amount,
- self.doc.precision("change_amount"),
+ self.doc.paid_amount - grand_total, self.doc.precision("change_amount")
)
self.doc.base_change_amount = flt(
- self.doc.base_paid_amount - base_grand_total + self.doc.base_write_off_amount,
- self.doc.precision("base_change_amount"),
+ self.doc.base_paid_amount - base_grand_total, self.doc.precision("base_change_amount")
)
def calculate_write_off_amount(self):
- if flt(self.doc.change_amount) > 0:
+ if self.doc.get("write_off_outstanding_amount_automatically"):
self.doc.write_off_amount = flt(
- self.doc.grand_total - self.doc.paid_amount + self.doc.change_amount,
- self.doc.precision("write_off_amount"),
+ self.doc.outstanding_amount, self.doc.precision("write_off_amount")
)
self.doc.base_write_off_amount = flt(
self.doc.write_off_amount * self.doc.conversion_rate,
self.doc.precision("base_write_off_amount"),
)
+ self.calculate_outstanding_amount()
+
def calculate_margin(self, item):
rate_with_margin = 0.0
base_rate_with_margin = 0.0
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 9fec43b..047ec81 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -689,7 +689,12 @@
}));
this.frm.doc.total_advance = flt(total_allocated_amount, precision("total_advance"));
+ if (this.frm.doc.write_off_outstanding_amount_automatically) {
+ this.frm.doc.write_off_amount = 0;
+ }
+
this.calculate_outstanding_amount(update_paid_amount);
+ this.calculate_write_off_amount();
}
is_internal_invoice() {
@@ -825,26 +830,23 @@
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
- this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total +
- this.frm.doc.write_off_amount, precision("change_amount"));
+ this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total,
+ precision("change_amount"));
this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount -
- base_grand_total + this.frm.doc.base_write_off_amount,
- precision("base_change_amount"));
+ base_grand_total, precision("base_change_amount"));
}
}
}
- calculate_write_off_amount(){
- if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
- this.frm.doc.write_off_amount = flt(this.frm.doc.grand_total - this.frm.doc.paid_amount
- + this.frm.doc.change_amount, precision("write_off_amount"));
-
+ calculate_write_off_amount() {
+ if(this.frm.doc.write_off_outstanding_amount_automatically) {
+ this.frm.doc.write_off_amount = flt(this.frm.doc.outstanding_amount, precision("write_off_amount"));
this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
precision("base_write_off_amount"));
- }else{
- this.frm.doc.paid_amount = 0.0;
+
+ this.calculate_outstanding_amount(false);
}
- this.calculate_outstanding_amount(false);
+
}
};
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
index da00984..12ca7b3 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
@@ -177,11 +177,11 @@
def get_item_details():
- details = frappe.db.get_all("Item", fields=["item_code", "item_name", "item_group"])
+ details = frappe.db.get_all("Item", fields=["name", "item_name", "item_group"])
item_details = {}
for d in details:
item_details.setdefault(
- d.item_code, frappe._dict({"item_name": d.item_name, "item_group": d.item_group})
+ d.name, frappe._dict({"item_name": d.item_name, "item_group": d.item_group})
)
return item_details
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index bc54f7f..c0a8e14 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -225,12 +225,16 @@
def set_transfer_qty(self):
for item in self.get("items"):
if not flt(item.qty):
- frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx))
+ frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx), title=_("Zero quantity"))
if not flt(item.conversion_factor):
frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx))
item.transfer_qty = flt(
flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item)
)
+ if not flt(item.transfer_qty):
+ frappe.throw(
+ _("Row {0}: Qty in Stock UOM can not be zero.").format(item.idx), title=_("Zero quantity")
+ )
def update_cost_in_project(self):
if self.work_order and not frappe.db.get_value(
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index aeedcd1..3ccd342 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -51,7 +51,6 @@
def tearDown(self):
frappe.db.rollback()
frappe.set_user("Administrator")
- frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "0")
def test_fifo(self):
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
@@ -767,13 +766,12 @@
fg_cost, flt(rm_cost + bom_operation_cost + work_order.additional_operating_cost, 2)
)
+ @change_settings("Manufacturing Settings", {"material_consumption": 1})
def test_work_order_manufacture_with_material_consumption(self):
from erpnext.manufacturing.doctype.work_order.work_order import (
make_stock_entry as _make_stock_entry,
)
- frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "1")
-
bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item", "is_default": 1, "docstatus": 1})
work_order = frappe.new_doc("Work Order")
@@ -983,43 +981,6 @@
repack.insert()
self.assertRaises(frappe.ValidationError, repack.submit)
- # def test_material_consumption(self):
- # frappe.db.set_value("Manufacturing Settings", None, "backflush_raw_materials_based_on", "BOM")
- # frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "0")
-
- # from erpnext.manufacturing.doctype.work_order.work_order \
- # import make_stock_entry as _make_stock_entry
- # bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2",
- # "is_default": 1, "docstatus": 1})
-
- # work_order = frappe.new_doc("Work Order")
- # work_order.update({
- # "company": "_Test Company",
- # "fg_warehouse": "_Test Warehouse 1 - _TC",
- # "production_item": "_Test FG Item 2",
- # "bom_no": bom_no,
- # "qty": 4.0,
- # "stock_uom": "_Test UOM",
- # "wip_warehouse": "_Test Warehouse - _TC",
- # "additional_operating_cost": 1000,
- # "use_multi_level_bom": 1
- # })
- # work_order.insert()
- # work_order.submit()
-
- # make_stock_entry(item_code="_Test Serialized Item With Series", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
- # make_stock_entry(item_code="_Test Item 2", target="_Test Warehouse - _TC", qty=50, basic_rate=20)
-
- # item_quantity = {
- # '_Test Item': 2.0,
- # '_Test Item 2': 12.0,
- # '_Test Serialized Item With Series': 6.0
- # }
-
- # stock_entry = frappe.get_doc(_make_stock_entry(work_order.name, "Material Consumption for Manufacture", 2))
- # for d in stock_entry.get('items'):
- # self.assertEqual(item_quantity.get(d.item_code), d.qty)
-
def test_customer_provided_parts_se(self):
create_item(
"CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
@@ -1358,6 +1319,13 @@
issue.reload() # reload because reposting current voucher updates rate
self.assertEqual(issue.value_difference, -30)
+ def test_transfer_qty_validation(self):
+ se = make_stock_entry(item_code="_Test Item", do_not_save=True, qty=0.001, rate=100)
+ se.items[0].uom = "Kg"
+ se.items[0].conversion_factor = 0.002
+
+ self.assertRaises(frappe.ValidationError, se.save)
+
def make_serialized_item(**args):
args = frappe._dict(args)
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 741646d..4f1891f 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -526,7 +526,7 @@
filters = {
"docstatus": 1,
- "status": ["in", ["Queued", "In Progress", "Failed"]],
+ "status": ["in", ["Queued", "In Progress"]],
"posting_date": ["<=", posting_date],
}