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

Merge pull request #1966 from anandpdoshi/anand-july-21

Browse Source 
Stock Entry Warehouse prefill, Item autosuggest by description
This commit is contained in:
Anand Doshi 2014-07-21 18:25:16 +05:30
commit 6e15f675a5
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/general_ledger/general_ledger.html
View File

@ -27,7 +27,7 @@
<td>{%= data[i].voucher_type%} <td>{%= data[i].voucher_type%}
<br>{%= data[i].voucher_no %}</td> <br>{%= data[i].voucher_no %}</td>
<td>{%= data[i].account %} <td>{%= data[i].account %}
<br>{%= __("Against") %}: {%= data[i].account %} <br>{%= __("Against") %}: {%= data[i].against_account %}
<br>{%= __("Remarks") %}: {%= data[i].remarks %}</td> <br>{%= __("Remarks") %}: {%= data[i].remarks %}</td>
<td style="text-align: right">{%= format_currency(data[i].debit) %}</td> <td style="text-align: right">{%= format_currency(data[i].debit) %}</td>
<td style="text-align: right">{%= format_currency(data[i].credit) %}</td> <td style="text-align: right">{%= format_currency(data[i].credit) %}</td>

3
erpnext/controllers/queries.py
View File

@ -167,7 +167,8 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
where tabItem.docstatus < 2 where tabItem.docstatus < 2
and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00') and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
and (tabItem.`{key}` LIKE %(txt)s and (tabItem.`{key}` LIKE %(txt)s
or tabItem.item_name LIKE %(txt)s) or tabItem.item_name LIKE %(txt)s
or tabItem.description LIKE %(txt)s)
{fcond} {mcond} {fcond} {mcond}
order by order by
if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999), if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),

30
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -230,6 +230,36 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse; if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
}, },
source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return"],
target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return"],
from_warehouse: function(doc) {
var me = this;
this.set_warehouse_if_missing("s_warehouse", doc.from_warehouse, function(row) {
return me.source_mandatory.indexOf(me.frm.doc.purpose)!==-1;
});
},
to_warehouse: function(doc) {
var me = this;
this.set_warehouse_if_missing("t_warehouse", doc.to_warehouse, function(row) {
return me.target_mandatory.indexOf(me.frm.doc.purpose)!==-1;
});
},
set_warehouse_if_missing: function(fieldname, value, condition) {
for (var i=0, l=(this.frm.doc.mtn_details || []).length; i<l; i++) {
var row = this.frm.doc.mtn_details[i];
if (!row[fieldname]) {
if (condition && !condition(row)) {
continue;
}
frappe.model.set_value(row.doctype, row.name, fieldname, value, "Link");
}
}
},
mtn_details_on_form_rendered: function(doc, grid_row) { mtn_details_on_form_rendered: function(doc, grid_row) {
erpnext.setup_serial_no(grid_row) erpnext.setup_serial_no(grid_row)
}, },