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

Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut

Browse Source
This commit is contained in:
Brahma K 2011-08-31 12:55:41 +05:30
parent 369c7009ec
commit 3c9a6a19e8
6 changed files with 37 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/patch.py
View File

@ -2,7 +2,7 @@
# ======================== # ========================
last_patch = 351 last_patch = 352
#------------------------------------------- #-------------------------------------------
@ -277,3 +277,7 @@ def execute(patch_no):
reload_doc('stock', 'doctype', 'item_customer_detail') reload_doc('stock', 'doctype', 'item_customer_detail')
elif patch_no == 351: elif patch_no == 351:
reload_doc('home', 'page', 'dashboard') reload_doc('home', 'page', 'dashboard')
elif patch_no == 352:
reload_doc('setup', 'doctype','feature_setup')
reload_doc('stock','doctype','item')
sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")

51
production/doctype/production_order/production_order.txt
View File

@ -5,13 +5,14 @@
{ {
'creation': '2010-08-08 17:09:14', 'creation': '2010-08-08 17:09:14',
'docstatus': 0, 'docstatus': 0,
'modified': '2010-12-23 11:08:12', 'modified': '2011-08-31 10:03:21',
'modified_by': 'umair@iwebnotes.com', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1313485457',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
'in_create': 0, 'in_create': 0,
@ -20,7 +21,7 @@
'section_style': 'Tabbed', 'section_style': 'Tabbed',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 179 'version': 180
}, },
# These values are common for all DocField # These values are common for all DocField
@ -54,7 +55,6 @@
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 1,
'permlevel': 0, 'permlevel': 0,
'role': 'System Manager', 'role': 'System Manager',
'submit': 1, 'submit': 1,
@ -64,7 +64,6 @@
# DocPerm # DocPerm
{ {
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 2,
'permlevel': 1, 'permlevel': 1,
'role': 'All' 'role': 'All'
}, },
@ -75,7 +74,6 @@
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 3,
'permlevel': 0, 'permlevel': 0,
'role': 'Production Manager', 'role': 'Production Manager',
'submit': 1, 'submit': 1,
@ -88,7 +86,6 @@
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 4,
'permlevel': 0, 'permlevel': 0,
'role': 'Production User', 'role': 'Production User',
'submit': 1, 'submit': 1,
@ -99,7 +96,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 1,
'label': 'Production Order', 'label': 'Production Order',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -112,7 +108,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'transaction_date', 'fieldname': 'transaction_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 2,
'label': 'Transaction Date', 'label': 'Transaction Date',
'oldfieldname': 'transaction_date', 'oldfieldname': 'transaction_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
@ -127,7 +122,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'posting_date', 'fieldname': 'posting_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 3,
'label': 'Posting Date', 'label': 'Posting Date',
'oldfieldname': 'posting_date', 'oldfieldname': 'posting_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
@ -142,7 +136,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'production_item', 'fieldname': 'production_item',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 4,
'in_filter': 1, 'in_filter': 1,
'label': 'Production Item', 'label': 'Production Item',
'oldfieldname': 'production_item', 'oldfieldname': 'production_item',
@ -158,7 +151,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'description', 'fieldname': 'description',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 5,
'label': 'Description', 'label': 'Description',
'oldfieldname': 'description', 'oldfieldname': 'description',
'oldfieldtype': 'Text', 'oldfieldtype': 'Text',
@ -173,14 +165,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'bom_no', 'fieldname': 'bom_no',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 7,
'label': 'BOM No', 'label': 'BOM No',
'oldfieldname': 'bom_no', 'oldfieldname': 'bom_no',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Bill Of Materials', 'options': 'Bill Of Materials',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@ -189,7 +179,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'origin', 'fieldname': 'origin',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 8,
'in_filter': 1, 'in_filter': 1,
'label': 'Origin', 'label': 'Origin',
'no_copy': 1, 'no_copy': 1,
@ -207,7 +196,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'qty', 'fieldname': 'qty',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 9,
'label': 'Qty', 'label': 'Qty',
'oldfieldname': 'qty', 'oldfieldname': 'qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -221,7 +209,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'project_name', 'fieldname': 'project_name',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 9,
'in_filter': 1, 'in_filter': 1,
'label': 'Project Name', 'label': 'Project Name',
'oldfieldname': 'project_name', 'oldfieldname': 'project_name',
@ -236,7 +223,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amended_from', 'fieldname': 'amended_from',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 10,
'label': 'Amended From', 'label': 'Amended From',
'oldfieldname': 'amended_from', 'oldfieldname': 'amended_from',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@ -248,7 +234,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amendment_date', 'fieldname': 'amendment_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 11,
'label': 'Amendment Date', 'label': 'Amendment Date',
'oldfieldname': 'amendment_date', 'oldfieldname': 'amendment_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
@ -259,7 +244,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 12,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0 'permlevel': 0
}, },
@ -269,7 +253,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'stock_uom', 'fieldname': 'stock_uom',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 12,
'label': 'Stock UOM', 'label': 'Stock UOM',
'oldfieldname': 'stock_uom', 'oldfieldname': 'stock_uom',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@ -281,7 +264,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'status', 'fieldname': 'status',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 13,
'in_filter': 1, 'in_filter': 1,
'label': 'Status', 'label': 'Status',
'no_copy': 1, 'no_copy': 1,
@ -300,15 +282,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fg_warehouse', 'fieldname': 'fg_warehouse',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 14,
'in_filter': 1, 'in_filter': 1,
'label': 'FG Warehouse', 'label': 'FG Warehouse',
'oldfieldname': 'fg_warehouse', 'oldfieldname': 'fg_warehouse',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1
'search_index': 0
}, },
# DocField # DocField
@ -318,15 +298,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'wip_warehouse', 'fieldname': 'wip_warehouse',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 15,
'in_filter': 1, 'in_filter': 1,
'label': 'WIP Warehouse', 'label': 'WIP Warehouse',
'oldfieldname': 'wip_warehouse', 'oldfieldname': 'wip_warehouse',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1
'search_index': 0
}, },
# DocField # DocField
@ -336,7 +314,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'consider_sa_items', 'fieldname': 'consider_sa_items',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 16,
'in_filter': 1, 'in_filter': 1,
'label': 'Consider SA Items', 'label': 'Consider SA Items',
'oldfieldname': 'consider_sa_items', 'oldfieldname': 'consider_sa_items',
@ -349,11 +326,11 @@
# DocField # DocField
{ {
'colour': 'White:FFF', 'colour': 'White:FFF',
'description': 'Updated after finished goods are transferred to FG Warehouse through Stock Entry',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'produced_qty', 'fieldname': 'produced_qty',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 18, 'label': 'Produced Qty',
'label': 'Produced Qty (Updated after finished goods are transferred to FG Warehouse through Stock Entry)',
'oldfieldname': 'produced_qty', 'oldfieldname': 'produced_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 1 'permlevel': 1
@ -364,14 +341,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'company', 'fieldname': 'company',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 19,
'label': 'Company', 'label': 'Company',
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1
'search_index': 0
}, },
# DocField # DocField
@ -379,7 +354,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fiscal_year', 'fieldname': 'fiscal_year',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 20,
'in_filter': 1, 'in_filter': 1,
'label': 'Fiscal Year', 'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year', 'oldfieldname': 'fiscal_year',
@ -393,7 +367,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 21,
'label': 'Next Steps', 'label': 'Next Steps',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -405,7 +378,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 22,
'label': 'Material Transfer', 'label': 'Material Transfer',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -416,7 +388,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 23,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0 'permlevel': 0
}, },
@ -427,7 +398,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 24,
'label': 'Backflush', 'label': 'Backflush',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -438,7 +408,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 25,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0 'permlevel': 0
}, },
@ -449,7 +418,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 26,
'label': 'Stop Production Order', 'label': 'Stop Production Order',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -462,7 +430,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 27,
'label': 'Unstop Production Order', 'label': 'Unstop Production Order',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,

