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

fld order change

Browse Source
This commit is contained in:
Nabin Hait 2012-04-27 13:56:58 +05:30
parent 727431b7b1
commit 0d1daa8875
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2012-04-13 11:56:17',
'docstatus': 0,
'modified': '2012-04-23 12:08:52',
'modified': '2012-04-27 11:21:21',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -186,20 +186,6 @@
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'amended_from',
'fieldtype': u'Link',
'label': u'Amended From',
'no_copy': 1,
'oldfieldname': u'amended_from',
'oldfieldtype': u'Link',
'options': u'Purchase Invoice',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
@ -359,6 +345,20 @@
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'amended_from',
'fieldtype': u'Link',
'label': u'Amended From',
'no_copy': 1,
'oldfieldname': u'amended_from',
'oldfieldtype': u'Link',
'options': u'Purchase Invoice',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'description': u'The date at which current entry is corrected in the system.',

2
erpnext/stock/search_criteria/stock_report/stock_report.js
View File

@ -87,4 +87,4 @@ report.get_query = function(){
q = repl("SELECT %(cols)s FROM %(tables)s, `tabStock Ledger Entry` WHERE %(cond)s %(date_cond)s GROUP BY %(group_by)s", {cols:cols, tables:tables, cond:cond, date_cond:date_cond, group_by:group_by});
return q;
}
}