Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.txt b/manufacturing/doctype/production_plan_item/production_plan_item.txt
index ab3ce11..6ae2a04 100644
--- a/manufacturing/doctype/production_plan_item/production_plan_item.txt
+++ b/manufacturing/doctype/production_plan_item/production_plan_item.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-07-03 13:30:04",
+ "creation": "2012-12-20 18:14:55",
"modified_by": "Administrator",
- "modified": "2012-12-10 18:30:00"
+ "modified": "2012-12-24 19:37:34"
},
{
"istable": 1,
@@ -18,6 +18,7 @@
"parent": "Production Plan Item",
"doctype": "DocField",
"parenttype": "DocType",
+ "permlevel": 0,
"parentfield": "fields"
},
{
@@ -25,14 +26,11 @@
"doctype": "DocType"
},
{
- "permlevel": 0,
"oldfieldtype": "Link",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Item Code",
"oldfieldname": "item_code",
"width": "150px",
- "trigger": "Client",
"fieldname": "item_code",
"fieldtype": "Link",
"reqd": 1,
@@ -44,11 +42,10 @@
"label": "BOM No",
"oldfieldname": "bom_no",
"width": "100px",
- "options": "BOM",
"fieldname": "bom_no",
"fieldtype": "Link",
"reqd": 1,
- "permlevel": 0
+ "options": "BOM"
},
{
"default": "0.00",
@@ -59,20 +56,20 @@
"width": "100px",
"fieldname": "planned_qty",
"fieldtype": "Currency",
- "reqd": 1,
- "permlevel": 0
+ "reqd": 1
},
{
+ "read_only": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "Sales Order",
"oldfieldname": "source_docname",
- "options": "Sales Order",
"fieldname": "sales_order",
"fieldtype": "Link",
- "permlevel": 1
+ "options": "Sales Order"
},
{
+ "read_only": 1,
"default": "0.00",
"oldfieldtype": "Currency",
"doctype": "DocField",
@@ -81,10 +78,10 @@
"width": "100px",
"fieldname": "so_pending_qty",
"fieldtype": "Currency",
- "reqd": 0,
- "permlevel": 1
+ "reqd": 0
},
{
+ "read_only": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "UOM",
@@ -92,17 +89,16 @@
"width": "80px",
"fieldname": "stock_uom",
"fieldtype": "Data",
- "reqd": 1,
- "permlevel": 1
+ "reqd": 1
},
{
+ "read_only": 1,
"oldfieldtype": "Text",
"doctype": "DocField",
"label": "Description",
"oldfieldname": "description",
"width": "200px",
"fieldname": "description",
- "fieldtype": "Text",
- "permlevel": 1
+ "fieldtype": "Text"
}
]
\ No newline at end of file
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index 37e0f8a..8834180 100644
--- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-07-03 13:30:04",
+ "creation": "2012-12-20 18:14:56",
"modified_by": "Administrator",
- "modified": "2012-12-10 18:30:00"
+ "modified": "2012-12-24 19:38:10"
},
{
"istable": 1,
@@ -18,6 +18,7 @@
"parent": "Production Plan Sales Order",
"doctype": "DocField",
"parenttype": "DocType",
+ "permlevel": 0,
"parentfield": "fields"
},
{
@@ -39,37 +40,36 @@
"label": "Sales Order",
"oldfieldname": "prevdoc_docname",
"width": "150px",
- "options": "Sales Order",
"fieldname": "sales_order",
"fieldtype": "Link",
- "permlevel": 0
+ "options": "Sales Order"
},
{
+ "read_only": 1,
"oldfieldtype": "Date",
"doctype": "DocField",
"label": "SO Date",
"oldfieldname": "document_date",
"width": "120px",
"fieldname": "sales_order_date",
- "fieldtype": "Date",
- "permlevel": 1
+ "fieldtype": "Date"
},
{
+ "read_only": 1,
"doctype": "DocField",
"label": "Customer",
"width": "150px",
- "options": "Customer",
"fieldname": "customer",
"fieldtype": "Link",
- "permlevel": 1
+ "options": "Customer"
},
{
+ "read_only": 1,
"doctype": "DocField",
"label": "Grand Total",
"width": "120px",
"fieldname": "grand_total",
- "fieldtype": "Currency",
- "permlevel": 1
+ "fieldtype": "Currency"
},
{
"write": 1,
diff --git a/public/js/website_utils.js b/public/js/website_utils.js
index f35ad4c..ff480ed 100644
--- a/public/js/website_utils.js
+++ b/public/js/website_utils.js
@@ -14,6 +14,7 @@
cmd: "website.send_message",
subject: opts.subject,
sender: opts.sender,
+ status: opts.status,
message: typeof opts.message == "string"
? opts.message
: JSON.stringify(opts.message)
diff --git a/website/__init__.py b/website/__init__.py
index 32d7116..909a936 100644
--- a/website/__init__.py
+++ b/website/__init__.py
@@ -11,13 +11,13 @@
@webnotes.whitelist(allow_guest=True)
def send_message():
from webnotes.model.doc import Document
- args = webnotes.form_dict
d = Document('Support Ticket')
d.subject = webnotes.form_dict.get('subject', 'Website Query')
d.description = webnotes.form_dict.get('message')
d.raised_by = webnotes.form_dict.get('sender')
-
+ d.status = webnotes.form_dict.get("status") or "Open"
+
if not d.description:
webnotes.response["message"] = 'Please write something'
return