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

project column moved to item table in pur cycle

Browse Source
This commit is contained in:
Nabin Hait 2011-10-20 19:19:07 +05:30
parent 69554511da
commit 57dd62d790
6 changed files with 147 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
View File

@ -412,7 +412,7 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, det) {
}
// ***************** Get project name *****************
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['pv_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) {
return 'SELECT `tabProject`.name FROM `tabProject` WHERE `tabProject`.status = "Open" AND `tabProject`.name LIKE "%s" ORDER BY `tabProject`.name ASC LIMIT 50';
}

38
erpnext/accounts/doctype/pv_detail/pv_detail.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:17',
'docstatus': 0,
'modified': '2011-03-30 11:23:38',
'modified': '2011-10-20 18:41:17',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -14,6 +14,7 @@
{
'autoname': 'EVD.######',
'colour': 'White:FFF',
'default_print_format': 'Standard',
'doctype': 'DocType',
'istable': 1,
'module': 'Accounts',
@ -21,7 +22,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
'version': 26
'version': 27
},
# These values are common for all DocField
@ -44,7 +45,6 @@
'doctype': 'DocField',
'fieldname': 'item_code',
'fieldtype': 'Link',
'idx': 1,
'in_filter': 1,
'label': 'Item',
'oldfieldname': 'item_code',
@ -62,7 +62,6 @@
'doctype': 'DocField',
'fieldname': 'item_name',
'fieldtype': 'Data',
'idx': 2,
'in_filter': 0,
'label': 'Item Name',
'oldfieldname': 'item_name',
@ -77,7 +76,6 @@
'doctype': 'DocField',
'fieldname': 'brand',
'fieldtype': 'Data',
'idx': 3,
'label': 'Brand',
'oldfieldname': 'brand',
'oldfieldtype': 'Data',
@ -90,7 +88,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Text',
'idx': 4,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Text',
@ -103,7 +100,6 @@
'doctype': 'DocField',
'fieldname': 'item_group',
'fieldtype': 'Link',
'idx': 5,
'in_filter': 1,
'label': 'Item Group',
'oldfieldname': 'item_group',
@ -111,7 +107,7 @@
'options': 'Item Group',
'permlevel': 1,
'print_hide': 1,
'search_index': 0
'search_index': 1
},
# DocField
@ -119,7 +115,6 @@
'doctype': 'DocField',
'fieldname': 'rate',
'fieldtype': 'Currency',
'idx': 6,
'label': 'Rate (Default Curr.)',
'oldfieldname': 'rate',
'oldfieldtype': 'Currency',
@ -134,7 +129,6 @@
'doctype': 'DocField',
'fieldname': 'import_rate',
'fieldtype': 'Currency',
'idx': 7,
'label': 'Rate',
'oldfieldname': 'import_rate',
'oldfieldtype': 'Currency',
@ -149,7 +143,6 @@
'doctype': 'DocField',
'fieldname': 'qty',
'fieldtype': 'Currency',
'idx': 8,
'label': 'Qty',
'oldfieldname': 'qty',
'oldfieldtype': 'Currency',
@ -164,7 +157,6 @@
'doctype': 'DocField',
'fieldname': 'amount',
'fieldtype': 'Currency',
'idx': 9,
'label': 'Amount (Default Curr.)',
'oldfieldname': 'amount',
'oldfieldtype': 'Currency',
@ -178,7 +170,6 @@
'doctype': 'DocField',
'fieldname': 'import_amount',
'fieldtype': 'Currency',
'idx': 10,
'label': 'Amount',
'oldfieldname': 'import_amount',
'oldfieldtype': 'Currency',
@ -192,7 +183,6 @@
'doctype': 'DocField',
'fieldname': 'expense_head',
'fieldtype': 'Link',
'idx': 11,
'label': 'Expense Head',
'oldfieldname': 'expense_head',
'oldfieldtype': 'Link',
@ -210,7 +200,6 @@
'doctype': 'DocField',
'fieldname': 'cost_center',
'fieldtype': 'Link',
'idx': 12,
'label': 'Cost Center',
'oldfieldname': 'cost_center',
'oldfieldtype': 'Link',
@ -221,12 +210,24 @@
'width': '120px'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'project_name',
'fieldtype': 'Link',
'in_filter': 1,
'label': 'Project Name',
'options': 'Project',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'purchase_order',
'fieldtype': 'Link',
'idx': 13,
'in_filter': 1,
'label': 'Pur Order',
'oldfieldname': 'purchase_order',
@ -243,7 +244,6 @@
'fieldname': 'po_detail',
'fieldtype': 'Data',
'hidden': 1,
'idx': 14,
'in_filter': 1,
'label': 'PO Detail',
'oldfieldname': 'po_detail',
@ -258,7 +258,6 @@
'doctype': 'DocField',
'fieldname': 'purchase_receipt',
'fieldtype': 'Link',
'idx': 15,
'in_filter': 1,
'label': 'Pur Receipt',
'oldfieldname': 'purchase_receipt',
@ -275,7 +274,6 @@
'fieldname': 'pr_detail',
'fieldtype': 'Data',
'hidden': 1,
'idx': 16,
'in_filter': 1,
'label': 'PR Detail',
'oldfieldname': 'pr_detail',
@ -291,7 +289,6 @@
'doctype': 'DocField',
'fieldname': 'item_tax_rate',
'fieldtype': 'Small Text',
'idx': 17,
'label': 'Item Tax Rate',
'oldfieldname': 'item_tax_rate',
'oldfieldtype': 'Small Text',
@ -306,7 +303,6 @@
'doctype': 'DocField',
'fieldname': 'page_break',
'fieldtype': 'Check',
'idx': 18,
'label': 'Page Break',
'no_copy': 1,
'permlevel': 0,

