Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 0d4a615..1974aa7 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -107,7 +107,8 @@
plc_conversion_rate: me.frm.doc.plc_conversion_rate,
is_subcontracted: me.frm.doc.is_subcontracted,
company: me.frm.doc.company,
- currency: me.frm.doc.currency
+ currency: me.frm.doc.currency,
+ transaction_date: me.frm.doc.transaction_date
}
},
callback: function(r) {
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index 1ee2700..d73f115 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
- "modified": "2013-07-08 13:51:42",
+ "modified": "2013-07-09 11:37:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -27,6 +27,20 @@
},
{
"doctype": "DocField",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "print_hide": 0,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "schedule_date",
"fieldtype": "Date",
"hidden": 0,
@@ -41,20 +55,6 @@
"search_index": 1
},
{
- "doctype": "DocField",
- "fieldname": "item_code",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Item Code",
- "oldfieldname": "item_code",
- "oldfieldtype": "Link",
- "options": "Item",
- "print_hide": 0,
- "read_only": 0,
- "reqd": 1,
- "search_index": 1
- },
- {
"description": "If Supplier Part Number exists for given Item, it gets stored here",
"doctype": "DocField",
"fieldname": "supplier_part_no",
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 7d9a417..992b4cf 100644
--- a/stock/doctype/material_request_item/material_request_item.txt
+++ b/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-03-07 07:03:25",
+ "modified": "2013-07-09 11:37:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -26,20 +26,6 @@
"name": "Material Request Item"
},
{
- "allow_on_submit": 0,
- "doctype": "DocField",
- "fieldname": "schedule_date",
- "fieldtype": "Date",
- "label": "Required Date",
- "no_copy": 1,
- "oldfieldname": "schedule_date",
- "oldfieldtype": "Date",
- "print_hide": 0,
- "print_width": "100px",
- "reqd": 1,
- "width": "100px"
- },
- {
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
@@ -54,6 +40,20 @@
"width": "100px"
},
{
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "fieldname": "schedule_date",
+ "fieldtype": "Date",
+ "label": "Required Date",
+ "no_copy": 1,
+ "oldfieldname": "schedule_date",
+ "oldfieldtype": "Date",
+ "print_hide": 0,
+ "print_width": "100px",
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",