mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 19:29:10 +00:00
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
This commit is contained in:
@@ -174,10 +174,9 @@ var calculate_total = function(doc) {
|
||||
|
||||
|
||||
cur_frm.fields_dict['item'].get_query = function(doc) {
|
||||
return 'SELECT DISTINCT `tabItem`.`name`, `tabItem`.description FROM `tabItem` \
|
||||
WHERE is_manufactured_item = "Yes" and (IFNULL(`tabItem`.`end_of_life`,"") = "" OR \
|
||||
`tabItem`.`end_of_life` = "0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND \
|
||||
`tabItem`.`%(key)s` like "%s" ORDER BY `tabItem`.`name` LIMIT 50';
|
||||
return erpnext.queries.item({
|
||||
'ifnull(tabItem.is_manufactured_item, "No")': 'Yes'
|
||||
})
|
||||
}
|
||||
|
||||
cur_frm.fields_dict['project_name'].get_query = function(doc, dt, dn) {
|
||||
|
||||
29
manufacturing/doctype/bom/locale/_messages_doc.json
Normal file
29
manufacturing/doctype/bom/locale/_messages_doc.json
Normal file
@@ -0,0 +1,29 @@
|
||||
[
|
||||
"Item Desription",
|
||||
"BOM Item",
|
||||
"Quantity of item obtained after manufacturing / repacking from given quantities of raw materials",
|
||||
"BOM",
|
||||
"Total Raw Material Cost",
|
||||
"Manage cost of operations",
|
||||
"Project Name",
|
||||
"Is Default",
|
||||
"Amended From",
|
||||
"BOM Operations",
|
||||
"Manufacturing",
|
||||
"With Operations",
|
||||
"Total Cost",
|
||||
"Item UOM",
|
||||
"Rate Of Materials Based On",
|
||||
"Item",
|
||||
"Last Purchase Rate",
|
||||
"Materials Required (Exploded)",
|
||||
"Total Operating Cost",
|
||||
"Quantity",
|
||||
"Operations",
|
||||
"Item to be manufactured or repacked",
|
||||
"Is Active",
|
||||
"Materials",
|
||||
"More Info",
|
||||
"Valuation Rate",
|
||||
"Costing"
|
||||
]
|
||||
1
manufacturing/doctype/bom/locale/_messages_js.json
Normal file
1
manufacturing/doctype/bom/locale/_messages_js.json
Normal file
@@ -0,0 +1 @@
|
||||
[]
|
||||
9
manufacturing/doctype/bom/locale/_messages_py.json
Normal file
9
manufacturing/doctype/bom/locale/_messages_py.json
Normal file
@@ -0,0 +1,9 @@
|
||||
[
|
||||
": It is linked to other active BOM(s)",
|
||||
"deactivate",
|
||||
"has been entered atleast twice",
|
||||
"Item",
|
||||
" against same operation",
|
||||
"Cannot ",
|
||||
"cancel"
|
||||
]
|
||||
29
manufacturing/doctype/bom/locale/hi-doc.json
Normal file
29
manufacturing/doctype/bom/locale/hi-doc.json
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"Amended From": "\u0938\u0947 \u0938\u0902\u0936\u094b\u0927\u093f\u0924",
|
||||
"BOM": "\u092c\u0940\u0913\u090f\u092e",
|
||||
"BOM Item": "\u092c\u0940\u0913\u090f\u092e \u0906\u0907\u091f\u092e",
|
||||
"BOM Operations": "\u092c\u0940\u0913\u090f\u092e \u0938\u0902\u091a\u093e\u0932\u0928",
|
||||
"Costing": "\u0932\u093e\u0917\u0924",
|
||||
"Is Active": "\u0938\u0915\u094d\u0930\u093f\u092f \u0939\u0948",
|
||||
"Is Default": "\u0921\u093f\u092b\u093c\u0949\u0932\u094d\u091f \u0939\u0948",
|
||||
"Item": "\u092e\u0926",
|
||||
"Item Desription": "\u0906\u0907\u091f\u092e desription",
|
||||
"Item UOM": "\u0906\u0907\u091f\u092e UOM",
|
||||
"Item to be manufactured or repacked": "\u0906\u0907\u091f\u092e \u0928\u093f\u0930\u094d\u092e\u093f\u0924 \u0915\u093f\u092f\u093e \u091c\u093e \u092f\u093e repacked",
|
||||
"Last Purchase Rate": "\u092a\u093f\u091b\u0932\u0947 \u0916\u0930\u0940\u0926 \u0926\u0930",
|
||||
"Manage cost of operations": "\u0938\u0902\u091a\u093e\u0932\u0928 \u0915\u0940 \u0932\u093e\u0917\u0924 \u0915\u093e \u092a\u094d\u0930\u092c\u0902\u0927\u0928",
|
||||
"Manufacturing": "\u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923",
|
||||
"Materials": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940",
|
||||
"Materials Required (Exploded)": "\u092e\u093e\u0932 \u0906\u0935\u0936\u094d\u092f\u0915 (\u0935\u093f\u0938\u094d\u092b\u094b\u091f)",
|
||||
"More Info": "\u0905\u0927\u093f\u0915 \u091c\u093e\u0928\u0915\u093e\u0930\u0940",
|
||||
"Operations": "\u0938\u0902\u091a\u093e\u0932\u0928",
|
||||
"Project Name": "\u0907\u0938 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e \u0915\u093e \u0928\u093e\u092e",
|
||||
"Quantity": "\u092e\u093e\u0924\u094d\u0930\u093e",
|
||||
"Quantity of item obtained after manufacturing / repacking from given quantities of raw materials": "\u0935\u0938\u094d\u0924\u0941 \u0915\u0940 \u092e\u093e\u0924\u094d\u0930\u093e \u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923 / \u0915\u091a\u094d\u091a\u0947 \u092e\u093e\u0932 \u0915\u0940 \u0926\u0940 \u0917\u0908 \u092e\u093e\u0924\u094d\u0930\u093e \u0938\u0947 repacking \u0915\u0947 \u092c\u093e\u0926 \u092a\u094d\u0930\u093e\u092a\u094d\u0924",
|
||||
"Rate Of Materials Based On": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0906\u0927\u093e\u0930 \u092a\u0930 \u0926\u0930",
|
||||
"Total Cost": "\u0915\u0941\u0932 \u0932\u093e\u0917\u0924",
|
||||
"Total Operating Cost": "\u0915\u0941\u0932 \u092a\u0930\u093f\u091a\u093e\u0932\u0928 \u0932\u093e\u0917\u0924",
|
||||
"Total Raw Material Cost": "\u0915\u0941\u0932 \u0915\u091a\u094d\u091a\u0947 \u092e\u093e\u0932 \u0915\u0940 \u0932\u093e\u0917\u0924",
|
||||
"Valuation Rate": "\u092e\u0942\u0932\u094d\u092f\u093e\u0902\u0915\u0928 \u0926\u0930",
|
||||
"With Operations": "\u0906\u092a\u0930\u0947\u0936\u0928\u094b\u0902 \u0915\u0947 \u0938\u093e\u0925"
|
||||
}
|
||||
9
manufacturing/doctype/bom/locale/hi-py.json
Normal file
9
manufacturing/doctype/bom/locale/hi-py.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
" against same operation": "\u090f\u0915 \u0939\u0940 \u0906\u092a\u0930\u0947\u0936\u0928 \u0915\u0947 \u0916\u093f\u0932\u093e\u092b",
|
||||
": It is linked to other active BOM(s)": ": \u092f\u0939 \u0905\u0928\u094d\u092f \u0938\u0915\u094d\u0930\u093f\u092f \u092c\u0940\u0913\u090f\u092e (\u0913\u0902) \u0938\u0947 \u091c\u0941\u0921\u093c\u093e \u0939\u0941\u0906 \u0939\u0948",
|
||||
"Cannot ": "\u0928\u0939\u0940\u0902 \u0915\u0930 \u0938\u0915\u0924\u0947",
|
||||
"Item": "\u092e\u0926",
|
||||
"cancel": "\u0930\u0926\u094d\u0926 \u0915\u0930\u0947\u0902",
|
||||
"deactivate": "\u0928\u093f\u0937\u094d\u0915\u094d\u0930\u093f\u092f \u0915\u0930\u0947\u0902",
|
||||
"has been entered atleast twice": "\u0915\u092e \u0938\u0947 \u0915\u092e \u0926\u094b \u092c\u093e\u0930 \u0926\u0930\u094d\u091c \u0915\u093f\u092f\u093e \u0917\u092f\u093e"
|
||||
}
|
||||
Reference in New Issue
Block a user