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

[cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-10-15 15:54:31 +05:30
parent 1dfcc7557a
commit dd6ebc1a4d
6 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -382,17 +382,6 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center"); cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center");
} }
cur_frm.cscript.copy_account_in_all_row = function(doc, cdt, cdn, fieldname) {
var d = locals[cdt][cdn];
if(d[fieldname]){
var cl = getchildren('Sales Invoice Item', doc.name, cur_frm.cscript.fname, doc.doctype);
for(var i = 0; i < cl.length; i++) {
if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
}
}
refresh_field(cur_frm.cscript.fname);
}
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.sales_invoice)) { if(cint(wn.boot.notification_settings.sales_invoice)) {
cur_frm.email_doc(wn.boot.notification_settings.sales_invoice_message); cur_frm.email_doc(wn.boot.notification_settings.sales_invoice_message);

2
docs/user/setup/docs.user.setup.price_list.md
View File

@ -20,7 +20,7 @@ An Item can have multiple prices based on customer, currency, region, shipping c
> Setup > Item Price > Setup > Item Price
- Enter Price List and Item Code, Valid for Buying or Selling, Item Name & Item Description will be automatically fetched. - Enter Price List and Item Code, Valid for Buying or Selling, Item Name and Item Description will be automatically fetched.
- Enter Rate and save the document. - Enter Rate and save the document.
![Item-Price](img/item-price.png) ![Item-Price](img/item-price.png)

12
public/js/controllers/stock_controller.js
View File

@ -18,6 +18,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
} }
}, },
show_general_ledger: function() { show_general_ledger: function() {
var me = this; var me = this;
if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) { if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) {
@ -30,5 +31,16 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
wn.set_route("general-ledger"); wn.set_route("general-ledger");
}); });
} }
},
copy_account_in_all_row: function(doc, dt, dn, fieldname) {
var d = locals[dt][dn];
if(d[fieldname]){
var cl = getchildren(this.frm.cscript.tname, doc.name, this.frm.cscript.fname, doc.doctype);
for(var i = 0; i < cl.length; i++) {
if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
}
}
refresh_field(this.frm.cscript.fname);
} }
}); });

11
stock/doctype/stock_entry/stock_entry.js
View File

@ -378,17 +378,6 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center"); cur_frm.cscript.copy_account_in_all_row(doc, cdt, cdn, "cost_center");
} }
cur_frm.cscript.copy_account_in_all_row = function(doc, cdt, cdn, fieldname) {
var d = locals[cdt][cdn];
if(d[fieldname]){
var cl = getchildren('Stock Entry Detail', doc.name, cur_frm.cscript.fname, doc.doctype);
for(var i = 0; i < cl.length; i++) {
if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
}
}
refresh_field(cur_frm.cscript.fname);
}
cur_frm.fields_dict.customer.get_query = function(doc, cdt, cdn) { cur_frm.fields_dict.customer.get_query = function(doc, cdt, cdn) {
return{ query:"controllers.queries.customer_query" } return{ query:"controllers.queries.customer_query" }
} }

8
stock/doctype/stock_entry/stock_entry.py
View File

@ -368,7 +368,7 @@ class DocType(StockController):
def get_item_details(self, arg): def get_item_details(self, arg):
arg = json.loads(arg) arg = json.loads(arg)
item = sql("""select stock_uom, description, item_name, item = sql("""select stock_uom, description, item_name,
purchase_account, cost_center from `tabItem` purchase_account, cost_center from `tabItem`
where name = %s and (ifnull(end_of_life,'')='' or end_of_life ='0000-00-00' where name = %s and (ifnull(end_of_life,'')='' or end_of_life ='0000-00-00'
@ -381,9 +381,9 @@ class DocType(StockController):
'stock_uom' : item and item[0]['stock_uom'] or '', 'stock_uom' : item and item[0]['stock_uom'] or '',
'description' : item and item[0]['description'] or '', 'description' : item and item[0]['description'] or '',
'item_name' : item and item[0]['item_name'] or '', 'item_name' : item and item[0]['item_name'] or '',
'expense_account' : item and item[0]['purchase_account'] or arg["expense_account"] \ 'expense_account' : item and item[0]['purchase_account'] or arg.get("expense_account") \
or webnotes.conn.get_value("Company", arg["company"], "default_expense_account"), or webnotes.conn.get_value("Company", arg.get("company"), "default_expense_account"),
'cost_center' : item and item[0]['cost_center'] or arg["cost_center"], 'cost_center' : item and item[0]['cost_center'] or arg.get("cost_center"),
'qty' : 0, 'qty' : 0,
'transfer_qty' : 0, 'transfer_qty' : 0,
'conversion_factor' : 1, 'conversion_factor' : 1,

3
stock/doctype/stock_entry_detail/stock_entry_detail.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-03-29 18:22:12", "creation": "2013-03-29 18:22:12",
"docstatus": 0, "docstatus": 0,
"modified": "2013-08-28 19:25:38", "modified": "2013-10-15 14:58:09",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -154,6 +154,7 @@
"print_hide": 1 "print_hide": 1
}, },
{ {
"default": ":Company",
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:sys_defaults.auto_accounting_for_stock",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "cost_center", "fieldname": "cost_center",