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

Merge pull request #31899 from s-aga-r/subcontracting-receipt/reposting

Browse Source 
fix: repost item valuation for subcontracting receipt
This commit is contained in:
Sagar Sharma 2022-08-19 22:01:22 +05:30 committed by GitHub
commit 3b51874da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js
View File

@ -15,7 +15,7 @@ frappe.ui.form.on('Repost Item Valuation', {
return { return {
filters: { filters: {
name: ['in', ['Purchase Receipt', 'Purchase Invoice', 'Delivery Note', name: ['in', ['Purchase Receipt', 'Purchase Invoice', 'Delivery Note',
'Sales Invoice', 'Stock Entry', 'Stock Reconciliation']] 'Sales Invoice', 'Stock Entry', 'Stock Reconciliation', 'Subcontracting Receipt']]
} }
}; };
}); });

13
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
View File

@ -15,6 +15,7 @@
"company", "company",
"posting_date", "posting_date",
"posting_time", "posting_time",
"set_posting_time",
"is_return", "is_return",
"return_against", "return_against",
"accounting_dimensions_section", "accounting_dimensions_section",
@ -138,6 +139,7 @@
"label": "Date", "label": "Date",
"no_copy": 1, "no_copy": 1,
"print_width": "100px", "print_width": "100px",
"read_only_depends_on": "eval: !doc.set_posting_time",
"reqd": 1, "reqd": 1,
"search_index": 1, "search_index": 1,
"width": "100px" "width": "100px"
@ -150,6 +152,7 @@
"no_copy": 1, "no_copy": 1,
"print_hide": 1, "print_hide": 1,
"print_width": "100px", "print_width": "100px",
"read_only_depends_on": "eval: !doc.set_posting_time",
"reqd": 1, "reqd": 1,
"width": "100px" "width": "100px"
}, },
@ -612,11 +615,19 @@
"label": "Total Additional Costs", "label": "Total Additional Costs",
"print_hide_if_no_value": 1, "print_hide_if_no_value": 1,
"read_only": 1 "read_only": 1
},
{
"default": "0",
"depends_on": "eval:doc.docstatus==0",
"fieldname": "set_posting_time",
"fieldtype": "Check",
"label": "Edit Posting Date and Time",
"print_hide": 1
} }
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-08-18 15:48:57.419191", "modified": "2022-08-19 19:50:16.935124",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Subcontracting", "module": "Subcontracting",
"name": "Subcontracting Receipt", "name": "Subcontracting Receipt",