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

Merge pull request #3303 from rmehta/letter-head-in-stock-entry

Browse Source 
[enhancement] letter head in stock entry #3291
This commit is contained in:
Nabin Hait 2015-05-21 13:20:26 +05:30
commit 7f8d6b6252
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
return erpnext.queries.item({is_stock_item: "Yes"}); return erpnext.queries.item({is_stock_item: "Yes"});
} }
}; };
this.frm.set_query("purchase_order", function() { this.frm.set_query("purchase_order", function() {
return { return {
"filters": { "filters": {
@ -68,8 +68,13 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
}, },
onload_post_render: function() { onload_post_render: function() {
var me = this;
cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty"); cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
this.set_default_account(); this.set_default_account(function() {
if(me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
cur_frm.script_manager.trigger("company");
}
});
}, },
refresh: function() { refresh: function() {
@ -102,7 +107,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
this.clean_up(); this.clean_up();
}, },
set_default_account: function() { set_default_account: function(callback) {
var me = this; var me = this;
if(cint(frappe.defaults.get_default("auto_accounting_for_stock")) && this.frm.doc.company) { if(cint(frappe.defaults.get_default("auto_accounting_for_stock")) && this.frm.doc.company) {
@ -122,6 +127,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
$.each(me.frm.doc.items || [], function(i, d) { $.each(me.frm.doc.items || [], function(i, d) {
if(!d.expense_account) d.expense_account = r.message; if(!d.expense_account) d.expense_account = r.message;
}); });
if(callback) callback();
} }
} }
}); });
@ -521,7 +527,14 @@ cur_frm.fields_dict.supplier.get_query = function(doc, cdt, cdn) {
} }
cur_frm.cscript.company = function(doc, cdt, cdn) { cur_frm.cscript.company = function(doc, cdt, cdn) {
erpnext.get_fiscal_year(doc.company, doc.posting_date); if(doc.company) {
erpnext.get_fiscal_year(doc.company, doc.posting_date, function() {
var company_doc = frappe.get_doc(":Company", doc.company);
if(company_doc.default_letter_head) {
cur_frm.set_value("letter_head", company_doc.default_letter_head);
}
});
}
} }
cur_frm.cscript.posting_date = function(doc, cdt, cdn){ cur_frm.cscript.posting_date = function(doc, cdt, cdn){

10
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -632,6 +632,14 @@
"reqd": 0, "reqd": 0,
"search_index": 0 "search_index": 0
}, },
{
"fieldname": "letter_head",
"fieldtype": "Link",
"label": "Letter Head",
"options": "Letter Head",
"permlevel": 0,
"precision": ""
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "amended_from", "fieldname": "amended_from",
@ -670,7 +678,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2015-03-03 18:09:12.035606", "modified": "2015-05-20 07:58:59.025553",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",