[terms and conditions] removed terms html and added terms and conditions to purchase invoice
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 4647fd2..e8bce65 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-05-28 12:18:35",
+ "modified": "2013-06-05 14:57:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -674,6 +674,32 @@
},
{
"doctype": "DocField",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Select Terms and Conditions",
+ "options": "Terms and Conditions",
+ "print_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "get_terms",
+ "fieldtype": "Button",
+ "label": "Get Terms and Conditions"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions1"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 5a84a7e..c69cda1 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-05-29 18:53:30",
+ "modified": "2013-06-05 14:42:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Sales Invoice",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1
},
{
"doctype": "DocType",
@@ -732,16 +734,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -1307,23 +1299,10 @@
"report_hide": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Accounts Manager",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Accounts Manager",
"submit": 1,
"write": 1
@@ -1333,33 +1312,13 @@
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Accounts User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Accounts User",
- "submit": 0,
- "write": 0
- },
- {
"doctype": "DocPerm",
"match": "customer",
- "permlevel": 0,
- "report": 1,
"role": "Customer"
- },
- {
- "doctype": "DocPerm",
- "permlevel": 0,
- "role": "Retail User"
}
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 62dd9a3..b8e1cee 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-05-28 12:20:40",
+ "modified": "2013-06-05 14:45:40",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Purchase Order",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1
},
{
"doctype": "DocType",
@@ -542,15 +544,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions1",
@@ -813,41 +806,15 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
"role": "Material User",
"submit": 0,
"write": 0
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
- "role": "Material User",
- "submit": 0,
- "write": 0
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Purchase Manager",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Purchase Manager",
"submit": 1,
"write": 1
@@ -857,26 +824,13 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Purchase User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "All",
- "submit": 0
- },
- {
"doctype": "DocPerm",
"match": "supplier",
- "permlevel": 0,
- "report": 1,
"role": "Supplier"
}
]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index bdb31fd..1882fb6 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-05-28 12:19:50",
+ "modified": "2013-06-05 14:46:30",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Supplier Quotation",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1
},
{
"doctype": "DocType",
@@ -508,15 +510,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions1",
@@ -673,8 +666,6 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Manufacturing Manager",
"submit": 1,
"write": 1
@@ -684,8 +675,6 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Purchase Manager",
"submit": 1,
"write": 1
@@ -695,8 +684,6 @@
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Purchase User",
"submit": 0,
"write": 1
@@ -706,8 +693,6 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Material User",
"submit": 0,
"write": 0
@@ -717,21 +702,8 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Supplier",
"submit": 0,
"write": 0
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "All",
- "submit": 0,
- "write": 0
}
]
\ No newline at end of file
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 48f4255..885fc82 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-05-28 14:51:00",
+ "modified": "2013-06-05 14:43:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -595,16 +595,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Term Details",
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 327fadd..77fcf11 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-05-28 15:05:40",
+ "modified": "2013-06-05 14:47:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -32,6 +32,7 @@
"parent": "Sales Order",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1
},
{
@@ -583,15 +584,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -974,22 +966,10 @@
"print_hide": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "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,
@@ -1000,72 +980,38 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
"report": 1,
"role": "Sales User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "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",
- "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",
- "permlevel": 1,
- "role": "Maintenance User",
- "submit": 0
- },
- {
- "doctype": "DocPerm",
- "permlevel": 0,
"role": "Accounts User"
},
{
"doctype": "DocPerm",
"match": "customer",
- "permlevel": 0,
"role": "Customer"
}
]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 222426c..f0731ce 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-05-28 12:26:10",
+ "modified": "2013-06-05 14:47:47",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"autoname": "naming_series:",
"doctype": "DocType",
"document_type": "Transaction",
+ "hide_toolbar": 0,
"in_create": 0,
"is_submittable": 1,
"module": "Stock",
@@ -32,7 +33,9 @@
"parent": "Delivery Note",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1
},
{
"doctype": "DocType",
@@ -607,16 +610,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -1148,91 +1141,39 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Material User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material User",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Material Manager",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material Manager",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Sales User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Sales User",
- "submit": 0,
- "write": 0
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Accounts User",
"submit": 0,
"write": 0
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Accounts User",
- "submit": 0
- },
- {
"doctype": "DocPerm",
"match": "customer_name",
- "permlevel": 0,
- "report": 1,
"role": "Customer"
}
]
\ No newline at end of file
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index 3caf3a1..f8c5226 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-04-24 10:47:55",
+ "modified": "2013-06-05 14:46:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -26,12 +26,19 @@
"permlevel": 0
},
{
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Material Request",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1,
+ "submit": 1,
+ "write": 1
},
{
"doctype": "DocType",
@@ -331,89 +338,19 @@
"print_hide": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Purchase Manager",
- "submit": 0,
- "write": 0
+ "role": "Purchase Manager"
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
- "role": "Purchase Manager",
- "submit": 1,
- "write": 1
+ "role": "Material Manager"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material Manager",
- "submit": 0,
- "write": 0
+ "role": "Material User"
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
- "role": "Material Manager",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material User",
- "submit": 0,
- "write": 0
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
- "role": "Material User",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
- "role": "Purchase User",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Purchase User",
- "submit": 0
+ "role": "Purchase User"
}
]
\ No newline at end of file
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index bfc8aa4..96b4141 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-05-28 12:21:20",
+ "modified": "2013-06-05 14:45:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Purchase Receipt",
"parentfield": "permissions",
"parenttype": "DocType",
- "read": 1
+ "permlevel": 0,
+ "read": 1,
+ "report": 1
},
{
"doctype": "DocType",
@@ -557,15 +559,6 @@
},
{
"doctype": "DocField",
- "fieldname": "terms_html",
- "fieldtype": "HTML",
- "label": "Terms and Conditions HTML",
- "oldfieldtype": "HTML",
- "options": "You can add Terms and Notes that will be printed in the Transaction",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions1",
@@ -889,45 +882,19 @@
"read_only": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material Manager",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Material Manager",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "Material User",
- "submit": 0,
- "write": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Material User",
"submit": 1,
"write": 1
@@ -937,26 +904,13 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "Purchase User",
"submit": 1,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Purchase User",
- "submit": 0
- },
- {
"doctype": "DocPerm",
"match": "supplier",
- "permlevel": 0,
- "report": 1,
"role": "Supplier"
}
]
\ No newline at end of file