10
setup/doctype/features_setup/features_setup.txt
View File

@ -5,14 +5,14 @@
{ {
'creation': '2011-08-25 16:53:56', 'creation': '2011-08-25 16:53:56',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-08-30 14:27:18', 'modified': '2011-08-31 09:31:39',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1314692719', '_last_update': '1314763100',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
'issingle': 1, 'issingle': 1,
@ -21,7 +21,7 @@
'name_case': 'Title Case', 'name_case': 'Title Case',
'section_style': 'Simple', 'section_style': 'Simple',
'show_in_menu': 1, 'show_in_menu': 1,
'version': 9 'version': 11
}, },
# These values are common for all DocField # These values are common for all DocField
@ -107,7 +107,7 @@
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'after_sale_installations', 'fieldname': 'after_sales_installations',
'fieldtype': 'Check', 'fieldtype': 'Check',
'label': 'After Sale Installations' 'label': 'After Sale Installations'
}, },
@ -146,7 +146,7 @@
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'item_groups_in_groups', 'fieldname': 'item_group_in_details',
'fieldtype': 'Check', 'fieldtype': 'Check',
'label': 'Item Groups in Details' 'label': 'Item Groups in Details'
}, },

8
startup/startup.js
View File

@ -572,7 +572,7 @@ pscript.feature_dict = {
'Delivery Note': {'delivery_note_details':['adj_rate']}, 'Delivery Note': {'delivery_note_details':['adj_rate']},
'Quotation': {'quotation_details':['adj_rate']}, 'Quotation': {'quotation_details':['adj_rate']},
'Receivable Voucher': {'entries':['adj_rate']}, 'Receivable Voucher': {'entries':['adj_rate']},
'Sales Order': {'sales_order_details':['adj_rate']} 'Sales Order': {'sales_order_details':['adj_rate','ref_rate']}
}, },
'brands': { 'brands': {
'Delivery Note': {'delivery_note_details':['brand']}, 'Delivery Note': {'delivery_note_details':['brand']},
@ -586,7 +586,7 @@ pscript.feature_dict = {
'Sales Order': {'sales_order_details':['brand']}, 'Sales Order': {'sales_order_details':['brand']},
'Serial No': {'fields':['brand']} 'Serial No': {'fields':['brand']}
}, },
'after_sale_installations': { 'after_sales_installations': {
'Delivery Note': {'fields':['installation_status','per_installed'],'delivery_note_details':['installed_qty']} 'Delivery Note': {'fields':['installation_status','per_installed'],'delivery_note_details':['installed_qty']}
}, },
'item_batch_nos': { 'item_batch_nos': {
@ -613,7 +613,7 @@ pscript.feature_dict = {
'Stock Entry': {'mtn_details':['serial_no']}, 'Stock Entry': {'mtn_details':['serial_no']},
'Stock Ledger Entry': {'fields':['serial_no']} 'Stock Ledger Entry': {'fields':['serial_no']}
}, },
'item_groups_in_details': { 'item_group_in_details': {
'Delivery Note': {'delivery_note_details':['item_group']}, 'Delivery Note': {'delivery_note_details':['item_group']},
'Enquiry': {'enquiry_details':['item_group']}, 'Enquiry': {'enquiry_details':['item_group']},
'Indent': {'indent_details':['item_group']}, 'Indent': {'indent_details':['item_group']},
@ -718,5 +718,3 @@ $(document).bind('form_refresh', function() {
} }
} }
}) })
$(document).bind('form_refresh', function() { })

