Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut
diff --git a/patches/patch.py b/patches/patch.py
index 6bb134f..c8b0472 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -2,7 +2,7 @@
# ========================
-last_patch = 351
+last_patch = 352
#-------------------------------------------
@@ -268,7 +268,7 @@
delete_doc('Custom Script', 'Profile-Client')
delete_doc('Custom Script', 'Event-Client')
delete_doc('Custom Script', 'File-Server')
-
+
# reload profile with new fields for security
delete_doc('DocType', 'Profile')
reload_doc('core', 'doctype', 'profile')
@@ -277,3 +277,7 @@
reload_doc('stock', 'doctype', 'item_customer_detail')
elif patch_no == 351:
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'")
diff --git a/production/doctype/production_order/production_order.txt b/production/doctype/production_order/production_order.txt
index c927edf..9226fd0 100644
--- a/production/doctype/production_order/production_order.txt
+++ b/production/doctype/production_order/production_order.txt
@@ -5,13 +5,14 @@
{
'creation': '2010-08-08 17:09:14',
'docstatus': 0,
- 'modified': '2010-12-23 11:08:12',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-08-31 10:03:21',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
+ '_last_update': '1313485457',
'colour': 'White:FFF',
'doctype': 'DocType',
'in_create': 0,
@@ -20,7 +21,7 @@
'section_style': 'Tabbed',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 179
+ 'version': 180
},
# These values are common for all DocField
@@ -54,7 +55,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 1,
'permlevel': 0,
'role': 'System Manager',
'submit': 1,
@@ -64,7 +64,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 2,
'permlevel': 1,
'role': 'All'
},
@@ -75,7 +74,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 3,
'permlevel': 0,
'role': 'Production Manager',
'submit': 1,
@@ -88,7 +86,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 4,
'permlevel': 0,
'role': 'Production User',
'submit': 1,
@@ -99,7 +96,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 1,
'label': 'Production Order',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -112,7 +108,6 @@
'doctype': 'DocField',
'fieldname': 'transaction_date',
'fieldtype': 'Date',
- 'idx': 2,
'label': 'Transaction Date',
'oldfieldname': 'transaction_date',
'oldfieldtype': 'Date',
@@ -127,7 +122,6 @@
'doctype': 'DocField',
'fieldname': 'posting_date',
'fieldtype': 'Date',
- 'idx': 3,
'label': 'Posting Date',
'oldfieldname': 'posting_date',
'oldfieldtype': 'Date',
@@ -142,7 +136,6 @@
'doctype': 'DocField',
'fieldname': 'production_item',
'fieldtype': 'Link',
- 'idx': 4,
'in_filter': 1,
'label': 'Production Item',
'oldfieldname': 'production_item',
@@ -158,7 +151,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Text',
- 'idx': 5,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Text',
@@ -173,14 +165,12 @@
'doctype': 'DocField',
'fieldname': 'bom_no',
'fieldtype': 'Link',
- 'idx': 7,
'label': 'BOM No',
'oldfieldname': 'bom_no',
'oldfieldtype': 'Link',
'options': 'Bill Of Materials',
'permlevel': 1,
'reqd': 1,
- 'search_index': 0,
'trigger': 'Client'
},
@@ -189,7 +179,6 @@
'doctype': 'DocField',
'fieldname': 'origin',
'fieldtype': 'Select',
- 'idx': 8,
'in_filter': 1,
'label': 'Origin',
'no_copy': 1,
@@ -207,7 +196,6 @@
'doctype': 'DocField',
'fieldname': 'qty',
'fieldtype': 'Currency',
- 'idx': 9,
'label': 'Qty',
'oldfieldname': 'qty',
'oldfieldtype': 'Currency',
@@ -221,7 +209,6 @@
'doctype': 'DocField',
'fieldname': 'project_name',
'fieldtype': 'Link',
- 'idx': 9,
'in_filter': 1,
'label': 'Project Name',
'oldfieldname': 'project_name',
@@ -236,7 +223,6 @@
'doctype': 'DocField',
'fieldname': 'amended_from',
'fieldtype': 'Data',
- 'idx': 10,
'label': 'Amended From',
'oldfieldname': 'amended_from',
'oldfieldtype': 'Data',
@@ -248,7 +234,6 @@
'doctype': 'DocField',
'fieldname': 'amendment_date',
'fieldtype': 'Date',
- 'idx': 11,
'label': 'Amendment Date',
'oldfieldname': 'amendment_date',
'oldfieldtype': 'Date',
@@ -259,7 +244,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 12,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -269,7 +253,6 @@
'doctype': 'DocField',
'fieldname': 'stock_uom',
'fieldtype': 'Data',
- 'idx': 12,
'label': 'Stock UOM',
'oldfieldname': 'stock_uom',
'oldfieldtype': 'Data',
@@ -281,7 +264,6 @@
'doctype': 'DocField',
'fieldname': 'status',
'fieldtype': 'Select',
- 'idx': 13,
'in_filter': 1,
'label': 'Status',
'no_copy': 1,
@@ -300,15 +282,13 @@
'doctype': 'DocField',
'fieldname': 'fg_warehouse',
'fieldtype': 'Link',
- 'idx': 14,
'in_filter': 1,
'label': 'FG Warehouse',
'oldfieldname': 'fg_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -318,15 +298,13 @@
'doctype': 'DocField',
'fieldname': 'wip_warehouse',
'fieldtype': 'Link',
- 'idx': 15,
'in_filter': 1,
'label': 'WIP Warehouse',
'oldfieldname': 'wip_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -336,7 +314,6 @@
'doctype': 'DocField',
'fieldname': 'consider_sa_items',
'fieldtype': 'Select',
- 'idx': 16,
'in_filter': 1,
'label': 'Consider SA Items',
'oldfieldname': 'consider_sa_items',
@@ -349,11 +326,11 @@
# DocField
{
'colour': 'White:FFF',
+ 'description': 'Updated after finished goods are transferred to FG Warehouse through Stock Entry',
'doctype': 'DocField',
'fieldname': 'produced_qty',
'fieldtype': 'Currency',
- 'idx': 18,
- 'label': 'Produced Qty (Updated after finished goods are transferred to FG Warehouse through Stock Entry)',
+ 'label': 'Produced Qty',
'oldfieldname': 'produced_qty',
'oldfieldtype': 'Currency',
'permlevel': 1
@@ -364,14 +341,12 @@
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
- 'idx': 19,
'label': 'Company',
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -379,7 +354,6 @@
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Select',
- 'idx': 20,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
@@ -393,7 +367,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 21,
'label': 'Next Steps',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -405,7 +378,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 22,
'label': 'Material Transfer',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -416,7 +388,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 23,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -427,7 +398,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 24,
'label': 'Backflush',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -438,7 +408,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 25,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -449,7 +418,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 26,
'label': 'Stop Production Order',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -462,7 +430,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 27,
'label': 'Unstop Production Order',
'oldfieldtype': 'Button',
'permlevel': 0,
diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt
index f95a8e7..ca0d2d4 100644
--- a/setup/doctype/features_setup/features_setup.txt
+++ b/setup/doctype/features_setup/features_setup.txt
@@ -5,14 +5,14 @@
{
'creation': '2011-08-25 16:53:56',
'docstatus': 0,
- 'modified': '2011-08-30 14:27:18',
+ 'modified': '2011-08-31 09:31:39',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1314692719',
+ '_last_update': '1314763100',
'colour': 'White:FFF',
'doctype': 'DocType',
'issingle': 1,
@@ -21,7 +21,7 @@
'name_case': 'Title Case',
'section_style': 'Simple',
'show_in_menu': 1,
- 'version': 9
+ 'version': 11
},
# These values are common for all DocField
@@ -107,7 +107,7 @@
# DocField
{
'doctype': 'DocField',
- 'fieldname': 'after_sale_installations',
+ 'fieldname': 'after_sales_installations',
'fieldtype': 'Check',
'label': 'After Sale Installations'
},
@@ -146,7 +146,7 @@
# DocField
{
'doctype': 'DocField',
- 'fieldname': 'item_groups_in_groups',
+ 'fieldname': 'item_group_in_details',
'fieldtype': 'Check',
'label': 'Item Groups in Details'
},
diff --git a/startup/startup.js b/startup/startup.js
index 046a320..1ec66d5 100644
--- a/startup/startup.js
+++ b/startup/startup.js
@@ -572,7 +572,7 @@
'Delivery Note': {'delivery_note_details':['adj_rate']},
'Quotation': {'quotation_details':['adj_rate']},
'Receivable Voucher': {'entries':['adj_rate']},
- 'Sales Order': {'sales_order_details':['adj_rate']}
+ 'Sales Order': {'sales_order_details':['adj_rate','ref_rate']}
},
'brands': {
'Delivery Note': {'delivery_note_details':['brand']},
@@ -586,7 +586,7 @@
'Sales Order': {'sales_order_details':['brand']},
'Serial No': {'fields':['brand']}
},
- 'after_sale_installations': {
+ 'after_sales_installations': {
'Delivery Note': {'fields':['installation_status','per_installed'],'delivery_note_details':['installed_qty']}
},
'item_batch_nos': {
@@ -613,7 +613,7 @@
'Stock Entry': {'mtn_details':['serial_no']},
'Stock Ledger Entry': {'fields':['serial_no']}
},
- 'item_groups_in_details': {
+ 'item_group_in_details': {
'Delivery Note': {'delivery_note_details':['item_group']},
'Enquiry': {'enquiry_details':['item_group']},
'Indent': {'indent_details':['item_group']},
@@ -718,5 +718,3 @@
}
}
})
-
-$(document).bind('form_refresh', function() { })
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 6dd7377..691e259 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -110,3 +110,9 @@
cur_frm.cscript.validate = function(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');
+}
\ No newline at end of file
diff --git a/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
index 1774b08..3f9b5a7 100644
--- a/stock/doctype/ref_rate_detail/ref_rate_detail.txt
+++ b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:19',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-08-31 11:36:41',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -23,7 +23,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 2
+ 'version': 3
},
# These values are common for all DocField
@@ -34,7 +34,8 @@
'parent': 'Ref Rate Detail',
'parentfield': 'fields',
'parenttype': 'DocType',
- 'permlevel': 0
+ 'permlevel': 0,
+ 'search_index': 1
},
# DocType, Ref Rate Detail
@@ -48,13 +49,12 @@
'doctype': 'DocField',
'fieldname': 'price_list_name',
'fieldtype': 'Select',
- 'idx': 1,
'label': 'Price List Name',
'oldfieldname': 'price_list_name',
'oldfieldtype': 'Select',
'options': 'link:Price List',
'reqd': 1,
- 'search_index': 1
+ 'trigger': 'Client'
},
# DocField
@@ -62,12 +62,10 @@
'doctype': 'DocField',
'fieldname': 'ref_rate',
'fieldtype': 'Currency',
- 'idx': 2,
'label': 'Ref Rate',
'oldfieldname': 'ref_rate',
'oldfieldtype': 'Currency',
- 'reqd': 0,
- 'search_index': 0
+ 'reqd': 0
},
# DocField
@@ -75,12 +73,10 @@
'doctype': 'DocField',
'fieldname': 'ref_currency',
'fieldtype': 'Select',
- 'idx': 3,
'label': 'Currency',
'oldfieldname': 'ref_currency',
'oldfieldtype': 'Select',
'options': 'link:Currency',
- 'reqd': 1,
- 'search_index': 1
+ 'reqd': 1
}
]
\ No newline at end of file