nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict merge

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-06-20 15:22:04 +05:30
parent 92571c6929 616657d4a2
commit e6974d10c2
43 changed files with 862 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
selling/doctype/sales_order/sales_order.js
View File

@@ -130,6 +130,29 @@ cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc
if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
cur_frm.fields_dict.shipping_address_name.get_query = cur_frm.fields_dict['customer_address'].get_query;
cur_frm.cscript.shipping_address_name = function() {
if(cur_frm.doc.shipping_address_name) {
wn.model.with_doc("Address", cur_frm.doc.shipping_address_name, function(name) {
var address = wn.model.get_doc("Address", name);
var out = $.map(["address_line1", "address_line2", "city"],
function(f) { return address[f]; });
var state_pincode = $.map(["state", "pincode"], function(f) { return address[f]; }).join(" ");
if(state_pincode) out.push(state_pincode);
if(address["country"]) out.push(address["country"]);
out.concat($.map([["Phone:", address["phone"]], ["Fax:", address["fax"]]],
function(val) { return val[1] ? val.join(" ") : null; }));
cur_frm.set_value("shipping_address", out.join("\n"));
});
}
};
cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) {
var callback = function(r,rt){
var doc = locals[cur_frm.doctype][cur_frm.docname];

78
selling/doctype/sales_order/sales_order.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-07 14:48:34",
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
"modified": "2013-01-29 17:14:58",
"modified": "2013-06-18 17:49:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -32,6 +32,7 @@
"parent": "Sales Order",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1
},
{
@@ -202,7 +203,7 @@
"label": "Shipping Address Name",
"options": "Address",
"print_hide": 1,
"read_only": 1
"read_only": 0
},
{
"doctype": "DocField",
@@ -950,104 +951,33 @@
"options": "Sales Team",
"print_hide": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "Sales Manager",
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Sales Manager",
"submit": 1,
"write": 1
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"match": "",
"permlevel": 0,
"report": 1,
"role": "Sales User",
"submit": 1,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "Sales User",
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Maintenance Manager",
"submit": 1,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"role": "Maintenance Manager",
"submit": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Maintenance User",
"submit": 1,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"role": "Maintenance User",
"submit": 0
},
{
"doctype": "DocPerm",
"permlevel": 0,
"role": "Accounts User"
},
{
"doctype": "DocPerm",
"match": "customer",
"permlevel": 0,
"role": "Customer"
}
]

10
selling/page/selling_home/selling_home.js
View File

@@ -180,6 +180,16 @@ wn.module_page["Selling"] = [
route: "query-report/Customers Not Buying Since Long Time",
doctype: "Sales Order"
},
{
"label":wn._("Quotation Trend"),
route: "query-report/Quotation Trends",
doctype: "Quotation"
},
{
"label":wn._("Sales Order Trend"),
route: "query-report/Sales Order Trends",
doctype: "Sales Order"
},
]
}
]

0
selling/report/quotation_trends/__init__.py Normal file
View File

5
selling/report/quotation_trends/quotation_trends.js Normal file
View File

@@ -0,0 +1,5 @@
wn.require("app/js/sales_trends_filters.js");
wn.query_reports["Quotation Trends"] = {
filters: get_filters()
}

34
selling/report/quotation_trends/quotation_trends.py Normal file
View File

@@ -0,0 +1,34 @@
# ERPNext - web based ERP (http://erpnext.com)
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
import webnotes
from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Quotation"
tab = ["tabQuotation","tabQuotation Item"]
details = get_columns(filters, trans)
data = get_data(filters, tab, details)
if not data:
webnotes.msgprint("Data not found for selected criterias")
return details["columns"], data

22
selling/report/quotation_trends/quotation_trends.txt Normal file
View File

@@ -0,0 +1,22 @@
[
{
"creation": "2013-06-07 16:01:16",
"docstatus": 0,
"modified": "2013-06-12 16:31:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"add_total_row": 0,
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
"ref_doctype": "Quotation",
"report_name": "Quotation Trends",
"report_type": "Script Report"
},
{
"doctype": "Report",
"name": "Quotation Trends"
}
]

0
selling/report/sales_order_trends/__init__.py Normal file
View File

5
selling/report/sales_order_trends/sales_order_trends.js Normal file
View File

@@ -0,0 +1,5 @@
wn.require("app/js/sales_trends_filters.js");
wn.query_reports["Sales Order Trends"] = {
filters: get_filters()
}

34
selling/report/sales_order_trends/sales_order_trends.py Normal file
View File

@@ -0,0 +1,34 @@
# ERPNext - web based ERP (http://erpnext.com)
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
import webnotes
from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Sales Order"
tab = ["tabSales Order","tabSales Order Item"]
details = get_columns(filters, trans)
data = get_data(filters, tab, details)
if not data :
webnotes.msgprint("Data not found for selected criterias")
return details["columns"], data

21
selling/report/sales_order_trends/sales_order_trends.txt Normal file
View File

@@ -0,0 +1,21 @@
[
{
"creation": "2013-06-13 18:43:30",
"docstatus": 0,
"modified": "2013-06-13 18:43:30",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
"ref_doctype": "Sales Order",
"report_name": "Sales Order Trends",
"report_type": "Script Report"
},
{
"doctype": "Report",
"name": "Sales Order Trends"
}
]