6
stock/doctype/item/item.js
View File

@ -110,3 +110,9 @@ cur_frm.cscript.weight_to_validate = function(doc,cdt,cdn){
cur_frm.cscript.validate = function(doc,cdt,cdn){ cur_frm.cscript.validate = function(doc,cdt,cdn){
cur_frm.cscript.weight_to_validate(doc,cdt,cdn); cur_frm.cscript.weight_to_validate(doc,cdt,cdn);
} }
//===========Fill Default Currency in "Ref Rate Details====================
cur_frm.fields_dict['ref_rate_details'].grid.onrowadd = function(doc, cdt, cdn){
locals[cdt][cdn].ref_currency = sys_defaults.currency;
refresh_field('ref_currency',cdn,'ref_rate_details');
}

20
stock/doctype/ref_rate_detail/ref_rate_detail.txt
View File

@ -5,8 +5,8 @@
{ {
'creation': '2010-08-08 17:09:19', 'creation': '2010-08-08 17:09:19',
'docstatus': 0, 'docstatus': 0,
'modified': '2010-09-20 14:06:57', 'modified': '2011-08-31 11:36:41',
'modified_by': 'umair@iwebnotes.com', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@ -23,7 +23,7 @@
'section_style': 'Tray', 'section_style': 'Tray',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 2 'version': 3
}, },
# These values are common for all DocField # These values are common for all DocField
@ -34,7 +34,8 @@
'parent': 'Ref Rate Detail', 'parent': 'Ref Rate Detail',
'parentfield': 'fields', 'parentfield': 'fields',
'parenttype': 'DocType', 'parenttype': 'DocType',
'permlevel': 0 'permlevel': 0,
'search_index': 1
}, },
# DocType, Ref Rate Detail # DocType, Ref Rate Detail
@ -48,13 +49,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'price_list_name', 'fieldname': 'price_list_name',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 1,
'label': 'Price List Name', 'label': 'Price List Name',
'oldfieldname': 'price_list_name', 'oldfieldname': 'price_list_name',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Price List', 'options': 'link:Price List',
'reqd': 1, 'reqd': 1,
'search_index': 1 'trigger': 'Client'
}, },
# DocField # DocField
@ -62,12 +62,10 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'ref_rate', 'fieldname': 'ref_rate',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 2,
'label': 'Ref Rate', 'label': 'Ref Rate',
'oldfieldname': 'ref_rate', 'oldfieldname': 'ref_rate',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'reqd': 0, 'reqd': 0
'search_index': 0
}, },
# DocField # DocField
@ -75,12 +73,10 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'ref_currency', 'fieldname': 'ref_currency',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 3,
'label': 'Currency', 'label': 'Currency',
'oldfieldname': 'ref_currency', 'oldfieldname': 'ref_currency',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Currency', 'options': 'link:Currency',
'reqd': 1, 'reqd': 1
'search_index': 1
} }
] ]