nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Rushabh Mehta
2012-11-29 16:30:57 +05:30
parent 64cb05c3c1 375ba8ef0a
commit b12d5363bc
29 changed files with 7988 additions and 9863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1027
selling/doctype/customer/customer.txt
View File

File diff suppressed because it is too large Load Diff

1158
selling/doctype/opportunity/opportunity.txt
View File

File diff suppressed because it is too large Load Diff

18
selling/doctype/quotation/quotation.txt
View File

@@ -2,7 +2,7 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-11-02 17:16:44",
"creation": "2012-11-28 11:26:20",
"modified_by": "Administrator",
"modified": "2012-11-26 11:57:10"
},
@@ -40,16 +40,6 @@
"name": "Quotation",
"doctype": "DocType"
},
{
"print_hide": 1,
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Basic Info",
"fieldname": "basic_info",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"doctype": "DocField",
"width": "50%",
@@ -245,9 +235,9 @@
"permlevel": 0
},
{
"allow_on_submit": 1,
"oldfieldtype": "Table",
"colour": "White:FFF",
"allow_on_submit": 1,
"doctype": "DocField",
"label": "Quotation Items",
"oldfieldname": "quotation_details",
@@ -739,8 +729,8 @@
},
{
"print_hide": 1,
"allow_on_submit": 1,
"oldfieldtype": "Select",
"allow_on_submit": 1,
"doctype": "DocField",
"label": "Letter Head",
"oldfieldname": "letter_head",
@@ -861,8 +851,8 @@
"permlevel": 0
},
{
"permlevel": 1,
"print_hide": 1,
"permlevel": 1,
"no_copy": 1,
"oldfieldtype": "Select",
"colour": "White:FFF",

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

@@ -92,6 +92,16 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Sales Order']);
}
}
cur_frm.cscript.order_type(doc);
}
cur_frm.cscript.order_type = function(doc) {
if(doc.order_type == "Sales") {
cur_frm.toggle_reqd("delivery_date", 1);
} else {
cur_frm.toggle_reqd("delivery_date", 0);
}
}
//customer

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

@@ -2,7 +2,7 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-11-24 17:21:44",
"creation": "2012-11-28 11:26:20",
"modified_by": "Administrator",
"modified": "2012-11-26 11:56:33"
},
@@ -38,16 +38,6 @@
"name": "Sales Order",
"doctype": "DocType"
},
{
"print_hide": 1,
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Basic Info",
"fieldname": "basic_info",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"oldfieldtype": "Column Break",
"doctype": "DocField",
@@ -734,8 +724,8 @@
},
{
"print_hide": 1,
"oldfieldtype": "Select",
"allow_on_submit": 1,
"oldfieldtype": "Select",
"doctype": "DocField",
"label": "Letter Head",
"oldfieldname": "letter_head",
@@ -835,17 +825,17 @@
},
{
"print_hide": 1,
"doctype": "DocField",
"no_copy": 1,
"depends_on": "eval:!doc.__islocal",
"colour": "White:FFF",
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "Cancel Reason",
"oldfieldname": "cancel_reason",
"permlevel": 1,
"fieldname": "cancel_reason",
"fieldtype": "Data",
"no_column": 0,
"permlevel": 1
"oldfieldtype": "Data"
},
{
"print_hide": 1,

2
selling/page/sales_analytics/sales_analytics.js
View File

@@ -136,7 +136,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
},
init_filter_values: function() {
this._super();
this.filter_inputs.range.val('Weekly');
this.filter_inputs.range.val('Monthly');
},
prepare_data: function() {
var me = this;