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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2013-03-30 17:47:56 +05:30
commit dc35137e20
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/report/gross_profit/gross_profit.py
View File

@ -14,7 +14,8 @@ def execute(filters=None):
columns = ["Delivery Note/Sales Invoice::120", "Link::30", "Posting Date:Date", "Posting Time", columns = ["Delivery Note/Sales Invoice::120", "Link::30", "Posting Date:Date", "Posting Time",
"Item Code:Link/Item", "Item Name", "Description", "Warehouse:Link/Warehouse", "Item Code:Link/Item", "Item Name", "Description", "Warehouse:Link/Warehouse",
"Qty:Float", "Selling Rate:Currency", "Selling Amount:Currency", "Buying Amount:Currency", "Qty:Float", "Selling Rate:Currency", "Avg. Buying Rate:Currency",
"Selling Amount:Currency", "Buying Amount:Currency",
"Gross Profit:Currency", "Gross Profit %:Percent", "Project:Link/Project"] "Gross Profit:Currency", "Gross Profit %:Percent", "Project:Link/Project"]
data = [] data = []
@ -35,7 +36,8 @@ def execute(filters=None):
icon = """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \ icon = """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \
% ("/".join(["#Form", row.parenttype, row.name]),) % ("/".join(["#Form", row.parenttype, row.name]),)
data.append([row.name, icon, row.posting_date, row.posting_time, row.item_code, row.item_name, data.append([row.name, icon, row.posting_date, row.posting_time, row.item_code, row.item_name,
row.description, row.warehouse, row.qty, row.basic_rate, row.amount, buying_amount, row.description, row.warehouse, row.qty, row.basic_rate,
row.qty and (buying_amount / row.qty) or 0, row.amount, buying_amount,
gross_profit, gross_profit_percent, row.project]) gross_profit, gross_profit_percent, row.project])
return columns, data return columns, data

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

@ -205,25 +205,27 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
}, },
make_return_jv: function() { make_return_jv: function() {
this.frm.call({ if(this.get_doctype_docname()) {
method: "make_return_jv", this.frm.call({
args: { method: "make_return_jv",
stock_entry: this.frm.doc.name args: {
}, stock_entry: this.frm.doc.name
callback: function(r) { },
if(!r.exc) { callback: function(r) {
var jv_name = wn.model.make_new_doc_and_get_name('Journal Voucher'); if(!r.exc) {
var jv = locals["Journal Voucher"][jv_name]; var jv_name = wn.model.make_new_doc_and_get_name('Journal Voucher');
$.extend(jv, r.message[0]); var jv = locals["Journal Voucher"][jv_name];
$.each(r.message.slice(1), function(i, jvd) { $.extend(jv, r.message[0]);
var child = wn.model.add_child(jv, "Journal Voucher Detail", "entries"); $.each(r.message.slice(1), function(i, jvd) {
$.extend(child, jvd); var child = wn.model.add_child(jv, "Journal Voucher Detail", "entries");
}); $.extend(child, jvd);
loaddoc("Journal Voucher", jv_name); });
loaddoc("Journal Voucher", jv_name);
}
} }
});
} }
});
}, },
}); });
@ -358,6 +360,7 @@ cur_frm.cscript.uom = function(doc, cdt, cdn) {
cur_frm.cscript.validate = function(doc, cdt, cdn) { cur_frm.cscript.validate = function(doc, cdt, cdn) {
cur_frm.cscript.validate_items(doc); cur_frm.cscript.validate_items(doc);
validated = cur_frm.cscript.get_doctype_docname() ? true : false;
} }
cur_frm.cscript.validate_items = function(doc) { cur_frm.cscript.validate_items = function(doc) {

6
website/doctype/blogger/blogger.txt
View File

@ -1,8 +1,8 @@
[ [
{ {
"creation": "2013-03-08 11:36:52", "creation": "2013-03-25 16:00:51",
"docstatus": 0, "docstatus": 0,
"modified": "2013-03-11 14:00:37", "modified": "2013-03-29 10:37:37",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -50,6 +50,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "full_name", "fieldname": "full_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Full Name", "label": "Full Name",
"reqd": 1 "reqd": 1
}, },
@ -77,6 +78,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "posts", "fieldname": "posts",
"fieldtype": "Int", "fieldtype": "Int",
"in_list_view": 1,
"label": "Posts", "label": "Posts",
"read_only": 1 "read_only": 1
}, },