17
erpnext/buying/doctype/po_detail/po_detail.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:12',
'docstatus': 0,
'modified': '2011-10-12 13:01:05',
'modified': '2011-10-20 18:39:20',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,7 +22,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
'version': 53
'version': 54
},
# These values are common for all DocField
@ -254,6 +254,19 @@
'width': '100px'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'project_name',
'fieldtype': 'Link',
'in_filter': 1,
'label': 'Project Name',
'options': 'Project',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0
},
# DocField
{
'colour': 'White:FFF',

3
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -111,11 +111,10 @@ cur_frm.cscript.transaction_date = function(doc,cdt,cdn){
// ---------------------- Get project name --------------------------
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) {
return 'SELECT `tabProject`.name FROM `tabProject` WHERE `tabProject`.status = "Open" AND `tabProject`.name LIKE "%s" ORDER BY `tabProject`.name ASC LIMIT 50';
}
//==================== Indent No Get Query =======================================================
//===== Only those Indents status != 'Completed' and docstatus = 1 i.e. submitted=================
cur_frm.fields_dict['indent_no'].get_query = function(doc) {

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

@ -105,7 +105,7 @@ cur_frm.cscript.transaction_date = function(doc,cdt,cdn){
}
// ***************** Get project name *****************
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['purchase_receipt_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) {
return 'SELECT `tabProject`.name FROM `tabProject` WHERE `tabProject`.status = "Open" AND `tabProject`.name LIKE "%s" ORDER BY `tabProject`.name ASC LIMIT 50';
}

246
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:16',
'docstatus': 0,
'modified': '2011-03-16 17:12:38',
'modified': '2011-10-20 18:40:15',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -14,6 +14,7 @@
{
'autoname': 'GRND/.#######',
'colour': 'White:FFF',
'default_print_format': 'Standard',
'doctype': 'DocType',
'istable': 1,
'module': 'Stock',
@ -21,7 +22,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
'version': 61
'version': 60
},
# These values are common for all DocField
@ -44,7 +45,6 @@
'doctype': 'DocField',
'fieldname': 'item_code',
'fieldtype': 'Link',
'idx': 1,
'in_filter': 1,
'label': 'Item Code',
'oldfieldname': 'item_code',
@ -62,7 +62,6 @@
'doctype': 'DocField',
'fieldname': 'item_name',
'fieldtype': 'Data',
'idx': 2,
'in_filter': 0,
'label': 'Item Name',
'oldfieldname': 'item_name',
@ -78,7 +77,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Text',
'idx': 3,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Text',
@ -87,31 +85,12 @@
'width': '300px'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'uom',
'fieldtype': 'Link',
'idx': 4,
'label': 'UOM',
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'UOM',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
'trigger': 'Client',
'width': '100px'
},
# DocField
{
'default': '0.00',
'doctype': 'DocField',
'fieldname': 'received_qty',
'fieldtype': 'Currency',
'idx': 5,
'label': 'Recd Quantity',
'oldfieldname': 'received_qty',
'oldfieldtype': 'Currency',
@ -121,28 +100,12 @@
'width': '100px'
},
# DocField
{
'default': '0.00',
'doctype': 'DocField',
'fieldname': 'qty',
'fieldtype': 'Currency',
'idx': 6,
'label': 'Accepted Quantity',
'oldfieldname': 'qty',
'oldfieldtype': 'Currency',
'permlevel': 0,
'trigger': 'Client',
'width': '100px'
},
# DocField
{
'default': '0.00',
'doctype': 'DocField',
'fieldname': 'rejected_qty',
'fieldtype': 'Currency',
'idx': 7,
'in_filter': 0,
'label': 'Rejected Quantity',
'oldfieldname': 'rejected_qty',
@ -160,7 +123,6 @@
'doctype': 'DocField',
'fieldname': 'purchase_rate',
'fieldtype': 'Currency',
'idx': 8,
'label': 'Rate (Default Curr.)',
'oldfieldname': 'purchase_rate',
'oldfieldtype': 'Currency',
@ -171,13 +133,26 @@
'width': '100px'
},
# DocField
{
'default': '0.00',
'doctype': 'DocField',
'fieldname': 'qty',
'fieldtype': 'Currency',
'label': 'Accepted Quantity',
'oldfieldname': 'qty',
'oldfieldtype': 'Currency',
'permlevel': 0,
'trigger': 'Client',
'width': '100px'
},
# DocField
{
'default': '0.00',
'doctype': 'DocField',
'fieldname': 'amount',
'fieldtype': 'Currency',
'idx': 9,
'label': 'Amount (Default Curr.)',
'oldfieldname': 'amount',
'oldfieldtype': 'Currency',
@ -192,32 +167,15 @@
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'schedule_date',
'fieldtype': 'Date',
'idx': 10,
'label': 'Schedule date',
'no_copy': 1,
'oldfieldname': 'schedule_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'warehouse',
'fieldname': 'uom',
'fieldtype': 'Link',
'hidden': 0,
'idx': 11,
'label': 'Accepted Warehouse',
'oldfieldname': 'warehouse',
'label': 'UOM',
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'options': 'UOM',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
'trigger': 'Client',
'width': '100px'
},
@ -228,7 +186,6 @@
'doctype': 'DocField',
'fieldname': 'import_rate',
'fieldtype': 'Currency',
'idx': 12,
'label': 'Rate',
'oldfieldname': 'import_rate',
'oldfieldtype': 'Currency',
@ -243,7 +200,6 @@
'doctype': 'DocField',
'fieldname': 'import_amount',
'fieldtype': 'Currency',
'idx': 13,
'label': 'Amount',
'oldfieldname': 'import_amount',
'oldfieldtype': 'Currency',
@ -255,7 +211,6 @@
'doctype': 'DocField',
'fieldname': 'conversion_factor',
'fieldtype': 'Currency',
'idx': 14,
'label': 'Conversion Factor',
'oldfieldname': 'conversion_factor',
'oldfieldtype': 'Currency',
@ -266,12 +221,26 @@
'width': '100px'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'warehouse',
'fieldtype': 'Link',
'hidden': 0,
'label': 'Accepted Warehouse',
'oldfieldname': 'warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 0,
'print_hide': 0,
'width': '100px'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'stock_uom',
'fieldtype': 'Data',
'idx': 15,
'label': 'Stock UOM',
'oldfieldname': 'stock_uom',
'oldfieldtype': 'Data',
@ -283,17 +252,65 @@
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'stock_qty',
'fieldtype': 'Currency',
'idx': 16,
'label': 'Stock Qty',
'oldfieldname': 'stock_qty',
'oldfieldtype': 'Currency',
'fieldname': 'rejected_warehouse',
'fieldtype': 'Link',
'hidden': 1,
'label': 'Rejected Warehouse',
'no_copy': 1,
'oldfieldname': 'rejected_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 1,
'print_hide': 1,
'width': '100px'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'brand',
'fieldtype': 'Link',
'hidden': 1,
'label': 'Brand',
'oldfieldname': 'brand',
'oldfieldtype': 'Link',
'options': 'Brand',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'item_group',
'fieldtype': 'Link',
'hidden': 1,
'in_filter': 1,
'label': 'Item Group',
'oldfieldname': 'item_group',
'oldfieldtype': 'Link',
'options': 'Item Group',
'permlevel': 1,
'print_hide': 1,
'search_index': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'schedule_date',
'fieldtype': 'Date',
'label': 'Schedule date',
'no_copy': 1,
'oldfieldname': 'schedule_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Client',
'width': '100px'
'report_hide': 0,
'reqd': 1
},
# DocField
@ -302,7 +319,7 @@
'doctype': 'DocField',
'fieldname': 'serial_no',
'fieldtype': 'Text',
'idx': 17,
'in_filter': 1,
'label': 'Serial No',
'no_copy': 1,
'oldfieldname': 'serial_no',
@ -318,84 +335,55 @@
'doctype': 'DocField',
'fieldname': 'batch_no',
'fieldtype': 'Link',
'idx': 18,
'label': 'Batch No',
'oldfieldname': 'batch_no',
'oldfieldtype': 'Link',
'options': 'Batch',
'permlevel': 0,
'print_hide': 1,
'search_index': 0,
'trigger': 'Client'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'rejected_warehouse',
'fieldtype': 'Link',
'hidden': 1,
'idx': 19,
'label': 'Rejected Warehouse',
'no_copy': 1,
'oldfieldname': 'rejected_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 1,
'print_hide': 1,
'search_index': 0,
'width': '100px'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'qa_no',
'fieldtype': 'Link',
'idx': 20,
'label': 'QA No',
'no_copy': 1,
'oldfieldname': 'qa_no',
'oldfieldtype': 'Link',
'options': 'QA Inspection Report',
'permlevel': 0,
'print_hide': 1,
'search_index': 0
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'brand',
'fieldtype': 'Link',
'hidden': 1,
'idx': 21,
'label': 'Brand',
'oldfieldname': 'brand',
'oldfieldtype': 'Link',
'options': 'Brand',
'permlevel': 1,
'fieldname': 'stock_qty',
'fieldtype': 'Currency',
'label': 'Stock Qty',
'oldfieldname': 'stock_qty',
'oldfieldtype': 'Currency',
'permlevel': 0,
'print_hide': 1,
'search_index': 0
'trigger': 'Client',
'width': '100px'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'item_group',
'fieldname': 'project_name',
'fieldtype': 'Link',
'hidden': 1,
'idx': 22,
'in_filter': 1,
'label': 'Item Group',
'oldfieldname': 'item_group',
'oldfieldtype': 'Link',
'options': 'Item Group',
'permlevel': 1,
'print_hide': 1,
'search_index': 0
'label': 'Project Name',
'options': 'Project',
'permlevel': 0,
'print_hide': 1
},
# DocField
@ -405,7 +393,6 @@
'fieldname': 'prevdoc_doctype',
'fieldtype': 'Data',
'hidden': 1,
'idx': 23,
'label': 'Prevdoc Doctype',
'oldfieldname': 'prevdoc_doctype',
'oldfieldtype': 'Data',
@ -420,7 +407,6 @@
'fieldname': 'prevdoc_docname',
'fieldtype': 'Link',
'hidden': 0,
'idx': 24,
'in_filter': 1,
'label': 'PO No',
'no_copy': 0,
@ -440,7 +426,6 @@
'fieldname': 'prevdoc_date',
'fieldtype': 'Date',
'hidden': 1,
'idx': 25,
'in_filter': 1,
'label': 'PO Date',
'oldfieldname': 'prevdoc_date',
@ -455,7 +440,6 @@
'fieldname': 'rm_supp_cost',
'fieldtype': 'Currency',
'hidden': 1,
'idx': 26,
'in_filter': 0,
'label': 'Raw Materials Supplied Cost',
'oldfieldname': 'rm_supp_cost',
@ -471,7 +455,6 @@
'fieldname': 'item_tax_amount',
'fieldtype': 'Currency',
'hidden': 1,
'idx': 27,
'label': 'Item Tax Amount',
'no_copy': 1,
'oldfieldname': 'item_tax_amount',
@ -479,7 +462,7 @@
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'search_index': 0,
'search_index': 1,
'width': '150px'
},
@ -490,7 +473,6 @@
'fieldname': 'prevdoc_detail_docname',
'fieldtype': 'Data',
'hidden': 1,
'idx': 28,
'in_filter': 1,
'label': 'PO Detail No',
'no_copy': 0,
@ -508,7 +490,6 @@
'doctype': 'DocField',
'fieldname': 'billed_qty',
'fieldtype': 'Currency',
'idx': 29,
'label': 'Billed Quantity',
'no_copy': 1,
'oldfieldname': 'billed_qty',
@ -523,8 +504,7 @@
'doctype': 'DocField',
'fieldname': 'valuation_rate',
'fieldtype': 'Currency',
'hidden': 0,
'idx': 30,
'hidden': 1,
'in_filter': 0,
'label': 'Valuation Rate',
'no_copy': 1,
@ -542,7 +522,6 @@
'fieldname': 'item_tax_rate',
'fieldtype': 'Small Text',
'hidden': 1,
'idx': 31,
'in_filter': 0,
'label': 'Item Tax Rate',
'oldfieldname': 'item_tax_rate',
@ -558,7 +537,6 @@
'doctype': 'DocField',
'fieldname': 'page_break',
'fieldtype': 'Check',
'idx': 32,
'label': 'Page Break',
'oldfieldname': 'page_break',
'oldfieldtype': 'Check',