Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
fix: minor issues
This commit is contained in:
commit
866867661e
@ -152,10 +152,9 @@ def build_forest(data):
|
||||
return [parent_account]
|
||||
elif account_name == child:
|
||||
parent_account_list = return_parent(data, parent_account)
|
||||
if not parent_account_list:
|
||||
if not parent_account_list and parent_account:
|
||||
frappe.throw(_("The parent account {0} does not exists in the uploaded template").format(
|
||||
frappe.bold(parent_account)))
|
||||
|
||||
return [child] + parent_account_list
|
||||
|
||||
charts_map, paths = {}, []
|
||||
|
@ -111,6 +111,7 @@ class TestPickList(unittest.TestCase):
|
||||
|
||||
stock_reconciliation = frappe.get_doc({
|
||||
'doctype': 'Stock Reconciliation',
|
||||
'purpose': 'Stock Reconciliation',
|
||||
'company': '_Test Company',
|
||||
'items': [{
|
||||
'item_code': '_Test Serialized Item',
|
||||
|
@ -4,6 +4,7 @@
|
||||
"description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Document",
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"naming_series",
|
||||
"company",
|
||||
@ -44,11 +45,11 @@
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"default": "Stock Reconciliation",
|
||||
"fieldname": "purpose",
|
||||
"fieldtype": "Select",
|
||||
"label": "Purpose",
|
||||
"options": "Opening Stock\nStock Reconciliation"
|
||||
"options": "\nOpening Stock\nStock Reconciliation",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "col1",
|
||||
@ -153,7 +154,7 @@
|
||||
"idx": 1,
|
||||
"is_submittable": 1,
|
||||
"max_attachments": 1,
|
||||
"modified": "2019-05-26 09:03:09.542141",
|
||||
"modified": "2020-04-08 17:02:47.196206",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Stock Reconciliation",
|
||||
|
@ -240,6 +240,7 @@ def create_batch_or_serial_no_items():
|
||||
def create_stock_reconciliation(**args):
|
||||
args = frappe._dict(args)
|
||||
sr = frappe.new_doc("Stock Reconciliation")
|
||||
sr.purpose = args.purpose or "Stock Reconciliation"
|
||||
sr.posting_date = args.posting_date or nowdate()
|
||||
sr.posting_time = args.posting_time or nowtime()
|
||||
sr.set_posting_time = 1
|
||||
|
Loading…
Reference in New Issue
Block a user