diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 5e98cb01fb..9905398d3f 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
- "modified": "2013-07-10 14:54:03",
+ "modified": "2013-11-03 14:11:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -47,7 +47,6 @@
"read_only": 1
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index 487c982be6..99335b7023 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-07-10 14:54:06",
+ "modified": "2013-11-02 16:58:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,6 +44,7 @@
"width": "120px"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt
index 90b2ed4aff..5740579088 100644
--- a/accounts/doctype/gl_entry/gl_entry.txt
+++ b/accounts/doctype/gl_entry/gl_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:06",
"docstatus": 0,
- "modified": "2013-08-22 17:12:13",
+ "modified": "2013-11-03 14:14:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,7 +41,6 @@
"name": "GL Entry"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -52,7 +51,6 @@
"search_index": 1
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index 0ce8c4967b..b47d7ed4c1 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-25 10:53:52",
"docstatus": 0,
- "modified": "2013-11-02 14:27:46",
+ "modified": "2013-11-03 14:11:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -90,7 +90,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt
index 1e0ba9ebe7..09a3757985 100755
--- a/accounts/doctype/pos_setting/pos_setting.txt
+++ b/accounts/doctype/pos_setting/pos_setting.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
- "modified": "2013-11-02 14:17:45",
+ "modified": "2013-11-02 16:58:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -48,6 +48,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 2a90369ee9..7f0a65d11f 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-11-02 14:27:47",
+ "modified": "2013-11-03 14:11:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -137,7 +137,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index d7fb8e552b..1a79636183 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-07-10 14:54:12",
+ "modified": "2013-11-02 19:41:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -242,6 +242,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index b29316ec93..4f39698146 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-11-02 14:35:31",
+ "modified": "2013-11-03 14:11:36",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -165,7 +165,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -747,6 +746,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -759,6 +759,7 @@
"search_index": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 07cdc547e0..d7dac74343 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-08-29 16:58:56",
+ "modified": "2013-11-02 19:41:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -297,6 +297,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index f01b6e3492..9536184bdf 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-11-02 14:27:52",
+ "modified": "2013-11-03 14:14:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -126,7 +126,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index fade98fa98..4145a7fb38 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-10-10 17:01:57",
+ "modified": "2013-11-02 19:41:27",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -359,6 +359,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
index 6726afd676..e5a3486f2a 100644
--- a/buying/doctype/supplier/supplier.txt
+++ b/buying/doctype/supplier/supplier.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
- "modified": "2013-11-02 14:24:01",
+ "modified": "2013-11-03 14:01:43",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -42,7 +42,6 @@
"name": "Supplier"
},
{
- "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts",
"doctype": "DocField",
"fieldname": "basic_info",
"fieldtype": "Section Break",
@@ -89,6 +88,7 @@
"reqd": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -96,14 +96,6 @@
"oldfieldtype": "Column Break",
"options": "icon-map-marker"
},
- {
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "address_desc",
- "fieldtype": "HTML",
- "label": "Address Desc",
- "options": "Addresses will appear only when you save the supplier"
- },
{
"doctype": "DocField",
"fieldname": "address_html",
@@ -117,14 +109,6 @@
"fieldtype": "Column Break",
"width": "50%"
},
- {
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "contact_desc",
- "fieldtype": "HTML",
- "label": "Contact Desc",
- "options": "Contact Details will appear only when you save the supplier"
- },
{
"doctype": "DocField",
"fieldname": "contact_html",
@@ -133,6 +117,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
@@ -177,13 +162,10 @@
"options": "Currency"
},
{
- "description": "Statutory info and other general information about your Supplier",
"doctype": "DocField",
- "fieldname": "supplier_details",
- "fieldtype": "Text",
- "label": "Supplier Details",
- "oldfieldname": "supplier_details",
- "oldfieldtype": "Code"
+ "fieldname": "credit_days",
+ "fieldtype": "Int",
+ "label": "Credit Days"
},
{
"doctype": "DocField",
@@ -191,12 +173,6 @@
"fieldtype": "Column Break",
"width": "50%"
},
- {
- "doctype": "DocField",
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "label": "Credit Days"
- },
{
"doctype": "DocField",
"fieldname": "website",
@@ -205,6 +181,15 @@
"oldfieldname": "website",
"oldfieldtype": "Data"
},
+ {
+ "description": "Statutory info and other general information about your Supplier",
+ "doctype": "DocField",
+ "fieldname": "supplier_details",
+ "fieldtype": "Text",
+ "label": "Supplier Details",
+ "oldfieldname": "supplier_details",
+ "oldfieldtype": "Code"
+ },
{
"doctype": "DocField",
"fieldname": "communications",
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index 42d38db8b6..fcef822fb3 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
- "modified": "2013-11-02 14:27:54",
+ "modified": "2013-11-03 14:14:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -126,7 +126,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 515cdb2a34..f09f5a82e2 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-10-10 17:02:11",
+ "modified": "2013-11-02 19:41:29",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -288,6 +288,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index b13a46b2e4..856f26ee29 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
- "modified": "2013-11-02 14:27:56",
+ "modified": "2013-11-03 11:19:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -234,7 +234,7 @@
"fieldname": "scheduled_confirmation_date",
"fieldtype": "Date",
"in_filter": 1,
- "label": "Scheduled Confirmation Date",
+ "label": "Offer Date",
"oldfieldname": "scheduled_confirmation_date",
"oldfieldtype": "Date",
"search_index": 0
@@ -243,7 +243,7 @@
"doctype": "DocField",
"fieldname": "final_confirmation_date",
"fieldtype": "Date",
- "label": "Final Confirmation Date",
+ "label": "Confirmation Date",
"oldfieldname": "final_confirmation_date",
"oldfieldtype": "Date",
"search_index": 0
@@ -329,7 +329,7 @@
"fieldname": "company_email",
"fieldtype": "Data",
"in_filter": 1,
- "label": "Email (By company)",
+ "label": "Company Email",
"oldfieldname": "company_email",
"oldfieldtype": "Data",
"reqd": 0
@@ -338,7 +338,7 @@
"doctype": "DocField",
"fieldname": "notice_number_of_days",
"fieldtype": "Int",
- "label": "Notice - Number of Days",
+ "label": "Notice (days)",
"oldfieldname": "notice_number_of_days",
"oldfieldtype": "Int"
},
@@ -457,13 +457,13 @@
"fieldname": "emergency_contact_details",
"fieldtype": "HTML",
"label": "Emergency Contact Details",
- "options": "Emergency Contact Details"
+ "options": "Emergency Contact Details
"
},
{
"doctype": "DocField",
"fieldname": "person_to_be_contacted",
"fieldtype": "Data",
- "label": "Person To Be Contacted"
+ "label": "Emergency Contact"
},
{
"doctype": "DocField",
@@ -475,7 +475,7 @@
"doctype": "DocField",
"fieldname": "emergency_phone_number",
"fieldtype": "Data",
- "label": "Emergency Phone Number"
+ "label": "Emergency Phone"
},
{
"doctype": "DocField",
@@ -487,7 +487,7 @@
"doctype": "DocField",
"fieldname": "permanent_accommodation_type",
"fieldtype": "Select",
- "label": "Permanent Accommodation Type",
+ "label": "Permanent Address Is",
"options": "\nRented\nOwned"
},
{
@@ -500,7 +500,7 @@
"doctype": "DocField",
"fieldname": "current_accommodation_type",
"fieldtype": "Select",
- "label": "Current Accommodation Type",
+ "label": "Current Address Is",
"options": "\nRented\nOwned"
},
{
diff --git a/patches/1311/__init__.py b/patches/1311/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/patches/1311/p01_cleanup.py b/patches/1311/p01_cleanup.py
new file mode 100644
index 0000000000..6c45aaeed9
--- /dev/null
+++ b/patches/1311/p01_cleanup.py
@@ -0,0 +1,6 @@
+import webnotes
+
+def execute():
+ from core.doctype.custom_field.custom_field import delete_and_create_custom_field_if_values_exist
+ delete_and_create_custom_field_if_values_exist("Material Request",
+ {"fieldtype":"Text", "fieldname":"remark", "label":"Remarks","insert_after":"Fiscal Year"})
\ No newline at end of file
diff --git a/projects/doctype/time_log/time_log_calendar.js b/projects/doctype/time_log/time_log_calendar.js
index 12cfcba562..a4f22db329 100644
--- a/projects/doctype/time_log/time_log_calendar.js
+++ b/projects/doctype/time_log/time_log_calendar.js
@@ -6,7 +6,7 @@ wn.views.calendar["Time Log"] = {
"start": "from_time",
"end": "to_time",
"id": "name",
- "title": w._("title"),
+ "title": "title",
"allDay": "allDay"
},
get_events_method: "projects.doctype.time_log.time_log.get_events"
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
index 0cd6c8e9d4..7a24531665 100644
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-11 14:26:44",
"docstatus": 0,
- "modified": "2013-11-02 14:24:03",
+ "modified": "2013-11-03 14:01:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -38,7 +38,6 @@
"name": "Customer"
},
{
- "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts",
"doctype": "DocField",
"fieldname": "basic_info",
"fieldtype": "Section Break",
@@ -65,7 +64,7 @@
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
- "label": "Customer Name",
+ "label": "Full Name",
"no_copy": 1,
"oldfieldname": "customer_name",
"oldfieldtype": "Data",
@@ -79,7 +78,7 @@
"doctype": "DocField",
"fieldname": "customer_type",
"fieldtype": "Select",
- "label": "Customer Type",
+ "label": "Type",
"oldfieldname": "customer_type",
"oldfieldtype": "Select",
"options": "\nCompany\nIndividual",
@@ -87,7 +86,6 @@
"reqd": 1
},
{
- "description": "Fetch lead which will be converted into customer.",
"doctype": "DocField",
"fieldname": "lead_name",
"fieldtype": "Link",
@@ -110,13 +108,13 @@
"width": "50%"
},
{
- "description": "To manage Customer Groups, click here",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
- "label": "Customer Group",
+ "label": "Group",
"oldfieldname": "customer_group",
"oldfieldtype": "Link",
"options": "Customer Group",
@@ -126,6 +124,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -139,6 +138,7 @@
"reqd": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -146,15 +146,6 @@
"options": "icon-map-marker",
"permlevel": 0
},
- {
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "address_desc",
- "fieldtype": "HTML",
- "label": "Address Desc",
- "options": "Addresses will appear only when you save the customer",
- "permlevel": 0
- },
{
"doctype": "DocField",
"fieldname": "address_html",
@@ -170,15 +161,6 @@
"permlevel": 0,
"width": "50%"
},
- {
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "contact_desc",
- "fieldtype": "HTML",
- "label": "Contact Desc",
- "options": "Contact Details will appear only when you save the customer",
- "permlevel": 0
- },
{
"doctype": "DocField",
"fieldname": "contact_html",
@@ -189,6 +171,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
@@ -235,23 +218,6 @@
"reqd": 1,
"search_index": 1
},
- {
- "doctype": "DocField",
- "fieldname": "default_price_list",
- "fieldtype": "Link",
- "label": "Default Price List",
- "options": "Price List",
- "permlevel": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "label": "Default Currency",
- "no_copy": 1,
- "options": "Currency",
- "permlevel": 0
- },
{
"description": "Your Customer's TAX registration numbers (if applicable) or any general information",
"doctype": "DocField",
@@ -269,6 +235,23 @@
"permlevel": 0,
"width": "50%"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "no_copy": 1,
+ "options": "Currency",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "default_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0
+ },
{
"doctype": "DocField",
"fieldname": "credit_days",
@@ -308,7 +291,7 @@
"doctype": "DocField",
"fieldname": "default_sales_partner",
"fieldtype": "Link",
- "label": "Default Sales Partner",
+ "label": "Sales Partner",
"oldfieldname": "default_sales_partner",
"oldfieldtype": "Link",
"options": "Sales Partner",
@@ -318,7 +301,7 @@
"doctype": "DocField",
"fieldname": "default_commission_rate",
"fieldtype": "Float",
- "label": "Default Commission Rate",
+ "label": "Commission Rate",
"oldfieldname": "default_commission_rate",
"oldfieldtype": "Currency",
"permlevel": 0
diff --git a/selling/doctype/customer_discount/customer_discount.txt b/selling/doctype/customer_discount/customer_discount.txt
index e7b78224b3..135871db81 100644
--- a/selling/doctype/customer_discount/customer_discount.txt
+++ b/selling/doctype/customer_discount/customer_discount.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-07-22 12:43:40",
"docstatus": 0,
- "modified": "2013-07-22 12:49:32",
+ "modified": "2013-11-02 19:41:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -27,6 +27,7 @@
"name": "Customer Discount"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
@@ -36,7 +37,7 @@
{
"doctype": "DocField",
"fieldname": "discount",
- "fieldtype": "Currency",
+ "fieldtype": "Float",
"label": "Discount (%)"
}
]
\ No newline at end of file
diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt
index b319e33dcb..af81d7fb5b 100644
--- a/selling/doctype/installation_note/installation_note.txt
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 13:13:06",
"docstatus": 0,
- "modified": "2013-11-02 14:05:46",
+ "modified": "2013-11-02 16:58:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -130,6 +130,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -141,6 +142,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index fdd7fa5c7c..0fbf1a3ff6 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 11:45:37",
"docstatus": 0,
- "modified": "2013-11-02 14:39:56",
+ "modified": "2013-11-02 16:58:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -298,6 +298,7 @@
"oldfieldtype": "Data"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt
index 773ea59b92..604599cef7 100644
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:30",
"docstatus": 0,
- "modified": "2013-11-02 14:27:57",
+ "modified": "2013-11-03 14:20:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -209,6 +209,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -222,7 +223,7 @@
},
{
"depends_on": "eval:doc.enquiry_from==\"Customer\"",
- "description": "To manage Territory, click here",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -283,7 +284,6 @@
"read_only": 1
},
{
- "description": "Filing in Additional Information about the Opportunity will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -302,7 +302,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index fb1501c0c3..efa1ee90bd 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-07-10 14:54:11",
+ "modified": "2013-11-02 19:41:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"width": "300px"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index c08449ef41..0c42722cf1 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-11-02 14:36:45",
+ "modified": "2013-11-03 14:20:15",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -203,7 +203,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -559,7 +558,6 @@
"width": "200px"
},
{
- "description": "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template",
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -599,6 +597,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -613,6 +612,7 @@
},
{
"depends_on": "customer",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -678,7 +678,6 @@
"reqd": 0
},
{
- "description": "Filling in additional information about the Quotation will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -820,6 +819,7 @@
},
{
"allow_on_submit": 1,
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_html",
"fieldtype": "HTML",
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index c38116a99f..37642086b8 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-08-07 14:44:28",
+ "modified": "2013-11-02 19:41:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -239,6 +239,7 @@
"label": "Reference"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index efff1fce42..7a1af77947 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
- "modified": "2013-11-02 14:40:29",
+ "modified": "2013-11-03 14:20:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -174,7 +174,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -195,7 +194,7 @@
"fieldtype": "Date",
"hidden": 0,
"in_filter": 1,
- "label": "Expected Delivery Date",
+ "label": "Delivery Date",
"oldfieldname": "delivery_date",
"oldfieldtype": "Date",
"print_hide": 1,
@@ -204,12 +203,12 @@
"width": "160px"
},
{
- "description": "Purchase Order sent by customer",
+ "description": "Customer's Purchase Order Number",
"doctype": "DocField",
"fieldname": "po_no",
"fieldtype": "Data",
"hidden": 0,
- "label": "Customer's Purchase Order No",
+ "label": "PO No",
"oldfieldname": "po_no",
"oldfieldtype": "Data",
"print_hide": 0,
@@ -218,11 +217,12 @@
},
{
"depends_on": "eval:doc.po_no",
+ "description": "Customer's Purchase Order Date",
"doctype": "DocField",
"fieldname": "po_date",
"fieldtype": "Date",
"hidden": 0,
- "label": "Customer's Purchase Order Date",
+ "label": "PO Date",
"oldfieldname": "po_date",
"oldfieldtype": "Date",
"print_hide": 0,
@@ -611,6 +611,7 @@
"width": "50%"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -622,7 +623,7 @@
"search_index": 1
},
{
- "description": "Category of customer as entered in Customer master",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -659,7 +660,6 @@
"print_hide": 1
},
{
- "description": "Filling in additional information about the Sales Order will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 47b4d6b870..4754aa1404 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-08-22 15:43:07",
+ "modified": "2013-11-03 14:14:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -344,6 +344,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
@@ -401,7 +402,6 @@
"report_hide": 1
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt
index 2e8c91ff70..a112a7cd69 100644
--- a/selling/doctype/selling_settings/selling_settings.txt
+++ b/selling/doctype/selling_settings/selling_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 10:25:16",
"docstatus": 0,
- "modified": "2013-11-02 14:22:36",
+ "modified": "2013-11-02 16:58:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -47,7 +47,7 @@
"options": "Customer Name\nNaming Series"
},
{
- "description": "Manage Customer Groups",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -55,6 +55,7 @@
"options": "Customer Group"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt b/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
index 531f8dac4c..ffc3635660 100644
--- a/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
+++ b/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-19 15:57:32",
"docstatus": 0,
- "modified": "2013-07-15 17:33:15",
+ "modified": "2013-11-02 16:58:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"reqd": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "default_territory",
"fieldtype": "Link",
@@ -71,6 +72,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "default_customer_group",
"fieldtype": "Link",
diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt
index abd6896f68..f76a2e1ef3 100644
--- a/setup/doctype/customer_group/customer_group.txt
+++ b/setup/doctype/customer_group/customer_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:23",
"docstatus": 0,
- "modified": "2013-11-02 14:23:33",
+ "modified": "2013-11-02 16:52:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -62,6 +62,7 @@
"reqd": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "parent_customer_group",
"fieldtype": "Link",
@@ -121,6 +122,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt
index 89c9dd310b..3f73ee2e25 100644
--- a/setup/doctype/features_setup/features_setup.txt
+++ b/setup/doctype/features_setup/features_setup.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-12-20 12:50:49",
"docstatus": 0,
- "modified": "2013-08-22 15:36:43",
+ "modified": "2013-11-03 14:20:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -235,7 +235,6 @@
"fieldtype": "Column Break"
},
{
- "description": "Enables More Info. in all documents",
"doctype": "DocField",
"fieldname": "fs_more_info",
"fieldtype": "Check",
diff --git a/setup/doctype/for_territory/for_territory.txt b/setup/doctype/for_territory/for_territory.txt
index be454ec018..7bdb6e56e2 100644
--- a/setup/doctype/for_territory/for_territory.txt
+++ b/setup/doctype/for_territory/for_territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 12:48:38",
"docstatus": 0,
- "modified": "2013-07-10 14:54:09",
+ "modified": "2013-11-02 16:58:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -13,6 +13,7 @@
"name": "__common__"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index f573110330..b365893596 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-28 10:35:29",
"docstatus": 0,
- "modified": "2013-08-05 17:21:14",
+ "modified": "2013-11-02 19:41:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -67,6 +67,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "parent_item_group",
"fieldtype": "Link",
@@ -160,6 +161,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt
index ab47565744..7d0750ffcd 100644
--- a/setup/doctype/sales_partner/sales_partner.txt
+++ b/setup/doctype/sales_partner/sales_partner.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-12 15:34:06",
"docstatus": 0,
- "modified": "2013-07-05 14:54:31",
+ "modified": "2013-11-02 16:59:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -64,6 +64,7 @@
"search_index": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index 5d22d8896d..71debd37b0 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-07-10 14:54:24",
+ "modified": "2013-11-02 19:41:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -26,6 +26,7 @@
"name": "Target Detail"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt
index b647e7b712..200f24f82f 100644
--- a/setup/doctype/territory/territory.txt
+++ b/setup/doctype/territory/territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
- "modified": "2013-08-05 18:12:29",
+ "modified": "2013-11-02 16:59:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -64,6 +64,7 @@
"reqd": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "parent_territory",
"fieldtype": "Link",
@@ -130,6 +131,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/website_item_group/website_item_group.txt b/setup/doctype/website_item_group/website_item_group.txt
index 5753fcf81e..0a8a3aacc9 100644
--- a/setup/doctype/website_item_group/website_item_group.txt
+++ b/setup/doctype/website_item_group/website_item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:09",
"docstatus": 0,
- "modified": "2013-07-10 14:54:30",
+ "modified": "2013-11-02 19:41:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
"name": "__common__"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 7f2e181504..7fb166e686 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
- "modified": "2013-11-02 14:36:48",
+ "modified": "2013-11-03 14:20:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -195,7 +195,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -691,6 +690,7 @@
"read_only": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -704,6 +704,7 @@
"search_index": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -733,7 +734,6 @@
"read_only": 0
},
{
- "description": "Filling in Additional Information about the Delivery Note will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index 8d1792d7c1..a118715cd3 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-10-10 17:03:11",
+ "modified": "2013-11-02 19:41:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -297,6 +297,7 @@
"width": "120px"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index d6541fc4b1..22c5dcc7cf 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
- "modified": "2013-11-02 14:05:57",
+ "modified": "2013-11-02 19:41:40",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -89,7 +89,7 @@
"search_index": 1
},
{
- "description": "Manage Item Groups",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index 29aaeeacc2..1330c4524e 100644
--- a/stock/doctype/material_request/material_request.txt
+++ b/stock/doctype/material_request/material_request.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 14:48:38",
"docstatus": 0,
- "modified": "2013-11-02 14:28:03",
+ "modified": "2013-11-03 15:29:49",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,7 +50,7 @@
"doctype": "DocField",
"fieldname": "type_section",
"fieldtype": "Section Break",
- "label": "Type",
+ "label": "Basic Info",
"options": "icon-pushpin"
},
{
@@ -58,7 +58,7 @@
"fieldname": "material_request_type",
"fieldtype": "Select",
"in_list_view": 1,
- "label": "Material Request Type",
+ "label": "Type",
"options": "Purchase\nTransfer",
"reqd": 1
},
@@ -128,7 +128,6 @@
"options": "Material Request Item"
},
{
- "description": "Give additional details about the indent.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -145,7 +144,12 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
+ "doctype": "DocField",
+ "fieldname": "requested_by",
+ "fieldtype": "Data",
+ "label": "Requested For"
+ },
+ {
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -174,19 +178,6 @@
"search_index": 1,
"width": "150px"
},
- {
- "description": "Name of the entity who has requested for the Material Request",
- "doctype": "DocField",
- "fieldname": "requested_by",
- "fieldtype": "Data",
- "in_list_view": 0,
- "label": "Requested By",
- "no_copy": 1,
- "oldfieldname": "requested_by",
- "oldfieldtype": "Data",
- "print_width": "100px",
- "width": "100px"
- },
{
"doctype": "DocField",
"fieldname": "column_break2",
@@ -195,17 +186,6 @@
"print_width": "50%",
"width": "50%"
},
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "letter_head",
- "fieldtype": "Select",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "link:Letter Head",
- "print_hide": 1
- },
{
"doctype": "DocField",
"fieldname": "status",
@@ -224,6 +204,26 @@
"search_index": 1,
"width": "100px"
},
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "letter_head",
+ "fieldtype": "Select",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "link:Letter Head",
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "options": "Print Heading",
+ "print_hide": 1
+ },
{
"description": "% of materials ordered against this Material Request",
"doctype": "DocField",
@@ -238,20 +238,6 @@
"read_only": 1
},
{
- "doctype": "DocField",
- "fieldname": "remark",
- "fieldtype": "Small Text",
- "in_list_view": 0,
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remark",
- "oldfieldtype": "Small Text",
- "print_hide": 0,
- "print_width": "150px",
- "width": "150px"
- },
- {
- "description": "Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template",
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -278,15 +264,6 @@
"oldfieldname": "terms",
"oldfieldtype": "Text Editor"
},
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "options": "Print Heading",
- "print_hide": 1
- },
{
"doctype": "DocPerm",
"role": "Purchase Manager"
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 2ef4acd531..15884a3b5e 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-10-11 14:21:32",
+ "modified": "2013-11-03 20:36:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -74,20 +74,6 @@
"in_list_view": 0,
"label": "Quantity and Warehouse"
},
- {
- "doctype": "DocField",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 0,
- "print_width": "100px",
- "reqd": 0,
- "width": "100px"
- },
{
"doctype": "DocField",
"fieldname": "qty",
@@ -116,6 +102,26 @@
"reqd": 1,
"width": "70px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "For Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 0,
+ "print_width": "100px",
+ "reqd": 0,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info"
+ },
{
"doctype": "DocField",
"fieldname": "lead_time_date",
@@ -143,6 +149,7 @@
"width": "100px"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 10a504c7f4..6035b7177e 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-11-02 14:28:03",
+ "modified": "2013-11-03 14:20:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -135,7 +135,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -486,7 +485,6 @@
"read_only": 1
},
{
- "description": "Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.",
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -542,7 +540,6 @@
"print_hide": 1
},
{
- "description": "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 9c0d0fbb11..22ded6d2c3 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2013-10-10 17:02:51",
+ "modified": "2013-11-02 19:41:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -369,6 +369,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index 8500303dc1..b29a1a8ea2 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
- "modified": "2013-08-28 19:13:09",
+ "modified": "2013-11-02 19:41:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -143,6 +143,7 @@
"width": "300px"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt
index 7ef13bfe26..ca9b5f29a2 100644
--- a/stock/doctype/stock_entry/stock_entry.txt
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-09 11:43:55",
"docstatus": 0,
- "modified": "2013-11-02 14:28:05",
+ "modified": "2013-11-03 14:11:42",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -164,7 +164,6 @@
{
"allow_on_submit": 0,
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index a5ea161a73..641a68c3bc 100644
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-29 19:25:42",
"docstatus": 0,
- "modified": "2013-08-23 12:23:18",
+ "modified": "2013-11-03 14:11:43",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -92,7 +92,6 @@
"width": "100px"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/stock/doctype/stock_settings/stock_settings.txt b/stock/doctype/stock_settings/stock_settings.txt
index e8edd0359a..634ee3a60f 100644
--- a/stock/doctype/stock_settings/stock_settings.txt
+++ b/stock/doctype/stock_settings/stock_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-24 16:37:54",
"docstatus": 0,
- "modified": "2013-07-05 14:56:41",
+ "modified": "2013-11-02 19:41:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -46,7 +46,7 @@
"options": "Item Code\nNaming Series"
},
{
- "description": "Manage Item Groups",
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index 9f27b7b133..f9fbc6bd6a 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-11-02 14:06:02",
+ "modified": "2013-11-02 16:59:22",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -279,6 +279,7 @@
"read_only": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -288,6 +289,7 @@
"reqd": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index c14764ccce..bdf14a18f7 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-22 15:32:36",
+ "modified": "2013-11-02 16:59:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -188,6 +188,7 @@
"search_index": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -200,6 +201,7 @@
"search_index": 0
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index ee84f96c55..f68a1f4ffa 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:31",
"docstatus": 0,
- "modified": "2013-07-22 15:24:40",
+ "modified": "2013-11-02 16:59:24",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -293,6 +293,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -301,6 +302,7 @@
"print_hide": 1
},
{
+ "description": "Add / Edit",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",