Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into independent-manu-entry

Browse Source
This commit is contained in:
Marica 2021-11-26 13:20:33 +05:30 committed by GitHub
commit 26207d9517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 257 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@ -2397,6 +2397,32 @@ class TestSalesInvoice(unittest.TestCase):
frappe.db.set_value('Accounts Settings', None, 'acc_frozen_upto', None)
def test_over_billing_case_against_delivery_note(self):
'''
Test a case where duplicating the item with qty = 1 in the invoice
allows overbilling even if it is disabled
'''
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
over_billing_allowance = frappe.db.get_single_value('Accounts Settings', 'over_billing_allowance')
frappe.db.set_value('Accounts Settings', None, 'over_billing_allowance', 0)
dn = create_delivery_note()
dn.submit()
si = make_sales_invoice(dn.name)
# make a copy of first item and add it to invoice
item_copy = frappe.copy_doc(si.items[0])
si.append('items', item_copy)
si.save()
with self.assertRaises(frappe.ValidationError) as err:
si.submit()
self.assertTrue("cannot overbill" in str(err.exception).lower())
frappe.db.set_value('Accounts Settings', None, 'over_billing_allowance', over_billing_allowance)
def get_sales_invoice_for_e_invoice():
si = make_sales_invoice_for_ewaybill()
si.naming_series = 'INV-2020-.#####'

6
erpnext/buying/doctype/supplier/supplier.py
View File

@ -11,7 +11,11 @@ from frappe.contacts.address_and_contact import (
)
from frappe.model.naming import set_name_by_naming_series, set_name_from_naming_options
from erpnext.accounts.party import get_dashboard_info, validate_party_accounts
from erpnext.accounts.party import ( # noqa
get_dashboard_info,
get_timeline_data,
validate_party_accounts,
)
from erpnext.utilities.transaction_base import TransactionBase

45
erpnext/controllers/accounts_controller.py
View File

@ -1011,6 +1011,7 @@ class AccountsController(TransactionBase):
def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on, parentfield):
from erpnext.controllers.status_updater import get_allowance_for
item_allowance = {}
global_qty_allowance, global_amount_allowance = None, None
@ -1031,12 +1032,7 @@ class AccountsController(TransactionBase):
.format(item.item_code, ref_dt), title=_("Warning"), indicator="orange")
continue
already_billed = frappe.db.sql("""
select sum(%s)
from `tab%s`
where %s=%s and docstatus=1 and parent != %s
""" % (based_on, self.doctype + " Item", item_ref_dn, '%s', '%s'),
(item.get(item_ref_dn), self.name))[0][0]
already_billed = self.get_billed_amount_for_item(item, item_ref_dn, based_on)
total_billed_amt = flt(flt(already_billed) + flt(item.get(based_on)),
self.precision(based_on, item))
@ -1064,6 +1060,43 @@ class AccountsController(TransactionBase):
frappe.msgprint(_("Overbilling of {} ignored because you have {} role.")
.format(total_overbilled_amt, role_allowed_to_over_bill), indicator="orange", alert=True)
def get_billed_amount_for_item(self, item, item_ref_dn, based_on):
'''
Returns Sum of Amount of
Sales/Purchase Invoice Items
that are linked to `item_ref_dn` (`dn_detail` / `pr_detail`)
that are submitted OR not submitted but are under current invoice
'''
from frappe.query_builder import Criterion
from frappe.query_builder.functions import Sum
item_doctype = frappe.qb.DocType(item.doctype)
based_on_field = frappe.qb.Field(based_on)
join_field = frappe.qb.Field(item_ref_dn)
result = (
frappe.qb.from_(item_doctype)
.select(Sum(based_on_field))
.where(
join_field == item.get(item_ref_dn)
).where(
Criterion.any([ # select all items from other invoices OR current invoices
Criterion.all([ # for selecting items from other invoices
item_doctype.docstatus == 1,
item_doctype.parent != self.name
]),
Criterion.all([ # for selecting items from current invoice, that are linked to same reference
item_doctype.docstatus == 0,
item_doctype.parent == self.name,
item_doctype.name != item.name
])
])
)
).run()
return result[0][0] if result else 0
def throw_overbill_exception(self, item, max_allowed_amt):
frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings")
.format(item.item_code, item.idx, max_allowed_amt))

41
erpnext/controllers/stock_controller.py
View File

