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

fix in last sales and quote rate in quotation

Browse Source
This commit is contained in:
Anand Doshi 2012-07-16 16:33:10 +05:30
parent e7c54a4714
commit 8499773db8
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
erpnext/selling/doctype/quotation/quotation.js
View File

@ -283,35 +283,51 @@ cur_frm.cscript.validate = function(doc,cdt,cdn){
//================ Last Quoted Price and Last Sold Price suggestion ====================== //================ Last Quoted Price and Last Sold Price suggestion ======================
cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query= function(doc, cdt, cdn) { cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query= function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
var cond = (doc.order_type == 'Maintenance')? " and tabItem.is_service_item = 'Yes'" : " and tabItem.is_sales_item = 'Yes'" var cond = (doc.order_type == 'Maintenance') ? " and item.is_service_item = 'Yes'" : " and item.is_sales_item = 'Yes'";
if(doc.customer) if(doc.customer) {
return repl("SELECT i.name,i.item_code,concat('Last quoted at - ',cast(quote_rate as char)) as quote_rate,concat('Last sold at - ',cast(sales_rate as char)) as sales_rate, i.item_name, i.description FROM\ var export_rate_field = wn.meta.get_docfield(cdt, 'export_rate', cdn);
var precision = (export_rate_field && export_rate_field.fieldtype) === 'Float' ? 6 : 2;
return repl("\
select \
item.name, \
( \ ( \
select item_code,name, item_name, description from tabItem where tabItem.%(key)s like '%s' %(cond)s\ select concat('Last Quote @ ', q.currency, ' ', \
)i\ format(q_item.export_rate, %(precision)s)) \
left join\ from `tabQuotation` q, `tabQuotation Item` q_item \
where \
q.name = q_item.parent \
and q_item.item_code = item.name \
and q.docstatus = 1 \
and q.customer = \"%(cust)s\" \
order by q.transaction_date desc \
limit 1 \
) as quote_rate, \
( \ ( \
select q.item_code,q.quote_rate from\ select concat('Last Sale @ ', si.currency, ' ', \
(\ format(si_item.basic_rate, %(precision)s)) \
select q.transaction_date,qd.item_code,qd.basic_rate as quote_rate from `tabQuotation Item` qd, `tabQuotation` q where q.name=qd.parent and q.docstatus=1 and customer='%(cust)s'\ from `tabSales Invoice` si, `tabSales Invoice Item` si_item \
)q,\ where \
(\ si.name = si_item.parent \
select qd.item_code,max(q.transaction_date) as transaction_date from `tabQuotation Item` qd, `tabQuotation` q where q.name=qd.parent and q.docstatus=1 and customer='%(cust)s' group by qd.item_code\ and si_item.item_code = item.name \
)m where q.item_code=m.item_code and q.transaction_date=m.transaction_date\ and si.docstatus = 1 \
)q on i.item_code=q.item_code\ and si.customer = \"%(cust)s\" \
left join\ order by si.voucher_date desc \
(\ limit 1 \
select r.item_code,r.sales_rate from\ ) as sales_rate, \
(\ item.item_name, item.description \
select r.voucher_date,rd.item_code,rd.basic_rate as sales_rate from `tabSales Invoice Item` rd, `tabSales Invoice` r where r.name=rd.parent and r.docstatus=1 and r.customer='%(cust)s'\ from `tabItem` item \
)r,\ where \
(\ item.%(key)s like \"%s\" \
select rd.item_code,max(r.voucher_date) as voucher_date from `tabSales Invoice Item` rd, `tabSales Invoice` r where r.name=rd.parent and r.docstatus=1 and r.customer='%(cust)s' group by rd.item_code\ %(cond)s \
)m where r.item_code=m.item_code and r.voucher_date=m.voucher_date\ limit 25", {
)s on i.item_code=s.item_code ORDER BY i.item_code LIMIT 50",{cust:doc.customer, cond:cond}); cust: doc.customer,
else cond: cond,
precision: precision
});
} else {
return repl("SELECT name, item_name, description FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' %(cond)s ORDER BY tabItem.item_code DESC LIMIT 50", {cond:cond}); return repl("SELECT name, item_name, description FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' %(cond)s ORDER BY tabItem.item_code DESC LIMIT 50", {cond:cond});
} }
}
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = { var args = {