@ -17,7 +17,7 @@ from erpnext.accounts.general_ledger import (
from erpnext.accounts.utils import get_fiscal_year
from erpnext.controllers.accounts_controller import AccountsController
from erpnext.stock import get_warehouse_account_map
from erpnext.stock.stock_ledger import get_valuation_rate
from erpnext.stock.stock_ledger import get_items_to_be_repost, get_valuation_rate
class QualityInspectionRequiredError(frappe.ValidationError): pass
@ -544,7 +544,12 @@ class StockController(AccountsController):
"company": self.company
})
if future_sle_exists(args):
create_repost_item_valuation_entry(args)
item_based_reposting = cint(frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting"))
if item_based_reposting:
create_item_wise_repost_entries(voucher_type=self.doctype, voucher_no=self.name)
else:
create_repost_item_valuation_entry(args)
@frappe.whitelist()
def make_quality_inspections(doctype, docname, items):
@ -679,3 +684,35 @@ def create_repost_item_valuation_entry(args):
repost_entry.flags.ignore_permissions = True
repost_entry.save()
repost_entry.submit()
def create_item_wise_repost_entries(voucher_type, voucher_no, allow_zero_rate=False):
"""Using a voucher create repost item valuation records for all item-warehouse pairs."""
stock_ledger_entries = get_items_to_be_repost(voucher_type, voucher_no)
distinct_item_warehouses = set()
repost_entries = []
for sle in stock_ledger_entries:
item_wh = (sle.item_code, sle.warehouse)
if item_wh in distinct_item_warehouses:
continue
distinct_item_warehouses.add(item_wh)
repost_entry = frappe.new_doc("Repost Item Valuation")
repost_entry.based_on = "Item and Warehouse"
repost_entry.voucher_type = voucher_type
repost_entry.voucher_no = voucher_no
repost_entry.item_code = sle.item_code
repost_entry.warehouse = sle.warehouse
repost_entry.posting_date = sle.posting_date
repost_entry.posting_time = sle.posting_time
repost_entry.allow_zero_rate = allow_zero_rate
repost_entry.flags.ignore_links = True
repost_entry.flags.ignore_permissions = True
repost_entry.submit()
repost_entries.append(repost_entry)
return repost_entries

6
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@ -238,6 +238,12 @@ frappe.ui.form.on('Production Plan', {
method: "get_items",
freeze: true,
doc: frm.doc,
callback: function() {
frm.refresh_field("po_items");
if (frm.doc.sub_assembly_items.length > 0) {
frm.trigger("get_sub_assembly_items");
}
}
});
},

22
erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
View File

@ -1,7 +1,6 @@
# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import frappe
from frappe import _
from frappe.utils import flt
@ -30,7 +29,6 @@ def get_data(report_filters):
for row in job_cards:
row.operating_cost = flt(row.hour_rate) * (flt(row.total_time_in_mins) / 60.0)
update_raw_material_cost(row, report_filters)
data.append(row)
return data
@ -46,12 +44,6 @@ def get_filters(report_filters, operations):
return filters
def update_raw_material_cost(row, filters):
row.rm_cost = 0.0
for data in frappe.get_all("Job Card Item", fields = ["amount"],
filters={"parent": row.name, "docstatus": 1}):
row.rm_cost += data.amount
def get_columns(filters):
return [
{
@ -59,7 +51,7 @@ def get_columns(filters):
"fieldtype": "Link",
"fieldname": "name",
"options": "Job Card",
"width": "100"
"width": "120"
},
{
"label": _("Work Order"),
@ -111,18 +103,12 @@ def get_columns(filters):
"label": _("Operating Cost"),
"fieldtype": "Currency",
"fieldname": "operating_cost",
"width": "100"
},
{
"label": _("Raw Material Cost"),
"fieldtype": "Currency",
"fieldname": "rm_cost",
"width": "100"
"width": "150"
},
{
"label": _("Total Time (in Mins)"),
"fieldtype": "Float",
"fieldname": "total_time_in_mins",
"width": "100"
"width": "150"
}
]

1
erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
View File

@ -7,6 +7,7 @@ import frappe
def execute():
frappe.reload_doc("setup", "doctype", "target_detail")
frappe.reload_doc("core", "doctype", "prepared_report")
for d in ['Sales Person', 'Sales Partner', 'Territory']:
frappe.db.sql("""

6
erpnext/selling/doctype/customer/customer.py
View File

@ -18,7 +18,11 @@ from frappe.model.rename_doc import update_linked_doctypes
from frappe.utils import cint, cstr, flt, get_formatted_email, today
from frappe.utils.user import get_users_with_role
from erpnext.accounts.party import get_dashboard_info, validate_party_accounts
from erpnext.accounts.party import ( # noqa
get_dashboard_info,
get_timeline_data,
validate_party_accounts,
)
from erpnext.utilities.transaction_base import TransactionBase

6
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
View File

@ -64,7 +64,7 @@
"in_standard_filter": 1,
"label": "Status",
"no_copy": 1,
"options": "Queued\nIn Progress\nCompleted\nFailed",
"options": "Queued\nIn Progress\nCompleted\nSkipped\nFailed",
"read_only": 1
},
{
@ -177,7 +177,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2021-11-18 02:18:10.524560",
"modified": "2021-11-24 02:18:10.524560",
"modified_by": "Administrator",
"module": "Stock",
"name": "Repost Item Valuation",
@ -228,4 +228,4 @@
],
"sort_field": "modified",
"sort_order": "DESC"
}
}

55
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@ -1,7 +1,6 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import frappe
from frappe import _
from frappe.model.document import Document
@ -19,7 +18,7 @@ from erpnext.stock.stock_ledger import repost_future_sle
class RepostItemValuation(Document):
def validate(self):
self.set_status()
self.set_status(write=False)
self.reset_field_values()
self.set_company()
@ -27,26 +26,27 @@ class RepostItemValuation(Document):
if self.based_on == 'Transaction':
self.item_code = None
self.warehouse = None
else:
self.voucher_type = None
self.voucher_no = None
self.allow_negative_stock = self.allow_negative_stock or \
cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock"))
def set_company(self):
if self.voucher_type and self.voucher_no:
if self.based_on == "Transaction":
self.company = frappe.get_cached_value(self.voucher_type, self.voucher_no, "company")
elif self.warehouse:
self.company = frappe.get_cached_value("Warehouse", self.warehouse, "company")
def set_status(self, status=None):
def set_status(self, status=None, write=True):
status = status or self.status
if not status:
status = 'Queued'
self.db_set('status', status)
self.status = 'Queued'
else:
self.status = status
if write:
self.db_set('status', self.status)
def on_submit(self):
if not frappe.flags.in_test:
if not frappe.flags.in_test or self.flags.dont_run_in_test:
return
frappe.enqueue(repost, timeout=1800, queue='long',
@ -58,6 +58,37 @@ class RepostItemValuation(Document):
frappe.enqueue(repost, timeout=1800, queue='long',
job_name='repost_sle', now=True, doc=self)
def deduplicate_similar_repost(self):
""" Deduplicate similar reposts based on item-warehouse-posting combination."""
if self.based_on != "Item and Warehouse":
return
filters = {
"item_code": self.item_code,
"warehouse": self.warehouse,
"name": self.name,
"posting_date": self.posting_date,
"posting_time": self.posting_time,
}
frappe.db.sql("""
update `tabRepost Item Valuation`
set status = 'Skipped'
WHERE item_code = %(item_code)s
and warehouse = %(warehouse)s
and name != %(name)s
and TIMESTAMP(posting_date, posting_time) > TIMESTAMP(%(posting_date)s, %(posting_time)s)
and docstatus = 1
and status = 'Queued'
and based_on = 'Item and Warehouse'
""",
filters
)
def on_doctype_update():
frappe.db.add_index("Repost Item Valuation", ["warehouse", "item_code"], "item_warehouse")
def repost(doc):
try:
if not frappe.db.exists("Repost Item Valuation", doc.name):
@ -134,7 +165,9 @@ def repost_entries():
for row in riv_entries:
doc = frappe.get_doc('Repost Item Valuation', row.name)
repost(doc)
if doc.status in ('Queued', 'In Progress'):
doc.deduplicate_similar_repost()
repost(doc)
riv_entries = get_repost_item_valuation_entries()
if riv_entries:

68
erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
View File

@ -5,6 +5,8 @@ import unittest
import frappe
from erpnext.controllers.stock_controller import create_item_wise_repost_entries
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import (
in_configured_timeslot,
)
@ -70,3 +72,69 @@ class TestRepostItemValuation(unittest.TestCase):
in_configured_timeslot(repost_settings, case.get("current_time")),
msg=f"Exepcted false from : {case}",
)
def test_create_item_wise_repost_item_valuation_entries(self):
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
get_multiple_items=True,
)
rivs = create_item_wise_repost_entries(pr.doctype, pr.name)
self.assertGreaterEqual(len(rivs), 2)
self.assertIn("_Test Item", [d.item_code for d in rivs])
for riv in rivs:
self.assertEqual(riv.company, "_Test Company with perpetual inventory")
self.assertEqual(riv.warehouse, "Stores - TCP1")
def test_deduplication(self):
def _assert_status(doc, status):
doc.load_from_db()
self.assertEqual(doc.status, status)
riv_args = frappe._dict(
doctype="Repost Item Valuation",
item_code="_Test Item",
warehouse="_Test Warehouse - _TC",
based_on="Item and Warehouse",
voucher_type="Sales Invoice",
voucher_no="SI-1",
posting_date="2021-01-02",
posting_time="00:01:00",
)
# new repost without any duplicates
riv1 = frappe.get_doc(riv_args)
riv1.flags.dont_run_in_test = True
riv1.submit()
_assert_status(riv1, "Queued")
self.assertEqual(riv1.voucher_type, "Sales Invoice") # traceability
self.assertEqual(riv1.voucher_no, "SI-1")
# newer than existing duplicate - riv1
riv2 = frappe.get_doc(riv_args.update({"posting_date": "2021-01-03"}))
riv2.flags.dont_run_in_test = True
riv2.submit()
riv1.deduplicate_similar_repost()
_assert_status(riv2, "Skipped")
# older than exisitng duplicate - riv1
riv3 = frappe.get_doc(riv_args.update({"posting_date": "2021-01-01"}))
riv3.flags.dont_run_in_test = True
riv3.submit()
riv3.deduplicate_similar_repost()
_assert_status(riv3, "Queued")
_assert_status(riv1, "Skipped")
# unrelated reposts, shouldn't do anything to others.
riv4 = frappe.get_doc(riv_args.update({"warehouse": "Stores - _TC"}))
riv4.flags.dont_run_in_test = True
riv4.submit()
riv4.deduplicate_similar_repost()
_assert_status(riv4, "Queued")
_assert_status(riv3, "Queued")
# to avoid breaking other tests accidentaly
riv4.set_status("Skipped")
riv3.set_status("Skipped")

12
erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
View File

@ -1,6 +1,7 @@
{
"actions": [],
"allow_rename": 1,
"beta": 1,
"creation": "2021-10-01 10:56:30.814787",
"doctype": "DocType",
"editable_grid": 1,
@ -10,7 +11,8 @@
"limit_reposting_timeslot",
"start_time",
"end_time",
"limits_dont_apply_on"
"limits_dont_apply_on",
"item_based_reposting"
],
"fields": [
{
@ -44,12 +46,18 @@
"fieldname": "limit_reposting_timeslot",
"fieldtype": "Check",
"label": "Limit timeslot for Stock Reposting"
},
{
"default": "0",
"fieldname": "item_based_reposting",
"fieldtype": "Check",
"label": "Use Item based reposting"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2021-10-01 11:27:28.981594",
"modified": "2021-11-02 01:22:45.155841",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reposting Settings",

22
erpnext/stock/report/total_stock_summary/total_stock_summary.js
View File

@ -10,23 +10,8 @@ frappe.query_reports["Total Stock Summary"] = {
"fieldtype": "Select",
"width": "80",
"reqd": 1,
"options": ["", "Warehouse", "Company"],
"change": function() {
let group_by = frappe.query_report.get_filter_value("group_by")
let company_filter = frappe.query_report.get_filter("company")
if (group_by == "Company") {
company_filter.df.reqd = 0;
company_filter.df.hidden = 1;
frappe.query_report.set_filter_value("company", "");
company_filter.refresh();
}
else {
company_filter.df.reqd = 1;
company_filter.df.hidden = 0;
company_filter.refresh();
frappe.query_report.refresh();
}
}
"options": ["Warehouse", "Company"],
"default": "Warehouse",
},
{
"fieldname": "company",
@ -34,8 +19,9 @@ frappe.query_reports["Total Stock Summary"] = {
"fieldtype": "Link",
"width": "80",
"options": "Company",
"reqd": 1,
"default": frappe.defaults.get_user_default("Company"),
"reqd": 1
"depends_on": "eval: doc.group_by != 'Company'",
},
]
}

11
erpnext/stock/report/total_stock_summary/total_stock_summary.py
View File

@ -7,8 +7,9 @@ from frappe import _
def execute(filters=None):
if not filters: filters = {}
validate_filters(filters)
if not filters:
filters = {}
columns = get_columns()
stock = get_total_stock(filters)
@ -53,9 +54,3 @@ def get_total_stock(filters):
ON warehouse.name = ledger.warehouse
WHERE
ledger.actual_qty != 0 %s""" % (columns, conditions))
def validate_filters(filters):
if filters.get("group_by") == 'Company' and \
filters.get("company"):
frappe.throw(_("Please set Company filter blank if Group By is 'Company'"))