diff --git a/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt b/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt
index 72f326bda31..e2f642204d2 100644
--- a/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt
+++ b/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt
@@ -1,188 +1,147 @@
-# DocType Mapper, Delivery Note-Sales Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:42',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:43',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Delivery Note-Sales Invoice',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Delivery Note-Sales Invoice',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Delivery Note',
- 'module': u'Accounts',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Sales Invoice'
- },
-
- # DocType Mapper, Delivery Note-Sales Invoice
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Delivery Note-Sales Invoice'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: obj.basic_rate and (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate) or obj.qty',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'delivery_note'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'dn_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'prevdoc_docname',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'sales_order'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'prevdoc_detail_docname',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'so_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: flt(obj.amount) - flt(obj.billed_amt)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'export_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'naming_series',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'naming_series'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'incentives',
- 'map': u'No',
- 'match_id': 3,
- 'to_field': u'incentives'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'serial_no',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'serial_no'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'export_rate',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'export_rate'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Delivery Note',
- 'match_id': 0,
- 'to_table': u'Sales Invoice',
- 'validation_logic': u'docstatus=1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'delivery_note_details',
- 'from_table': u'Delivery Note Item',
- 'match_id': 1,
- 'to_field': u'entries',
- 'to_table': u'Sales Invoice Item',
- 'validation_logic': u'(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'other_charges',
- 'from_table': u'Sales Taxes and Charges',
- 'match_id': 2,
- 'to_field': u'other_charges',
- 'to_table': u'Sales Taxes and Charges',
- 'validation_logic': u'name is not null'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'sales_team',
- 'from_table': u'Sales Team',
- 'match_id': 3,
- 'to_field': u'sales_team',
- 'to_table': u'Sales Team',
- 'validation_logic': u'name is not null'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:42",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:43"
+ },
+ {
+ "name": "__common__",
+ "parent": "Delivery Note-Sales Invoice",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Delivery Note-Sales Invoice",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Sales Invoice",
+ "module": "Accounts",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Delivery Note"
+ },
+ {
+ "name": "Delivery Note-Sales Invoice",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: obj.basic_rate and (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate) or obj.qty"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "delivery_note",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "dn_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "sales_order",
+ "doctype": "Field Mapper Detail",
+ "from_field": "prevdoc_docname"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "so_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "prevdoc_detail_docname"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: flt(obj.amount) - flt(obj.billed_amt)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "export_amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "naming_series",
+ "doctype": "Field Mapper Detail",
+ "from_field": "naming_series"
+ },
+ {
+ "map": "No",
+ "match_id": 3,
+ "to_field": "incentives",
+ "doctype": "Field Mapper Detail",
+ "from_field": "incentives"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "serial_no",
+ "doctype": "Field Mapper Detail",
+ "from_field": "serial_no"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "export_rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "export_rate",
+ "checking_operator": "="
+ },
+ {
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Delivery Note",
+ "to_table": "Sales Invoice",
+ "validation_logic": "docstatus=1"
+ },
+ {
+ "match_id": 1,
+ "to_field": "entries",
+ "doctype": "Table Mapper Detail",
+ "from_field": "delivery_note_details",
+ "from_table": "Delivery Note Item",
+ "to_table": "Sales Invoice Item",
+ "validation_logic": "(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1"
+ },
+ {
+ "match_id": 2,
+ "to_field": "other_charges",
+ "doctype": "Table Mapper Detail",
+ "from_field": "other_charges",
+ "from_table": "Sales Taxes and Charges",
+ "to_table": "Sales Taxes and Charges",
+ "validation_logic": "name is not null"
+ },
+ {
+ "match_id": 3,
+ "to_field": "sales_team",
+ "doctype": "Table Mapper Detail",
+ "from_field": "sales_team",
+ "from_table": "Sales Team",
+ "to_table": "Sales Team",
+ "validation_logic": "name is not null"
+ }
]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt b/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt
index 8d87fda9a69..dd5705da9af 100644
--- a/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt
+++ b/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt
@@ -1,64 +1,49 @@
-# DocType Mapper, Project-Sales Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-09-01 15:47:59',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Project',
- 'match_id': 0,
- 'name': '__common__',
- 'parent': u'Project-Sales Invoice',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper',
- 'to_table': u'Sales Invoice',
- 'validation_logic': u'name is not null'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'customer',
- 'map': u'Yes',
- 'match_id': 0,
- 'name': '__common__',
- 'parent': u'Project-Sales Invoice',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper',
- 'to_field': u'customer'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': 'DocType Mapper',
- 'from_doctype': u'Project',
- 'module': u'Accounts',
- 'name': '__common__',
- 'to_doctype': u'Sales Invoice'
- },
-
- # DocType Mapper, Project-Sales Invoice
- {
- 'doctype': 'DocType Mapper',
- 'name': u'Project-Sales Invoice'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2010-09-01 15:47:59",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "match_id": 0,
+ "parent": "Project-Sales Invoice",
+ "name": "__common__",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "from_table": "Project",
+ "to_table": "Sales Invoice",
+ "validation_logic": "name is not null",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "parent": "Project-Sales Invoice",
+ "name": "__common__",
+ "to_field": "customer",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "checking_operator": "=",
+ "from_field": "customer",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Sales Invoice",
+ "module": "Accounts",
+ "doctype": "DocType Mapper",
+ "from_doctype": "Project"
+ },
+ {
+ "name": "Project-Sales Invoice",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "doctype": "Field Mapper Detail"
+ },
+ {
+ "doctype": "Table Mapper Detail"
+ }
]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt
index 0e544576fd9..ce45824e404 100644
--- a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt
+++ b/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt
@@ -1,158 +1,123 @@
-# DocType Mapper, Purchase Order-Purchase Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:09:35',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Order-Purchase Invoice',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Order-Purchase Invoice',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Purchase Order',
- 'module': u'Accounts',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Purchase Invoice'
- },
-
- # DocType Mapper, Purchase Order-Purchase Invoice
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Purchase Order-Purchase Invoice'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'purchase_rate',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'import_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'purchase_order'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'po_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'naming_series',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'naming_series'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'total_tax',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'total_tax'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'conversion_rate',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'conversion_rate'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Purchase Order',
- 'match_id': 0,
- 'to_table': u'Purchase Invoice',
- 'validation_logic': u'docstatus =1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'po_details',
- 'from_table': u'Purchase Order Item',
- 'match_id': 1,
- 'to_field': u'entries',
- 'to_table': u'Purchase Invoice Item',
- 'validation_logic': u'ifnull(billed_qty,0) < qty and docstatus = 1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'purchase_tax_details',
- 'from_table': u'Purchase Taxes and Charges',
- 'match_id': 2,
- 'to_field': u'purchase_tax_details',
- 'to_table': u'Purchase Taxes and Charges',
- 'validation_logic': u'docstatus =1'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2010-08-08 17:09:35",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Order-Purchase Invoice",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Order-Purchase Invoice",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Purchase Invoice",
+ "module": "Accounts",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Purchase Order"
+ },
+ {
+ "name": "Purchase Order-Purchase Invoice",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: flt(obj.qty) - flt(obj.billed_qty)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "purchase_rate"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "import_amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "purchase_order",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "po_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "naming_series",
+ "doctype": "Field Mapper Detail",
+ "from_field": "naming_series"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "total_tax",
+ "doctype": "Field Mapper Detail",
+ "from_field": "total_tax"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "conversion_rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "conversion_rate"
+ },
+ {
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Purchase Order",
+ "to_table": "Purchase Invoice",
+ "validation_logic": "docstatus =1"
+ },
+ {
+ "match_id": 1,
+ "to_field": "entries",
+ "doctype": "Table Mapper Detail",
+ "from_field": "po_details",
+ "from_table": "Purchase Order Item",
+ "to_table": "Purchase Invoice Item",
+ "validation_logic": "ifnull(billed_qty,0) < qty and docstatus = 1"
+ },
+ {
+ "match_id": 2,
+ "to_field": "purchase_tax_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "purchase_tax_details",
+ "from_table": "Purchase Taxes and Charges",
+ "to_table": "Purchase Taxes and Charges",
+ "validation_logic": "docstatus =1"
+ }
]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt
index 75b188b62e0..f6c87e266c7 100644
--- a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt
+++ b/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt
@@ -1,185 +1,144 @@
-# DocType Mapper, Purchase Receipt-Purchase Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:09:35',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Receipt-Purchase Invoice',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Receipt-Purchase Invoice',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Purchase Receipt',
- 'module': u'Accounts',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Purchase Invoice'
- },
-
- # DocType Mapper, Purchase Receipt-Purchase Invoice
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Purchase Receipt-Purchase Invoice'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'purchase_rate',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'import_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'purchase_receipt'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'prevdoc_docname',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'purchase_order'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'pr_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'prevdoc_detail_docname',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'po_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'naming_series',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'naming_series'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'net_total',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'grand_total',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'total_tax',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'total_tax'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'purchase_receipt_details',
- 'from_table': u'Purchase Receipt Item',
- 'match_id': 1,
- 'to_field': u'entries',
- 'to_table': u'Purchase Invoice Item',
- 'validation_logic': u'ifnull(billed_qty,0) < qty'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Purchase Receipt',
- 'match_id': 0,
- 'to_table': u'Purchase Invoice',
- 'validation_logic': u'docstatus=1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'purchase_tax_details',
- 'from_table': u'Purchase Taxes and Charges',
- 'match_id': 2,
- 'to_field': u'purchase_tax_details',
- 'to_table': u'Purchase Taxes and Charges',
- 'validation_logic': u'docstatus=1'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2010-08-08 17:09:35",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Receipt-Purchase Invoice",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Receipt-Purchase Invoice",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Purchase Invoice",
+ "module": "Accounts",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Purchase Receipt"
+ },
+ {
+ "name": "Purchase Receipt-Purchase Invoice",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: flt(obj.qty) - flt(obj.billed_qty)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "purchase_rate"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "import_amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "purchase_receipt",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "purchase_order",
+ "doctype": "Field Mapper Detail",
+ "from_field": "prevdoc_docname"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "pr_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "po_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "prevdoc_detail_docname"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "naming_series",
+ "doctype": "Field Mapper Detail",
+ "from_field": "naming_series"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "net_total",
+ "doctype": "Field Mapper Detail",
+ "from_field": "net_total"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "grand_total",
+ "doctype": "Field Mapper Detail",
+ "from_field": "grand_total"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "total_tax",
+ "doctype": "Field Mapper Detail",
+ "from_field": "total_tax"
+ },
+ {
+ "match_id": 1,
+ "to_field": "entries",
+ "doctype": "Table Mapper Detail",
+ "from_field": "purchase_receipt_details",
+ "from_table": "Purchase Receipt Item",
+ "to_table": "Purchase Invoice Item",
+ "validation_logic": "ifnull(billed_qty,0) < qty"
+ },
+ {
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Purchase Receipt",
+ "to_table": "Purchase Invoice",
+ "validation_logic": "docstatus=1"
+ },
+ {
+ "match_id": 2,
+ "to_field": "purchase_tax_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "purchase_tax_details",
+ "from_table": "Purchase Taxes and Charges",
+ "to_table": "Purchase Taxes and Charges",
+ "validation_logic": "docstatus=1"
+ }
]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt b/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt
index aa1cc3c9a48..4b6257b2240 100644
--- a/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt
+++ b/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt
@@ -1,190 +1,149 @@
-# DocType Mapper, Sales Order-Sales Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:42',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:42',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Sales Order-Sales Invoice',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Sales Order-Sales Invoice',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Sales Order',
- 'module': u'Accounts',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Sales Invoice'
- },
-
- # DocType Mapper, Sales Order-Sales Invoice
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Sales Order-Sales Invoice'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'customer',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: obj.basic_rate and (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate) or obj.qty',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'sales_order'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'so_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval:flt(obj.amount) - flt(obj.billed_amt)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'export_amount'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'project_name',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'project_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'reserved_warehouse',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'warehouse'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'naming_series',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'naming_series'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'incentives',
- 'map': u'No',
- 'match_id': 3,
- 'to_field': u'incentives'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'export_rate',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'export_rate'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Sales Order',
- 'match_id': 0,
- 'to_table': u'Sales Invoice',
- 'validation_logic': u'docstatus=1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'sales_order_detail',
- 'from_table': u'Sales Order Item',
- 'match_id': 1,
- 'to_field': u'entries',
- 'to_table': u'Sales Invoice Item',
- 'validation_logic': u'(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'other_charges',
- 'from_table': u'Sales Taxes and Charges',
- 'match_id': 2,
- 'to_field': u'other_charges',
- 'to_table': u'Sales Taxes and Charges',
- 'validation_logic': u'name is not null'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'sales_team',
- 'from_table': u'Sales Team',
- 'match_id': 3,
- 'to_field': u'sales_team',
- 'to_table': u'Sales Team',
- 'validation_logic': u'name is not null'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:42",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:42"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Order-Sales Invoice",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Order-Sales Invoice",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Sales Invoice",
+ "module": "Accounts",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Sales Order"
+ },
+ {
+ "name": "Sales Order-Sales Invoice",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "customer",
+ "doctype": "Field Mapper Detail",
+ "from_field": "customer",
+ "checking_operator": "="
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: obj.basic_rate and (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate) or obj.qty"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "sales_order",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "so_detail",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval:flt(obj.amount) - flt(obj.billed_amt)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "export_amount",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "project_name",
+ "doctype": "Field Mapper Detail",
+ "from_field": "project_name",
+ "checking_operator": "="
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "warehouse",
+ "doctype": "Field Mapper Detail",
+ "from_field": "reserved_warehouse"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "naming_series",
+ "doctype": "Field Mapper Detail",
+ "from_field": "naming_series"
+ },
+ {
+ "map": "No",
+ "match_id": 3,
+ "to_field": "incentives",
+ "doctype": "Field Mapper Detail",
+ "from_field": "incentives"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "export_rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "export_rate",
+ "checking_operator": "="
+ },
+ {
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Sales Order",
+ "to_table": "Sales Invoice",
+ "validation_logic": "docstatus=1"
+ },
+ {
+ "match_id": 1,
+ "to_field": "entries",
+ "doctype": "Table Mapper Detail",
+ "from_field": "sales_order_detail",
+ "from_table": "Sales Order Item",
+ "to_table": "Sales Invoice Item",
+ "validation_logic": "(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1"
+ },
+ {
+ "match_id": 2,
+ "to_field": "other_charges",
+ "doctype": "Table Mapper Detail",
+ "from_field": "other_charges",
+ "from_table": "Sales Taxes and Charges",
+ "to_table": "Sales Taxes and Charges",
+ "validation_logic": "name is not null"
+ },
+ {
+ "match_id": 3,
+ "to_field": "sales_team",
+ "doctype": "Table Mapper Detail",
+ "from_field": "sales_team",
+ "from_table": "Sales Team",
+ "to_table": "Sales Team",
+ "validation_logic": "name is not null"
+ }
]
\ No newline at end of file
diff --git a/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt b/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
index acbe877a936..05abfff9d7e 100644
--- a/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
+++ b/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
@@ -1,131 +1,112 @@
-# GL Mapper, Purchase Invoice with write off
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-04-30 19:55:05',
- u'docstatus': 0,
- u'modified': '2012-10-03 11:08:09',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all GL Mapper
- {
- 'doc_type': u'Purchase Invoice with write off',
- u'doctype': u'GL Mapper',
- u'name': u'__common__'
- },
-
- # These values are common for all GL Mapper Detail
- {
- u'doctype': u'GL Mapper Detail',
- u'name': u'__common__',
- 'parent': u'Purchase Invoice with write off',
- 'parentfield': u'fields',
- 'parenttype': u'GL Mapper'
- },
-
- # GL Mapper, Purchase Invoice with write off
- {
- u'doctype': u'GL Mapper',
- u'name': u'Purchase Invoice with write off'
- },
-
- # GL Mapper Detail
- {
- 'account': u'expense_head',
- 'against': u'parent:credit_to',
- 'aging_date': u'parent:aging_date',
- 'company': u'parent:company',
- 'cost_center': u'cost_center',
- 'credit': u'value:0',
- 'debit': u'amount',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'parent:fiscal_year',
- 'is_opening': u'parent:is_opening',
- 'posting_date': u'parent:posting_date',
- 'remarks': u'parent:remarks',
- 'table_field': u'entries',
- 'transaction_date': u'parent:voucher_date',
- 'voucher_no': u'parent:name',
- 'voucher_type': u'parent:doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'account_head',
- 'against': u'parent:credit_to',
- 'aging_date': u'parent:aging_date',
- 'company': u'parent:company',
- 'cost_center': u'cost_center',
- 'credit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0",
- 'debit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'parent:fiscal_year',
- 'is_opening': u'parent:is_opening',
- 'posting_date': u'parent:posting_date',
- 'remarks': u'parent:remarks',
- 'table_field': u'purchase_tax_details',
- 'transaction_date': u'parent:voucher_date',
- 'voucher_no': u'parent:name',
- 'voucher_type': u'parent:doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'tax_code',
- 'against': u'credit_to',
- 'aging_date': u'aging_date',
- 'company': u'company',
- 'credit': u'ded_amount',
- 'debit': u'value:0',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'fiscal_year',
- 'is_opening': u'is_opening',
- 'posting_date': u'posting_date',
- 'remarks': u'remarks',
- 'transaction_date': u'voucher_date',
- 'voucher_no': u'name',
- 'voucher_type': u'doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'credit_to',
- 'against': u'against_expense_account',
- 'against_voucher': u'name',
- 'against_voucher_type': u"value:'Purchase Invoice'",
- 'aging_date': u'aging_date',
- 'company': u'company',
- 'credit': u'total_amount_to_pay',
- 'debit': u'value:0',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'fiscal_year',
- 'is_opening': u'is_opening',
- 'posting_date': u'posting_date',
- 'remarks': u'remarks',
- 'transaction_date': u'voucher_date',
- 'voucher_no': u'name',
- 'voucher_type': u'doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'write_off_account',
- 'against': u'credit_to',
- 'aging_date': u'aging_date',
- 'company': u'company',
- 'cost_center': u'write_off_cost_center',
- 'credit': u'write_off_amount',
- 'debit': u'value:0',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'fiscal_year',
- 'is_opening': u'is_opening',
- 'posting_date': u'posting_date',
- 'remarks': u'remarks',
- 'transaction_date': u'voucher_date',
- 'voucher_no': u'name',
- 'voucher_type': u'doctype'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-30 19:55:05",
+ "modified_by": "Administrator",
+ "modified": "2012-10-03 11:08:09"
+ },
+ {
+ "doc_type": "Purchase Invoice with write off",
+ "name": "__common__",
+ "doctype": "GL Mapper"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Invoice with write off",
+ "doctype": "GL Mapper Detail",
+ "parenttype": "GL Mapper",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Invoice with write off",
+ "doctype": "GL Mapper"
+ },
+ {
+ "account": "expense_head",
+ "doctype": "GL Mapper Detail",
+ "company": "parent:company",
+ "debit": "amount",
+ "fiscal_year": "parent:fiscal_year",
+ "against": "parent:credit_to",
+ "aging_date": "parent:aging_date",
+ "credit": "value:0",
+ "table_field": "entries",
+ "transaction_date": "parent:voucher_date",
+ "voucher_type": "parent:doctype",
+ "is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
+ "voucher_no": "parent:name",
+ "cost_center": "cost_center"
+ },
+ {
+ "account": "account_head",
+ "doctype": "GL Mapper Detail",
+ "company": "parent:company",
+ "debit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
+ "fiscal_year": "parent:fiscal_year",
+ "against": "parent:credit_to",
+ "aging_date": "parent:aging_date",
+ "credit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0",
+ "table_field": "purchase_tax_details",
+ "transaction_date": "parent:voucher_date",
+ "voucher_type": "parent:doctype",
+ "is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
+ "voucher_no": "parent:name",
+ "cost_center": "cost_center"
+ },
+ {
+ "account": "tax_code",
+ "doctype": "GL Mapper Detail",
+ "company": "company",
+ "debit": "value:0",
+ "fiscal_year": "fiscal_year",
+ "against": "credit_to",
+ "aging_date": "aging_date",
+ "credit": "ded_amount",
+ "transaction_date": "voucher_date",
+ "voucher_type": "doctype",
+ "is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name"
+ },
+ {
+ "account": "credit_to",
+ "doctype": "GL Mapper Detail",
+ "credit": "total_amount_to_pay",
+ "against_voucher_type": "value:'Purchase Invoice'",
+ "company": "company",
+ "debit": "value:0",
+ "fiscal_year": "fiscal_year",
+ "against": "against_expense_account",
+ "aging_date": "aging_date",
+ "against_voucher": "name",
+ "transaction_date": "voucher_date",
+ "voucher_type": "doctype",
+ "is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name"
+ },
+ {
+ "account": "write_off_account",
+ "doctype": "GL Mapper Detail",
+ "company": "company",
+ "debit": "value:0",
+ "fiscal_year": "fiscal_year",
+ "against": "credit_to",
+ "aging_date": "aging_date",
+ "credit": "write_off_amount",
+ "transaction_date": "voucher_date",
+ "voucher_type": "doctype",
+ "is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name",
+ "cost_center": "write_off_cost_center"
+ }
]
\ No newline at end of file
diff --git a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
index 61851d979cf..125116504dc 100644
--- a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
+++ b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
@@ -1,112 +1,95 @@
-# GL Mapper, Purchase Invoice
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-04-30 19:55:04',
- u'docstatus': 0,
- u'modified': '2012-10-03 11:07:26',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all GL Mapper
- {
- 'doc_type': u'Purchase Invoice',
- u'doctype': u'GL Mapper',
- u'name': u'__common__'
- },
-
- # These values are common for all GL Mapper Detail
- {
- u'doctype': u'GL Mapper Detail',
- u'name': u'__common__',
- 'parent': u'Purchase Invoice',
- 'parentfield': u'fields',
- 'parenttype': u'GL Mapper'
- },
-
- # GL Mapper, Purchase Invoice
- {
- u'doctype': u'GL Mapper',
- u'name': u'Purchase Invoice'
- },
-
- # GL Mapper Detail
- {
- 'account': u'expense_head',
- 'against': u'parent:credit_to',
- 'aging_date': u'parent:aging_date',
- 'company': u'parent:company',
- 'cost_center': u'cost_center',
- 'credit': u'value:0',
- 'debit': u'amount',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'parent:fiscal_year',
- 'is_opening': u'parent:is_opening',
- 'posting_date': u'parent:posting_date',
- 'remarks': u'parent:remarks',
- 'table_field': u'entries',
- 'transaction_date': u'parent:voucher_date',
- 'voucher_no': u'parent:name',
- 'voucher_type': u'parent:doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'account_head',
- 'against': u'parent:credit_to',
- 'aging_date': u'parent:aging_date',
- 'company': u'parent:company',
- 'cost_center': u'cost_center',
- 'credit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0",
- 'debit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'parent:fiscal_year',
- 'is_opening': u'parent:is_opening',
- 'posting_date': u'parent:posting_date',
- 'remarks': u'parent:remarks',
- 'table_field': u'purchase_tax_details',
- 'transaction_date': u'parent:voucher_date',
- 'voucher_no': u'parent:name',
- 'voucher_type': u'parent:doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'tax_code',
- 'against': u'credit_to',
- 'aging_date': u'aging_date',
- 'company': u'company',
- 'credit': u'ded_amount',
- 'debit': u'value:0',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'fiscal_year',
- 'is_opening': u'is_opening',
- 'posting_date': u'posting_date',
- 'remarks': u'remarks',
- 'transaction_date': u'voucher_date',
- 'voucher_no': u'name',
- 'voucher_type': u'doctype'
- },
-
- # GL Mapper Detail
- {
- 'account': u'credit_to',
- 'against': u'against_expense_account',
- 'against_voucher': u'name',
- 'against_voucher_type': u"value:'Purchase Invoice'",
- 'aging_date': u'aging_date',
- 'company': u'company',
- 'credit': u'total_amount_to_pay',
- 'debit': u'value:0',
- u'doctype': u'GL Mapper Detail',
- 'fiscal_year': u'fiscal_year',
- 'is_opening': u'is_opening',
- 'posting_date': u'posting_date',
- 'remarks': u'remarks',
- 'transaction_date': u'voucher_date',
- 'voucher_no': u'name',
- 'voucher_type': u'doctype'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-30 19:55:04",
+ "modified_by": "Administrator",
+ "modified": "2012-10-03 11:07:26"
+ },
+ {
+ "doc_type": "Purchase Invoice",
+ "name": "__common__",
+ "doctype": "GL Mapper"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Invoice",
+ "doctype": "GL Mapper Detail",
+ "parenttype": "GL Mapper",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Invoice",
+ "doctype": "GL Mapper"
+ },
+ {
+ "account": "expense_head",
+ "doctype": "GL Mapper Detail",
+ "company": "parent:company",
+ "debit": "amount",
+ "fiscal_year": "parent:fiscal_year",
+ "against": "parent:credit_to",
+ "aging_date": "parent:aging_date",
+ "credit": "value:0",
+ "table_field": "entries",
+ "transaction_date": "parent:voucher_date",
+ "voucher_type": "parent:doctype",
+ "is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
+ "voucher_no": "parent:name",
+ "cost_center": "cost_center"
+ },
+ {
+ "account": "account_head",
+ "doctype": "GL Mapper Detail",
+ "company": "parent:company",
+ "debit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
+ "fiscal_year": "parent:fiscal_year",
+ "against": "parent:credit_to",
+ "aging_date": "parent:aging_date",
+ "credit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0",
+ "table_field": "purchase_tax_details",
+ "transaction_date": "parent:voucher_date",
+ "voucher_type": "parent:doctype",
+ "is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
+ "voucher_no": "parent:name",
+ "cost_center": "cost_center"
+ },
+ {
+ "account": "tax_code",
+ "doctype": "GL Mapper Detail",
+ "company": "company",
+ "debit": "value:0",
+ "fiscal_year": "fiscal_year",
+ "against": "credit_to",
+ "aging_date": "aging_date",
+ "credit": "ded_amount",
+ "transaction_date": "voucher_date",
+ "voucher_type": "doctype",
+ "is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name"
+ },
+ {
+ "account": "credit_to",
+ "doctype": "GL Mapper Detail",
+ "credit": "total_amount_to_pay",
+ "against_voucher_type": "value:'Purchase Invoice'",
+ "company": "company",
+ "debit": "value:0",
+ "fiscal_year": "fiscal_year",
+ "against": "against_expense_account",
+ "aging_date": "aging_date",
+ "against_voucher": "name",
+ "transaction_date": "voucher_date",
+ "voucher_type": "doctype",
+ "is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt b/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
index e3355ec8b82..19456a920ab 100755
--- a/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
+++ b/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
@@ -1,28 +1,21 @@
-# Print Format, Cheque Printing Format
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-11 13:16:56',
- 'docstatus': 0,
- 'modified': '2012-04-13 12:24:20',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Journal Voucher',
- 'doctype': 'Print Format',
- 'html': u'\n\n
\n
\nPAYMENT ADVICE
\n
\n\n\nTo :
\n\n | \n\n\n\n\n| Voucher No : | \n\n\n | \n \n\n| Voucher Date : | \n\n\n | \n \n\n| Cheque No : | \n\n\n | \n \n\n| Cheque Date : | \n\n\n | \n \n\n \n | \n
\n\n
\n
We are pleased to enclose our cheque in full/part Settlement of your under noted bills \n
\n
\n\n\n| | \nTotal : | \n\n\n | \n
\n\nNarration :\n\n
| \n
\n\n
\n
Prepared By
\n
Authorised Signatory
\n
Received Payment as Above
\n
_____________
\n
A/c Payee
\n
_____________
\n
\n\n
\n
\n\n
\n
\n\n
\n
\n\n
\n
\n
\n
\nPAYMENT ADVICE
\n
\n\n\nTo :
\n\n | \n\n\n\n\n| Voucher No : | \n\n\n | \n \n\n| Voucher Date : | \n\n\n | \n \n\n| Cheque No : | \n\n\n | \n \n\n| Cheque Date : | \n\n\n | \n \n\n \n | \n
\n\n
\n
We are pleased to enclose our cheque in full/part Settlement of your under noted bills \n
\n
\n\n\n| | \nTotal : | \n\n\n | \n
\n\nNarration :\n\n
| \n
\n\n
\n
Prepared By
\n
Authorised Signatory
\n
Received Payment as Above
\n
_____________
\n
A/c Payee
\n
_____________
\n
\n\n
\n
\n\n
\n
\n\n
\n
\n\n
\n
\n \n | \n \n | \n
\n \n FORM No. 16 A\n Certificate No: \n [See rule 31 (1)(b)] \n Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961\n [For interest on securities; dividends; interests other than \'interests on securities\';winnings from lottery or crossword puzzle;\n winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n \n non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n \n on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section \n 196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n | \n
\n\n \n | Name and address of person deducing tax | \n Acknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-site | \n Name and address of the person to whom payment is made or in whose account it is credited | \n
\n \n \n | \n \n | \n \n \n | \n \n \n | \n
\n \n \n \n \n Registration Details OF THE DEDUCTOR
\n |
\n \n | \n \n \n \n NATURE OF PAYMENT
\n |
\n \n \n | \n \n \n \n PAN NO. OF THE PAYEE
\n |
\n \n \n | \n
\n \n \n | DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT\n (The deductor is to provide transaction wise details of tax deducted and deposited) \n |
\n \n \n | \n \n | \n
\n \n \n \n Certified that a sum of Rs. has been deducted at source and paid to the credit of the Central Government as per details given above
\n Signature of person responsible for deduction of tax \n | \n
\n \n \n \n \n \n | Place: | \n Full Name: | \n \n \n | Date: | \n Designation: | \n \n \n | \n
\n \n
\n\n',
- 'module': 'Accounts',
- 'name': '__common__',
- 'standard': 'Yes'
- },
-
- # Print Format, Form 16A Print Format
- {
- 'doctype': 'Print Format',
- 'name': 'Form 16A Print Format'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2010-09-27 17:30:34",
+ "modified_by": "Administrator",
+ "modified": "2011-10-19 14:19:27"
+ },
+ {
+ "name": "__common__",
+ "module": "Accounts",
+ "standard": "Yes",
+ "html": "\n \n\n\n \n | \n \n | \n
\n \n FORM No. 16 A\n Certificate No: \n [See rule 31 (1)(b)] \n Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961\n [For interest on securities; dividends; interests other than 'interests on securities';winnings from lottery or crossword puzzle;\n winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n \n non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n \n on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section \n 196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n | \n
\n\n \n | Name and address of person deducing tax | \n Acknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-site | \n Name and address of the person to whom payment is made or in whose account it is credited | \n
\n \n \n | \n \n | \n \n \n | \n \n \n | \n
\n \n \n \n \n Registration Details OF THE DEDUCTOR
\n |
\n \n | \n \n \n \n NATURE OF PAYMENT
\n |
\n \n \n | \n \n \n \n PAN NO. OF THE PAYEE
\n |
\n \n \n | \n
\n \n \n | DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT\n (The deductor is to provide transaction wise details of tax deducted and deposited) \n |
\n \n \n | \n \n | \n
\n \n \n \n Certified that a sum of Rs. has been deducted at source and paid to the credit of the Central Government as per details given above
\n Signature of person responsible for deduction of tax \n | \n
\n \n \n \n \n \n | Place: | \n Full Name: | \n \n \n | Date: | \n Designation: | \n \n \n | \n
\n \n
\n\n",
+ "doctype": "Print Format"
+ },
+ {
+ "name": "Form 16A Print Format",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/POS Invoice/POS Invoice.txt b/accounts/Print Format/POS Invoice/POS Invoice.txt
index 82eeaf08247..edd5f111b86 100644
--- a/accounts/Print Format/POS Invoice/POS Invoice.txt
+++ b/accounts/Print Format/POS Invoice/POS Invoice.txt
@@ -1,28 +1,21 @@
-# Print Format, POS Invoice
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-12-21 11:08:55',
- 'docstatus': 0,
- 'modified': '2012-03-20 12:29:49',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Sales Invoice',
- 'doctype': 'Print Format',
- 'html': u'\n\n\n\n\n\n\n\n\n\n | NO: | \n DATE: | \n
\n\n | M/s | \n
\n
\n\n\n\n
\n\n
\n\n |
\n | For |
\n | |
\n | Signatory |
\n
\n\n\n',
- 'module': u'Accounts',
- 'name': '__common__',
- 'standard': u'Yes'
- },
-
- # Print Format, POS Invoice
- {
- 'doctype': 'Print Format',
- 'name': u'POS Invoice'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-12-21 11:08:55",
+ "modified_by": "Administrator",
+ "modified": "2012-03-20 12:29:49"
+ },
+ {
+ "doc_type": "Sales Invoice",
+ "name": "__common__",
+ "module": "Accounts",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n | NO: | \n DATE: | \n
\n\n | M/s | \n
\n
\n\n\n\n
\n\n
\n\n |
\n | For |
\n | |
\n | Signatory |
\n
\n\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "POS Invoice",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
index 4b56d7256ee..bd9a52e0951 100755
--- a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
+++ b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
@@ -1,28 +1,21 @@
-# Print Format, Payment Receipt Voucher
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-11 13:16:56',
- 'docstatus': 0,
- 'modified': '2012-04-13 12:24:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Journal Voucher',
- 'doctype': 'Print Format',
- 'html': u'\n
\n
\n\n\n\n\n| Receipt No.: | \n | \n
\n\n| Date : | \n | \n
\n\n| Remark: | \n | \n
\n\n| Received From: | \n | \n
\n
\n
\n\n
\n
\nThis receipt is issued subject to realization of the Cheque
\n\n
\n\n\nFor ,
(Authorised Signatory) | \n
\n
',
- 'module': u'Accounts',
- 'name': '__common__',
- 'standard': u'Yes'
- },
-
- # Print Format, Payment Receipt Voucher
- {
- 'doctype': 'Print Format',
- 'name': u'Payment Receipt Voucher'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-11 13:16:56",
+ "modified_by": "Administrator",
+ "modified": "2012-04-13 12:24:59"
+ },
+ {
+ "doc_type": "Journal Voucher",
+ "name": "__common__",
+ "module": "Accounts",
+ "doctype": "Print Format",
+ "html": "\n
\n
\n\n\n\n\n| Receipt No.: | \n | \n
\n\n| Date : | \n | \n
\n\n| Remark: | \n | \n
\n\n| Received From: | \n | \n
\n
\n
\n\n
\n
\nThis receipt is issued subject to realization of the Cheque
\n\n
\n\n\nFor ,
(Authorised Signatory) | \n
\n
",
+ "standard": "Yes"
+ },
+ {
+ "name": "Payment Receipt Voucher",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt b/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
index 2f6ae86848c..eba8fb92136 100644
--- a/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
+++ b/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
@@ -1,28 +1,21 @@
-# Print Format, Sales Invoice Classic
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-05-16 14:07:31',
- 'docstatus': 0,
- 'modified': '2012-06-04 16:02:12',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Sales Invoice',
- 'doctype': 'Print Format',
- 'html': u'\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': u'Accounts',
- 'name': '__common__',
- 'standard': u'Yes'
- },
-
- # Print Format, Sales Invoice Classic
- {
- 'doctype': 'Print Format',
- 'name': u'Sales Invoice Classic'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-05-16 14:07:31",
+ "modified_by": "Administrator",
+ "modified": "2012-06-04 16:02:12"
+ },
+ {
+ "doc_type": "Sales Invoice",
+ "name": "__common__",
+ "module": "Accounts",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Sales Invoice Classic",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt b/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
index 114650362e5..5cfefc2efa0 100644
--- a/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
+++ b/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
@@ -1,28 +1,21 @@
-# Print Format, Sales Invoice Modern
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-05-16 14:07:31',
- 'docstatus': 0,
- 'modified': '2012-06-04 16:01:46',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Sales Invoice',
- 'doctype': 'Print Format',
- 'html': u'\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': u'Accounts',
- 'name': '__common__',
- 'standard': u'Yes'
- },
-
- # Print Format, Sales Invoice Modern
- {
- 'doctype': 'Print Format',
- 'name': u'Sales Invoice Modern'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-05-16 14:07:31",
+ "modified_by": "Administrator",
+ "modified": "2012-06-04 16:01:46"
+ },
+ {
+ "doc_type": "Sales Invoice",
+ "name": "__common__",
+ "module": "Accounts",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Sales Invoice Modern",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt b/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
index 77e6ef3830a..f910a294208 100644
--- a/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
+++ b/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
@@ -1,28 +1,21 @@
-# Print Format, Sales Invoice Spartan
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-05-16 14:07:31',
- 'docstatus': 0,
- 'modified': '2012-06-04 16:01:09',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': u'Sales Invoice',
- 'doctype': 'Print Format',
- 'html': u'\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': u'Accounts',
- 'name': '__common__',
- 'standard': u'Yes'
- },
-
- # Print Format, Sales Invoice Spartan
- {
- 'doctype': 'Print Format',
- 'name': u'Sales Invoice Spartan'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-05-16 14:07:31",
+ "modified_by": "Administrator",
+ "modified": "2012-06-04 16:01:09"
+ },
+ {
+ "doc_type": "Sales Invoice",
+ "name": "__common__",
+ "module": "Accounts",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Sales Invoice Spartan",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
index f1d0b9fd64f..9914b488dd3 100644
--- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
+++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
@@ -1,167 +1,134 @@
-# DocType, Bank Reconciliation
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:40',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:40',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1294312169',
- 'allow_copy': 1,
- 'allow_email': 1,
- 'allow_print': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_heading': 1,
- 'hide_toolbar': 1,
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'read_only': 1,
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 12
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Bank Reconciliation',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Bank Reconciliation',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Bank Reconciliation
- {
- 'doctype': 'DocType',
- 'name': u'Bank Reconciliation'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'head_html',
- 'fieldtype': u'HTML',
- 'label': u'Head HTML',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'description': u'Select account head of the bank where cheque was deposited.',
- 'doctype': u'DocField',
- 'fieldname': u'bank_account',
- 'fieldtype': u'Link',
- 'label': u'Bank Account',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'from_date',
- 'fieldtype': u'Date',
- 'label': u'From Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'to_date',
- 'fieldtype': u'Date',
- 'label': u'To Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'get_non_reconciled_entries',
- 'fieldtype': u'Button',
- 'label': u'Get Non Reconciled Entries',
- 'options': u'get_details',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'entries',
- 'fieldtype': u'Table',
- 'label': u'Entries',
- 'options': u'Bank Reconciliation Detail',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'update_clearance_date',
- 'fieldtype': u'Button',
- 'label': u'Update Clearance Date',
- 'options': u'update_details',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total_amount',
- 'fieldtype': u'Currency',
- 'label': u'Total Amount',
- 'permlevel': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:40",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:40"
+ },
+ {
+ "section_style": "Simple",
+ "allow_print": 1,
+ "module": "Accounts",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "read_only": 1,
+ "allow_email": 1,
+ "hide_heading": 1,
+ "issingle": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1294312169",
+ "show_in_menu": 0,
+ "version": 12,
+ "hide_toolbar": 1,
+ "allow_copy": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Bank Reconciliation",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Bank Reconciliation",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Bank Reconciliation",
+ "doctype": "DocType"
+ },
+ {
+ "amend": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Accounts User",
+ "cancel": 0,
+ "permlevel": 0
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Accounts Manager",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Head HTML",
+ "fieldname": "head_html",
+ "fieldtype": "HTML",
+ "permlevel": 0
+ },
+ {
+ "description": "Select account head of the bank where cheque was deposited.",
+ "doctype": "DocField",
+ "label": "Bank Account",
+ "permlevel": 0,
+ "fieldname": "bank_account",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account"
+ },
+ {
+ "doctype": "DocField",
+ "label": "From Date",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "To Date",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Get Non Reconciled Entries",
+ "permlevel": 0,
+ "fieldname": "get_non_reconciled_entries",
+ "fieldtype": "Button",
+ "options": "get_details"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Entries",
+ "permlevel": 0,
+ "fieldname": "entries",
+ "fieldtype": "Table",
+ "options": "Bank Reconciliation Detail"
+ },
+ {
+ "doctype": "DocField",
+ "options": "update_details",
+ "fieldname": "update_clearance_date",
+ "fieldtype": "Button",
+ "label": "Update Clearance Date",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Amount",
+ "fieldname": "total_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index e3688b4a90e..cc3bb680194 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -1,131 +1,106 @@
-# DocType, Bank Reconciliation Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:41',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:41',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'show_in_menu': 0,
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'no_copy': 0,
- 'parent': u'Bank Reconciliation Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'search_index': 0
- },
-
- # DocType, Bank Reconciliation Detail
- {
- 'doctype': 'DocType',
- 'name': u'Bank Reconciliation Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_id',
- 'fieldtype': u'Link',
- 'label': u'Voucher ID',
- 'oldfieldname': u'voucher_id',
- 'oldfieldtype': u'Link',
- 'options': u'Journal Voucher',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'against_account',
- 'fieldtype': u'Data',
- 'label': u'Against Account',
- 'oldfieldname': u'against_account',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'description': u'The date at which current entry will get or has actually executed.',
- 'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'label': u'Posting Date',
- 'oldfieldname': u'posting_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cheque_number',
- 'fieldtype': u'Data',
- 'label': u'Cheque Number',
- 'oldfieldname': u'cheque_number',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cheque_date',
- 'fieldtype': u'Date',
- 'label': u'Cheque Date',
- 'oldfieldname': u'cheque_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'debit',
- 'fieldtype': u'Currency',
- 'label': u'Debit',
- 'oldfieldname': u'debit',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'credit',
- 'fieldtype': u'Currency',
- 'label': u'Credit',
- 'oldfieldname': u'credit',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'clearance_date',
- 'fieldtype': u'Date',
- 'label': u'Clearance Date',
- 'oldfieldname': u'clearance_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:41",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:41"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "version": 5,
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Bank Reconciliation Detail",
+ "no_copy": 0,
+ "search_index": 0,
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Bank Reconciliation Detail",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Voucher ID",
+ "oldfieldname": "voucher_id",
+ "permlevel": 0,
+ "fieldname": "voucher_id",
+ "fieldtype": "Link",
+ "options": "Journal Voucher"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Against Account",
+ "oldfieldname": "against_account",
+ "fieldname": "against_account",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "description": "The date at which current entry will get or has actually executed.",
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "oldfieldname": "posting_date",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Cheque Number",
+ "oldfieldname": "cheque_number",
+ "fieldname": "cheque_number",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Cheque Date",
+ "oldfieldname": "cheque_date",
+ "fieldname": "cheque_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Debit",
+ "oldfieldname": "debit",
+ "fieldname": "debit",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Credit",
+ "oldfieldname": "credit",
+ "fieldname": "credit",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Clearance Date",
+ "oldfieldname": "clearance_date",
+ "fieldname": "clearance_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/budget_control/budget_control.txt b/accounts/doctype/budget_control/budget_control.txt
index a08762fd559..b27e65f6ce3 100644
--- a/accounts/doctype/budget_control/budget_control.txt
+++ b/accounts/doctype/budget_control/budget_control.txt
@@ -1,31 +1,24 @@
-# DocType, Budget Control
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:41',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:41',
- 'modified_by': u'Administrator',
- 'owner': u'nabin@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 23
- },
-
- # DocType, Budget Control
- {
- 'doctype': 'DocType',
- 'name': u'Budget Control'
- }
+ {
+ "owner": "nabin@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:41",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:41"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "version": 23,
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "issingle": 1
+ },
+ {
+ "name": "Budget Control",
+ "doctype": "DocType"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index f9f287a9987..7e28e817ab9 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -1,94 +1,77 @@
-# DocType, Budget Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:41',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:41',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'CBD/.######',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'show_in_menu': 0,
- 'version': 6
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Budget Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Budget Detail
- {
- 'doctype': 'DocType',
- 'name': u'Budget Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'account',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Account',
- 'oldfieldname': u'account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'budget_allocated',
- 'fieldtype': u'Currency',
- 'label': u'Budget Allocated',
- 'oldfieldname': u'budget_allocated',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'actual',
- 'fieldtype': u'Currency',
- 'label': u'Actual',
- 'oldfieldname': u'actual',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:41",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:41"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "version": 6,
+ "autoname": "CBD/.######",
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Budget Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Budget Detail",
+ "doctype": "DocType"
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Account",
+ "oldfieldname": "account",
+ "trigger": "Client",
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "reqd": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Budget Allocated",
+ "oldfieldname": "budget_allocated",
+ "fieldname": "budget_allocated",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Actual",
+ "oldfieldname": "actual",
+ "fieldname": "actual",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "options": "link:Fiscal Year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt
index ab8a6c8cdc8..c376e5a6ee0 100644
--- a/accounts/doctype/budget_distribution/budget_distribution.txt
+++ b/accounts/doctype/budget_distribution/budget_distribution.txt
@@ -1,160 +1,129 @@
-# DocType, Budget Distribution
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-07-03 13:30:50',
- 'docstatus': 0,
- 'modified': '2012-07-11 14:37:30',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:distribution_id',
- 'colour': u'White:FFF',
- 'description': u'**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**',
- 'doctype': 'DocType',
- 'module': u'Accounts',
- 'name': '__common__',
- 'name_case': u'Title Case',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Budget Distribution',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Budget Distribution',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Budget Distribution
- {
- 'doctype': 'DocType',
- 'name': u'Budget Distribution'
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'Accounts Manager'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Name of the Budget Distribution',
- 'doctype': u'DocField',
- 'fieldname': u'distribution_id',
- 'fieldtype': u'Data',
- 'label': u'Distribution Name',
- 'oldfieldname': u'distribution_id',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'budget_distribution_details',
- 'fieldtype': u'Table',
- 'label': u'Budget Distribution Details',
- 'oldfieldname': u'budget_distribution_details',
- 'oldfieldtype': u'Table',
- 'options': u'Budget Distribution Detail',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:50",
+ "modified_by": "Administrator",
+ "modified": "2012-07-11 14:37:30"
+ },
+ {
+ "section_style": "Simple",
+ "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",
+ "module": "Accounts",
+ "allow_trash": 1,
+ "server_code_error": " ",
+ "autoname": "field:distribution_id",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "doctype": "DocType",
+ "show_in_menu": 0,
+ "name_case": "Title Case",
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Budget Distribution",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Budget Distribution",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Budget Distribution",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "write": 1,
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 2,
+ "doctype": "DocPerm"
+ },
+ {
+ "amend": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Accounts Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Accounts Manager",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "role": "Accounts Manager",
+ "permlevel": 2,
+ "doctype": "DocPerm"
+ },
+ {
+ "description": "Name of the Budget Distribution",
+ "oldfieldtype": "Data",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Distribution Name",
+ "oldfieldname": "distribution_id",
+ "fieldname": "distribution_id",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Table",
+ "doctype": "DocField",
+ "label": "Budget Distribution Details",
+ "oldfieldname": "budget_distribution_details",
+ "permlevel": 0,
+ "fieldname": "budget_distribution_details",
+ "fieldtype": "Table",
+ "options": "Budget Distribution Detail"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index 0acfdbc5bbe..5c7d09995a8 100644
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -1,64 +1,51 @@
-# DocType, Budget Distribution Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-07-03 13:30:47',
- 'docstatus': 0,
- 'modified': '2012-07-11 14:32:16',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'BDD/.#####',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Budget Distribution Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Budget Distribution Detail
- {
- 'doctype': 'DocType',
- 'name': u'Budget Distribution Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'month',
- 'fieldtype': u'Data',
- 'label': u'Month',
- 'oldfieldname': u'month',
- 'oldfieldtype': u'Data',
- 'permlevel': 2,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'percentage_allocation',
- 'fieldtype': u'Currency',
- 'label': u'Percentage Allocation',
- 'oldfieldname': u'percentage_allocation',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:47",
+ "modified_by": "Administrator",
+ "modified": "2012-07-11 14:32:16"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Accounts",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "autoname": "BDD/.#####",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Budget Distribution Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Budget Distribution Detail",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Month",
+ "oldfieldname": "month",
+ "fieldname": "month",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 2
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Percentage Allocation",
+ "oldfieldname": "percentage_allocation",
+ "fieldname": "percentage_allocation",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt
index b404204ead0..7d5d1304c14 100644
--- a/accounts/doctype/c_form/c_form.txt
+++ b/accounts/doctype/c_form/c_form.txt
@@ -1,229 +1,181 @@
-# DocType, C-Form
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-12-14 11:40:47',
- 'docstatus': 0,
- 'modified': '2012-04-06 17:29:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1333712835',
- 'allow_attach': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'max_attachments': 3,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 19
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'C-Form',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'C-Form',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, C-Form
- {
- 'doctype': 'DocType',
- 'name': u'C-Form'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'naming_series',
- 'fieldtype': u'Select',
- 'label': u'Series',
- 'options': u'\nC-FORM/',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'c_form_no',
- 'fieldtype': u'Data',
- 'label': u'C-Form No',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'received_date',
- 'fieldtype': u'Date',
- 'label': u'Received Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'customer',
- 'fieldtype': u'Link',
- 'label': u'Customer',
- 'options': u'Customer',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Select',
- 'label': u'Company',
- 'options': u'link:Company',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'label': u'Fiscal Year',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'quarter',
- 'fieldtype': u'Select',
- 'label': u'Quarter',
- 'options': u'\nI\nII\nIII\nIV',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total_amount',
- 'fieldtype': u'Currency',
- 'label': u'Total Amount',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'state',
- 'fieldtype': u'Select',
- 'label': u'State',
- 'options': u"link:State\ncountry='India'",
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'section_break0',
- 'fieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'invoice_details',
- 'fieldtype': u'Table',
- 'label': u'Invoice Details',
- 'options': u'C-Form Invoice Detail',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total_invoiced_amount',
- 'fieldtype': u'Currency',
- 'label': u'Total Invoiced Amount',
- 'permlevel': 1,
- 'print_hide': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'file_list',
- 'fieldtype': u'Text',
- 'hidden': 1,
- 'label': u'File List',
- 'permlevel': 0,
- 'print_hide': 1
- }
-]
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-12-14 11:40:47",
+ "modified_by": "Administrator",
+ "modified": "2012-04-06 17:29:50"
+ },
+ {
+ "section_style": "Simple",
+ "allow_attach": 1,
+ "module": "Accounts",
+ "doctype": "DocType",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1333712835",
+ "show_in_menu": 0,
+ "max_attachments": 3,
+ "version": 19
+ },
+ {
+ "name": "__common__",
+ "parent": "C-Form",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "C-Form",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "C-Form",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Accounts User",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Accounts Manager",
+ "permlevel": 0
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Series",
+ "permlevel": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nC-FORM/"
+ },
+ {
+ "doctype": "DocField",
+ "label": "C-Form No",
+ "fieldname": "c_form_no",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Received Date",
+ "fieldname": "received_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Customer",
+ "permlevel": 0,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Customer"
+ },
+ {
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "label": "Company",
+ "options": "link:Company"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year"
+ },
+ {
+ "doctype": "DocField",
+ "permlevel": 0,
+ "fieldname": "quarter",
+ "fieldtype": "Select",
+ "label": "Quarter",
+ "options": "\nI\nII\nIII\nIV"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Amount",
+ "fieldname": "total_amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "State",
+ "permlevel": 0,
+ "fieldname": "state",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:State\ncountry='India'"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "permlevel": 0,
+ "fieldname": "invoice_details",
+ "fieldtype": "Table",
+ "label": "Invoice Details",
+ "options": "C-Form Invoice Detail"
+ },
+ {
+ "print_hide": 0,
+ "doctype": "DocField",
+ "label": "Total Invoiced Amount",
+ "fieldname": "total_invoiced_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "File List",
+ "fieldname": "file_list",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "permlevel": 0
+ }
+]
\ No newline at end of file
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 367d8c12c06..d61d32c65d7 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
@@ -1,91 +1,72 @@
-# DocType, C-Form Invoice Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:41',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:41',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'C-Form Invoice Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, C-Form Invoice Detail
- {
- 'doctype': 'DocType',
- 'name': u'C-Form Invoice Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'invoice_no',
- 'fieldtype': u'Link',
- 'label': u'Invoice No',
- 'options': u'Sales Invoice',
- 'permlevel': 0,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'invoice_date',
- 'fieldtype': u'Date',
- 'label': u'Invoice Date',
- 'permlevel': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'territory',
- 'fieldtype': u'Link',
- 'label': u'Territory',
- 'options': u'Territory',
- 'permlevel': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'net_total',
- 'fieldtype': u'Currency',
- 'label': u'Net Total',
- 'permlevel': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'grand_total',
- 'fieldtype': u'Currency',
- 'label': u'Grand Total',
- 'permlevel': 1,
- 'width': u'120px'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:41",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:41"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "version": 5,
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "C-Form Invoice Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "C-Form Invoice Detail",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Invoice No",
+ "width": "160px",
+ "options": "Sales Invoice",
+ "fieldname": "invoice_no",
+ "fieldtype": "Link",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Invoice Date",
+ "width": "120px",
+ "fieldname": "invoice_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Territory",
+ "width": "120px",
+ "options": "Territory",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Net Total",
+ "width": "120px",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Grand Total",
+ "width": "120px",
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt
index 23ccc856a06..c34f8a2f9f0 100644
--- a/accounts/doctype/fiscal_year/fiscal_year.txt
+++ b/accounts/doctype/fiscal_year/fiscal_year.txt
@@ -1,134 +1,109 @@
-# DocType, Fiscal Year
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-07-03 13:30:47',
- 'docstatus': 0,
- 'modified': '2012-07-11 14:56:41',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1322549700',
- 'allow_trash': 1,
- 'autoname': u'field:year',
- 'colour': u'White:FFF',
- 'description': u'**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tabbed',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Fiscal Year',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Fiscal Year',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocType, Fiscal Year
- {
- 'doctype': 'DocType',
- 'name': u'Fiscal Year'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'doctype': u'DocPerm',
- 'submit': 0
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'year_details',
- 'fieldtype': u'Section Break',
- 'label': u'Fiscal Year Details',
- 'oldfieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'For e.g. 2012, 2012-13',
- 'doctype': u'DocField',
- 'fieldname': u'year',
- 'fieldtype': u'Data',
- 'label': u'Year Name',
- 'oldfieldname': u'year',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'year_start_date',
- 'fieldtype': u'Date',
- 'label': u'Year Start Date',
- 'oldfieldname': u'year_start_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'No',
- 'description': u'Entries are not allowed against this Fiscal Year if the year is closed.',
- 'doctype': u'DocField',
- 'fieldname': u'is_fiscal_year_closed',
- 'fieldtype': u'Select',
- 'label': u'Year Closed',
- 'oldfieldname': u'is_fiscal_year_closed',
- 'oldfieldtype': u'Select',
- 'options': u'\nNo\nYes',
- 'permlevel': 0,
- 'reqd': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:47",
+ "modified_by": "Administrator",
+ "modified": "2012-07-11 14:56:41"
+ },
+ {
+ "section_style": "Tabbed",
+ "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "allow_trash": 1,
+ "server_code_error": " ",
+ "document_type": "Master",
+ "autoname": "field:year",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1322549700",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Fiscal Year",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Fiscal Year",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "cancel": 1,
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Fiscal Year",
+ "doctype": "DocType"
+ },
+ {
+ "amend": 0,
+ "doctype": "DocPerm",
+ "submit": 0
+ },
+ {
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Fiscal Year Details",
+ "fieldname": "year_details",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "description": "For e.g. 2012, 2012-13",
+ "oldfieldtype": "Data",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Year Name",
+ "oldfieldname": "year",
+ "fieldname": "year",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Year Start Date",
+ "oldfieldname": "year_start_date",
+ "fieldname": "year_start_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "description": "Entries are not allowed against this Fiscal Year if the year is closed.",
+ "default": "No",
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Year Closed",
+ "oldfieldname": "is_fiscal_year_closed",
+ "options": "\nNo\nYes",
+ "fieldname": "is_fiscal_year_closed",
+ "fieldtype": "Select",
+ "reqd": 0,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/gl_control/gl_control.txt b/accounts/doctype/gl_control/gl_control.txt
index d75ff169fcc..7e0710cddbf 100644
--- a/accounts/doctype/gl_control/gl_control.txt
+++ b/accounts/doctype/gl_control/gl_control.txt
@@ -1,31 +1,24 @@
-# DocType, GL Control
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:42',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:42',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 288
- },
-
- # DocType, GL Control
- {
- 'doctype': 'DocType',
- 'name': u'GL Control'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:42",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:42"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "version": 288,
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "issingle": 1
+ },
+ {
+ "name": "GL Control",
+ "doctype": "DocType"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt
index 9c8b5dd54e2..76fc101da9f 100644
--- a/accounts/doctype/gl_entry/gl_entry.txt
+++ b/accounts/doctype/gl_entry/gl_entry.txt
@@ -1,302 +1,249 @@
-# DocType, GL Entry
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:42',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:42',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1319016431',
- 'autoname': u'GL.#######',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'in_create': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'search_fields': u'voucher_no,account,posting_date,against_voucher',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 103
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'GL Entry',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'create': 0,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'GL Entry',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1,
- 'write': 0
- },
-
- # DocType, GL Entry
- {
- 'doctype': 'DocType',
- 'name': u'GL Entry'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'doctype': u'DocPerm',
- 'role': u'Accounts User',
- 'submit': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 0
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager'
- },
-
- # DocField
- {
- 'description': u'The date at which current entry will get or has actually executed.',
- 'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Posting Date',
- 'oldfieldname': u'posting_date',
- 'oldfieldtype': u'Date',
- 'search_index': 1
- },
-
- # DocField
- {
- 'description': u'The date at which current entry is made in system.',
- 'doctype': u'DocField',
- 'fieldname': u'transaction_date',
- 'fieldtype': u'Date',
- 'label': u'Transaction Date',
- 'oldfieldname': u'transaction_date',
- 'oldfieldtype': u'Date'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'aging_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Aging Date',
- 'oldfieldname': u'aging_date',
- 'oldfieldtype': u'Date',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'account',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Account',
- 'oldfieldname': u'account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cost_center',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'debit',
- 'fieldtype': u'Currency',
- 'label': u'Debit Amt',
- 'oldfieldname': u'debit',
- 'oldfieldtype': u'Currency'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'credit',
- 'fieldtype': u'Currency',
- 'label': u'Credit Amt',
- 'oldfieldname': u'credit',
- 'oldfieldtype': u'Currency'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'against',
- 'fieldtype': u'Text',
- 'in_filter': 1,
- 'label': u'Against',
- 'oldfieldname': u'against',
- 'oldfieldtype': u'Text'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'against_voucher',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Against Voucher',
- 'oldfieldname': u'against_voucher',
- 'oldfieldtype': u'Data',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'against_voucher_type',
- 'fieldtype': u'Data',
- 'in_filter': 0,
- 'label': u'Against Voucher Type',
- 'oldfieldname': u'against_voucher_type',
- 'oldfieldtype': u'Data',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_type',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Voucher Type',
- 'oldfieldname': u'voucher_type',
- 'oldfieldtype': u'Select',
- 'options': u'Journal Voucher\nSales Invoice\nPurchase Invoice',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_no',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Voucher No',
- 'oldfieldname': u'voucher_no',
- 'oldfieldtype': u'Data',
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'remarks',
- 'fieldtype': u'Text',
- 'in_filter': 1,
- 'label': u'Remarks',
- 'no_copy': 1,
- 'oldfieldname': u'remarks',
- 'oldfieldtype': u'Text',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_cancelled',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Is Cancelled',
- 'oldfieldname': u'is_cancelled',
- 'oldfieldtype': u'Select',
- 'options': u'No\nYes',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_opening',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Is Opening',
- 'oldfieldname': u'is_opening',
- 'oldfieldtype': u'Select',
- 'options': u'No\nYes',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_advance',
- 'fieldtype': u'Select',
- 'in_filter': 0,
- 'label': u'Is Advance',
- 'oldfieldname': u'is_advance',
- 'oldfieldtype': u'Select',
- 'options': u'No\nYes',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Link',
- 'options': u'Company',
- 'search_index': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:42",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:42"
+ },
+ {
+ "section_style": "Simple",
+ "in_create": 1,
+ "search_fields": "voucher_no,account,posting_date,against_voucher",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "autoname": "GL.#######",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1319016431",
+ "show_in_menu": 0,
+ "version": 103
+ },
+ {
+ "name": "__common__",
+ "parent": "GL Entry",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "GL Entry",
+ "read": 1,
+ "create": 0,
+ "doctype": "DocPerm",
+ "write": 0,
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "GL Entry",
+ "doctype": "DocType"
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "role": "Accounts User",
+ "doctype": "DocPerm",
+ "submit": 0
+ },
+ {
+ "amend": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "role": "Accounts Manager",
+ "cancel": 0,
+ "permlevel": 0
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 0,
+ "doctype": "DocPerm"
+ },
+ {
+ "description": "The date at which current entry will get or has actually executed.",
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "oldfieldname": "posting_date",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "oldfieldtype": "Date",
+ "in_filter": 1
+ },
+ {
+ "description": "The date at which current entry is made in system.",
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Transaction Date",
+ "oldfieldname": "transaction_date",
+ "fieldname": "transaction_date",
+ "fieldtype": "Date"
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Aging Date",
+ "oldfieldname": "aging_date",
+ "fieldname": "aging_date",
+ "fieldtype": "Date",
+ "oldfieldtype": "Date",
+ "in_filter": 1
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Account",
+ "oldfieldname": "account",
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "options": "Cost Center",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Debit Amt",
+ "oldfieldname": "debit",
+ "fieldname": "debit",
+ "fieldtype": "Currency"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Credit Amt",
+ "oldfieldname": "credit",
+ "fieldname": "credit",
+ "fieldtype": "Currency"
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Against",
+ "oldfieldname": "against",
+ "fieldname": "against",
+ "fieldtype": "Text",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Against Voucher",
+ "oldfieldname": "against_voucher",
+ "fieldname": "against_voucher",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Against Voucher Type",
+ "oldfieldname": "against_voucher_type",
+ "fieldname": "against_voucher_type",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "in_filter": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Voucher Type",
+ "oldfieldname": "voucher_type",
+ "fieldname": "voucher_type",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "Journal Voucher\nSales Invoice\nPurchase Invoice",
+ "in_filter": 1
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Voucher No",
+ "oldfieldname": "voucher_no",
+ "fieldname": "voucher_no",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "in_filter": 1
+ },
+ {
+ "no_copy": 1,
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Remarks",
+ "oldfieldname": "remarks",
+ "fieldname": "remarks",
+ "fieldtype": "Text",
+ "oldfieldtype": "Text",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Is Cancelled",
+ "oldfieldname": "is_cancelled",
+ "fieldname": "is_cancelled",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Is Opening",
+ "oldfieldname": "is_opening",
+ "fieldname": "is_opening",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Is Advance",
+ "oldfieldname": "is_advance",
+ "fieldname": "is_advance",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "in_filter": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "in_filter": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 972c1253700..7bf9e36fc95 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -1,187 +1,158 @@
-# DocType, Journal Voucher Detail
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-05-03 18:41:39',
- u'docstatus': 0,
- u'modified': '2012-10-02 16:47:37',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'JVD.######',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- u'name': u'__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Journal Voucher Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Journal Voucher Detail
- {
- u'doctype': u'DocType',
- u'name': u'Journal Voucher Detail'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'account',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Account',
- 'oldfieldname': u'account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client',
- 'width': u'250px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'debit',
- 'fieldtype': u'Currency',
- 'label': u'Debit',
- 'oldfieldname': u'debit',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'credit',
- 'fieldtype': u'Currency',
- 'label': u'Credit',
- 'oldfieldname': u'credit',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'cost_center',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'permlevel': 0,
- 'search_index': 0,
- 'width': u'180px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'balance',
- 'fieldtype': u'Data',
- 'label': u'Account Balance',
- 'no_copy': 1,
- 'oldfieldname': u'balance',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'against_voucher',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Against Purchase Invoice',
- 'no_copy': 1,
- 'oldfieldname': u'against_voucher',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Invoice',
- 'permlevel': 0,
- 'print_hide': 0,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'against_invoice',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Against Sales Invoice',
- 'no_copy': 1,
- 'oldfieldname': u'against_invoice',
- 'oldfieldtype': u'Link',
- 'options': u'Sales Invoice',
- 'permlevel': 0,
- 'print_hide': 0,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'against_jv',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Against Journal Voucher',
- 'no_copy': 1,
- 'oldfieldname': u'against_jv',
- 'oldfieldtype': u'Link',
- 'options': u'Journal Voucher',
- 'permlevel': 0,
- 'print_hide': 0,
- 'search_index': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'is_advance',
- 'fieldtype': u'Select',
- 'label': u'Is Advance',
- 'no_copy': 1,
- 'oldfieldname': u'is_advance',
- 'oldfieldtype': u'Select',
- 'options': u'No\nYes',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'against_account',
- 'fieldtype': u'Text',
- 'hidden': 1,
- 'label': u'Against Account',
- 'no_copy': 1,
- 'oldfieldname': u'against_account',
- 'oldfieldtype': u'Text',
- 'permlevel': 0,
- 'print_hide': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-05-03 18:41:39",
+ "modified_by": "Administrator",
+ "modified": "2012-10-02 16:47:37"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Accounts",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "autoname": "JVD.######",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Journal Voucher Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Journal Voucher Detail",
+ "doctype": "DocType"
+ },
+ {
+ "permlevel": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Account",
+ "oldfieldname": "account",
+ "width": "250px",
+ "trigger": "Client",
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Account",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Debit",
+ "oldfieldname": "debit",
+ "trigger": "Client",
+ "fieldname": "debit",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Credit",
+ "oldfieldname": "credit",
+ "trigger": "Client",
+ "fieldname": "credit",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "width": "180px",
+ "options": "Cost Center",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Account Balance",
+ "oldfieldname": "balance",
+ "fieldname": "balance",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 0,
+ "no_copy": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Against Purchase Invoice",
+ "oldfieldname": "against_voucher",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "against_voucher",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "options": "Purchase Invoice",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "no_copy": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Against Sales Invoice",
+ "oldfieldname": "against_invoice",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "against_invoice",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "options": "Sales Invoice",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "no_copy": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Against Journal Voucher",
+ "oldfieldname": "against_jv",
+ "options": "Journal Voucher",
+ "fieldname": "against_jv",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Is Advance",
+ "oldfieldname": "is_advance",
+ "permlevel": 0,
+ "fieldname": "is_advance",
+ "fieldtype": "Select",
+ "options": "No\nYes"
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Against Account",
+ "oldfieldname": "against_account",
+ "fieldname": "against_account",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/mis_control/mis_control.txt b/accounts/doctype/mis_control/mis_control.txt
index ebfca08e160..1936fb6b812 100644
--- a/accounts/doctype/mis_control/mis_control.txt
+++ b/accounts/doctype/mis_control/mis_control.txt
@@ -1,31 +1,24 @@
-# DocType, MIS Control
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:49',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:49',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 120
- },
-
- # DocType, MIS Control
- {
- 'doctype': 'DocType',
- 'name': u'MIS Control'
- }
-]
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:49",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:49"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "version": 120,
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "issingle": 1
+ },
+ {
+ "name": "MIS Control",
+ "doctype": "DocType"
+ }
+]
\ No newline at end of file
diff --git a/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt b/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt
index 20d618b34d2..aee2b90c858 100755
--- a/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt
+++ b/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt
@@ -1,51 +1,40 @@
-# DocType, Multi Ledger Report Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:44',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:44',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 3
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'account',
- 'fieldtype': u'Link',
- 'label': u'Account',
- 'name': '__common__',
- 'options': u'Account',
- 'parent': u'Multi Ledger Report Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'300px'
- },
-
- # DocType, Multi Ledger Report Detail
- {
- 'doctype': 'DocType',
- 'name': u'Multi Ledger Report Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:44",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:44"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "version": 3,
+ "show_in_menu": 0
+ },
+ {
+ "parent": "Multi Ledger Report Detail",
+ "reqd": 1,
+ "name": "__common__",
+ "doctype": "DocField",
+ "label": "Account",
+ "width": "300px",
+ "parenttype": "DocType",
+ "options": "Account",
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Multi Ledger Report Detail",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
index 3887743208b..4ae813af03a 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
@@ -1,274 +1,217 @@
-# DocType, Payment to Invoice Matching Tool
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:42',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:42',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1316509358',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Other',
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 1,
- 'version': 37
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Payment to Invoice Matching Tool',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Payment to Invoice Matching Tool',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Payment to Invoice Matching Tool
- {
- 'doctype': 'DocType',
- 'name': u'Payment to Invoice Matching Tool'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'account',
- 'fieldtype': u'Link',
- 'label': u'Account',
- 'options': u'Account',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_type',
- 'fieldtype': u'Select',
- 'label': u'Voucher Type',
- 'options': u'Sales Invoice\nPurchase Invoice\nJournal Voucher',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'voucher_no',
- 'fieldtype': u'Link',
- 'label': u'Voucher No',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total_amount',
- 'fieldtype': u'Currency',
- 'label': u'Total Amount',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'pending_amt_to_reconcile',
- 'fieldtype': u'Currency',
- 'label': u'Pending Amt To Reconcile',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'payment_entries',
- 'fieldtype': u'Section Break',
- 'label': u'Payment Entries',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'column_break2',
- 'fieldtype': u'Column Break',
- 'label': u"Filter payment entries based on date:
",
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'from_date',
- 'fieldtype': u'Date',
- 'label': u'From Date',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'to_date',
- 'fieldtype': u'Date',
- 'label': u'To Date',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'column_break3',
- 'fieldtype': u'Column Break',
- 'label': u"Filter payment entries based on amount:
",
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'amt_greater_than',
- 'fieldtype': u'Data',
- 'label': u'Amount >=',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amt_less_than',
- 'fieldtype': u'Data',
- 'label': u'Amount <=',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'section_break0',
- 'fieldtype': u'Section Break',
- 'options': u'Simple',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'pull_payment_entries',
- 'fieldtype': u'Button',
- 'label': u'Pull Payment Entries',
- 'options': u'get_payment_entries',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'ir_payment_details',
- 'fieldtype': u'Table',
- 'label': u'Payment Entries',
- 'options': u'Payment to Invoice Matching Tool Detail',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'reconcile_html',
- 'fieldtype': u'HTML',
- 'label': u'Reconcile HTML',
- 'options': u"Select Payment Voucher and Amount to Reconcile in the above table and then click Reconcile button
",
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'reconcile',
- 'fieldtype': u'Button',
- 'label': u'Reconcile',
- 'options': u'reconcile',
- 'permlevel': 0,
- 'trigger': u'Client'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:42",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:42"
+ },
+ {
+ "section_style": "Simple",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "issingle": 1,
+ "document_type": "Other",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1316509358",
+ "show_in_menu": 1,
+ "version": 37
+ },
+ {
+ "name": "__common__",
+ "parent": "Payment to Invoice Matching Tool",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Payment to Invoice Matching Tool",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Payment to Invoice Matching Tool",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Accounts Manager",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Accounts User",
+ "permlevel": 0
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "options": "Account",
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "label": "Account",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "options": "Sales Invoice\nPurchase Invoice\nJournal Voucher",
+ "fieldname": "voucher_type",
+ "fieldtype": "Select",
+ "label": "Voucher Type",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Voucher No",
+ "trigger": "Client",
+ "fieldname": "voucher_no",
+ "fieldtype": "Link",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Amount",
+ "fieldname": "total_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Pending Amt To Reconcile",
+ "fieldname": "pending_amt_to_reconcile",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Payment Entries",
+ "fieldname": "payment_entries",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Filter payment entries based on date:
",
+ "width": "50%",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "From Date",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "To Date",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Filter payment entries based on amount:
",
+ "width": "50%",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Amount >=",
+ "fieldname": "amt_greater_than",
+ "fieldtype": "Data",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Amount <=",
+ "fieldname": "amt_less_than",
+ "fieldtype": "Data",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "permlevel": 0,
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "options": "Simple"
+ },
+ {
+ "doctype": "DocField",
+ "options": "get_payment_entries",
+ "fieldname": "pull_payment_entries",
+ "fieldtype": "Button",
+ "label": "Pull Payment Entries",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "options": "Payment to Invoice Matching Tool Detail",
+ "fieldname": "ir_payment_details",
+ "fieldtype": "Table",
+ "label": "Payment Entries",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Reconcile HTML",
+ "permlevel": 0,
+ "fieldname": "reconcile_html",
+ "fieldtype": "HTML",
+ "options": "Select Payment Voucher and Amount to Reconcile in the above table and then click Reconcile button
"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Reconcile",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "reconcile",
+ "fieldtype": "Button",
+ "options": "reconcile"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
index 7b3beb82b81..ab7e6bbfb52 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
@@ -1,131 +1,104 @@
-# DocType, Payment to Invoice Matching Tool Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:43',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:43',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 14
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Payment to Invoice Matching Tool Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Payment to Invoice Matching Tool Detail
- {
- 'doctype': 'DocType',
- 'name': u'Payment to Invoice Matching Tool Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'selected',
- 'fieldtype': u'Check',
- 'label': u'Select',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'60px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_no',
- 'fieldtype': u'Link',
- 'label': u'Voucher No',
- 'options': u'Journal Voucher',
- 'permlevel': 1,
- 'reqd': 0,
- 'width': u'140px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amt_due',
- 'fieldtype': u'Currency',
- 'label': u'Amt Due',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amt_to_be_reconciled',
- 'fieldtype': u'Currency',
- 'label': u'Amt to be reconciled',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'label': u'Posting Date',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total_amt',
- 'fieldtype': u'Currency',
- 'label': u'Total Amt',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'against_account',
- 'fieldtype': u'Data',
- 'label': u'Against Account',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'remarks',
- 'fieldtype': u'Small Text',
- 'label': u'Remarks',
- 'permlevel': 1,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'voucher_detail_no',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Voucher Detail No',
- 'no_column': 0,
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:43",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:43"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "version": 14,
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Payment to Invoice Matching Tool Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Payment to Invoice Matching Tool Detail",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Select",
+ "width": "60px",
+ "fieldname": "selected",
+ "fieldtype": "Check",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "permlevel": 1,
+ "doctype": "DocField",
+ "label": "Voucher No",
+ "width": "140px",
+ "fieldname": "voucher_no",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "options": "Journal Voucher"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Amt Due",
+ "fieldname": "amt_due",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Amt to be reconciled",
+ "fieldname": "amt_to_be_reconciled",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Amt",
+ "fieldname": "total_amt",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Against Account",
+ "fieldname": "against_account",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Remarks",
+ "width": "200px",
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Voucher Detail No",
+ "fieldname": "voucher_detail_no",
+ "fieldtype": "Data",
+ "no_column": 0,
+ "reqd": 0,
+ "hidden": 1,
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
index 2313d40b13a..26ce5453472 100644
--- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
+++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
@@ -1,276 +1,221 @@
-# DocType, Period Closing Voucher
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-06-11 12:09:52',
- 'docstatus': 0,
- 'modified': '2012-07-10 14:21:21',
- 'modified_by': u'Administrator',
- 'owner': u'jai@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1311621379',
- 'autoname': u'PCE/.###',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'is_submittable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'search_fields': u'posting_date, fiscal_year',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Period Closing Voucher',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Period Closing Voucher',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Period Closing Voucher
- {
- 'doctype': 'DocType',
- 'name': u'Period Closing Voucher'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager'
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'transaction_date',
- 'fieldtype': u'Date',
- 'label': u'Transaction Date',
- 'oldfieldname': u'transaction_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'label': u'Posting Date',
- 'oldfieldname': u'posting_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'label': u'Closing Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amended_from',
- 'fieldtype': u'Data',
- 'label': u'Amended From',
- 'no_copy': 1,
- 'oldfieldname': u'amended_from',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amendment_date',
- 'fieldtype': u'Date',
- 'label': u'Amendment Date',
- 'no_copy': 1,
- 'oldfieldname': u'amendment_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Select',
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Select',
- 'options': u'link:Company',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'closing_account_head',
- 'fieldtype': u'Link',
- 'label': u'Closing Account Head',
- 'oldfieldname': u'closing_account_head',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'coa_help',
- 'fieldtype': u'HTML',
- 'label': u'CoA Help',
- 'oldfieldtype': u'HTML',
- 'options': u'To manage Account Head, click here',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'remarks',
- 'fieldtype': u'Small Text',
- 'label': u'Remarks',
- 'oldfieldname': u'remarks',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cancel_reason',
- 'fieldtype': u'Small Text',
- 'hidden': 1,
- 'label': u'Cancel Reason',
- 'oldfieldname': u'cancel_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'print_hide': 1,
- 'search_index': 0
- }
+ {
+ "owner": "jai@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-06-11 12:09:52",
+ "modified_by": "Administrator",
+ "modified": "2012-07-10 14:21:21"
+ },
+ {
+ "section_style": "Simple",
+ "is_submittable": 1,
+ "search_fields": "posting_date, fiscal_year",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "autoname": "PCE/.###",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1311621379",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Period Closing Voucher",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Period Closing Voucher",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Period Closing Voucher",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Accounts Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Accounts Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Accounts Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Accounts Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "Accounts Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Transaction Date",
+ "oldfieldname": "transaction_date",
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "oldfieldname": "posting_date",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Closing Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year"
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Amendment Date",
+ "oldfieldname": "amendment_date",
+ "fieldname": "amendment_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Company"
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Closing Account Head",
+ "oldfieldname": "closing_account_head",
+ "trigger": "Client",
+ "fieldname": "closing_account_head",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "HTML",
+ "doctype": "DocField",
+ "label": "CoA Help",
+ "permlevel": 0,
+ "fieldname": "coa_help",
+ "fieldtype": "HTML",
+ "options": "To manage Account Head, click here"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Remarks",
+ "oldfieldname": "remarks",
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Cancel Reason",
+ "oldfieldname": "cancel_reason",
+ "fieldname": "cancel_reason",
+ "fieldtype": "Small Text",
+ "oldfieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt
index 1c7de5b0dd2..b50ff81f6c6 100755
--- a/accounts/doctype/pos_setting/pos_setting.txt
+++ b/accounts/doctype/pos_setting/pos_setting.txt
@@ -1,282 +1,229 @@
-# DocType, POS Setting
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-06-11 12:09:53',
- 'docstatus': 0,
- 'modified': '2012-07-16 16:27:51',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1322549700',
- 'autoname': u'POS/.####',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'POS Setting',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'POS Setting',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1
- },
-
- # DocType, POS Setting
- {
- 'doctype': 'DocType',
- 'name': u'POS Setting'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'user',
- 'fieldtype': u'Link',
- 'label': u'User',
- 'oldfieldname': u'user',
- 'oldfieldtype': u'Link',
- 'options': u'Profile'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'territory',
- 'fieldtype': u'Link',
- 'label': u'Territory',
- 'oldfieldname': u'territory',
- 'oldfieldtype': u'Link',
- 'options': u'Territory',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'naming_series',
- 'fieldtype': u'Select',
- 'label': u'Series',
- 'no_copy': 1,
- 'oldfieldname': u'naming_series',
- 'oldfieldtype': u'Select',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'currency',
- 'fieldtype': u'Select',
- 'label': u'Currency',
- 'oldfieldname': u'currency',
- 'oldfieldtype': u'Select',
- 'options': u'link:Currency',
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'1',
- 'doctype': u'DocField',
- 'fieldname': u'conversion_rate',
- 'fieldtype': u'Float',
- 'label': u'Conversion Rate',
- 'oldfieldname': u'conversion_rate',
- 'oldfieldtype': u'Currency',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'price_list_name',
- 'fieldtype': u'Select',
- 'label': u'Price List',
- 'oldfieldname': u'price_list_name',
- 'oldfieldtype': u'Select',
- 'options': u'link:Price List',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Link',
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Link',
- 'options': u'Company',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'customer_account',
- 'fieldtype': u'Link',
- 'label': u'Customer Account',
- 'oldfieldname': u'customer_account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'reqd': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cash_bank_account',
- 'fieldtype': u'Link',
- 'label': u'Cash/Bank Account',
- 'oldfieldname': u'cash_bank_account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'income_account',
- 'fieldtype': u'Link',
- 'label': u'Income Account',
- 'oldfieldname': u'income_account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'warehouse',
- 'fieldtype': u'Link',
- 'label': u'Warehouse',
- 'oldfieldname': u'warehouse',
- 'oldfieldtype': u'Link',
- 'options': u'Warehouse',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cost_center',
- 'fieldtype': u'Link',
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'charge',
- 'fieldtype': u'Link',
- 'label': u'Charge',
- 'oldfieldname': u'charge',
- 'oldfieldtype': u'Link',
- 'options': u'Sales Taxes and Charges Master'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'letter_head',
- 'fieldtype': u'Select',
- 'label': u'Letter Head',
- 'oldfieldname': u'letter_head',
- 'oldfieldtype': u'Select',
- 'options': u'link:Letter Head',
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'tc_name',
- 'fieldtype': u'Link',
- 'label': u'Terms and Conditions',
- 'oldfieldname': u'tc_name',
- 'oldfieldtype': u'Link',
- 'options': u'Terms and Conditions'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'select_print_heading',
- 'fieldtype': u'Select',
- 'in_filter': 0,
- 'label': u'Select Print Heading',
- 'oldfieldname': u'select_print_heading',
- 'oldfieldtype': u'Select',
- 'options': u'link:Print Heading'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'role': u'System Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'role': u'Accounts Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'Accounts User'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-06-11 12:09:53",
+ "modified_by": "Administrator",
+ "modified": "2012-07-16 16:27:51"
+ },
+ {
+ "section_style": "Simple",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "autoname": "POS/.####",
+ "show_in_menu": 0,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1322549700",
+ "server_code_error": " ",
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "POS Setting",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "POS Setting",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "POS Setting",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "User",
+ "oldfieldname": "user",
+ "fieldname": "user",
+ "fieldtype": "Link",
+ "options": "Profile"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Territory",
+ "oldfieldname": "territory",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Territory"
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Series",
+ "oldfieldname": "naming_series",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "fieldname": "currency",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Currency"
+ },
+ {
+ "default": "1",
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Conversion Rate",
+ "oldfieldname": "conversion_rate",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "fieldname": "price_list_name",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Price List"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Company"
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Customer Account",
+ "oldfieldname": "customer_account",
+ "fieldname": "customer_account",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "options": "Account"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Cash/Bank Account",
+ "oldfieldname": "cash_bank_account",
+ "fieldname": "cash_bank_account",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Income Account",
+ "oldfieldname": "income_account",
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Warehouse"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Cost Center"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Charge",
+ "oldfieldname": "charge",
+ "fieldname": "charge",
+ "fieldtype": "Link",
+ "options": "Sales Taxes and Charges Master"
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "fieldname": "letter_head",
+ "fieldtype": "Select",
+ "options": "link:Letter Head"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Terms and Conditions",
+ "oldfieldname": "tc_name",
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "options": "Terms and Conditions"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Select Print Heading",
+ "oldfieldname": "select_print_heading",
+ "fieldname": "select_print_heading",
+ "fieldtype": "Select",
+ "options": "link:Print Heading",
+ "in_filter": 0
+ },
+ {
+ "write": 1,
+ "create": 1,
+ "role": "System Manager",
+ "doctype": "DocPerm",
+ "submit": 0
+ },
+ {
+ "write": 1,
+ "create": 1,
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "write": 1,
+ "create": 1,
+ "role": "Accounts Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "DocPerm"
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 56e2cb629e4..836f808c901 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -40,12 +40,12 @@
},
{
"oldfieldtype": "Data",
+ "search_index": 0,
"doctype": "DocField",
"label": "Item Name",
"oldfieldname": "item_name",
"fieldname": "item_name",
"fieldtype": "Data",
- "search_index": 0,
"reqd": 1,
"permlevel": 0,
"in_filter": 0
@@ -140,6 +140,7 @@
},
{
"print_hide": 1,
+ "permlevel": 0,
"oldfieldtype": "Link",
"doctype": "DocField",
"label": "Expense Head",
@@ -149,7 +150,6 @@
"fieldname": "expense_head",
"fieldtype": "Link",
"reqd": 1,
- "permlevel": 0
},
{
"print_hide": 1,
@@ -200,35 +200,35 @@
"label": "Item Group",
"oldfieldname": "item_group",
"permlevel": 1,
+ "options": "Item Group",
"fieldname": "item_group",
"fieldtype": "Link",
"search_index": 1,
"hidden": 1,
- "options": "Item Group",
"in_filter": 1
},
{
"print_hide": 1,
"oldfieldtype": "Link",
+ "search_index": 1,
"doctype": "DocField",
"label": "Pur Order",
"oldfieldname": "purchase_order",
"options": "Purchase Order",
"fieldname": "purchase_order",
"fieldtype": "Link",
- "search_index": 1,
"permlevel": 1,
"in_filter": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
+ "search_index": 1,
"doctype": "DocField",
"label": "Purchase Order Item",
"oldfieldname": "po_detail",
"fieldname": "po_detail",
"fieldtype": "Data",
- "search_index": 1,
"hidden": 1,
"permlevel": 1,
"in_filter": 1
@@ -236,25 +236,25 @@
{
"print_hide": 1,
"oldfieldtype": "Link",
+ "search_index": 1,
"doctype": "DocField",
"label": "Pur Receipt",
"oldfieldname": "purchase_receipt",
"options": "Purchase Receipt",
"fieldname": "purchase_receipt",
"fieldtype": "Link",
- "search_index": 1,
"permlevel": 1,
"in_filter": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
+ "search_index": 1,
"doctype": "DocField",
"label": "PR Detail",
"oldfieldname": "pr_detail",
"fieldname": "pr_detail",
"fieldtype": "Data",
- "search_index": 1,
"hidden": 1,
"permlevel": 1,
"in_filter": 1
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
index 05bcb868318..52f837eefb1 100644
--- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -1,239 +1,202 @@
-# DocType, Purchase Taxes and Charges
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-09-18 11:20:24',
- u'docstatus': 0,
- u'modified': '2012-09-28 12:27:43',
- u'modified_by': u'Administrator',
- u'owner': u'wasim@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1322549700',
- 'autoname': u'PVTD.######',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'hide_heading': 1,
- 'istable': 1,
- 'module': u'Accounts',
- u'name': u'__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Purchase Taxes and Charges',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Taxes and Charges
- {
- u'doctype': u'DocType',
- u'name': u'Purchase Taxes and Charges'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'charge_type',
- 'fieldtype': u'Select',
- 'label': u'Type',
- 'oldfieldname': u'charge_type',
- 'oldfieldtype': u'Select',
- 'options': u'\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'account_head',
- 'fieldtype': u'Link',
- 'label': u'Account Head',
- 'oldfieldname': u'account_head',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'cost_center',
- 'fieldtype': u'Link',
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'300px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate',
- 'oldfieldname': u'rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'tax_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'tax_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'total',
- 'fieldtype': u'Currency',
- 'label': u'Total',
- 'oldfieldname': u'total',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'row_id',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'label': u'Enter Row',
- 'oldfieldname': u'row_id',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'Valuation and Total',
- u'doctype': u'DocField',
- 'fieldname': u'category',
- 'fieldtype': u'Select',
- 'label': u'Consider Tax or Charge for',
- 'oldfieldname': u'category',
- 'oldfieldtype': u'Select',
- 'options': u'Valuation and Total\nValuation\nTotal',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'Add',
- u'doctype': u'DocField',
- 'fieldname': u'add_deduct_tax',
- 'fieldtype': u'Select',
- 'label': u'Add or Deduct',
- 'oldfieldname': u'add_deduct_tax',
- 'oldfieldtype': u'Select',
- 'options': u'Add\nDeduct',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'item_wise_tax_detail',
- 'fieldtype': u'Small Text',
- 'hidden': 1,
- 'label': u'Item Wise Tax Detail ',
- 'oldfieldname': u'item_wise_tax_detail',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'parenttype',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Parenttype',
- 'oldfieldname': u'parenttype',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'description': u'Cheating Field\nPlease do not delete ',
- u'doctype': u'DocField',
- 'fieldname': u'total_tax_amount',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Total +Tax',
- 'no_copy': 1,
- 'oldfieldname': u'total_tax_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'description': u'Cheating Field\nPlease do not delete ',
- u'doctype': u'DocField',
- 'fieldname': u'total_amount',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Tax Amount',
- 'no_copy': 1,
- 'oldfieldname': u'total_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- }
+ {
+ "owner": "wasim@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-09-18 11:20:24",
+ "modified_by": "Administrator",
+ "modified": "2012-09-28 12:27:43"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Accounts",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "hide_heading": 1,
+ "autoname": "PVTD.######",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1322549700",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Taxes and Charges",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Taxes and Charges",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "charge_type",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "charge_type",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Account Head",
+ "oldfieldname": "account_head",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "account_head",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "options": "Cost Center"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate",
+ "oldfieldname": "rate",
+ "trigger": "Client",
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "tax_amount",
+ "trigger": "Client",
+ "fieldname": "tax_amount",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Total",
+ "oldfieldname": "total",
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Enter Row",
+ "oldfieldname": "row_id",
+ "trigger": "Client",
+ "fieldname": "row_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "default": "Valuation and Total",
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Consider Tax or Charge for",
+ "oldfieldname": "category",
+ "options": "Valuation and Total\nValuation\nTotal",
+ "fieldname": "category",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "default": "Add",
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Add or Deduct",
+ "oldfieldname": "add_deduct_tax",
+ "trigger": "Client",
+ "fieldname": "add_deduct_tax",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "Add\nDeduct",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Item Wise Tax Detail ",
+ "oldfieldname": "item_wise_tax_detail",
+ "fieldname": "item_wise_tax_detail",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Parenttype",
+ "oldfieldname": "parenttype",
+ "fieldname": "parenttype",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Cheating Field\nPlease do not delete ",
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Total +Tax",
+ "oldfieldname": "total_tax_amount",
+ "fieldname": "total_tax_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 0,
+ "report_hide": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Cheating Field\nPlease do not delete ",
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Tax Amount",
+ "oldfieldname": "total_amount",
+ "fieldname": "total_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 0,
+ "report_hide": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
index 9e659ee2e69..da33cb21b38 100644
--- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
+++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
@@ -1,149 +1,120 @@
-# DocType, Purchase Taxes and Charges Master
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-05-15 12:14:32',
- 'docstatus': 0,
- 'modified': '2012-08-17 09:57:04',
- 'modified_by': u'Administrator',
- 'owner': u'wasim@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1325570646',
- 'allow_trash': 1,
- 'autoname': u'field:title',
- 'colour': u'White:FFF',
- 'description': u'Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like "Shipping", "Insurance", "Handling" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Taxes and Charges Master',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Purchase Taxes and Charges Master',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Purchase Taxes and Charges Master
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Taxes and Charges Master'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Purchase Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Purchase Master Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'title',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Title',
- 'oldfieldname': u'title',
- 'oldfieldtype': u'Data',
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_default',
- 'fieldtype': u'Check',
- 'label': u'Default'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Company',
- 'options': u'Company',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_tax_details',
- 'fieldtype': u'Table',
- 'label': u'Purchase Taxes and Charges',
- 'oldfieldname': u'purchase_tax_details',
- 'oldfieldtype': u'Table',
- 'options': u'Purchase Taxes and Charges'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Company',
- 'options': u'Company',
- 'reqd': 1
- }
+ {
+ "owner": "wasim@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-05-15 12:14:32",
+ "modified_by": "Administrator",
+ "modified": "2012-08-17 09:57:04"
+ },
+ {
+ "section_style": "Simple",
+ "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "allow_trash": 1,
+ "server_code_error": " ",
+ "document_type": "Master",
+ "autoname": "field:title",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1325570646",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Taxes and Charges Master",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Taxes and Charges Master",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Purchase Taxes and Charges Master",
+ "doctype": "DocType"
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Purchase Manager",
+ "cancel": 0,
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Purchase Master Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Title",
+ "oldfieldname": "title",
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "reqd": 1,
+ "in_filter": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "is_default",
+ "fieldtype": "Check",
+ "label": "Default"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Company",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Table",
+ "doctype": "DocField",
+ "label": "Purchase Taxes and Charges",
+ "oldfieldname": "purchase_tax_details",
+ "fieldname": "purchase_tax_details",
+ "fieldtype": "Table",
+ "options": "Purchase Taxes and Charges"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Company",
+ "in_filter": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index 5725246d9af..bb17796daf4 100644
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -1,105 +1,86 @@
-# DocType, Sales Invoice Advance
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:40',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:40',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 24
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'no_copy': 1,
- 'parent': u'Sales Invoice Advance',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Sales Invoice Advance
- {
- 'doctype': 'DocType',
- 'name': u'Sales Invoice Advance'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'journal_voucher',
- 'fieldtype': u'Link',
- 'label': u'Journal Voucher',
- 'oldfieldname': u'journal_voucher',
- 'oldfieldtype': u'Link',
- 'options': u'Journal Voucher',
- 'permlevel': 1,
- 'width': u'250px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'jv_detail_no',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Journal Voucher Detail No',
- 'oldfieldname': u'jv_detail_no',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'advance_amount',
- 'fieldtype': u'Currency',
- 'label': u'Advance amount',
- 'oldfieldname': u'advance_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'allocated_amount',
- 'fieldtype': u'Currency',
- 'label': u'Allocated amount',
- 'oldfieldname': u'allocated_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'trigger': u'Client',
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'remarks',
- 'fieldtype': u'Small Text',
- 'label': u'Remarks',
- 'oldfieldname': u'remarks',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1,
- 'width': u'150px'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:40",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:40"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "version": 24,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Invoice Advance",
+ "no_copy": 1,
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Sales Invoice Advance",
+ "doctype": "DocType"
+ },
+ {
+ "permlevel": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Journal Voucher",
+ "oldfieldname": "journal_voucher",
+ "width": "250px",
+ "fieldname": "journal_voucher",
+ "fieldtype": "Link",
+ "options": "Journal Voucher"
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Journal Voucher Detail No",
+ "oldfieldname": "jv_detail_no",
+ "width": "120px",
+ "fieldname": "jv_detail_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Advance amount",
+ "oldfieldname": "advance_amount",
+ "width": "120px",
+ "fieldname": "advance_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Allocated amount",
+ "oldfieldname": "allocated_amount",
+ "width": "120px",
+ "trigger": "Client",
+ "fieldname": "allocated_amount",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Remarks",
+ "oldfieldname": "remarks",
+ "width": "150px",
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index da30751c17a..19a627a7d4b 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -1,454 +1,385 @@
-# DocType, Sales Invoice Item
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-06-08 16:07:55',
- 'docstatus': 0,
- 'modified': '2012-07-09 11:00:18',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'INVD.######',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Sales Invoice Item',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Sales Invoice Item
- {
- 'doctype': 'DocType',
- 'name': u'Sales Invoice Item'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'barcode',
- 'fieldtype': u'Data',
- 'label': u'Barcode',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_code',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Item',
- 'oldfieldname': u'item_code',
- 'oldfieldtype': u'Link',
- 'options': u'Item',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 0,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'customer_item_code',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u"Customer's Item Code",
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_name',
- 'fieldtype': u'Data',
- 'in_filter': 0,
- 'label': u'Item Name',
- 'oldfieldname': u'item_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Text',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'qty',
- 'fieldtype': u'Currency',
- 'label': u'Qty',
- 'oldfieldname': u'qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'stock_uom',
- 'fieldtype': u'Data',
- 'label': u'UOM',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate',
- 'oldfieldname': u'ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'adj_rate',
- 'fieldtype': u'Float',
- 'label': u'Discount (%)',
- 'oldfieldname': u'adj_rate',
- 'oldfieldtype': u'Float',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'export_rate',
- 'fieldtype': u'Currency',
- 'label': u'Basic Rate',
- 'oldfieldname': u'export_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'export_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'export_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'base_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Price List Rate*',
- 'oldfieldname': u'base_ref_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'basic_rate',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Basic Rate*',
- 'oldfieldname': u'basic_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'search_index': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount*',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'warehouse',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'label': u'Warehouse',
- 'oldfieldname': u'warehouse',
- 'oldfieldtype': u'Link',
- 'options': u'Warehouse',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'income_account',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Income Account',
- 'oldfieldname': u'income_account',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'120px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'cost_center',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'serial_no',
- 'fieldtype': u'Small Text',
- 'in_filter': 1,
- 'label': u'Serial No',
- 'oldfieldname': u'serial_no',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'print_hide': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'batch_no',
- 'fieldtype': u'Link',
- 'label': u'Batch No',
- 'options': u'Batch',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_group',
- 'fieldtype': u'Link',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Item Group',
- 'oldfieldname': u'item_group',
- 'oldfieldtype': u'Link',
- 'options': u'Item Group',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'brand',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Brand Name',
- 'oldfieldname': u'brand',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'actual_qty',
- 'fieldtype': u'Currency',
- 'label': u'Available Qty at Warehouse',
- 'oldfieldname': u'actual_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'delivered_qty',
- 'fieldtype': u'Currency',
- 'label': u'Delivered Qty',
- 'oldfieldname': u'delivered_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'sales_order',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Sales Order',
- 'oldfieldname': u'sales_order',
- 'oldfieldtype': u'Link',
- 'options': u'Sales Order',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'so_detail',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'SO Detail ',
- 'oldfieldname': u'so_detail',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'delivery_note',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Delivery Note',
- 'oldfieldname': u'delivery_note',
- 'oldfieldtype': u'Link',
- 'options': u'Delivery Note',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'dn_detail',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'DN Detail',
- 'oldfieldname': u'dn_detail',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_tax_rate',
- 'fieldtype': u'Small Text',
- 'hidden': 1,
- 'label': u'Item Tax Rate',
- 'oldfieldname': u'item_tax_rate',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'clear_pending',
- 'fieldtype': u'Check',
- 'hidden': 1,
- 'label': u'Clear Pending',
- 'no_copy': 1,
- 'oldfieldname': u'clear_pending',
- 'oldfieldtype': u'Check',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'page_break',
- 'fieldtype': u'Check',
- 'label': u'Page Break',
- 'no_copy': 1,
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-06-08 16:07:55",
+ "modified_by": "Administrator",
+ "modified": "2012-07-09 11:00:18"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Accounts",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "autoname": "INVD.######",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Invoice Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Sales Invoice Item",
+ "doctype": "DocType"
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Barcode",
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item",
+ "oldfieldname": "item_code",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 0,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Customer's Item Code",
+ "fieldname": "customer_item_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 0
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "200px",
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "trigger": "Client",
+ "fieldname": "qty",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "UOM",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Price List Rate",
+ "oldfieldname": "ref_rate",
+ "trigger": "Client",
+ "fieldname": "ref_rate",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Float",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Discount (%)",
+ "oldfieldname": "adj_rate",
+ "trigger": "Client",
+ "fieldname": "adj_rate",
+ "fieldtype": "Float",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Basic Rate",
+ "oldfieldname": "export_rate",
+ "trigger": "Client",
+ "fieldname": "export_rate",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "export_amount",
+ "fieldname": "export_amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Price List Rate*",
+ "oldfieldname": "base_ref_rate",
+ "fieldname": "base_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Basic Rate*",
+ "oldfieldname": "basic_rate",
+ "trigger": "Client",
+ "fieldname": "basic_rate",
+ "fieldtype": "Currency",
+ "search_index": 0,
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount*",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "permlevel": 0,
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "options": "Warehouse"
+ },
+ {
+ "print_hide": 1,
+ "permlevel": 0,
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Income Account",
+ "oldfieldname": "income_account",
+ "width": "120px",
+ "trigger": "Client",
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Account",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "permlevel": 0,
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "width": "120px",
+ "trigger": "Client",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "options": "Cost Center",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Serial No",
+ "oldfieldname": "serial_no",
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Batch No",
+ "options": "Batch",
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "options": "Item Group",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Brand Name",
+ "oldfieldname": "brand",
+ "fieldname": "brand",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Available Qty at Warehouse",
+ "oldfieldname": "actual_qty",
+ "fieldname": "actual_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Delivered Qty",
+ "oldfieldname": "delivered_qty",
+ "fieldname": "delivered_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Sales Order",
+ "oldfieldname": "sales_order",
+ "trigger": "Client",
+ "fieldname": "sales_order",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "options": "Sales Order",
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "SO Detail ",
+ "oldfieldname": "so_detail",
+ "fieldname": "so_detail",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Delivery Note",
+ "oldfieldname": "delivery_note",
+ "trigger": "Client",
+ "fieldname": "delivery_note",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "options": "Delivery Note",
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "DN Detail",
+ "oldfieldname": "dn_detail",
+ "fieldname": "dn_detail",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Check",
+ "doctype": "DocField",
+ "label": "Clear Pending",
+ "oldfieldname": "clear_pending",
+ "fieldname": "clear_pending",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "label": "Page Break",
+ "fieldname": "page_break",
+ "fieldtype": "Check",
+ "permlevel": 0,
+ "report_hide": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
index 234907cc971..04b079492af 100644
--- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -1,223 +1,188 @@
-# DocType, Sales Taxes and Charges
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-07-04 16:40:13',
- 'docstatus': 0,
- 'modified': '2012-07-12 13:50:43',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'INVTD.######',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_heading': 1,
- 'istable': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Sales Taxes and Charges',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Sales Taxes and Charges
- {
- 'doctype': 'DocType',
- 'name': u'Sales Taxes and Charges'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'charge_type',
- 'fieldtype': u'Select',
- 'label': u'Type',
- 'oldfieldname': u'charge_type',
- 'oldfieldtype': u'Select',
- 'options': u'\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'account_head',
- 'fieldtype': u'Link',
- 'label': u'Account Head',
- 'oldfieldname': u'account_head',
- 'oldfieldtype': u'Link',
- 'options': u'Account',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'cost_center_other_charges',
- 'fieldtype': u'Link',
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center_other_charges',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate',
- 'oldfieldname': u'rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'tax_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'tax_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'total',
- 'fieldtype': u'Currency',
- 'label': u'Total',
- 'oldfieldname': u'total',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'row_id',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'label': u'Enter Row',
- 'oldfieldname': u'row_id',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'item_wise_tax_detail',
- 'fieldtype': u'Small Text',
- 'hidden': 1,
- 'label': u'Item Wise Tax Detail ',
- 'oldfieldname': u'item_wise_tax_detail',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'parenttype',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Parenttype',
- 'oldfieldname': u'parenttype',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Cheating Field\nPlease do not delete ',
- 'doctype': u'DocField',
- 'fieldname': u'total_tax_amount',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Total Tax Amount',
- 'no_copy': 1,
- 'oldfieldname': u'total_tax_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'description': u'Cheating Field\nPlease do not delete ',
- 'doctype': u'DocField',
- 'fieldname': u'total_amount',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Total Amount',
- 'no_copy': 1,
- 'oldfieldname': u'total_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'allow_on_submit': 0,
- 'description': u'If checked, the tax amount will be considered as already included in the Print Rate / Print Amount',
- 'doctype': u'DocField',
- 'fieldname': u'included_in_print_rate',
- 'fieldtype': u'Check',
- 'label': u'Is this Tax included in Basic Rate?',
- 'no_column': 0,
- 'no_copy': 1,
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1,
- 'width': u'150px'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-04 16:40:13",
+ "modified_by": "Administrator",
+ "modified": "2012-07-12 13:50:43"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Accounts",
+ "doctype": "DocType",
+ "autoname": "INVTD.######",
+ "show_in_menu": 0,
+ "hide_heading": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "server_code_error": " ",
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Taxes and Charges",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Sales Taxes and Charges",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "charge_type",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "charge_type",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total"
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Account Head",
+ "oldfieldname": "account_head",
+ "trigger": "Client",
+ "fieldname": "account_head",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "reqd": 1,
+ "options": "Account",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center_other_charges",
+ "permlevel": 0,
+ "fieldname": "cost_center_other_charges",
+ "fieldtype": "Link",
+ "options": "Cost Center"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate",
+ "oldfieldname": "rate",
+ "trigger": "Client",
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "tax_amount",
+ "trigger": "Client",
+ "fieldname": "tax_amount",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Total",
+ "oldfieldname": "total",
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Enter Row",
+ "oldfieldname": "row_id",
+ "trigger": "Client",
+ "fieldname": "row_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Item Wise Tax Detail ",
+ "oldfieldname": "item_wise_tax_detail",
+ "fieldname": "item_wise_tax_detail",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Parenttype",
+ "oldfieldname": "parenttype",
+ "fieldname": "parenttype",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Cheating Field\nPlease do not delete ",
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Total Tax Amount",
+ "oldfieldname": "total_tax_amount",
+ "fieldname": "total_tax_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 0,
+ "report_hide": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Cheating Field\nPlease do not delete ",
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Total Amount",
+ "oldfieldname": "total_amount",
+ "fieldname": "total_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 0,
+ "report_hide": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
+ "no_copy": 1,
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Is this Tax included in Basic Rate?",
+ "width": "150px",
+ "fieldname": "included_in_print_rate",
+ "fieldtype": "Check",
+ "no_column": 0,
+ "permlevel": 0,
+ "report_hide": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
index 5870a466870..d789d8553f6 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
+++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
@@ -1,173 +1,142 @@
-# DocType, Sales Taxes and Charges Master
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-07-03 13:30:46',
- 'docstatus': 0,
- 'modified': '2012-07-12 13:43:32',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1322549700',
- 'allow_trash': 1,
- 'autoname': u'field:title',
- 'colour': u'White:FFF',
- 'description': u'Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like "Shipping", "Insurance", "Handling" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'Accounts',
- 'name': '__common__',
- 'section_style': u'Tabbed',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Sales Taxes and Charges Master',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Sales Taxes and Charges Master',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Sales Taxes and Charges Master
- {
- 'doctype': 'DocType',
- 'name': u'Sales Taxes and Charges Master'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'title',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Title',
- 'oldfieldname': u'title',
- 'oldfieldtype': u'Data',
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_default',
- 'fieldtype': u'Check',
- 'label': u'Default'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'* Will be calculated in the transaction.',
- 'doctype': u'DocField',
- 'fieldname': u'other_charges',
- 'fieldtype': u'Table',
- 'label': u'Sales Taxes and Charges Master',
- 'oldfieldname': u'other_charges',
- 'oldfieldtype': u'Table',
- 'options': u'Sales Taxes and Charges'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Link',
- 'options': u'Company',
- 'reqd': 1,
- 'search_index': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:46",
+ "modified_by": "Administrator",
+ "modified": "2012-07-12 13:43:32"
+ },
+ {
+ "section_style": "Tabbed",
+ "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.",
+ "module": "Accounts",
+ "doctype": "DocType",
+ "allow_trash": 1,
+ "server_code_error": " ",
+ "document_type": "Master",
+ "autoname": "field:title",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1322549700",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Taxes and Charges Master",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Taxes and Charges Master",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Sales Taxes and Charges Master",
+ "doctype": "DocType"
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Sales Master Manager",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Sales User",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Sales User",
+ "cancel": 0,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Accounts Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Sales Master Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Title",
+ "oldfieldname": "title",
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "reqd": 1,
+ "in_filter": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "is_default",
+ "fieldtype": "Check",
+ "label": "Default"
+ },
+ {
+ "description": "* Will be calculated in the transaction.",
+ "oldfieldtype": "Table",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Sales Taxes and Charges Master",
+ "oldfieldname": "other_charges",
+ "fieldname": "other_charges",
+ "fieldtype": "Table",
+ "options": "Sales Taxes and Charges"
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "oldfieldtype": "Link",
+ "reqd": 1,
+ "options": "Company",
+ "in_filter": 1
+ }
]
\ No newline at end of file
diff --git a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt
index e7dc9b4a4e0..092cd6eaef6 100755
--- a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt
+++ b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt
@@ -1,32 +1,25 @@
-# DocType, Trend Analyzer Control
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:49',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:49',
- 'modified_by': u'Administrator',
- 'owner': u'saumil@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'in_create': 1,
- 'issingle': 1,
- 'module': u'Accounts',
- 'name': '__common__',
- 'read_only': 1,
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 11
- },
-
- # DocType, Trend Analyzer Control
- {
- 'doctype': 'DocType',
- 'name': u'Trend Analyzer Control'
- }
-]
+ {
+ "owner": "saumil@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:49",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:49"
+ },
+ {
+ "section_style": "Simple",
+ "in_create": 1,
+ "module": "Accounts",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "issingle": 1,
+ "read_only": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "version": 11
+ },
+ {
+ "name": "Trend Analyzer Control",
+ "doctype": "DocType"
+ }
+]
\ No newline at end of file
diff --git a/accounts/page/accounts_browser/accounts_browser.txt b/accounts/page/accounts_browser/accounts_browser.txt
index d3e98db12b1..38dc643c396 100644
--- a/accounts/page/accounts_browser/accounts_browser.txt
+++ b/accounts/page/accounts_browser/accounts_browser.txt
@@ -1,49 +1,36 @@
-# Page, Accounts Browser
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-06-14 15:07:28',
- u'docstatus': 0,
- u'modified': '2012-10-04 16:57:27',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'Accounts Browser',
- 'show_in_menu': 0,
- 'standard': u'Yes'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'Accounts Browser',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, Accounts Browser
- {
- u'doctype': u'Page',
- u'name': u'Accounts Browser'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts User'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts Manager'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-06-14 15:07:28",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 16:57:27"
+ },
+ {
+ "name": "__common__",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "page_name": "Accounts Browser",
+ "doctype": "Page",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "Accounts Browser",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "Accounts Browser",
+ "doctype": "Page"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts Manager",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/accounts_home/accounts_home.txt b/accounts/page/accounts_home/accounts_home.txt
index 28b0e72603c..6000241e27e 100644
--- a/accounts/page/accounts_home/accounts_home.txt
+++ b/accounts/page/accounts_home/accounts_home.txt
@@ -1,28 +1,21 @@
-# Page, accounts-home
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-06-14 15:07:28',
- u'docstatus': 0,
- u'modified': '2012-10-05 16:30:46',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'accounts-home',
- 'standard': u'Yes',
- 'title': u'Accounts Home'
- },
-
- # Page, accounts-home
- {
- u'doctype': u'Page',
- u'name': u'accounts-home'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-06-14 15:07:28",
+ "modified_by": "Administrator",
+ "modified": "2012-10-05 16:30:46"
+ },
+ {
+ "name": "__common__",
+ "title": "Accounts Home",
+ "module": "Accounts",
+ "doctype": "Page",
+ "page_name": "accounts-home",
+ "standard": "Yes"
+ },
+ {
+ "name": "accounts-home",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/financial_analytics/financial_analytics.txt b/accounts/page/financial_analytics/financial_analytics.txt
index b02144fd014..5572a0e50bb 100644
--- a/accounts/page/financial_analytics/financial_analytics.txt
+++ b/accounts/page/financial_analytics/financial_analytics.txt
@@ -1,55 +1,40 @@
-# Page, financial-analytics
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-09-18 11:05:48',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:02:43',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'financial-analytics',
- 'standard': u'Yes',
- 'title': u'Financial Analytics'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'financial-analytics',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, financial-analytics
- {
- u'doctype': u'Page',
- u'name': u'financial-analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts Manager'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts User'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-09-18 11:05:48",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:02:43"
+ },
+ {
+ "name": "__common__",
+ "title": "Financial Analytics",
+ "module": "Accounts",
+ "doctype": "Page",
+ "page_name": "financial-analytics",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "financial-analytics",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "financial-analytics",
+ "doctype": "Page"
+ },
+ {
+ "role": "Analytics",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts Manager",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt
index ba212fcfb72..152aa405405 100644
--- a/accounts/page/financial_statements/financial_statements.txt
+++ b/accounts/page/financial_statements/financial_statements.txt
@@ -1,49 +1,36 @@
-# Page, Financial Statements
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-06-14 15:07:28',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:04:05',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'Financial Statements',
- 'show_in_menu': 0,
- 'standard': u'Yes'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'Financial Statements',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, Financial Statements
- {
- u'doctype': u'Page',
- u'name': u'Financial Statements'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts User'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts Manager'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-06-14 15:07:28",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:04:05"
+ },
+ {
+ "name": "__common__",
+ "module": "Accounts",
+ "show_in_menu": 0,
+ "page_name": "Financial Statements",
+ "doctype": "Page",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "Financial Statements",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "Financial Statements",
+ "doctype": "Page"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts Manager",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/general_ledger/general_ledger.txt b/accounts/page/general_ledger/general_ledger.txt
index 067f2f0df80..94b93e20c49 100644
--- a/accounts/page/general_ledger/general_ledger.txt
+++ b/accounts/page/general_ledger/general_ledger.txt
@@ -1,55 +1,40 @@
-# Page, general-ledger
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-09-14 11:25:48',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:00:09',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'general-ledger',
- 'standard': u'Yes',
- 'title': u'General Ledger'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'general-ledger',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, general-ledger
- {
- u'doctype': u'Page',
- u'name': u'general-ledger'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts Manager'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts User'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-09-14 11:25:48",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:00:09"
+ },
+ {
+ "name": "__common__",
+ "title": "General Ledger",
+ "module": "Accounts",
+ "doctype": "Page",
+ "page_name": "general-ledger",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "general-ledger",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "general-ledger",
+ "doctype": "Page"
+ },
+ {
+ "role": "Analytics",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts Manager",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/trial_balance/trial_balance.txt b/accounts/page/trial_balance/trial_balance.txt
index 9bbd513317c..eafc1d2f631 100644
--- a/accounts/page/trial_balance/trial_balance.txt
+++ b/accounts/page/trial_balance/trial_balance.txt
@@ -1,55 +1,40 @@
-# Page, trial-balance
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-09-18 11:05:48',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:01:47',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'trial-balance',
- 'standard': u'Yes',
- 'title': u'Trial Balance'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'trial-balance',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, trial-balance
- {
- u'doctype': u'Page',
- u'name': u'trial-balance'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts Manager'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Accounts User'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-09-18 11:05:48",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:01:47"
+ },
+ {
+ "name": "__common__",
+ "title": "Trial Balance",
+ "module": "Accounts",
+ "doctype": "Page",
+ "page_name": "trial-balance",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "trial-balance",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "trial-balance",
+ "doctype": "Page"
+ },
+ {
+ "role": "Analytics",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts Manager",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Accounts User",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.txt b/accounts/page/voucher_import_tool/voucher_import_tool.txt
index ab4b9bdfeef..8e5ad0b7f0e 100644
--- a/accounts/page/voucher_import_tool/voucher_import_tool.txt
+++ b/accounts/page/voucher_import_tool/voucher_import_tool.txt
@@ -1,43 +1,32 @@
-# Page, voucher-import-tool
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-10-02 18:51:49',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:04:18',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_name': u'voucher-import-tool',
- 'standard': u'Yes',
- 'title': u'Voucher Import Tool'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'voucher-import-tool',
- 'parentfield': u'roles',
- 'parenttype': u'Page',
- 'role': u'Accounts Manager'
- },
-
- # Page, voucher-import-tool
- {
- u'doctype': u'Page',
- u'name': u'voucher-import-tool'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-10-02 18:51:49",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:04:18"
+ },
+ {
+ "name": "__common__",
+ "title": "Voucher Import Tool",
+ "module": "Accounts",
+ "doctype": "Page",
+ "page_name": "voucher-import-tool",
+ "standard": "Yes"
+ },
+ {
+ "parent": "voucher-import-tool",
+ "name": "__common__",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "role": "Accounts Manager",
+ "parentfield": "roles"
+ },
+ {
+ "name": "voucher-import-tool",
+ "doctype": "Page"
+ },
+ {
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.txt b/accounts/search_criteria/accounts_payable/accounts_payable.txt
index 55ef6dd871a..7f9151c4437 100644
--- a/accounts/search_criteria/accounts_payable/accounts_payable.txt
+++ b/accounts/search_criteria/accounts_payable/accounts_payable.txt
@@ -1,33 +1,26 @@
-# Search Criteria, accounts_payable
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-05-14 18:05:41',
- u'docstatus': 0,
- u'modified': '2012-10-17 10:51:41',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
- 'criteria_name': u'Accounts Payable',
- 'doc_type': u'GL Entry',
- u'doctype': u'Search Criteria',
- 'filters': u'{"GL Entry\\u0001Voucher Type":[""],"GL Entry\\u0001Is Cancelled":[""],"GL Entry\\u0001Is Opening":[""],"GL Entry\\u0001Fiscal Year":[""],"Purchase Invoice\\u0001Aging Based On":["Aging Date"],"GL Entry\\u0001Range 1":"30","GL Entry\\u0001Range 2":"45","GL Entry\\u0001Range 3":"60","GL Entry\\u0001Range 4":"90"}',
- 'module': u'Accounts',
- u'name': u'__common__',
- 'page_len': 50,
- 'sort_by': u'`tabGL Entry`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, accounts_payable
- {
- u'doctype': u'Search Criteria',
- u'name': u'accounts_payable'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-05-14 18:05:41",
+ "modified_by": "Administrator",
+ "modified": "2012-10-17 10:51:41"
+ },
+ {
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{\"GL Entry\\u0001Voucher Type\":[\"\"],\"GL Entry\\u0001Is Cancelled\":[\"\"],\"GL Entry\\u0001Is Opening\":[\"\"],\"GL Entry\\u0001Fiscal Year\":[\"\"],\"Purchase Invoice\\u0001Aging Based On\":[\"Aging Date\"],\"GL Entry\\u0001Range 1\":\"30\",\"GL Entry\\u0001Range 2\":\"45\",\"GL Entry\\u0001Range 3\":\"60\",\"GL Entry\\u0001Range 4\":\"90\"}",
+ "doctype": "Search Criteria",
+ "doc_type": "GL Entry",
+ "name": "__common__",
+ "sort_by": "`tabGL Entry`.`name`",
+ "page_len": 50,
+ "criteria_name": "Accounts Payable",
+ "columns": "GL Entry\u0001Posting Date,GL Entry\u0001Account,GL Entry\u0001Against Voucher,GL Entry\u0001Voucher No"
+ },
+ {
+ "name": "accounts_payable",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/accounts_receivable/accounts_receivable.txt b/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
index 33a5318cf7d..cfa496e1e55 100644
--- a/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
+++ b/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
@@ -1,32 +1,25 @@
-# Search Criteria, accounts_receivable
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'GL Entry\x01Posting Date,GL Entry\x01Transaction Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
- 'criteria_name': u'Accounts Receivable',
- 'doc_type': u'GL Entry',
- 'doctype': 'Search Criteria',
- 'filters': u"{'GL Entry\x01Is Cancelled':'No','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'sort_by': u'`tabGL Entry`.`name`',
- 'sort_order': u'ASC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, accounts_receivable
- {
- 'doctype': 'Search Criteria',
- 'name': u'accounts_receivable'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "ASC",
+ "filters": "{'GL Entry\u0001Is Cancelled':'No','GL Entry\u0001Fiscal Year':'','GL Entry\u0001Company':'','GL Entry\u0001Range 1':'30','GL Entry\u0001Range 2':'45','GL Entry\u0001Range 3':'60','GL Entry\u0001Range 4':'90'}",
+ "doctype": "Search Criteria",
+ "doc_type": "GL Entry",
+ "name": "__common__",
+ "sort_by": "`tabGL Entry`.`name`",
+ "criteria_name": "Accounts Receivable",
+ "columns": "GL Entry\u0001Posting Date,GL Entry\u0001Transaction Date,GL Entry\u0001Account,GL Entry\u0001Against Voucher,GL Entry\u0001Voucher No"
+ },
+ {
+ "name": "accounts_receivable",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
index c329d7ed32b..00384386f52 100644
--- a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
+++ b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
@@ -1,36 +1,29 @@
-# Search Criteria, bank_clearance_report
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Journal Voucher\x01ID,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher\x01Clearance Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
- 'criteria_name': u'Bank Clearance report',
- 'description': u'Bank Clearance report',
- 'dis_filters': u'fiscal_year',
- 'doc_type': u'Journal Voucher Detail',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Journal Voucher',
- 'sort_by': u'ID',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, bank_clearance_report
- {
- 'doctype': 'Search Criteria',
- 'name': u'bank_clearance_report'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "description": "Bank Clearance report",
+ "parent_doc_type": "Journal Voucher",
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Journal Voucher\u0001Submitted':1,'Journal Voucher\u0001Voucher Type':'','Journal Voucher\u0001Is Opening':'','Journal Voucher\u0001Fiscal Year':'','Journal Voucher\u0001Company':'','Journal Voucher\u0001TDS Applicable':'','Journal Voucher\u0001TDS Category':''}",
+ "dis_filters": "fiscal_year",
+ "doc_type": "Journal Voucher Detail",
+ "name": "__common__",
+ "doctype": "Search Criteria",
+ "sort_by": "ID",
+ "page_len": 50,
+ "criteria_name": "Bank Clearance report",
+ "columns": "Journal Voucher\u0001ID,Journal Voucher Detail\u0001Account,Journal Voucher Detail\u0001Debit,Journal Voucher Detail\u0001Credit,Journal Voucher\u0001Clearance Date,Journal Voucher\u0001Cheque No,Journal Voucher\u0001Cheque Date,Journal Voucher\u0001Voucher Date,Journal Voucher\u0001Posting Date,Journal Voucher Detail\u0001Against Payable,Journal Voucher Detail\u0001Against Receivable"
+ },
+ {
+ "name": "bank_clearance_report",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
index 1518e855606..4d5d5fcf704 100644
--- a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
+++ b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
@@ -1,36 +1,29 @@
-# Search Criteria, bank_reconciliation_statement
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_cond': u"(`tabJournal Voucher Detail`.credit >= 0 or `tabJournal Voucher Detail`.credit is null)\n(`tabJournal Voucher`.cheque_no is not null or `tabJournal Voucher`.cheque_no != '')\n(ifnull(`tabJournal Voucher`.clearance_date, '0000-00-00') >'%(clearance_date1)s' or `tabJournal Voucher`.clearance_date is null or `tabJournal Voucher`.clearance_date = '0000-00-00')\n(`tabJournal Voucher`.posting_date <= '%(clearance_date1)s')",
- 'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Clearance Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Account',
- 'criteria_name': u'Bank Reconciliation Statement',
- 'dis_filters': u'clearance_date\nfiscal_year',
- 'doc_type': u'Journal Voucher Detail',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Journal Voucher',
- 'sort_by': u'`tabJournal Voucher`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, bank_reconciliation_statement
- {
- 'doctype': 'Search Criteria',
- 'name': u'bank_reconciliation_statement'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "parent_doc_type": "Journal Voucher",
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Journal Voucher\u0001Submitted':1,'Journal Voucher\u0001Voucher Type':'','Journal Voucher\u0001Is Opening':'','Journal Voucher\u0001Company':'','Journal Voucher\u0001TDS Applicable':'','Journal Voucher\u0001TDS Category':''}",
+ "dis_filters": "clearance_date\nfiscal_year",
+ "doc_type": "Journal Voucher Detail",
+ "name": "__common__",
+ "add_cond": "(`tabJournal Voucher Detail`.credit >= 0 or `tabJournal Voucher Detail`.credit is null)\n(`tabJournal Voucher`.cheque_no is not null or `tabJournal Voucher`.cheque_no != '')\n(ifnull(`tabJournal Voucher`.clearance_date, '0000-00-00') >'%(clearance_date1)s' or `tabJournal Voucher`.clearance_date is null or `tabJournal Voucher`.clearance_date = '0000-00-00')\n(`tabJournal Voucher`.posting_date <= '%(clearance_date1)s')",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabJournal Voucher`.`name`",
+ "page_len": 50,
+ "criteria_name": "Bank Reconciliation Statement",
+ "columns": "Journal Voucher\u0001ID,Journal Voucher\u0001Posting Date,Journal Voucher\u0001Cheque No,Journal Voucher\u0001Cheque Date,Journal Voucher\u0001Clearance Date,Journal Voucher Detail\u0001Account,Journal Voucher Detail\u0001Debit,Journal Voucher Detail\u0001Credit,Journal Voucher Detail\u0001Against Account"
+ },
+ {
+ "name": "bank_reconciliation_statement",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report/budget_variance_report.txt b/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
index f8df9dbe0b1..2c079a0294a 100644
--- a/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
+++ b/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
@@ -1,33 +1,26 @@
-# Search Criteria, budget_variance_report
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'criteria_name': u'Budget Variance Report',
- 'doc_type': u'Budget Detail',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Budget Detail\x01Fiscal Year':''}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Cost Center',
- 'sort_by': u'`tabCost Center`.`lft`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, budget_variance_report
- {
- 'doctype': 'Search Criteria',
- 'name': u'budget_variance_report'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "parent_doc_type": "Cost Center",
+ "module": "Accounts",
+ "doctype": "Search Criteria",
+ "sort_order": "DESC",
+ "filters": "{'Budget Detail\u0001Fiscal Year':''}",
+ "standard": "Yes",
+ "doc_type": "Budget Detail",
+ "name": "__common__",
+ "sort_by": "`tabCost Center`.`lft`",
+ "page_len": 50,
+ "criteria_name": "Budget Variance Report"
+ },
+ {
+ "name": "budget_variance_report",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt b/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
index aba68a82c14..ffc642290c2 100644
--- a/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
+++ b/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
@@ -1,36 +1,29 @@
-# Search Criteria, business_associate_commission_report
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'saumil@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_col': u"SUM(`tabSales Invoice`.`total_commission`) AS 'Total Commission'\nSUM(`tabSales Invoice`.`net_total`) AS 'Net Total'\n((SUM(`tabSales Invoice`.`total_commission`) / SUM(`tabSales Invoice`.`net_total`)) * 100) AS 'Average Commission Rate'",
- 'add_cond': u'`tabSales Invoice`.`net_total` > 0\n`tabSales Invoice`.`total_commission` > 0',
- 'columns': u'Sales Invoice\x01Business Associate',
- 'criteria_name': u'Business Associate Commission Report',
- 'description': u'Track total commission given to your Business Associate',
- 'doc_type': u'Sales Invoice',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Sales Invoice\x01Submitted':1}",
- 'group_by': u'`tabSales Invoice`.sales_partner',
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, business_associate_commission_report
- {
- 'doctype': 'Search Criteria',
- 'name': u'business_associate_commission_report'
- }
+ {
+ "owner": "saumil@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "add_col": "SUM(`tabSales Invoice`.`total_commission`) AS 'Total Commission'\nSUM(`tabSales Invoice`.`net_total`) AS 'Net Total'\n((SUM(`tabSales Invoice`.`total_commission`) / SUM(`tabSales Invoice`.`net_total`)) * 100) AS 'Average Commission Rate'",
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Sales Invoice\u0001Submitted':1}",
+ "description": "Track total commission given to your Business Associate",
+ "doc_type": "Sales Invoice",
+ "name": "__common__",
+ "add_cond": "`tabSales Invoice`.`net_total` > 0\n`tabSales Invoice`.`total_commission` > 0",
+ "doctype": "Search Criteria",
+ "group_by": "`tabSales Invoice`.sales_partner",
+ "page_len": 50,
+ "criteria_name": "Business Associate Commission Report",
+ "columns": "Sales Invoice\u0001Business Associate"
+ },
+ {
+ "name": "business_associate_commission_report",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/collection_report/collection_report.txt b/accounts/search_criteria/collection_report/collection_report.txt
index dd78dfcf9e3..781e74c22c9 100644
--- a/accounts/search_criteria/collection_report/collection_report.txt
+++ b/accounts/search_criteria/collection_report/collection_report.txt
@@ -1,33 +1,26 @@
-# Search Criteria, collection_report
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Receivable,Journal Voucher Detail\x01Is Advance',
- 'criteria_name': u'Collection Report',
- 'doc_type': u'Journal Voucher Detail',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'parent_doc_type': u'Journal Voucher',
- 'sort_by': u'`tabJournal Voucher`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, collection_report
- {
- 'doctype': 'Search Criteria',
- 'name': u'collection_report'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "parent_doc_type": "Journal Voucher",
+ "module": "Accounts",
+ "doctype": "Search Criteria",
+ "sort_order": "DESC",
+ "filters": "{'Journal Voucher\u0001Saved':1,'Journal Voucher\u0001Submitted':1,'Journal Voucher\u0001Voucher Type':'','Journal Voucher\u0001Is Opening':'','Journal Voucher\u0001Company':'','Journal Voucher\u0001TDS Applicable':'','Journal Voucher\u0001TDS Category':'','GL Entry\u0001Range 1':'30','GL Entry\u0001Range 2':'45','GL Entry\u0001Range 3':'60','GL Entry\u0001Range 4':'90'}",
+ "standard": "Yes",
+ "doc_type": "Journal Voucher Detail",
+ "name": "__common__",
+ "sort_by": "`tabJournal Voucher`.`name`",
+ "criteria_name": "Collection Report",
+ "columns": "Journal Voucher\u0001ID,Journal Voucher\u0001Posting Date,Journal Voucher\u0001Company,Journal Voucher\u0001Cheque No,Journal Voucher\u0001Cheque Date,Journal Voucher Detail\u0001Account,Journal Voucher Detail\u0001Credit,Journal Voucher Detail\u0001Against Receivable,Journal Voucher Detail\u0001Is Advance"
+ },
+ {
+ "name": "collection_report",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt b/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
index 2aed5078f3e..98e3b080e81 100644
--- a/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
+++ b/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
@@ -1,33 +1,26 @@
-# Search Criteria, cost_center_wise_expense
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:50',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'swarnalata@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'criteria_name': u'Cost Center wise Expense',
- 'dis_filters': u'fiscal_year',
- 'doc_type': u'GL Entry',
- 'doctype': 'Search Criteria',
- 'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabGL Entry`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, cost_center_wise_expense
- {
- 'doctype': 'Search Criteria',
- 'name': u'cost_center_wise_expense'
- }
+ {
+ "owner": "swarnalata@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:50",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "module": "Accounts",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'GL Entry\u0001Voucher Type':'','GL Entry\u0001Is Cancelled':'','GL Entry\u0001Fiscal Year':'','GL Entry\u0001Company':''}",
+ "doctype": "Search Criteria",
+ "dis_filters": "fiscal_year",
+ "doc_type": "GL Entry",
+ "name": "__common__",
+ "sort_by": "`tabGL Entry`.`name`",
+ "page_len": 50,
+ "criteria_name": "Cost Center wise Expense"
+ },
+ {
+ "name": "cost_center_wise_expense",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/general_ledger/general_ledger.txt b/accounts/search_criteria/general_ledger/general_ledger.txt
index 5cf15ea5c4a..939b8a3f496 100644
--- a/accounts/search_criteria/general_ledger/general_ledger.txt
+++ b/accounts/search_criteria/general_ledger/general_ledger.txt
@@ -1,32 +1,25 @@
-# Search Criteria, general_ledger
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'criteria_name': u'General Ledger',
- 'doc_type': u'GL Entry',
- 'doctype': 'Search Criteria',
- 'filters': u"{'GL Entry\x01From Posting Date\x01lower':'','GL Entry\x01To Posting Date\x01upper':'','GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
- 'module': u'Accounts',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabGL Entry`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, general_ledger
- {
- 'doctype': 'Search Criteria',
- 'name': u'general_ledger'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "Accounts",
+ "sort_order": "DESC",
+ "filters": "{'GL Entry\u0001From Posting Date\u0001lower':'','GL Entry\u0001To Posting Date\u0001upper':'','GL Entry\u0001Voucher Type':'','GL Entry\u0001Is Cancelled':'No','GL Entry\u0001Is Opening':'','GL Entry\u0001Fiscal Year':'','GL Entry\u0001Company':''}",
+ "standard": "Yes",
+ "doc_type": "GL Entry",
+ "name": "__common__",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabGL Entry`.`name`",
+ "page_len": 50,
+ "criteria_name": "General Ledger"
+ },
+ {
+ "name": "general_ledger",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/accounts/search_criteria/invoices_overdue/invoices_overdue.txt b/accounts/search_criteria/invoices_overdue/invoices_overdue.txt
index a83d490e116..514afacee6e 100644
--- a/accounts/search_criteria/invoices_overdue/invoices_overdue.txt
+++ b/accounts/search_criteria/invoices_overdue/invoices_overdue.txt
@@ -1,34 +1,27 @@
-# Search Criteria, invoices-overdue
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_cond': u'`tabSales Invoice`.due_date=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'transaction_date',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'transaction_date'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Purchase Request',
- 'match_id': 0,
- 'reference_key': u'prevdoc_docname',
- 'to_table': u'Purchase Order',
- 'validation_logic': u'docstatus = 1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'indent_details',
- 'from_table': u'Purchase Request Item',
- 'match_id': 1,
- 'reference_doctype_key': u'prevdoc_doctype',
- 'to_field': u'po_details',
- 'to_table': u'Purchase Order Item',
- 'validation_logic': u'qty > ifnull(ordered_qty,0) and docstatus =1'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2010-08-08 17:09:34",
+ "modified_by": "Administrator",
+ "modified": "2012-07-02 11:12:28"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Request-Purchase Order",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Request-Purchase Order",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Purchase Order",
+ "module": "Buying",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Purchase Request"
+ },
+ {
+ "name": "Purchase Request-Purchase Order",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "company",
+ "doctype": "Field Mapper Detail",
+ "from_field": "company",
+ "checking_operator": "="
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_doctype",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parenttype"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_docname",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_detail_docname",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "stock_uom",
+ "doctype": "Field Mapper Detail",
+ "from_field": "uom"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "conversion_factor",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval:flt(1)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "stock_qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "qty",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "schedule_date",
+ "doctype": "Field Mapper Detail",
+ "from_field": "schedule_date"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "transaction_date",
+ "doctype": "Field Mapper Detail",
+ "from_field": "transaction_date",
+ "checking_operator": ">="
+ },
+ {
+ "reference_key": "prevdoc_docname",
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Purchase Request",
+ "to_table": "Purchase Order",
+ "validation_logic": "docstatus = 1"
+ },
+ {
+ "match_id": 1,
+ "reference_doctype_key": "prevdoc_doctype",
+ "to_field": "po_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "indent_details",
+ "from_table": "Purchase Request Item",
+ "to_table": "Purchase Order Item",
+ "validation_logic": "qty > ifnull(ordered_qty,0) and docstatus =1"
+ }
]
\ No newline at end of file
diff --git a/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt b/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt
index 7d1de7524ad..1d66116ae2a 100644
--- a/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt
+++ b/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt
@@ -1,115 +1,90 @@
-# DocType Mapper, Purchase Request-Supplier Quotation
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-08-02 18:36:26',
- 'docstatus': 0,
- 'modified': '2012-08-03 12:34:09',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Request-Supplier Quotation',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Purchase Request-Supplier Quotation',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Purchase Request',
- 'module': u'Buying',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Supplier Quotation'
- },
-
- # DocType Mapper, Purchase Request-Supplier Quotation
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Purchase Request-Supplier Quotation'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'company',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parenttype',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'prevdoc_doctype'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'prevdoc_docname'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'prevdoc_detail_docname'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'>=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'transaction_date',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'transaction_date'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Purchase Request',
- 'match_id': 0,
- 'reference_key': u'prevdoc_docname',
- 'to_table': u'Supplier Quotation',
- 'validation_logic': u'docstatus = 1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'indent_details',
- 'from_table': u'Purchase Request Item',
- 'match_id': 1,
- 'reference_doctype_key': u'prevdoc_doctype',
- 'to_field': u'quotation_items',
- 'to_table': u'Supplier Quotation Item',
- 'validation_logic': u'docstatus =1'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-08-02 18:36:26",
+ "modified_by": "Administrator",
+ "modified": "2012-08-03 12:34:09"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Request-Supplier Quotation",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Request-Supplier Quotation",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Supplier Quotation",
+ "module": "Buying",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Purchase Request"
+ },
+ {
+ "name": "Purchase Request-Supplier Quotation",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "company",
+ "doctype": "Field Mapper Detail",
+ "from_field": "company",
+ "checking_operator": "="
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_doctype",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parenttype"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_docname",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "prevdoc_detail_docname",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "transaction_date",
+ "doctype": "Field Mapper Detail",
+ "from_field": "transaction_date",
+ "checking_operator": ">="
+ },
+ {
+ "reference_key": "prevdoc_docname",
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Purchase Request",
+ "to_table": "Supplier Quotation",
+ "validation_logic": "docstatus = 1"
+ },
+ {
+ "match_id": 1,
+ "reference_doctype_key": "prevdoc_doctype",
+ "to_field": "quotation_items",
+ "doctype": "Table Mapper Detail",
+ "from_field": "indent_details",
+ "from_table": "Purchase Request Item",
+ "to_table": "Supplier Quotation Item",
+ "validation_logic": "docstatus =1"
+ }
]
\ No newline at end of file
diff --git a/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt b/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt
index 6dc79e6ecbb..500ca8f26f3 100755
--- a/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt
+++ b/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt
@@ -1,116 +1,91 @@
-# DocType Mapper, Sales Order-Purchase Request
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-05-20 10:07:55',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Sales Order-Purchase Request',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Sales Order-Purchase Request',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': 'DocType Mapper',
- 'from_doctype': u'Sales Order',
- 'module': u'Buying',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Purchase Request'
- },
-
- # DocType Mapper, Sales Order-Purchase Request
- {
- 'doctype': 'DocType Mapper',
- 'name': u'Sales Order-Purchase Request'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'>=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'transaction_date',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'transaction_date'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'company',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'sales_order_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'stock_uom',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'reserved_warehouse',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'warehouse'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'sales_order_details',
- 'from_table': u'Sales Order Item',
- 'match_id': 1,
- 'reference_doctype_key': u'prevdoc_doctype',
- 'reference_key': u'prevdoc_detail_docname',
- 'to_field': u'indent_details',
- 'to_table': u'Purchase Request Item',
- 'validation_logic': u'docstatus=1'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Sales Order',
- 'match_id': 0,
- 'reference_key': u'prevdoc_docname',
- 'to_table': u'Purchase Request',
- 'validation_logic': u'docstatus = 1'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-05-20 10:07:55",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Order-Purchase Request",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Sales Order-Purchase Request",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Purchase Request",
+ "module": "Buying",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Sales Order"
+ },
+ {
+ "name": "Sales Order-Purchase Request",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "transaction_date",
+ "doctype": "Field Mapper Detail",
+ "from_field": "transaction_date",
+ "checking_operator": ">="
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "company",
+ "doctype": "Field Mapper Detail",
+ "from_field": "company",
+ "checking_operator": "="
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "sales_order_no",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "uom",
+ "doctype": "Field Mapper Detail",
+ "from_field": "stock_uom"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "warehouse",
+ "doctype": "Field Mapper Detail",
+ "from_field": "reserved_warehouse"
+ },
+ {
+ "reference_key": "prevdoc_detail_docname",
+ "match_id": 1,
+ "reference_doctype_key": "prevdoc_doctype",
+ "to_field": "indent_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "sales_order_details",
+ "from_table": "Sales Order Item",
+ "to_table": "Purchase Request Item",
+ "validation_logic": "docstatus=1"
+ },
+ {
+ "reference_key": "prevdoc_docname",
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Sales Order",
+ "to_table": "Purchase Request",
+ "validation_logic": "docstatus = 1"
+ }
]
\ No newline at end of file
diff --git a/buying/DocType Mapper/Supplier Quotation-Purchase Order/Supplier Quotation-Purchase Order.txt b/buying/DocType Mapper/Supplier Quotation-Purchase Order/Supplier Quotation-Purchase Order.txt
index a616266c910..a1c65f98f82 100644
--- a/buying/DocType Mapper/Supplier Quotation-Purchase Order/Supplier Quotation-Purchase Order.txt
+++ b/buying/DocType Mapper/Supplier Quotation-Purchase Order/Supplier Quotation-Purchase Order.txt
@@ -1,169 +1,132 @@
-# DocType Mapper, Supplier Quotation-Purchase Order
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-08-03 12:33:04',
- 'docstatus': 0,
- 'modified': '2012-08-06 16:45:56',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'name': '__common__',
- 'parent': u'Supplier Quotation-Purchase Order',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper',
- 'validation_logic': u'docstatus = 1'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'name': '__common__',
- 'parent': u'Supplier Quotation-Purchase Order',
- 'parentfield': u'field_mapper_details',
- 'parenttype': u'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': u'DocType Mapper',
- 'from_doctype': u'Supplier Quotation',
- 'module': u'Buying',
- 'name': '__common__',
- 'ref_doc_submitted': 1,
- 'to_doctype': u'Purchase Order'
- },
-
- # DocType Mapper, Supplier Quotation-Purchase Order
- {
- 'doctype': u'DocType Mapper',
- 'name': u'Supplier Quotation-Purchase Order'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'company',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'company'
- },
-
- # Field Mapper Detail
- {
- 'checking_operator': u'>=',
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'transaction_date',
- 'map': u'No',
- 'match_id': 0,
- 'to_field': u'transaction_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'conversion_rate',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'net_total',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'total_tax',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'total_tax'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'grand_total',
- 'map': u'Yes',
- 'match_id': 0,
- 'to_field': u'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'parent',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'supplier_quotation'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'name',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'supplier_quotation_item'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'uom',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': u'Field Mapper Detail',
- 'from_field': u'eval:flt(1)',
- 'map': u'Yes',
- 'match_id': 1,
- 'to_field': u'conversion_factor'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_table': u'Supplier Quotation',
- 'match_id': 0,
- 'reference_key': u'prevdoc_docname',
- 'to_table': u'Purchase Order'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'quotation_details',
- 'from_table': u'Supplier Quotation Item',
- 'match_id': 1,
- 'reference_doctype_key': u'prevdoc_doctype',
- 'to_field': u'po_details',
- 'to_table': u'Purchase Order Item'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'purchase_tax_details',
- 'from_table': u'Purchase Taxes and Charges',
- 'match_id': 2,
- 'to_field': u'purchase_tax_details',
- 'to_table': u'Purchase Taxes and Charges'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-08-03 12:33:04",
+ "modified_by": "Administrator",
+ "modified": "2012-08-06 16:45:56"
+ },
+ {
+ "name": "__common__",
+ "parent": "Supplier Quotation-Purchase Order",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "validation_logic": "docstatus = 1",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "parent": "Supplier Quotation-Purchase Order",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Purchase Order",
+ "module": "Buying",
+ "doctype": "DocType Mapper",
+ "ref_doc_submitted": 1,
+ "from_doctype": "Supplier Quotation"
+ },
+ {
+ "name": "Supplier Quotation-Purchase Order",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "company",
+ "doctype": "Field Mapper Detail",
+ "from_field": "company",
+ "checking_operator": "="
+ },
+ {
+ "map": "No",
+ "match_id": 0,
+ "to_field": "transaction_date",
+ "doctype": "Field Mapper Detail",
+ "from_field": "transaction_date",
+ "checking_operator": ">="
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "conversion_rate",
+ "doctype": "Field Mapper Detail",
+ "from_field": "conversion_rate"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "net_total",
+ "doctype": "Field Mapper Detail",
+ "from_field": "net_total"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "total_tax",
+ "doctype": "Field Mapper Detail",
+ "from_field": "total_tax"
+ },
+ {
+ "map": "Yes",
+ "match_id": 0,
+ "to_field": "grand_total",
+ "doctype": "Field Mapper Detail",
+ "from_field": "grand_total"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "supplier_quotation",
+ "doctype": "Field Mapper Detail",
+ "from_field": "parent"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "supplier_quotation_item",
+ "doctype": "Field Mapper Detail",
+ "from_field": "name"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "stock_uom",
+ "doctype": "Field Mapper Detail",
+ "from_field": "uom"
+ },
+ {
+ "map": "Yes",
+ "match_id": 1,
+ "to_field": "conversion_factor",
+ "doctype": "Field Mapper Detail",
+ "from_field": "eval:flt(1)"
+ },
+ {
+ "reference_key": "prevdoc_docname",
+ "match_id": 0,
+ "doctype": "Table Mapper Detail",
+ "from_table": "Supplier Quotation",
+ "to_table": "Purchase Order"
+ },
+ {
+ "match_id": 1,
+ "reference_doctype_key": "prevdoc_doctype",
+ "to_field": "po_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "quotation_details",
+ "from_table": "Supplier Quotation Item",
+ "to_table": "Purchase Order Item"
+ },
+ {
+ "match_id": 2,
+ "to_field": "purchase_tax_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "purchase_tax_details",
+ "from_table": "Purchase Taxes and Charges",
+ "to_table": "Purchase Taxes and Charges"
+ }
]
\ No newline at end of file
diff --git a/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt b/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
index fd074e3f093..5c5c8aa5779 100644
--- a/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
+++ b/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
@@ -1,28 +1,21 @@
-# Print Format, Purchase Order Classic
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-12-13 11:02:59',
- 'docstatus': 0,
- 'modified': '2011-12-13 13:51:41',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': 'Purchase Order',
- 'doctype': 'Print Format',
- 'html': '\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': 'Buying',
- 'name': '__common__',
- 'standard': 'Yes'
- },
-
- # Print Format, Purchase Order Classic
- {
- 'doctype': 'Print Format',
- 'name': 'Purchase Order Classic'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-12-13 11:02:59",
+ "modified_by": "Administrator",
+ "modified": "2011-12-13 13:51:41"
+ },
+ {
+ "doc_type": "Purchase Order",
+ "name": "__common__",
+ "module": "Buying",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Purchase Order Classic",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt b/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
index 90a135e5bbd..535839f9106 100644
--- a/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
+++ b/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
@@ -1,28 +1,21 @@
-# Print Format, Purchase Order Modern
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-12-13 11:02:59',
- 'docstatus': 0,
- 'modified': '2011-12-13 13:53:52',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': 'Purchase Order',
- 'doctype': 'Print Format',
- 'html': '\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': 'Buying',
- 'name': '__common__',
- 'standard': 'Yes'
- },
-
- # Print Format, Purchase Order Modern
- {
- 'doctype': 'Print Format',
- 'name': 'Purchase Order Modern'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-12-13 11:02:59",
+ "modified_by": "Administrator",
+ "modified": "2011-12-13 13:53:52"
+ },
+ {
+ "doc_type": "Purchase Order",
+ "name": "__common__",
+ "module": "Buying",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Purchase Order Modern",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt b/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
index 7b0510de33f..04999b53b0c 100644
--- a/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
+++ b/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
@@ -1,28 +1,21 @@
-# Print Format, Purchase Order Spartan
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-12-13 11:02:59',
- 'docstatus': 0,
- 'modified': '2011-12-13 13:55:23',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Print Format
- {
- 'doc_type': 'Purchase Order',
- 'doctype': 'Print Format',
- 'html': '\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n\t\n\t\n
\n\n\t\n\t\n
\n',
- 'module': 'Buying',
- 'name': '__common__',
- 'standard': 'Yes'
- },
-
- # Print Format, Purchase Order Spartan
- {
- 'doctype': 'Print Format',
- 'name': 'Purchase Order Spartan'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2011-12-13 11:02:59",
+ "modified_by": "Administrator",
+ "modified": "2011-12-13 13:55:23"
+ },
+ {
+ "doc_type": "Purchase Order",
+ "name": "__common__",
+ "module": "Buying",
+ "doctype": "Print Format",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "standard": "Yes"
+ },
+ {
+ "name": "Purchase Order Spartan",
+ "doctype": "Print Format"
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_common/purchase_common.txt b/buying/doctype/purchase_common/purchase_common.txt
index dc1e1f105a2..2d38c7eb32c 100644
--- a/buying/doctype/purchase_common/purchase_common.txt
+++ b/buying/doctype/purchase_common/purchase_common.txt
@@ -1,31 +1,24 @@
-# DocType, Purchase Common
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:51',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:51',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'issingle': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 187
- },
-
- # DocType, Purchase Common
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Common'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:51",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:51"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Buying",
+ "show_in_menu": 0,
+ "version": 187,
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "issingle": 1
+ },
+ {
+ "name": "Purchase Common",
+ "doctype": "DocType"
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.py b/buying/doctype/purchase_order/purchase_order.py
index e52499cfd01..7182306b6d4 100644
--- a/buying/doctype/purchase_order/purchase_order.py
+++ b/buying/doctype/purchase_order/purchase_order.py
@@ -299,7 +299,11 @@ class DocType(TransactionBase):
def add_bom(self, d):
#----- fetching default bom from Bill of Materials instead of Item Master --
- bom_det = sql("select t1.item, t2.item_code, t2.qty_consumed_per_unit, t2.moving_avg_rate, t2.value_as_per_mar, t2.stock_uom, t2.name, t2.parent from `tabBOM` t1, `tabBOM Item` t2 where t2.parent = t1.name and t1.item = '%s' and ifnull(t1.is_default,0) = 1 and t1.docstatus = 1" % d.item_code)
+ bom_det = sql("""select t1.item, t2.item_code, t2.qty_consumed_per_unit,
+ t2.moving_avg_rate, t2.value_as_per_mar, t2.stock_uom, t2.name, t2.parent
+ from `tabBOM` t1, `tabBOM Item` t2
+ where t2.parent = t1.name and t1.item = %s
+ and ifnull(t1.is_default,0) = 1 and t1.docstatus = 1""", (d.item_code,))
if not bom_det:
msgprint("No default BOM exists for item: %s" % d.item_code)
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index 552ca4a7a67..9f8151df0d8 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -263,12 +263,12 @@
{
"print_hide": 1,
"oldfieldtype": "Date",
+ "search_index": 0,
"doctype": "DocField",
"label": "Purchase Request Date",
"oldfieldname": "prevdoc_date",
"fieldname": "prevdoc_date",
"fieldtype": "Date",
- "search_index": 0,
"hidden": 1,
"permlevel": 1,
"in_filter": 1
@@ -326,11 +326,11 @@
"label": "Item Group",
"oldfieldname": "item_group",
"permlevel": 1,
+ "options": "Item Group",
"fieldname": "item_group",
"fieldtype": "Link",
"search_index": 0,
"hidden": 1,
- "options": "Item Group",
"in_filter": 1
},
{
@@ -361,11 +361,11 @@
{
"print_hide": 1,
"default": "0.00",
+ "no_copy": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Billed Quantity",
"oldfieldname": "billed_qty",
- "no_copy": 1,
"fieldname": "billed_qty",
"fieldtype": "Currency",
"hidden": 0,
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
index eb529c41344..f9cbd04dca1 100644
--- a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
+++ b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
@@ -1,144 +1,117 @@
-# DocType, Purchase Order Item Supplied
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:50',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:50',
- 'modified_by': u'Administrator',
- 'owner': u'dhanalekshmi@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_toolbar': 1,
- 'istable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Order Item Supplied',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Order Item Supplied
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Order Item Supplied'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reference_name',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'in_filter': 0,
- 'label': u'Reference Name',
- 'oldfieldname': u'reference_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'bom_detail_no',
- 'fieldtype': u'Data',
- 'label': u'BOM Detail No',
- 'oldfieldname': u'bom_detail_no',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'main_item_code',
- 'fieldtype': u'Data',
- 'label': u'Item Code',
- 'oldfieldname': u'main_item_code',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rm_item_code',
- 'fieldtype': u'Data',
- 'label': u'Raw Material Item Code',
- 'oldfieldname': u'rm_item_code',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'required_qty',
- 'fieldtype': u'Currency',
- 'label': u'Required Qty',
- 'oldfieldname': u'required_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate',
- 'oldfieldname': u'rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'conversion_factor',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Conversion Factor',
- 'oldfieldname': u'conversion_factor',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'stock_uom',
- 'fieldtype': u'Data',
- 'label': u'Stock Uom',
- 'oldfieldname': u'stock_uom',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- }
+ {
+ "owner": "dhanalekshmi@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:50",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:50"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "module": "Buying",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 1,
+ "hide_toolbar": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Order Item Supplied",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Order Item Supplied",
+ "doctype": "DocType"
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Reference Name",
+ "oldfieldname": "reference_name",
+ "fieldname": "reference_name",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 0,
+ "permlevel": 1,
+ "in_filter": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "BOM Detail No",
+ "oldfieldname": "bom_detail_no",
+ "fieldname": "bom_detail_no",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "main_item_code",
+ "fieldname": "main_item_code",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Raw Material Item Code",
+ "oldfieldname": "rm_item_code",
+ "fieldname": "rm_item_code",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Required Qty",
+ "oldfieldname": "required_qty",
+ "fieldname": "required_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate",
+ "oldfieldname": "rate",
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Conversion Factor",
+ "oldfieldname": "conversion_factor",
+ "fieldname": "conversion_factor",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Stock Uom",
+ "oldfieldname": "stock_uom",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
index 602bb259b44..5b5729c25ba 100644
--- a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
+++ b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
@@ -1,179 +1,146 @@
-# DocType, Purchase Receipt Item Supplied
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:50',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:50',
- 'modified_by': u'Administrator',
- 'owner': u'wasim@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_toolbar': 0,
- 'istable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 17
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Receipt Item Supplied',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Receipt Item Supplied
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Receipt Item Supplied'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reference_name',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'in_filter': 0,
- 'label': u'Reference Name',
- 'oldfieldname': u'reference_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'bom_detail_no',
- 'fieldtype': u'Data',
- 'label': u'BOM Detail No',
- 'oldfieldname': u'bom_detail_no',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'main_item_code',
- 'fieldtype': u'Data',
- 'label': u'Item Code',
- 'oldfieldname': u'main_item_code',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rm_item_code',
- 'fieldtype': u'Data',
- 'label': u'Raw Material Item Code',
- 'oldfieldname': u'rm_item_code',
- 'oldfieldtype': u'Data',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Data',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'required_qty',
- 'fieldtype': u'Currency',
- 'label': u'Required Qty',
- 'oldfieldname': u'required_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'consumed_qty',
- 'fieldtype': u'Currency',
- 'label': u'Consumed Qty',
- 'oldfieldname': u'consumed_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate',
- 'oldfieldname': u'rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'conversion_factor',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Conversion Factor',
- 'oldfieldname': u'conversion_factor',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'stock_uom',
- 'fieldtype': u'Data',
- 'label': u'Stock Uom',
- 'oldfieldname': u'stock_uom',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'current_stock',
- 'fieldtype': u'Currency',
- 'label': u'Current Stock',
- 'oldfieldname': u'current_stock',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- }
+ {
+ "owner": "wasim@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:50",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:50"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "module": "Buying",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 17,
+ "hide_toolbar": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Receipt Item Supplied",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Receipt Item Supplied",
+ "doctype": "DocType"
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Reference Name",
+ "oldfieldname": "reference_name",
+ "fieldname": "reference_name",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "hidden": 0,
+ "permlevel": 1,
+ "in_filter": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "BOM Detail No",
+ "oldfieldname": "bom_detail_no",
+ "fieldname": "bom_detail_no",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "main_item_code",
+ "fieldname": "main_item_code",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Raw Material Item Code",
+ "oldfieldname": "rm_item_code",
+ "fieldname": "rm_item_code",
+ "fieldtype": "Data",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Required Qty",
+ "oldfieldname": "required_qty",
+ "fieldname": "required_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Consumed Qty",
+ "oldfieldname": "consumed_qty",
+ "fieldname": "consumed_qty",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate",
+ "oldfieldname": "rate",
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Conversion Factor",
+ "oldfieldname": "conversion_factor",
+ "fieldname": "conversion_factor",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Stock Uom",
+ "oldfieldname": "stock_uom",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Current Stock",
+ "oldfieldname": "current_stock",
+ "fieldname": "current_stock",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_request_item/purchase_request_item.txt b/buying/doctype/purchase_request_item/purchase_request_item.txt
index 3107529b36c..b8f1cf67ebf 100644
--- a/buying/doctype/purchase_request_item/purchase_request_item.txt
+++ b/buying/doctype/purchase_request_item/purchase_request_item.txt
@@ -1,261 +1,222 @@
-# DocType, Purchase Request Item
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-11 13:17:40',
- 'docstatus': 0,
- 'modified': '2012-04-12 14:52:49',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'IDTD/.#####',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 37
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Request Item',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Request Item
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Request Item'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'schedule_date',
- 'fieldtype': u'Date',
- 'label': u'Required Date',
- 'no_copy': 1,
- 'oldfieldname': u'schedule_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 1,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_code',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Item Code',
- 'oldfieldname': u'item_code',
- 'oldfieldtype': u'Link',
- 'options': u'Item',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Text',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'250px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'warehouse',
- 'fieldtype': u'Link',
- 'label': u'Warehouse',
- 'oldfieldname': u'warehouse',
- 'oldfieldtype': u'Link',
- 'options': u'Warehouse',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 0,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'qty',
- 'fieldtype': u'Currency',
- 'label': u'Quantity',
- 'no_copy': 0,
- 'oldfieldname': u'qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'80px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'uom',
- 'fieldtype': u'Link',
- 'label': u'Stock UOM',
- 'no_copy': 0,
- 'oldfieldname': u'uom',
- 'oldfieldtype': u'Link',
- 'options': u'UOM',
- 'permlevel': 1,
- 'reqd': 1,
- 'width': u'70px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'lead_time_date',
- 'fieldtype': u'Date',
- 'label': u'Lead Time Date',
- 'no_copy': 1,
- 'oldfieldname': u'lead_time_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_name',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Item Name',
- 'oldfieldname': u'item_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'item_group',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Item Group',
- 'no_copy': 0,
- 'oldfieldname': u'item_group',
- 'oldfieldtype': u'Link',
- 'options': u'Item Group',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'brand',
- 'fieldtype': u'Link',
- 'label': u'Brand',
- 'oldfieldname': u'brand',
- 'oldfieldtype': u'Link',
- 'options': u'Brand',
- 'permlevel': 1,
- 'print_hide': 1,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'min_order_qty',
- 'fieldtype': u'Currency',
- 'label': u'Min Order Qty',
- 'no_copy': 1,
- 'oldfieldname': u'min_order_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 0,
- 'width': u'70px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'projected_qty',
- 'fieldtype': u'Currency',
- 'label': u'Projected Qty',
- 'no_copy': 1,
- 'oldfieldname': u'projected_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'width': u'70px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'ordered_qty',
- 'fieldtype': u'Currency',
- 'label': u'Ordered Qty',
- 'no_copy': 1,
- 'oldfieldname': u'ordered_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'sales_order_no',
- 'fieldtype': u'Link',
- 'label': u'Sales Order No',
- 'no_copy': 1,
- 'options': u'Sales Order',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'page_break',
- 'fieldtype': u'Check',
- 'label': u'Page Break',
- 'no_copy': 1,
- 'oldfieldname': u'page_break',
- 'oldfieldtype': u'Check',
- 'permlevel': 0,
- 'print_hide': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-11 13:17:40",
+ "modified_by": "Administrator",
+ "modified": "2012-04-12 14:52:49"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Buying",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "autoname": "IDTD/.#####",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 37
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Request Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Request Item",
+ "doctype": "DocType"
+ },
+ {
+ "print_hide": 0,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Required Date",
+ "oldfieldname": "schedule_date",
+ "width": "100px",
+ "fieldname": "schedule_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "permlevel": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "width": "100px",
+ "trigger": "Client",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "250px",
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "width": "100px",
+ "trigger": "Client",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "options": "Warehouse",
+ "permlevel": 0
+ },
+ {
+ "width": "80px",
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Quantity",
+ "oldfieldname": "qty",
+ "no_copy": 0,
+ "trigger": "Client",
+ "fieldname": "qty",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "no_copy": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Stock UOM",
+ "oldfieldname": "uom",
+ "width": "70px",
+ "options": "UOM",
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Lead Time Date",
+ "oldfieldname": "lead_time_date",
+ "fieldname": "lead_time_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "width": "100px",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "permlevel": 1,
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 0,
+ "options": "Item Group",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "permlevel": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Brand",
+ "oldfieldname": "brand",
+ "width": "100px",
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "options": "Brand"
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Min Order Qty",
+ "oldfieldname": "min_order_qty",
+ "width": "70px",
+ "fieldname": "min_order_qty",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Projected Qty",
+ "oldfieldname": "projected_qty",
+ "width": "70px",
+ "fieldname": "projected_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Ordered Qty",
+ "oldfieldname": "ordered_qty",
+ "fieldname": "ordered_qty",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "doctype": "DocField",
+ "label": "Sales Order No",
+ "permlevel": 1,
+ "fieldname": "sales_order_no",
+ "fieldtype": "Link",
+ "options": "Sales Order"
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Check",
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "label": "Page Break",
+ "oldfieldname": "page_break",
+ "fieldname": "page_break",
+ "fieldtype": "Check",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt
index 8d4cd0a93ed..64bc087795b 100644
--- a/buying/doctype/quality_inspection/quality_inspection.txt
+++ b/buying/doctype/quality_inspection/quality_inspection.txt
@@ -1,345 +1,288 @@
-# DocType, Quality Inspection
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:51',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:45:50',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1317365120',
- 'autoname': u'QAI/.######',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'is_submittable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'print_outline': u'Yes',
- 'search_fields': u'item_code, report_date, purchase_receipt_no, delivery_note_no',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 38
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Quality Inspection',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Quality Inspection',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1,
- 'role': u'Quality Manager'
- },
-
- # DocType, Quality Inspection
- {
- 'doctype': 'DocType',
- 'name': u'Quality Inspection'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'submit': 1,
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'qa_inspection',
- 'fieldtype': u'Section Break',
- 'label': u'QA Inspection',
- 'no_copy': 0,
- 'oldfieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'naming_series',
- 'fieldtype': u'Select',
- 'label': u'Naming Series',
- 'no_copy': 1,
- 'options': u'\nQAI/11-12/',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'inspection_type',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Inspection Type',
- 'oldfieldname': u'inspection_type',
- 'oldfieldtype': u'Select',
- 'options': u'\nIncoming\nOutgoing\nIn Process',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'report_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Report Date',
- 'oldfieldname': u'report_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'item_code',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Item Code',
- 'oldfieldname': u'item_code',
- 'oldfieldtype': u'Link',
- 'options': u'Item',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'sample_size',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Sample Size',
- 'oldfieldname': u'sample_size',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'in_filter': 1,
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'search_index': 0,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_serial_no',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'label': u'Item Serial No',
- 'oldfieldname': u'item_serial_no',
- 'oldfieldtype': u'Link',
- 'options': u'Serial No',
- 'permlevel': 0,
- 'print_hide': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'batch_no',
- 'fieldtype': u'Link',
- 'label': u'Batch No',
- 'oldfieldname': u'batch_no',
- 'oldfieldtype': u'Link',
- 'options': u'Batch',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'purchase_receipt_no',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Purchase Receipt No',
- 'oldfieldname': u'purchase_receipt_no',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Receipt',
- 'permlevel': 0,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'delivery_note_no',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Delivery Note No',
- 'oldfieldname': u'delivery_note_no',
- 'oldfieldtype': u'Link',
- 'options': u'Delivery Note',
- 'permlevel': 0,
- 'print_hide': 0,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'inspected_by',
- 'fieldtype': u'Data',
- 'label': u'Inspected By',
- 'oldfieldname': u'inspected_by',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'remarks',
- 'fieldtype': u'Text',
- 'label': u'Remarks',
- 'no_copy': 1,
- 'oldfieldname': u'remarks',
- 'oldfieldtype': u'Text',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'verified_by',
- 'fieldtype': u'Data',
- 'label': u'Verified By',
- 'oldfieldname': u'verified_by',
- 'oldfieldtype': u'Data',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amended_from',
- 'fieldtype': u'Data',
- 'label': u'Amended From',
- 'no_copy': 1,
- 'oldfieldname': u'amended_from',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amendment_date',
- 'fieldtype': u'Date',
- 'label': u'Amendment Date',
- 'no_copy': 1,
- 'oldfieldname': u'amendment_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'specification_details',
- 'fieldtype': u'Section Break',
- 'label': u'Specification Details',
- 'oldfieldtype': u'Section Break',
- 'options': u'Simple',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'get_specification_details',
- 'fieldtype': u'Button',
- 'label': u'Get Specification Details',
- 'options': u'get_item_specification_details',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'qa_specification_details',
- 'fieldtype': u'Table',
- 'label': u'Quality Inspection Readings',
- 'oldfieldname': u'qa_specification_details',
- 'oldfieldtype': u'Table',
- 'options': u'Quality Inspection Reading',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:51",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:45:50"
+ },
+ {
+ "section_style": "Simple",
+ "is_submittable": 1,
+ "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no",
+ "module": "Buying",
+ "_last_update": "1317365120",
+ "server_code_error": " ",
+ "print_outline": "Yes",
+ "autoname": "QAI/.######",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "doctype": "DocType",
+ "show_in_menu": 0,
+ "version": 38
+ },
+ {
+ "name": "__common__",
+ "parent": "Quality Inspection",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Quality Inspection",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "role": "Quality Manager",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Quality Inspection",
+ "doctype": "DocType"
+ },
+ {
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "QA Inspection",
+ "fieldname": "qa_inspection",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "no_copy": 1,
+ "doctype": "DocField",
+ "label": "Naming Series",
+ "permlevel": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nQAI/11-12/"
+ },
+ {
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Inspection Type",
+ "oldfieldname": "inspection_type",
+ "trigger": "Client",
+ "fieldname": "inspection_type",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nIncoming\nOutgoing\nIn Process",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Report Date",
+ "oldfieldname": "report_date",
+ "fieldname": "report_date",
+ "fieldtype": "Date",
+ "oldfieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "hidden": 0,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Sample Size",
+ "oldfieldname": "sample_size",
+ "fieldname": "sample_size",
+ "fieldtype": "Currency",
+ "oldfieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 0
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Serial No",
+ "oldfieldname": "item_serial_no",
+ "permlevel": 0,
+ "fieldname": "item_serial_no",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "options": "Serial No"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Batch No",
+ "oldfieldname": "batch_no",
+ "permlevel": 0,
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "options": "Batch"
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Purchase Receipt No",
+ "oldfieldname": "purchase_receipt_no",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "purchase_receipt_no",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "hidden": 0,
+ "options": "Purchase Receipt",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Delivery Note No",
+ "oldfieldname": "delivery_note_no",
+ "permlevel": 0,
+ "fieldname": "delivery_note_no",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "hidden": 0,
+ "options": "Delivery Note",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Inspected By",
+ "oldfieldname": "inspected_by",
+ "fieldname": "inspected_by",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Remarks",
+ "oldfieldname": "remarks",
+ "fieldname": "remarks",
+ "fieldtype": "Text",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Verified By",
+ "oldfieldname": "verified_by",
+ "fieldname": "verified_by",
+ "fieldtype": "Data",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Amendment Date",
+ "oldfieldname": "amendment_date",
+ "fieldname": "amendment_date",
+ "fieldtype": "Date",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Specification Details",
+ "permlevel": 0,
+ "fieldname": "specification_details",
+ "fieldtype": "Section Break",
+ "options": "Simple"
+ },
+ {
+ "doctype": "DocField",
+ "options": "get_item_specification_details",
+ "fieldname": "get_specification_details",
+ "fieldtype": "Button",
+ "label": "Get Specification Details",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Table",
+ "doctype": "DocField",
+ "label": "Quality Inspection Readings",
+ "oldfieldname": "qa_specification_details",
+ "permlevel": 0,
+ "fieldname": "qa_specification_details",
+ "fieldtype": "Table",
+ "options": "Quality Inspection Reading"
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
index b356dd93468..4f5480cd7a0 100644
--- a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
+++ b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
@@ -1,175 +1,140 @@
-# DocType, Quality Inspection Reading
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:52',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:52',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'QASD/.#####',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 2
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Quality Inspection Reading',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Quality Inspection Reading
- {
- 'doctype': 'DocType',
- 'name': u'Quality Inspection Reading'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'specification',
- 'fieldtype': u'Data',
- 'label': u'Parameter',
- 'oldfieldname': u'specification',
- 'oldfieldtype': u'Data',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'value',
- 'fieldtype': u'Data',
- 'label': u'Acceptance Criteria',
- 'oldfieldname': u'value',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_1',
- 'fieldtype': u'Data',
- 'label': u'Reading 1',
- 'oldfieldname': u'reading_1',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_2',
- 'fieldtype': u'Data',
- 'label': u'Reading 2',
- 'oldfieldname': u'reading_2',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_3',
- 'fieldtype': u'Data',
- 'label': u'Reading 3',
- 'oldfieldname': u'reading_3',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_4',
- 'fieldtype': u'Data',
- 'label': u'Reading 4',
- 'oldfieldname': u'reading_4',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_5',
- 'fieldtype': u'Data',
- 'label': u'Reading 5',
- 'oldfieldname': u'reading_5',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_6',
- 'fieldtype': u'Data',
- 'label': u'Reading 6',
- 'oldfieldname': u'reading_6',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_7',
- 'fieldtype': u'Data',
- 'label': u'Reading 7',
- 'oldfieldname': u'reading_7',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_8',
- 'fieldtype': u'Data',
- 'label': u'Reading 8',
- 'oldfieldname': u'reading_8',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_9',
- 'fieldtype': u'Data',
- 'label': u'Reading 9',
- 'oldfieldname': u'reading_9',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'reading_10',
- 'fieldtype': u'Data',
- 'label': u'Reading 10',
- 'oldfieldname': u'reading_10',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'default': u'Accepted',
- 'doctype': u'DocField',
- 'fieldname': u'status',
- 'fieldtype': u'Select',
- 'label': u'Status',
- 'oldfieldname': u'status',
- 'oldfieldtype': u'Select',
- 'options': u'Accepted\nRejected'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:52",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:52"
+ },
+ {
+ "section_style": "Tray",
+ "istable": 1,
+ "module": "Buying",
+ "server_code_error": " ",
+ "doctype": "DocType",
+ "autoname": "QASD/.#####",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 2
+ },
+ {
+ "name": "__common__",
+ "parent": "Quality Inspection Reading",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Quality Inspection Reading",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Parameter",
+ "oldfieldname": "specification",
+ "fieldname": "specification",
+ "fieldtype": "Data",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Acceptance Criteria",
+ "oldfieldname": "value",
+ "fieldname": "value",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 1",
+ "oldfieldname": "reading_1",
+ "fieldname": "reading_1",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 2",
+ "oldfieldname": "reading_2",
+ "fieldname": "reading_2",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 3",
+ "oldfieldname": "reading_3",
+ "fieldname": "reading_3",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 4",
+ "oldfieldname": "reading_4",
+ "fieldname": "reading_4",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 5",
+ "oldfieldname": "reading_5",
+ "fieldname": "reading_5",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 6",
+ "oldfieldname": "reading_6",
+ "fieldname": "reading_6",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 7",
+ "oldfieldname": "reading_7",
+ "fieldname": "reading_7",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 8",
+ "oldfieldname": "reading_8",
+ "fieldname": "reading_8",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 9",
+ "oldfieldname": "reading_9",
+ "fieldname": "reading_9",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Reading 10",
+ "oldfieldname": "reading_10",
+ "fieldname": "reading_10",
+ "fieldtype": "Data"
+ },
+ {
+ "default": "Accepted",
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Status",
+ "oldfieldname": "status",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "options": "Accepted\nRejected"
+ }
]
\ 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 3b270490240..db2abfaed17 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-08-06 11:15:46",
"modified_by": "Administrator",
- "modified": "2012-08-02 18:04:35"
+ "modified": "2012-12-10 18:30:00"
},
{
"is_submittable": 1,
@@ -697,7 +697,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "role": "Production Manager",
+ "role": "Manufacturing Manager",
"cancel": 1,
"permlevel": 0
},
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index df745427a8f..97cddf7a4a9 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -160,11 +160,11 @@
"doctype": "DocField",
"label": "Warehouse",
"oldfieldname": "warehouse",
- "options": "Warehouse",
"fieldname": "warehouse",
"fieldtype": "Link",
"reqd": 0,
"hidden": 0,
+ "options": "Warehouse",
"permlevel": 0
},
{
@@ -222,12 +222,12 @@
{
"print_hide": 1,
"oldfieldtype": "Date",
+ "search_index": 0,
"doctype": "DocField",
"label": "Purchase Request Date",
"oldfieldname": "prevdoc_date",
"fieldname": "prevdoc_date",
"fieldtype": "Date",
- "search_index": 0,
"hidden": 1,
"permlevel": 1,
"in_filter": 1
@@ -265,11 +265,11 @@
"label": "Item Group",
"oldfieldname": "item_group",
"permlevel": 1,
+ "options": "Item Group",
"fieldname": "item_group",
"fieldtype": "Link",
"search_index": 0,
"hidden": 1,
- "options": "Item Group",
"in_filter": 1
},
{
diff --git a/buying/page/buying_home/buying_home.txt b/buying/page/buying_home/buying_home.txt
index d2d2accb03c..96a67f8cf31 100644
--- a/buying/page/buying_home/buying_home.txt
+++ b/buying/page/buying_home/buying_home.txt
@@ -1,28 +1,21 @@
-# Page, buying-home
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-02-21 13:22:54',
- 'docstatus': 0,
- 'modified': '2012-02-21 13:22:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- 'doctype': 'Page',
- 'module': u'Buying',
- 'name': '__common__',
- 'page_name': u'buying-home',
- 'standard': u'Yes',
- 'title': u'Buying Home'
- },
-
- # Page, buying-home
- {
- 'doctype': 'Page',
- 'name': u'buying-home'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-02-21 13:22:54",
+ "modified_by": "Administrator",
+ "modified": "2012-02-21 13:22:54"
+ },
+ {
+ "name": "__common__",
+ "title": "Buying Home",
+ "module": "Buying",
+ "doctype": "Page",
+ "page_name": "buying-home",
+ "standard": "Yes"
+ },
+ {
+ "name": "buying-home",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/buying/page/purchase_analytics/purchase_analytics.txt b/buying/page/purchase_analytics/purchase_analytics.txt
index b0232ed2ee7..0368b8f8c3e 100644
--- a/buying/page/purchase_analytics/purchase_analytics.txt
+++ b/buying/page/purchase_analytics/purchase_analytics.txt
@@ -1,49 +1,36 @@
-# Page, purchase-analytics
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-09-21 20:15:16',
- u'docstatus': 0,
- u'modified': '2012-10-04 17:24:17',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- u'doctype': u'Page',
- 'module': u'Buying',
- u'name': u'__common__',
- 'page_name': u'purchase-analytics',
- 'standard': u'Yes',
- 'title': u'Purchase Analytics'
- },
-
- # These values are common for all Page Role
- {
- u'doctype': u'Page Role',
- u'name': u'__common__',
- 'parent': u'purchase-analytics',
- 'parentfield': u'roles',
- 'parenttype': u'Page'
- },
-
- # Page, purchase-analytics
- {
- u'doctype': u'Page',
- u'name': u'purchase-analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Analytics'
- },
-
- # Page Role
- {
- u'doctype': u'Page Role',
- 'role': u'Purchase Manager'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-09-21 20:15:16",
+ "modified_by": "Administrator",
+ "modified": "2012-10-04 17:24:17"
+ },
+ {
+ "name": "__common__",
+ "title": "Purchase Analytics",
+ "module": "Buying",
+ "doctype": "Page",
+ "page_name": "purchase-analytics",
+ "standard": "Yes"
+ },
+ {
+ "name": "__common__",
+ "parent": "purchase-analytics",
+ "doctype": "Page Role",
+ "parenttype": "Page",
+ "parentfield": "roles"
+ },
+ {
+ "name": "purchase-analytics",
+ "doctype": "Page"
+ },
+ {
+ "role": "Analytics",
+ "doctype": "Page Role"
+ },
+ {
+ "role": "Purchase Manager",
+ "doctype": "Page Role"
+ }
]
\ No newline at end of file
diff --git a/buying/report/supplier_quotations/supplier_quotations.txt b/buying/report/supplier_quotations/supplier_quotations.txt
index dba7dc6facf..ab4f872b59f 100644
--- a/buying/report/supplier_quotations/supplier_quotations.txt
+++ b/buying/report/supplier_quotations/supplier_quotations.txt
@@ -1,26 +1,19 @@
-# Report, Supplier Quotations
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-08-07 14:52:42',
- 'docstatus': 0,
- 'modified': '2012-12-03 17:10:41',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Report
- {
- 'doctype': 'Report',
- 'json': u'{"filters":[["Supplier Quotation","supplier","like","%%"],["Supplier Quotation Item","item_code","like","%%"]],"columns":[["name","Supplier Quotation"],["supplier","Supplier Quotation"],["item_code","Supplier Quotation Item"],["description","Supplier Quotation Item"],["qty","Supplier Quotation Item"],["currency","Supplier Quotation"],["import_rate","Supplier Quotation Item"],["import_amount","Supplier Quotation Item"]],"sort_by":"modified","sort_order":"desc","sort_by_next":"name","sort_order_next":"desc"}',
- 'name': '__common__',
- 'ref_doctype': u'Supplier Quotation'
- },
-
- # Report, Supplier Quotations
- {
- 'doctype': 'Report',
- 'name': u'Supplier Quotations'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-08-07 14:52:42",
+ "modified_by": "Administrator",
+ "modified": "2012-12-03 17:10:41"
+ },
+ {
+ "name": "__common__",
+ "ref_doctype": "Supplier Quotation",
+ "doctype": "Report",
+ "json": "{\"filters\":[[\"Supplier Quotation\",\"supplier\",\"like\",\"%%\"],[\"Supplier Quotation Item\",\"item_code\",\"like\",\"%%\"]],\"columns\":[[\"name\",\"Supplier Quotation\"],[\"supplier\",\"Supplier Quotation\"],[\"item_code\",\"Supplier Quotation Item\"],[\"description\",\"Supplier Quotation Item\"],[\"qty\",\"Supplier Quotation Item\"],[\"currency\",\"Supplier Quotation\"],[\"import_rate\",\"Supplier Quotation Item\"],[\"import_amount\",\"Supplier Quotation Item\"]],\"sort_by\":\"modified\",\"sort_order\":\"desc\",\"sort_by_next\":\"name\",\"sort_order_next\":\"desc\"}"
+ },
+ {
+ "name": "Supplier Quotations",
+ "doctype": "Report"
+ }
]
\ No newline at end of file
diff --git a/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
index de0f278dd30..ac92b71e0ed 100644
--- a/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
+++ b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
@@ -1,34 +1,27 @@
-# Search Criteria, itemwise_purchase_details
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-11 13:16:55',
- 'docstatus': 0,
- 'modified': '2012-04-13 11:15:06',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Purchase Order\x01ID,Purchase Order\x01Purchase Order Date,Purchase Order Item\x01Item Code,Purchase Order Item\x01Item Name,Purchase Order Item\x01Quantity,Purchase Order Item\x01Stock UOM,Purchase Order Item\x01Rate ,Purchase Order Item\x01Amount,Purchase Order\x01Net Total*,Purchase Order\x01Grand Total',
- 'criteria_name': u'Itemwise Purchase Details',
- 'doc_type': u'Purchase Order Item',
- 'doctype': 'Search Criteria',
- 'filters': u'{"Purchase Order\\u0001Submitted":1,"Purchase Order\\u0001Status":[],"Purchase Order\\u0001Fiscal Year":[]}',
- 'module': u'Buying',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Purchase Order',
- 'sort_by': u'`tabPurchase Order`.`transaction_date`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, itemwise_purchase_details
- {
- 'doctype': 'Search Criteria',
- 'name': u'itemwise_purchase_details'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-11 13:16:55",
+ "modified_by": "Administrator",
+ "modified": "2012-04-13 11:15:06"
+ },
+ {
+ "parent_doc_type": "Purchase Order",
+ "module": "Buying",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{\"Purchase Order\\u0001Submitted\":1,\"Purchase Order\\u0001Status\":[],\"Purchase Order\\u0001Fiscal Year\":[]}",
+ "doc_type": "Purchase Order Item",
+ "name": "__common__",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabPurchase Order`.`transaction_date`",
+ "page_len": 50,
+ "criteria_name": "Itemwise Purchase Details",
+ "columns": "Purchase Order\u0001ID,Purchase Order\u0001Purchase Order Date,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001Stock UOM,Purchase Order Item\u0001Rate ,Purchase Order Item\u0001Amount,Purchase Order\u0001Net Total*,Purchase Order\u0001Grand Total"
+ },
+ {
+ "name": "itemwise_purchase_details",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
index cbdcc5cc671..8650d20cba5 100644
--- a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
+++ b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
@@ -1,37 +1,30 @@
-# Search Criteria, pending_po_items_to_bill
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'dhanalekshmi@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_col': u'(CASE WHEN (`tabPurchase Order Item`.qty- ifnull(`tabPurchase Order Item`.billed_qty, 0) > 0 ) THEN (`tabPurchase Order Item`.qty-ifnull(`tabPurchase Order Item`.billed_qty, 0) ) ELSE 0 END) AS "Pending To Bill"',
- 'add_cond': u'(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) > 0 or `tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.billed_qty, 0) > 0)\n`tabPurchase Order`.status != "Stopped"',
- 'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,Purchase Order Item\x01Purchase Request No,Purchase Order Item\x01Item Code,Purchase Order Item\x01Item Name,Purchase Order Item\x01Description,Purchase Order Item\x01Quantity,Purchase Order Item\x01UOM,Purchase Order Item\x01Received Qty',
- 'criteria_name': u'Pending PO Items To Bill',
- 'description': u'Pending PO Items To Bill',
- 'doc_type': u'Purchase Order Item',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
- 'module': u'Buying',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Purchase Order',
- 'sort_by': u'`tabPurchase Order`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, pending_po_items_to_bill
- {
- 'doctype': 'Search Criteria',
- 'name': u'pending_po_items_to_bill'
- }
+ {
+ "owner": "dhanalekshmi@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "add_col": "(CASE WHEN (`tabPurchase Order Item`.qty- ifnull(`tabPurchase Order Item`.billed_qty, 0) > 0 ) THEN (`tabPurchase Order Item`.qty-ifnull(`tabPurchase Order Item`.billed_qty, 0) ) ELSE 0 END) AS \"Pending To Bill\"",
+ "parent_doc_type": "Purchase Order",
+ "module": "Buying",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Purchase Order\u0001Saved':1,'Purchase Order\u0001Submitted':1,'Purchase Order\u0001Status':'','Purchase Order\u0001Fiscal Year':''}",
+ "description": "Pending PO Items To Bill",
+ "doc_type": "Purchase Order Item",
+ "name": "__common__",
+ "add_cond": "(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) > 0 or `tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.billed_qty, 0) > 0)\n`tabPurchase Order`.status != \"Stopped\"",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabPurchase Order`.`name`",
+ "page_len": 50,
+ "criteria_name": "Pending PO Items To Bill",
+ "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
+ },
+ {
+ "name": "pending_po_items_to_bill",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
index 185e1559ab5..a103fb501dc 100644
--- a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
+++ b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
@@ -1,37 +1,30 @@
-# Search Criteria, pending_po_items_to_receive
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:52',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:52',
- 'modified_by': u'Administrator',
- 'owner': u'dhanalekshmi@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_col': u'`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) AS "Pending Quantity To Receive"\n(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) * `tabPurchase Order Item`.purchase_rate AS "Pending Amount To Receive"',
- 'add_cond': u'`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) > 0 \n`tabPurchase Order`.status != "Stopped"',
- 'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,Purchase Order Item\x01Purchase Request No,Purchase Order Item\x01Item Code,Purchase Order Item\x01Item Name,Purchase Order Item\x01Description,Purchase Order Item\x01Quantity,Purchase Order Item\x01UOM,Purchase Order Item\x01Received Qty',
- 'criteria_name': u'Pending PO Items To Receive',
- 'description': u'Pending PO Items To Receive',
- 'doc_type': u'Purchase Order Item',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
- 'module': u'Buying',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Purchase Order',
- 'sort_by': u'`tabPurchase Order`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, pending_po_items_to_receive
- {
- 'doctype': 'Search Criteria',
- 'name': u'pending_po_items_to_receive'
- }
+ {
+ "owner": "dhanalekshmi@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:52",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:52"
+ },
+ {
+ "add_col": "`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) AS \"Pending Quantity To Receive\"\n(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) * `tabPurchase Order Item`.purchase_rate AS \"Pending Amount To Receive\"",
+ "parent_doc_type": "Purchase Order",
+ "module": "Buying",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Purchase Order\u0001Saved':1,'Purchase Order\u0001Submitted':1,'Purchase Order\u0001Status':'','Purchase Order\u0001Fiscal Year':''}",
+ "description": "Pending PO Items To Receive",
+ "doc_type": "Purchase Order Item",
+ "name": "__common__",
+ "add_cond": "`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0) > 0 \n`tabPurchase Order`.status != \"Stopped\"",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabPurchase Order`.`name`",
+ "page_len": 50,
+ "criteria_name": "Pending PO Items To Receive",
+ "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
+ },
+ {
+ "name": "pending_po_items_to_receive",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt b/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
index e49ea0bf6af..9fa5ccf3119 100644
--- a/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
+++ b/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
@@ -1,39 +1,32 @@
-# Search Criteria, purchase_in_transit
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-11 13:16:55',
- 'docstatus': 0,
- 'modified': '2012-04-13 12:06:15',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'add_col': u"`tabPurchase Receipt`.`posting_date` AS 'PR Posting Date'",
- 'add_cond': u"`tabPurchase Invoice Item`.`purchase_receipt` = `tabPurchase Receipt`.`name`\n`tabPurchase Receipt`.`posting_date` >= '%(pr_posting_date)s'\n`tabPurchase Receipt`.`posting_date` <= '%(pr_posting_date1)s'\n`tabPurchase Receipt`.`posting_date` > `tabPurchase Invoice`.`posting_date`",
- 'add_tab': u'`tabPurchase Receipt`',
- 'columns': u'Purchase Invoice\x01ID,Purchase Invoice\x01Posting Date,Purchase Invoice\x01Credit To,Purchase Invoice Item\x01Qty,Purchase Invoice Item\x01Amount,Purchase Invoice Item\x01Pur Order,Purchase Invoice Item\x01Pur Receipt',
- 'criteria_name': u'Purchase in Transit',
- 'description': u'List of PR whose posting date is after PV posting date',
- 'dis_filters': u'`tabPurchase Receipt`.`pr_posting_date`',
- 'doc_type': u'Purchase Invoice Item',
- 'doctype': 'Search Criteria',
- 'filters': u'{"Purchase Invoice\\u0001Submitted":1,"Purchase Invoice\\u0001Is Opening":[""],"Purchase Invoice\\u0001Fiscal Year":[""]}',
- 'module': u'Buying',
- 'name': '__common__',
- 'page_len': 50,
- 'parent_doc_type': u'Purchase Invoice',
- 'sort_by': u'`tabPurchase Invoice`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, purchase_in_transit
- {
- 'doctype': 'Search Criteria',
- 'name': u'purchase_in_transit'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-11 13:16:55",
+ "modified_by": "Administrator",
+ "modified": "2012-04-13 12:06:15"
+ },
+ {
+ "add_col": "`tabPurchase Receipt`.`posting_date` AS 'PR Posting Date'",
+ "parent_doc_type": "Purchase Invoice",
+ "module": "Buying",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{\"Purchase Invoice\\u0001Submitted\":1,\"Purchase Invoice\\u0001Is Opening\":[\"\"],\"Purchase Invoice\\u0001Fiscal Year\":[\"\"]}",
+ "dis_filters": "`tabPurchase Receipt`.`pr_posting_date`",
+ "description": "List of PR whose posting date is after PV posting date",
+ "doc_type": "Purchase Invoice Item",
+ "name": "__common__",
+ "add_tab": "`tabPurchase Receipt`",
+ "add_cond": "`tabPurchase Invoice Item`.`purchase_receipt` = `tabPurchase Receipt`.`name`\n`tabPurchase Receipt`.`posting_date` >= '%(pr_posting_date)s'\n`tabPurchase Receipt`.`posting_date` <= '%(pr_posting_date1)s'\n`tabPurchase Receipt`.`posting_date` > `tabPurchase Invoice`.`posting_date`",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabPurchase Invoice`.`name`",
+ "page_len": 50,
+ "criteria_name": "Purchase in Transit",
+ "columns": "Purchase Invoice\u0001ID,Purchase Invoice\u0001Posting Date,Purchase Invoice\u0001Credit To,Purchase Invoice Item\u0001Qty,Purchase Invoice Item\u0001Amount,Purchase Invoice Item\u0001Pur Order,Purchase Invoice Item\u0001Pur Receipt"
+ },
+ {
+ "name": "purchase_in_transit",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt
index ad76eb031e5..dc228298b01 100644
--- a/home/doctype/feed/feed.txt
+++ b/home/doctype/feed/feed.txt
@@ -1,105 +1,80 @@
-# DocType, Feed
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-07-03 13:29:42',
- u'docstatus': 0,
- u'modified': '2012-10-15 15:23:02',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'_FEED.#####',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'module': u'Home',
- u'name': u'__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Feed',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- u'doctype': u'DocPerm',
- u'name': u'__common__',
- 'parent': u'Feed',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'role': u'System Manager'
- },
-
- # DocType, Feed
- {
- u'doctype': u'DocType',
- u'name': u'Feed'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'feed_type',
- 'fieldtype': u'Select',
- 'label': u'Feed Type'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'doc_type',
- 'fieldtype': u'Data',
- 'label': u'Doc Type'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'doc_name',
- 'fieldtype': u'Data',
- 'label': u'Doc Name'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'subject',
- 'fieldtype': u'Data',
- 'label': u'Subject'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'color',
- 'fieldtype': u'Data',
- 'label': u'Color'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'full_name',
- 'fieldtype': u'Data',
- 'label': u'Full Name'
- },
-
- # DocPerm
- {
- u'doctype': u'DocPerm'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:29:42",
+ "modified_by": "Administrator",
+ "modified": "2012-10-15 15:23:02"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "Home",
+ "doctype": "DocType",
+ "version": 1,
+ "autoname": "_FEED.#####",
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Feed",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "parent": "Feed",
+ "read": 1,
+ "name": "__common__",
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Feed",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "feed_type",
+ "fieldtype": "Select",
+ "label": "Feed Type"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "doc_type",
+ "fieldtype": "Data",
+ "label": "Doc Type"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "doc_name",
+ "fieldtype": "Data",
+ "label": "Doc Name"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "subject",
+ "fieldtype": "Data",
+ "label": "Subject"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "color",
+ "fieldtype": "Data",
+ "label": "Color"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "full_name",
+ "fieldtype": "Data",
+ "label": "Full Name"
+ },
+ {
+ "doctype": "DocPerm"
+ }
]
\ No newline at end of file
diff --git a/home/page/activity/activity.txt b/home/page/activity/activity.txt
index e7f396389f0..ec39d011a08 100644
--- a/home/page/activity/activity.txt
+++ b/home/page/activity/activity.txt
@@ -1,28 +1,21 @@
-# Page, activity
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-02-29 11:59:13',
- 'docstatus': 0,
- 'modified': '2012-02-29 12:11:46',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- 'doctype': 'Page',
- 'module': u'Home',
- 'name': '__common__',
- 'page_name': u'activity',
- 'standard': u'Yes',
- 'title': u'Activity'
- },
-
- # Page, activity
- {
- 'doctype': 'Page',
- 'name': u'activity'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-02-29 11:59:13",
+ "modified_by": "Administrator",
+ "modified": "2012-02-29 12:11:46"
+ },
+ {
+ "name": "__common__",
+ "title": "Activity",
+ "module": "Home",
+ "doctype": "Page",
+ "page_name": "activity",
+ "standard": "Yes"
+ },
+ {
+ "name": "activity",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/home/page/attributions/attributions.txt b/home/page/attributions/attributions.txt
index a15adb97b79..aea8fbb827f 100644
--- a/home/page/attributions/attributions.txt
+++ b/home/page/attributions/attributions.txt
@@ -1,28 +1,21 @@
-# Page, attributions
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-01 12:30:42',
- 'docstatus': 0,
- 'modified': '2012-03-01 12:30:42',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- 'doctype': 'Page',
- 'module': u'Home',
- 'name': '__common__',
- 'page_name': u'attributions',
- 'standard': u'Yes',
- 'title': u'Attributions'
- },
-
- # Page, attributions
- {
- 'doctype': 'Page',
- 'name': u'attributions'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-01 12:30:42",
+ "modified_by": "Administrator",
+ "modified": "2012-03-01 12:30:42"
+ },
+ {
+ "name": "__common__",
+ "title": "Attributions",
+ "module": "Home",
+ "doctype": "Page",
+ "page_name": "attributions",
+ "standard": "Yes"
+ },
+ {
+ "name": "attributions",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/home/page/desktop/desktop.css b/home/page/desktop/desktop.css
index f1c4fb09187..88a437c6226 100644
--- a/home/page/desktop/desktop.css
+++ b/home/page/desktop/desktop.css
@@ -6,7 +6,7 @@
.sprite-hr{ background-position: 0 -439px; width: 40px; height: 32px; }
.sprite-kb{ background-position: 0 -521px; width: 24px; height: 39px; }
.sprite-messages{ background-position: 0 -610px; width: 40px; height: 26px; }
-.sprite-production{ background-position: 0 -686px; width: 40px; height: 33px; }
+.sprite-manufacturing{ background-position: 0 -686px; width: 40px; height: 33px; }
.sprite-project{ background-position: 0 -769px; width: 40px; height: 22px; }
.sprite-report{ background-position: 0 -841px; width: 29px; height: 40px; }
.sprite-selling{ background-position: 0 -931px; width: 34px; height: 40px; }
@@ -26,7 +26,7 @@
.sprite-support{ margin-top: 8px; margin-left: 8px; }
.sprite-hr{ margin-top: 12px; margin-left: 8px; }
.sprite-project{ margin-top: 16px; margin-left: 8px; }
-.sprite-production{ margin-top: 10px; margin-left: 8px; }
+.sprite-manufacturing{ margin-top: 10px; margin-left: 8px; }
.sprite-website{ margin-top: 8px; margin-left: 8px; }
.sprite-setting{ margin-top: 8px; margin-left: 8px; }
.sprite-report{ margin-top: 8px; margin-left: 14px; }
diff --git a/home/page/desktop/desktop.js b/home/page/desktop/desktop.js
index 75f2922b936..f9a3b544a20 100644
--- a/home/page/desktop/desktop.js
+++ b/home/page/desktop/desktop.js
@@ -33,7 +33,7 @@ erpnext.desktop.render = function() {
'Support': { sprite: 'support', label: 'Support'},
'HR': { sprite: 'hr', label: 'Human
Resources'},
'Projects': { sprite: 'project', label: 'Projects'},
- 'Production': { sprite: 'production', label: 'Production'},
+ 'Manufacturing': { sprite: 'manufacturing', label: 'Manufacturing'},
'Website': { sprite: 'website', label: 'Website'},
'Activity': { sprite: 'feed', label: 'Activity'},
'Setup': { sprite: 'setting', label: 'Setup'},
diff --git a/home/page/desktop/desktop.txt b/home/page/desktop/desktop.txt
index f1918b9a843..1eec626e410 100644
--- a/home/page/desktop/desktop.txt
+++ b/home/page/desktop/desktop.txt
@@ -1,28 +1,21 @@
-# Page, desktop
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-02-24 11:37:43',
- 'docstatus': 0,
- 'modified': '2012-02-24 11:37:43',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- 'doctype': 'Page',
- 'module': u'Home',
- 'name': '__common__',
- 'page_name': u'desktop',
- 'standard': u'Yes',
- 'title': u'Desktop'
- },
-
- # Page, desktop
- {
- 'doctype': 'Page',
- 'name': u'desktop'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-02-24 11:37:43",
+ "modified_by": "Administrator",
+ "modified": "2012-02-24 11:37:43"
+ },
+ {
+ "name": "__common__",
+ "title": "Desktop",
+ "module": "Home",
+ "doctype": "Page",
+ "page_name": "desktop",
+ "standard": "Yes"
+ },
+ {
+ "name": "desktop",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt b/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt
index ec2bd0696db..69d171ff795 100644
--- a/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt
+++ b/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt
@@ -1,47 +1,36 @@
-# DocType Mapper, Appraisal Template-Appraisal
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-09-01 15:47:59',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:50',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail',
- 'from_field': u'kra_sheet',
- 'from_table': u'Appraisal Template Goal',
- 'match_id': 0,
- 'name': '__common__',
- 'parent': u'Appraisal Template-Appraisal',
- 'parentfield': u'table_mapper_details',
- 'parenttype': u'DocType Mapper',
- 'to_field': u'appraisal_details',
- 'to_table': u'Appraisal Goal',
- 'validation_logic': u'name is not Null'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': 'DocType Mapper',
- 'from_doctype': u'Appraisal Template',
- 'module': u'HR',
- 'name': '__common__',
- 'to_doctype': u'Appraisal'
- },
-
- # DocType Mapper, Appraisal Template-Appraisal
- {
- 'doctype': 'DocType Mapper',
- 'name': u'Appraisal Template-Appraisal'
- },
-
- # Table Mapper Detail
- {
- 'doctype': u'Table Mapper Detail'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2010-09-01 15:47:59",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:50"
+ },
+ {
+ "match_id": 0,
+ "parent": "Appraisal Template-Appraisal",
+ "from_field": "kra_sheet",
+ "doctype": "Table Mapper Detail",
+ "to_table": "Appraisal Goal",
+ "name": "__common__",
+ "to_field": "appraisal_details",
+ "parenttype": "DocType Mapper",
+ "from_table": "Appraisal Template Goal",
+ "validation_logic": "name is not Null",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Appraisal",
+ "module": "HR",
+ "doctype": "DocType Mapper",
+ "from_doctype": "Appraisal Template"
+ },
+ {
+ "name": "Appraisal Template-Appraisal",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "doctype": "Table Mapper Detail"
+ }
]
\ No newline at end of file
diff --git a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
index 855c649a607..2cf9075e137 100644
--- a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
+++ b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
@@ -1,131 +1,100 @@
-# DocType Mapper, Salary Structure-Salary Slip
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-12-14 10:33:11',
- 'docstatus': 0,
- 'modified': '2011-09-15 15:04:44',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
- },
-
- # These values are common for all Table Mapper Detail
- {
- 'doctype': 'Table Mapper Detail',
- 'name': '__common__',
- 'parent': 'Salary Structure-Salary Slip',
- 'parentfield': 'table_mapper_details',
- 'parenttype': 'DocType Mapper',
- 'validation_logic': 'name is not null'
- },
-
- # These values are common for all Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
- 'name': '__common__',
- 'parent': 'Salary Structure-Salary Slip',
- 'parentfield': 'field_mapper_details',
- 'parenttype': 'DocType Mapper'
- },
-
- # These values are common for all DocType Mapper
- {
- 'doctype': 'DocType Mapper',
- 'from_doctype': 'Salary Structure',
- 'module': 'HR',
- 'name': '__common__',
- 'to_doctype': 'Salary Slip'
- },
-
- # DocType Mapper, Salary Structure-Salary Slip
- {
- 'doctype': 'DocType Mapper',
- 'name': 'Salary Structure-Salary Slip'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_earning',
- 'match_id': 0,
- 'to_field': 'gross_pay'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'modified_value',
- 'match_id': 1,
- 'to_field': 'e_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'd_modified_amt',
- 'match_id': 2,
- 'to_field': 'd_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'modified_value',
- 'match_id': 1,
- 'to_field': 'e_modified_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'depend_on_lwp',
- 'match_id': 1,
- 'to_field': 'e_depends_on_lwp'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'd_modified_amt',
- 'match_id': 2,
- 'to_field': 'd_modified_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'depend_on_lwp',
- 'match_id': 2,
- 'to_field': 'd_depends_on_lwp'
- },
-
- # Table Mapper Detail
- {
- 'doctype': 'Table Mapper Detail',
- 'from_table': 'Salary Structure',
- 'match_id': 0,
- 'to_table': 'Salary Slip'
- },
-
- # Table Mapper Detail
- {
- 'doctype': 'Table Mapper Detail',
- 'from_field': 'earning_details',
- 'from_table': 'Salary Structure Earning',
- 'match_id': 1,
- 'to_field': 'earning_details',
- 'to_table': 'Salary Slip Earning'
- },
-
- # Table Mapper Detail
- {
- 'doctype': 'Table Mapper Detail',
- 'from_field': 'deduction_details',
- 'from_table': 'Salary Structure Deduction',
- 'match_id': 2,
- 'to_field': 'deduction_details',
- 'to_table': 'Salary Slip Deduction'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2010-12-14 10:33:11",
+ "modified_by": "Administrator",
+ "modified": "2011-09-15 15:04:44"
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Structure-Salary Slip",
+ "doctype": "Table Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "validation_logic": "name is not null",
+ "parentfield": "table_mapper_details"
+ },
+ {
+ "map": "Yes",
+ "name": "__common__",
+ "parent": "Salary Structure-Salary Slip",
+ "doctype": "Field Mapper Detail",
+ "parenttype": "DocType Mapper",
+ "parentfield": "field_mapper_details"
+ },
+ {
+ "name": "__common__",
+ "to_doctype": "Salary Slip",
+ "module": "HR",
+ "doctype": "DocType Mapper",
+ "from_doctype": "Salary Structure"
+ },
+ {
+ "name": "Salary Structure-Salary Slip",
+ "doctype": "DocType Mapper"
+ },
+ {
+ "to_field": "gross_pay",
+ "doctype": "Field Mapper Detail",
+ "match_id": 0,
+ "from_field": "total_earning"
+ },
+ {
+ "to_field": "e_amount",
+ "doctype": "Field Mapper Detail",
+ "match_id": 1,
+ "from_field": "modified_value"
+ },
+ {
+ "to_field": "d_amount",
+ "doctype": "Field Mapper Detail",
+ "match_id": 2,
+ "from_field": "d_modified_amt"
+ },
+ {
+ "to_field": "e_modified_amount",
+ "doctype": "Field Mapper Detail",
+ "match_id": 1,
+ "from_field": "modified_value"
+ },
+ {
+ "to_field": "e_depends_on_lwp",
+ "doctype": "Field Mapper Detail",
+ "match_id": 1,
+ "from_field": "depend_on_lwp"
+ },
+ {
+ "to_field": "d_modified_amount",
+ "doctype": "Field Mapper Detail",
+ "match_id": 2,
+ "from_field": "d_modified_amt"
+ },
+ {
+ "to_field": "d_depends_on_lwp",
+ "doctype": "Field Mapper Detail",
+ "match_id": 2,
+ "from_field": "depend_on_lwp"
+ },
+ {
+ "to_table": "Salary Slip",
+ "doctype": "Table Mapper Detail",
+ "match_id": 0,
+ "from_table": "Salary Structure"
+ },
+ {
+ "match_id": 1,
+ "to_field": "earning_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "earning_details",
+ "from_table": "Salary Structure Earning",
+ "to_table": "Salary Slip Earning"
+ },
+ {
+ "match_id": 2,
+ "to_field": "deduction_details",
+ "doctype": "Table Mapper Detail",
+ "from_field": "deduction_details",
+ "from_table": "Salary Structure Deduction",
+ "to_table": "Salary Slip Deduction"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt
index 525b6897786..8005a2c2ff6 100644
--- a/hr/doctype/appraisal/appraisal.txt
+++ b/hr/doctype/appraisal/appraisal.txt
@@ -1,350 +1,293 @@
-# DocType, Appraisal
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-11-16 10:33:39',
- u'docstatus': 0,
- u'modified': '2012-11-16 15:22:59',
- u'modified_by': u'Administrator',
- u'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1316075905',
- 'autoname': u'APRSL.#####',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'is_submittable': 1,
- 'module': u'HR',
- u'name': u'__common__',
- 'search_fields': u'status, employee, employee_name',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Appraisal',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- u'doctype': u'DocPerm',
- u'name': u'__common__',
- 'parent': u'Appraisal',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Appraisal
- {
- u'doctype': u'DocType',
- u'name': u'Appraisal'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'employee_details',
- 'fieldtype': u'Section Break',
- 'label': u'Employee Details',
- 'oldfieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Select template from which you want to get the Goals',
- u'doctype': u'DocField',
- 'fieldname': u'kra_template',
- 'fieldtype': u'Link',
- 'label': u'Appraisal Template',
- 'oldfieldname': u'kra_template',
- 'oldfieldtype': u'Link',
- 'options': u'Appraisal Template',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'depends_on': u'kra_template',
- 'description': u'Select the Employee for whom you are creating the Appraisal.',
- u'doctype': u'DocField',
- 'fieldname': u'employee',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'For Employee',
- 'oldfieldname': u'employee',
- 'oldfieldtype': u'Link',
- 'options': u'Employee',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'employee_name',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'For Employee Name',
- 'oldfieldname': u'employee_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'Draft',
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'status',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Status',
- 'no_copy': 1,
- 'oldfieldname': u'status',
- 'oldfieldtype': u'Select',
- 'options': u'\nDraft\nSubmitted\nCompleted\nCancelled',
- 'permlevel': 1,
- 'reqd': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'start_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Start Date',
- 'oldfieldname': u'start_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'end_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'End Date',
- 'oldfieldname': u'end_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'section_break0',
- 'fieldtype': u'Section Break',
- 'label': u'Goals',
- 'oldfieldtype': u'Section Break',
- 'options': u'Simple',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'allow_on_submit': 0,
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'appraisal_details',
- 'fieldtype': u'Table',
- 'label': u'Appraisal Goals',
- 'oldfieldname': u'appraisal_details',
- 'oldfieldtype': u'Table',
- 'options': u'Appraisal Goal',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'allow_on_submit': 0,
- u'doctype': u'DocField',
- 'fieldname': u'calculate_total_score',
- 'fieldtype': u'Button',
- 'label': u'Calculate Total Score',
- 'oldfieldtype': u'Button',
- 'options': u'calculate_total',
- 'permlevel': 0
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'total_score',
- 'fieldtype': u'Currency',
- 'label': u'Total Score (Out of 5)',
- 'no_copy': 1,
- 'oldfieldname': u'total_score',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'section_break1',
- 'fieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Any other comments, noteworthy effort that should go in the records.',
- u'doctype': u'DocField',
- 'fieldname': u'comments',
- 'fieldtype': u'Text',
- 'label': u'Comments',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'depends_on': u'kra_template',
- u'doctype': u'DocField',
- 'fieldname': u'other_details',
- 'fieldtype': u'Section Break',
- 'label': u'Other Details',
- 'permlevel': 0
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Link',
- 'options': u'link:Company',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'amendment_date',
- 'fieldtype': u'Date',
- 'hidden': 1,
- 'label': u'Amendment Date',
- 'no_copy': 1,
- 'oldfieldname': u'amendment_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1,
- 'report_hide': 1,
- 'width': u'160px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'amended_from',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Amended From',
- 'no_copy': 1,
- 'oldfieldname': u'amended_from',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'report_hide': 1,
- 'width': u'150px'
- },
-
- # DocPerm
- {
- 'create': 1,
- u'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'Employee',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- u'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- u'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- u'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-11-16 10:33:39",
+ "modified_by": "Administrator",
+ "modified": "2012-11-16 15:22:59"
+ },
+ {
+ "section_style": "Simple",
+ "is_submittable": 1,
+ "search_fields": "status, employee, employee_name",
+ "module": "HR",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "autoname": "APRSL.#####",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1316075905",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Appraisal",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Employee Details",
+ "fieldname": "employee_details",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "description": "Select template from which you want to get the Goals",
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Appraisal Template",
+ "oldfieldname": "kra_template",
+ "options": "Appraisal Template",
+ "fieldname": "kra_template",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "description": "Select the Employee for whom you are creating the Appraisal.",
+ "search_index": 1,
+ "colour": "White:FFF",
+ "oldfieldtype": "Link",
+ "label": "For Employee",
+ "oldfieldname": "employee",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "depends_on": "kra_template",
+ "reqd": 1,
+ "options": "Employee",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "For Employee Name",
+ "oldfieldname": "employee_name",
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "depends_on": "kra_template",
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "depends_on": "kra_template",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "permlevel": 1,
+ "depends_on": "kra_template",
+ "no_copy": 1,
+ "search_index": 1,
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Status",
+ "oldfieldname": "status",
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "reqd": 1,
+ "options": "\nDraft\nSubmitted\nCompleted\nCancelled",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Start Date",
+ "oldfieldname": "start_date",
+ "fieldname": "start_date",
+ "fieldtype": "Date",
+ "depends_on": "kra_template",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "End Date",
+ "oldfieldname": "end_date",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "depends_on": "kra_template",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Goals",
+ "permlevel": 0,
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "depends_on": "kra_template",
+ "options": "Simple"
+ },
+ {
+ "oldfieldtype": "Table",
+ "colour": "White:FFF",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Appraisal Goals",
+ "oldfieldname": "appraisal_details",
+ "permlevel": 0,
+ "fieldname": "appraisal_details",
+ "fieldtype": "Table",
+ "options": "Appraisal Goal"
+ },
+ {
+ "oldfieldtype": "Button",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Calculate Total Score",
+ "permlevel": 0,
+ "fieldname": "calculate_total_score",
+ "fieldtype": "Button",
+ "options": "calculate_total"
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Total Score (Out of 5)",
+ "oldfieldname": "total_score",
+ "fieldname": "total_score",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "depends_on": "kra_template",
+ "doctype": "DocField",
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "description": "Any other comments, noteworthy effort that should go in the records.",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Comments",
+ "fieldname": "comments",
+ "fieldtype": "Text",
+ "permlevel": 0
+ },
+ {
+ "depends_on": "kra_template",
+ "doctype": "DocField",
+ "label": "Other Details",
+ "fieldname": "other_details",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Company",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Amendment Date",
+ "oldfieldname": "amendment_date",
+ "width": "160px",
+ "fieldname": "amendment_date",
+ "fieldtype": "Date",
+ "hidden": 1,
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "width": "150px",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 1,
+ "role": "Employee",
+ "permlevel": 0,
+ "match": "owner"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "HR User",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.txt b/hr/doctype/appraisal_goal/appraisal_goal.txt
index cdfa188b5db..5fe775e69e8 100644
--- a/hr/doctype/appraisal_goal/appraisal_goal.txt
+++ b/hr/doctype/appraisal_goal/appraisal_goal.txt
@@ -1,98 +1,81 @@
-# DocType, Appraisal Goal
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-07-03 13:30:40',
- u'docstatus': 0,
- u'modified': '2012-11-15 17:50:24',
- u'modified_by': u'Administrator',
- u'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'APRSLD.#####',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'istable': 1,
- 'module': u'HR',
- u'name': u'__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Appraisal Goal',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Appraisal Goal
- {
- u'doctype': u'DocType',
- u'name': u'Appraisal Goal'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Key Responsibility Area',
- u'doctype': u'DocField',
- 'fieldname': u'kra',
- 'fieldtype': u'Small Text',
- 'label': u'Goal',
- 'oldfieldname': u'kra',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'240px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'per_weightage',
- 'fieldtype': u'Currency',
- 'label': u'Weightage (%)',
- 'oldfieldname': u'per_weightage',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'width': u'70px'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'score',
- 'fieldtype': u'Currency',
- 'label': u'Score (0-5)',
- 'no_copy': 1,
- 'oldfieldname': u'score',
- 'oldfieldtype': u'Select',
- 'options': u'\n0\n1\n2\n3\n4\n5',
- 'permlevel': 0,
- 'trigger': u'Client',
- 'width': u'70px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'score_earned',
- 'fieldtype': u'Currency',
- 'label': u'Score Earned',
- 'no_copy': 1,
- 'oldfieldname': u'score_earned',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'width': u'70px'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:40",
+ "modified_by": "Administrator",
+ "modified": "2012-11-15 17:50:24"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "server_code_error": " ",
+ "version": 1,
+ "doctype": "DocType",
+ "autoname": "APRSLD.#####"
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal Goal",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Appraisal Goal",
+ "doctype": "DocType"
+ },
+ {
+ "description": "Key Responsibility Area",
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Goal",
+ "oldfieldname": "kra",
+ "width": "240px",
+ "fieldname": "kra",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Weightage (%)",
+ "oldfieldname": "per_weightage",
+ "width": "70px",
+ "fieldname": "per_weightage",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "permlevel": 0,
+ "no_copy": 1,
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "label": "Score (0-5)",
+ "oldfieldname": "score",
+ "width": "70px",
+ "trigger": "Client",
+ "fieldname": "score",
+ "fieldtype": "Currency",
+ "options": "\n0\n1\n2\n3\n4\n5"
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Score Earned",
+ "oldfieldname": "score_earned",
+ "width": "70px",
+ "fieldname": "score_earned",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_template/appraisal_template.txt b/hr/doctype/appraisal_template/appraisal_template.txt
index 62a0d5b4ad4..aece5dc9cbc 100644
--- a/hr/doctype/appraisal_template/appraisal_template.txt
+++ b/hr/doctype/appraisal_template/appraisal_template.txt
@@ -1,111 +1,86 @@
-# DocType, Appraisal Template
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:58',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:58',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'field:kra_title',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 3
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Appraisal Template',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Appraisal Template',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Appraisal Template
- {
- 'doctype': 'DocType',
- 'name': u'Appraisal Template'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'kra_title',
- 'fieldtype': u'Data',
- 'label': u'KRA Title',
- 'oldfieldname': u'kra_title',
- 'oldfieldtype': u'Data',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'kra_sheet',
- 'fieldtype': u'Table',
- 'label': u'Appraisal Template Goal',
- 'oldfieldname': u'kra_sheet',
- 'oldfieldtype': u'Table',
- 'options': u'Appraisal Template Goal'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:58",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:58"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "server_code_error": " ",
+ "version": 3,
+ "doctype": "DocType",
+ "autoname": "field:kra_title",
+ "document_type": "Master"
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal Template",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal Template",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Appraisal Template",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "KRA Title",
+ "oldfieldname": "kra_title",
+ "fieldname": "kra_title",
+ "fieldtype": "Data",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text"
+ },
+ {
+ "oldfieldtype": "Table",
+ "doctype": "DocField",
+ "label": "Appraisal Template Goal",
+ "oldfieldname": "kra_sheet",
+ "fieldname": "kra_sheet",
+ "fieldtype": "Table",
+ "options": "Appraisal Template Goal"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
index c3e95e551c2..e7564745a0c 100644
--- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
+++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
@@ -1,66 +1,53 @@
-# DocType, Appraisal Template Goal
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:58',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:58',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'KSHEET.#####',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 6
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Appraisal Template Goal',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocType, Appraisal Template Goal
- {
- 'doctype': 'DocType',
- 'name': u'Appraisal Template Goal'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Key Performance Area',
- 'doctype': u'DocField',
- 'fieldname': u'kra',
- 'fieldtype': u'Small Text',
- 'label': u'KRA',
- 'oldfieldname': u'kra',
- 'oldfieldtype': u'Small Text',
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'per_weightage',
- 'fieldtype': u'Currency',
- 'label': u'Weightage (%)',
- 'oldfieldname': u'per_weightage',
- 'oldfieldtype': u'Currency',
- 'width': u'100px'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:58",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:58"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "server_code_error": " ",
+ "version": 6,
+ "doctype": "DocType",
+ "autoname": "KSHEET.#####"
+ },
+ {
+ "name": "__common__",
+ "parent": "Appraisal Template Goal",
+ "doctype": "DocField",
+ "reqd": 1,
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Appraisal Template Goal",
+ "doctype": "DocType"
+ },
+ {
+ "description": "Key Performance Area",
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "KRA",
+ "oldfieldname": "kra",
+ "width": "200px",
+ "fieldname": "kra",
+ "fieldtype": "Small Text"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Weightage (%)",
+ "oldfieldname": "per_weightage",
+ "width": "100px",
+ "fieldname": "per_weightage",
+ "fieldtype": "Currency"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/attendance_control_panel/attendance_control_panel.txt b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
index 78904db6e28..3b4e3c917aa 100644
--- a/hr/doctype/attendance_control_panel/attendance_control_panel.txt
+++ b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
@@ -1,219 +1,174 @@
-# DocType, Attendance Control Panel
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:53',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:53',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1294312182',
- 'allow_attach': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'issingle': 1,
- 'max_attachments': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 122
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Attendance Control Panel',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Attendance Control Panel',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Attendance Control Panel
- {
- 'doctype': 'DocType',
- 'name': u'Attendance Control Panel'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u"Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.",
- 'doctype': u'DocField',
- 'fieldname': u'download_template',
- 'fieldtype': u'Section Break',
- 'label': u'Download Template',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Selected Attendance date will comes in the attendance template.',
- 'doctype': u'DocField',
- 'fieldname': u'att_fr_date',
- 'fieldtype': u'Date',
- 'label': u'Attendance From Date',
- 'oldfieldname': u'attenadnce_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'get_template',
- 'fieldtype': u'Button',
- 'label': u'Get Template',
- 'oldfieldtype': u'Button',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.',
- 'doctype': u'DocField',
- 'fieldname': u'att_to_date',
- 'fieldtype': u'Date',
- 'label': u'Attendance To Date',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'To import attendance data, click on "Add" button, select the saved CSV file and click on "Upload".\nSelect the date format as attendance date format in CSV file.\nClick on "Import".',
- 'doctype': u'DocField',
- 'fieldname': u'upload_attendance_data',
- 'fieldtype': u'Section Break',
- 'label': u'Upload Attendance Data',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_date_format',
- 'fieldtype': u'Select',
- 'label': u'Import Date Format ',
- 'options': u'yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'overwrite',
- 'fieldtype': u'Check',
- 'label': u'Overwrite',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'import',
- 'fieldtype': u'Button',
- 'label': u'Import',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'file_list',
- 'fieldtype': u'Text',
- 'hidden': 1,
- 'label': u'File List',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_log',
- 'fieldtype': u'Section Break',
- 'label': u'Import Log',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_log1',
- 'fieldtype': u'HTML',
- 'label': u'Import Log1',
- 'permlevel': 0
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:53",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:53"
+ },
+ {
+ "section_style": "Simple",
+ "allow_attach": 1,
+ "module": "HR",
+ "_last_update": "1294312182",
+ "doctype": "DocType",
+ "issingle": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "server_code_error": " ",
+ "max_attachments": 1,
+ "version": 122
+ },
+ {
+ "name": "__common__",
+ "parent": "Attendance Control Panel",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Attendance Control Panel",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Attendance Control Panel",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "HR User",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "HR Manager",
+ "permlevel": 0
+ },
+ {
+ "role": "HR User",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "description": "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Download Template",
+ "fieldname": "download_template",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "description": "Selected Attendance date will comes in the attendance template.",
+ "oldfieldtype": "Date",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Attendance From Date",
+ "oldfieldname": "attenadnce_date",
+ "fieldname": "att_fr_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Button",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Get Template",
+ "trigger": "Client",
+ "fieldname": "get_template",
+ "fieldtype": "Button",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "description": "All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Attendance To Date",
+ "fieldname": "att_to_date",
+ "fieldtype": "Date",
+ "permlevel": 0
+ },
+ {
+ "description": "To import attendance data, click on \"Add\" button, select the saved CSV file and click on \"Upload\".\nSelect the date format as attendance date format in CSV file.\nClick on \"Import\".",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Upload Attendance Data",
+ "fieldname": "upload_attendance_data",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "options": "yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy",
+ "fieldname": "import_date_format",
+ "fieldtype": "Select",
+ "label": "Import Date Format ",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Overwrite",
+ "fieldname": "overwrite",
+ "fieldtype": "Check",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Import",
+ "trigger": "Client",
+ "fieldname": "import",
+ "fieldtype": "Button",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "File List",
+ "fieldname": "file_list",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Import Log",
+ "fieldname": "import_log",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Import Log1",
+ "fieldname": "import_log1",
+ "fieldtype": "HTML",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt
index 2bf7c21b041..d49e5bb2fb6 100644
--- a/hr/doctype/branch/branch.txt
+++ b/hr/doctype/branch/branch.txt
@@ -1,97 +1,76 @@
-# DocType, Branch
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:branch',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 11
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Branch',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Branch',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Branch
- {
- 'doctype': 'DocType',
- 'name': u'Branch'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'branch',
- 'fieldtype': u'Data',
- 'label': u'Branch',
- 'oldfieldname': u'branch',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:branch",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 11
+ },
+ {
+ "name": "__common__",
+ "parent": "Branch",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Branch",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Branch",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "fieldname": "branch",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt
index 4d3bbdd7fa4..43a8d625e59 100644
--- a/hr/doctype/deduction_type/deduction_type.txt
+++ b/hr/doctype/deduction_type/deduction_type.txt
@@ -1,109 +1,86 @@
-# DocType, Deduction Type
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:deduction_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 10
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Deduction Type',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Deduction Type',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Deduction Type
- {
- 'doctype': 'DocType',
- 'name': u'Deduction Type'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'deduction_name',
- 'fieldtype': u'Data',
- 'label': u'Name',
- 'oldfieldname': u'deduction_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'width': u'300px'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:deduction_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 10
+ },
+ {
+ "name": "__common__",
+ "parent": "Deduction Type",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Deduction Type",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Deduction Type",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Name",
+ "oldfieldname": "deduction_name",
+ "fieldname": "deduction_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt
index 8d563476df3..981efd96c77 100644
--- a/hr/doctype/department/department.txt
+++ b/hr/doctype/department/department.txt
@@ -1,97 +1,76 @@
-# DocType, Department
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:department_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 7
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Department',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Department',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Department
- {
- 'doctype': 'DocType',
- 'name': u'Department'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'department_name',
- 'fieldtype': u'Data',
- 'label': u'Department',
- 'oldfieldname': u'department_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:department_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 7
+ },
+ {
+ "name": "__common__",
+ "parent": "Department",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Department",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Department",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Department",
+ "oldfieldname": "department_name",
+ "fieldname": "department_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt
index 0d9ca329de5..3a3de3731e7 100644
--- a/hr/doctype/designation/designation.txt
+++ b/hr/doctype/designation/designation.txt
@@ -1,97 +1,76 @@
-# DocType, Designation
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:designation_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 7
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Designation',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Designation',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Designation
- {
- 'doctype': 'DocType',
- 'name': u'Designation'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'designation_name',
- 'fieldtype': u'Data',
- 'label': u'Designation',
- 'oldfieldname': u'designation_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:designation_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 7
+ },
+ {
+ "name": "__common__",
+ "parent": "Designation",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Designation",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Designation",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Designation",
+ "oldfieldname": "designation_name",
+ "fieldname": "designation_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt
index f5588f1985a..fa89b681596 100644
--- a/hr/doctype/earning_type/earning_type.txt
+++ b/hr/doctype/earning_type/earning_type.txt
@@ -1,139 +1,112 @@
-# DocType, Earning Type
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:earning_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 13
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Earning Type',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Earning Type',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Earning Type
- {
- 'doctype': 'DocType',
- 'name': u'Earning Type'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'earning_name',
- 'fieldtype': u'Data',
- 'label': u'Name',
- 'oldfieldname': u'earning_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'reqd': 0,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'taxable',
- 'fieldtype': u'Select',
- 'label': u'Taxable',
- 'oldfieldname': u'taxable',
- 'oldfieldtype': u'Select',
- 'options': u'\nYes\nNo',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'depends_on': u"eval:doc.taxable=='No'",
- 'doctype': u'DocField',
- 'fieldname': u'exemption_limit',
- 'fieldtype': u'Currency',
- 'hidden': 1,
- 'label': u'Exemption Limit',
- 'oldfieldname': u'exemption_limit',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:earning_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 13
+ },
+ {
+ "name": "__common__",
+ "parent": "Earning Type",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Earning Type",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Earning Type",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Name",
+ "oldfieldname": "earning_name",
+ "fieldname": "earning_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Taxable",
+ "oldfieldname": "taxable",
+ "trigger": "Client",
+ "fieldname": "taxable",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\nYes\nNo",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Exemption Limit",
+ "oldfieldname": "exemption_limit",
+ "fieldname": "exemption_limit",
+ "fieldtype": "Currency",
+ "depends_on": "eval:doc.taxable=='No'",
+ "hidden": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/employee_education/employee_education.txt b/hr/doctype/employee_education/employee_education.txt
index b920fd6cb28..aa759550e75 100644
--- a/hr/doctype/employee_education/employee_education.txt
+++ b/hr/doctype/employee_education/employee_education.txt
@@ -1,103 +1,82 @@
-# DocType, Employee Education
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Employee Education',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Employee Education
- {
- 'doctype': 'DocType',
- 'name': u'Employee Education'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'school_univ',
- 'fieldtype': u'Small Text',
- 'label': u'School/University',
- 'oldfieldname': u'school_univ',
- 'oldfieldtype': u'Small Text'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'qualification',
- 'fieldtype': u'Data',
- 'label': u'Qualification',
- 'oldfieldname': u'qualification',
- 'oldfieldtype': u'Data',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'level',
- 'fieldtype': u'Select',
- 'label': u'Level',
- 'oldfieldname': u'level',
- 'oldfieldtype': u'Select',
- 'options': u'Graduate\nPost Graduate\nUnder Graduate'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'year_of_passing',
- 'fieldtype': u'Int',
- 'label': u'Year of Passing',
- 'oldfieldname': u'year_of_passing',
- 'oldfieldtype': u'Int'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'class_per',
- 'fieldtype': u'Data',
- 'label': u'Class / Percentage',
- 'oldfieldname': u'class_per',
- 'oldfieldtype': u'Data'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'maj_opt_subj',
- 'fieldtype': u'Text',
- 'label': u'Major/Optional Subjects',
- 'oldfieldname': u'maj_opt_subj',
- 'oldfieldtype': u'Text'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 5,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Employee Education",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Employee Education",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "School/University",
+ "oldfieldname": "school_univ",
+ "fieldname": "school_univ",
+ "fieldtype": "Small Text"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Qualification",
+ "oldfieldname": "qualification",
+ "width": "100px",
+ "fieldname": "qualification",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Level",
+ "oldfieldname": "level",
+ "fieldname": "level",
+ "fieldtype": "Select",
+ "options": "Graduate\nPost Graduate\nUnder Graduate"
+ },
+ {
+ "oldfieldtype": "Int",
+ "doctype": "DocField",
+ "label": "Year of Passing",
+ "oldfieldname": "year_of_passing",
+ "fieldname": "year_of_passing",
+ "fieldtype": "Int"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Class / Percentage",
+ "oldfieldname": "class_per",
+ "fieldname": "class_per",
+ "fieldtype": "Data"
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Major/Optional Subjects",
+ "oldfieldname": "maj_opt_subj",
+ "fieldname": "maj_opt_subj",
+ "fieldtype": "Text"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
index 3dcc1ff5b54..d16eb22ca7e 100644
--- a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
+++ b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
@@ -1,104 +1,83 @@
-# DocType, Employee Internal Work History
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:57',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:57',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 0,
- 'version': 6
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Employee Internal Work History',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Employee Internal Work History
- {
- 'doctype': 'DocType',
- 'name': u'Employee Internal Work History'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'branch',
- 'fieldtype': u'Select',
- 'label': u'Branch',
- 'oldfieldname': u'branch',
- 'oldfieldtype': u'Select',
- 'options': u'link:Branch'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'department',
- 'fieldtype': u'Select',
- 'label': u'Department',
- 'oldfieldname': u'department',
- 'oldfieldtype': u'Select',
- 'options': u'link:Department'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'designation',
- 'fieldtype': u'Select',
- 'label': u'Designation',
- 'oldfieldname': u'designation',
- 'oldfieldtype': u'Select',
- 'options': u'link:Designation'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'grade',
- 'fieldtype': u'Select',
- 'label': u'Grade',
- 'oldfieldname': u'grade',
- 'oldfieldtype': u'Select',
- 'options': u'link:Grade'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'from_date',
- 'fieldtype': u'Date',
- 'label': u'From Date',
- 'oldfieldname': u'from_date',
- 'oldfieldtype': u'Date'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'to_date',
- 'fieldtype': u'Date',
- 'label': u'To Date',
- 'oldfieldname': u'to_date',
- 'oldfieldtype': u'Date'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:57",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:57"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "doctype": "DocType",
+ "version": 6,
+ "show_in_menu": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Employee Internal Work History",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Employee Internal Work History",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "fieldname": "branch",
+ "fieldtype": "Select",
+ "options": "link:Branch"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Department",
+ "oldfieldname": "department",
+ "fieldname": "department",
+ "fieldtype": "Select",
+ "options": "link:Department"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Designation",
+ "oldfieldname": "designation",
+ "fieldname": "designation",
+ "fieldtype": "Select",
+ "options": "link:Designation"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Grade",
+ "oldfieldname": "grade",
+ "fieldname": "grade",
+ "fieldtype": "Select",
+ "options": "link:Grade"
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "From Date",
+ "oldfieldname": "from_date",
+ "fieldname": "from_date",
+ "fieldtype": "Date"
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "To Date",
+ "oldfieldname": "to_date",
+ "fieldname": "to_date",
+ "fieldtype": "Date"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/employee_training/employee_training.txt b/hr/doctype/employee_training/employee_training.txt
index c75183670fa..fef26f369e7 100644
--- a/hr/doctype/employee_training/employee_training.txt
+++ b/hr/doctype/employee_training/employee_training.txt
@@ -1,95 +1,76 @@
-# DocType, Employee Training
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:59',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Employee Training',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Employee Training
- {
- 'doctype': 'DocType',
- 'name': u'Employee Training'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'institute',
- 'fieldtype': u'Small Text',
- 'label': u'Institute / Conducted By',
- 'oldfieldname': u'institute',
- 'oldfieldtype': u'Small Text',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'nature_of_training',
- 'fieldtype': u'Small Text',
- 'label': u'Program / Seminar Title',
- 'oldfieldname': u'nature_of_training',
- 'oldfieldtype': u'Small Text',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'duration',
- 'fieldtype': u'Data',
- 'label': u'Duration',
- 'oldfieldname': u'duration',
- 'oldfieldtype': u'Data',
- 'reqd': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'loc',
- 'fieldtype': u'Data',
- 'label': u'Location',
- 'oldfieldname': u'loc',
- 'oldfieldtype': u'Data',
- 'reqd': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'certificate',
- 'fieldtype': u'Small Text',
- 'label': u'Certificate',
- 'oldfieldname': u'certificate',
- 'oldfieldtype': u'Small Text'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:59",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:59"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 5,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Employee Training",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Employee Training",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Institute / Conducted By",
+ "oldfieldname": "institute",
+ "fieldname": "institute",
+ "fieldtype": "Small Text",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Program / Seminar Title",
+ "oldfieldname": "nature_of_training",
+ "fieldname": "nature_of_training",
+ "fieldtype": "Small Text",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Duration",
+ "oldfieldname": "duration",
+ "fieldname": "duration",
+ "fieldtype": "Data",
+ "reqd": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Location",
+ "oldfieldname": "loc",
+ "fieldname": "loc",
+ "fieldtype": "Data",
+ "reqd": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Certificate",
+ "oldfieldname": "certificate",
+ "fieldname": "certificate",
+ "fieldtype": "Small Text"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt
index 57683820d55..137ca0691d5 100644
--- a/hr/doctype/employment_type/employment_type.txt
+++ b/hr/doctype/employment_type/employment_type.txt
@@ -1,97 +1,76 @@
-# DocType, Employment Type
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:55',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:55',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:employee_type_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 16
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Employment Type',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Employment Type',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Employment Type
- {
- 'doctype': 'DocType',
- 'name': u'Employment Type'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'employee_type_name',
- 'fieldtype': u'Data',
- 'label': u'Employment Type',
- 'oldfieldname': u'employee_type_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:55",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:55"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:employee_type_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 16
+ },
+ {
+ "name": "__common__",
+ "parent": "Employment Type",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Employment Type",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Employment Type",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Employment Type",
+ "oldfieldname": "employee_type_name",
+ "fieldname": "employee_type_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/expense_claim_type/expense_claim_type.txt b/hr/doctype/expense_claim_type/expense_claim_type.txt
index a5c09c87cdc..72825da1733 100644
--- a/hr/doctype/expense_claim_type/expense_claim_type.txt
+++ b/hr/doctype/expense_claim_type/expense_claim_type.txt
@@ -1,96 +1,75 @@
-# DocType, Expense Claim Type
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:55',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:55',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'field:expense_type',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Expense Claim Type',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Expense Claim Type',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Expense Claim Type
- {
- 'doctype': 'DocType',
- 'name': u'Expense Claim Type'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'expense_type',
- 'fieldtype': u'Data',
- 'in_filter': 0,
- 'label': u'Expense Claim Type',
- 'oldfieldname': u'expense_type',
- 'oldfieldtype': u'Data',
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'width': u'300px'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:55",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:55"
+ },
+ {
+ "section_style": "Simple",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "server_code_error": " ",
+ "version": 5,
+ "doctype": "DocType",
+ "autoname": "field:expense_type",
+ "document_type": "Master"
+ },
+ {
+ "name": "__common__",
+ "parent": "Expense Claim Type",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Expense Claim Type",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Expense Claim Type",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Expense Claim Type",
+ "oldfieldname": "expense_type",
+ "fieldname": "expense_type",
+ "fieldtype": "Data",
+ "oldfieldtype": "Data",
+ "reqd": 1,
+ "in_filter": 0
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt
index 2e14d9d557f..df4a28b5903 100644
--- a/hr/doctype/grade/grade.txt
+++ b/hr/doctype/grade/grade.txt
@@ -1,98 +1,77 @@
-# DocType, Grade
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:57',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:57',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:grade_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 7
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Grade',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Grade',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Grade
- {
- 'doctype': 'DocType',
- 'name': u'Grade'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User',
- 'submit': 0
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'grade_name',
- 'fieldtype': u'Data',
- 'label': u'Grade',
- 'oldfieldname': u'grade_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:57",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:57"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:grade_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 7
+ },
+ {
+ "name": "__common__",
+ "parent": "Grade",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Grade",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Grade",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm",
+ "submit": 0
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Grade",
+ "oldfieldname": "grade_name",
+ "fieldname": "grade_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/holiday/holiday.txt b/hr/doctype/holiday/holiday.txt
index 0d210c5f797..612a47a2766 100644
--- a/hr/doctype/holiday/holiday.txt
+++ b/hr/doctype/holiday/holiday.txt
@@ -1,60 +1,47 @@
-# DocType, Holiday
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:57',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:57',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 2
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Holiday',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Holiday
- {
- 'doctype': 'DocType',
- 'name': u'Holiday'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'holiday_date',
- 'fieldtype': u'Date',
- 'label': u'Date',
- 'oldfieldname': u'holiday_date',
- 'oldfieldtype': u'Date'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:57",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:57"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 2,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Holiday",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Holiday",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text"
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Date",
+ "oldfieldname": "holiday_date",
+ "fieldname": "holiday_date",
+ "fieldtype": "Date"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt
index ce0e49f1ab5..a4060fae62d 100644
--- a/hr/doctype/holiday_list/holiday_list.txt
+++ b/hr/doctype/holiday_list/holiday_list.txt
@@ -1,153 +1,124 @@
-# DocType, Holiday List
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:57',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:57',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 17
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Holiday List',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Holiday List',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'role': u'HR Manager',
- 'write': 1
- },
-
- # DocType, Holiday List
- {
- 'doctype': 'DocType',
- 'name': u'Holiday List'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'holiday_list_name',
- 'fieldtype': u'Data',
- 'label': u'Holiday List Name',
- 'oldfieldname': u'holiday_list_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_default',
- 'fieldtype': u'Check',
- 'label': u'Default',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Link',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'weekly_off',
- 'fieldtype': u'Select',
- 'label': u'Weekly Off',
- 'no_copy': 1,
- 'options': u'\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'get_weekly_off_dates',
- 'fieldtype': u'Button',
- 'label': u'Get Weekly Off Dates',
- 'options': u'get_weekly_off_dates',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'holiday_list_details',
- 'fieldtype': u'Table',
- 'label': u'Holidays',
- 'oldfieldname': u'holiday_list_details',
- 'oldfieldtype': u'Table',
- 'options': u'Holiday',
- 'permlevel': 0,
- 'reqd': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'clear_table',
- 'fieldtype': u'Button',
- 'label': u'Clear Table',
- 'options': u'clear_table',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:57",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:57"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 17
+ },
+ {
+ "name": "__common__",
+ "parent": "Holiday List",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "parent": "Holiday List",
+ "read": 1,
+ "doctype": "DocPerm",
+ "cancel": 1,
+ "name": "__common__",
+ "create": 1,
+ "write": 1,
+ "parenttype": "DocType",
+ "role": "HR Manager",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Holiday List",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Holiday List Name",
+ "oldfieldname": "holiday_list_name",
+ "fieldname": "holiday_list_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Default",
+ "fieldname": "is_default",
+ "fieldtype": "Check",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "doctype": "DocField",
+ "label": "Weekly Off",
+ "permlevel": 0,
+ "fieldname": "weekly_off",
+ "fieldtype": "Select",
+ "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday",
+ "report_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "options": "get_weekly_off_dates",
+ "fieldname": "get_weekly_off_dates",
+ "fieldtype": "Button",
+ "label": "Get Weekly Off Dates",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Table",
+ "doctype": "DocField",
+ "label": "Holidays",
+ "oldfieldname": "holiday_list_details",
+ "permlevel": 0,
+ "fieldname": "holiday_list_details",
+ "fieldtype": "Table",
+ "reqd": 0,
+ "options": "Holiday"
+ },
+ {
+ "doctype": "DocField",
+ "options": "clear_table",
+ "fieldname": "clear_table",
+ "fieldtype": "Button",
+ "label": "Clear Table",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt
index 7a9f9152a72..38463546b8c 100644
--- a/hr/doctype/leave_allocation/leave_allocation.txt
+++ b/hr/doctype/leave_allocation/leave_allocation.txt
@@ -1,266 +1,221 @@
-# DocType, Leave Allocation
[
-
- # These values are common in all dictionaries
- {
- u'creation': '2012-10-02 18:51:49',
- u'docstatus': 0,
- u'modified': '2012-10-17 12:51:44',
- u'modified_by': u'Administrator',
- u'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1317365120',
- 'autoname': u'LAL/.#####',
- 'colour': u'White:FFF',
- u'doctype': u'DocType',
- 'is_submittable': 1,
- 'module': u'HR',
- u'name': u'__common__',
- 'search_fields': u'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- u'doctype': u'DocField',
- u'name': u'__common__',
- 'parent': u'Leave Allocation',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- u'doctype': u'DocPerm',
- u'name': u'__common__',
- 'parent': u'Leave Allocation',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Leave Allocation
- {
- u'doctype': u'DocType',
- u'name': u'Leave Allocation'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'employee',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Employee',
- 'oldfieldname': u'employee',
- 'oldfieldtype': u'Link',
- 'options': u'Employee',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'employee_name',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Employee Name',
- 'permlevel': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'leave_type',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Leave Type',
- 'oldfieldname': u'leave_type',
- 'oldfieldtype': u'Link',
- 'options': u'link:Leave Type',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'Today',
- u'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'hidden': 0,
- 'label': u'Posting Date',
- 'no_copy': 1,
- 'oldfieldname': u'date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'reqd': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Data',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- u'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'hidden': 0,
- 'label': u'Description',
- 'oldfieldname': u'reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0,
- 'width': u'300px'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'carry_forward',
- 'fieldtype': u'Check',
- 'label': u'Carry Forward',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'carry_forwarded_leaves',
- 'fieldtype': u'Currency',
- 'label': u'Carry Forwarded Leaves',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- u'doctype': u'DocField',
- 'fieldname': u'new_leaves_allocated',
- 'fieldtype': u'Currency',
- 'label': u'New Leaves Allocated',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'total_leaves_allocated',
- 'fieldtype': u'Currency',
- 'label': u'Total Leaves Allocated',
- 'permlevel': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- u'doctype': u'DocField',
- 'fieldname': u'amended_from',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'label': u'Amended From',
- 'no_copy': 1,
- 'oldfieldname': u'amended_from',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'description': u'The date at which current entry is corrected in the system.',
- u'doctype': u'DocField',
- 'fieldname': u'amendment_date',
- 'fieldtype': u'Date',
- 'hidden': 0,
- 'label': u'Amendment Date',
- 'no_copy': 1,
- 'oldfieldname': u'amendment_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- u'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- u'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- u'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-10-02 18:51:49",
+ "modified_by": "Administrator",
+ "modified": "2012-10-17 12:51:44"
+ },
+ {
+ "section_style": "Simple",
+ "is_submittable": 1,
+ "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year",
+ "module": "HR",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "autoname": "LAL/.#####",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1317365120",
+ "show_in_menu": 0,
+ "version": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Allocation",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Allocation",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Leave Allocation",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Employee",
+ "oldfieldname": "employee",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Employee",
+ "in_filter": 1
+ },
+ {
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Employee Name",
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Leave Type",
+ "oldfieldname": "leave_type",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "leave_type",
+ "fieldtype": "Select",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "link:Leave Type",
+ "in_filter": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "oldfieldname": "date",
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "search_index": 0,
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "reason",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Carry Forward",
+ "trigger": "Client",
+ "fieldname": "carry_forward",
+ "fieldtype": "Check",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Carry Forwarded Leaves",
+ "trigger": "Client",
+ "fieldname": "carry_forwarded_leaves",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "label": "New Leaves Allocated",
+ "trigger": "Client",
+ "fieldname": "new_leaves_allocated",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Leaves Allocated",
+ "fieldname": "total_leaves_allocated",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "The date at which current entry is corrected in the system.",
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Amendment Date",
+ "oldfieldname": "amendment_date",
+ "fieldname": "amendment_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "HR User",
+ "cancel": 1,
+ "permlevel": 0,
+ "match": "owner"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "HR Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "role": "All",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/hr/doctype/leave_control_panel/leave_control_panel.txt
index 9d05ada57c6..a3472f3077d 100644
--- a/hr/doctype/leave_control_panel/leave_control_panel.txt
+++ b/hr/doctype/leave_control_panel/leave_control_panel.txt
@@ -1,228 +1,181 @@
-# DocType, Leave Control Panel
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:59',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1297751828',
- 'allow_copy': 1,
- 'allow_email': 1,
- 'allow_print': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_heading': 0,
- 'hide_toolbar': 0,
- 'issingle': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'read_only': 1,
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 162
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Leave Control Panel',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Leave Control Panel',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Leave Control Panel
- {
- 'doctype': 'DocType',
- 'name': u'Leave Control Panel'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'width': u'50%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Leave blank if considered for all employee types',
- 'doctype': u'DocField',
- 'fieldname': u'employee_type',
- 'fieldtype': u'Select',
- 'label': u'Employee Type',
- 'options': u'link:Employment Type'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Leave blank if considered for all branches',
- 'doctype': u'DocField',
- 'fieldname': u'branch',
- 'fieldtype': u'Select',
- 'label': u'Branch',
- 'options': u'link:Branch'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Leave blank if considered for all departments',
- 'doctype': u'DocField',
- 'fieldname': u'department',
- 'fieldtype': u'Select',
- 'label': u'Department',
- 'options': u'link:Department'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Leave blank if considered for all designations',
- 'doctype': u'DocField',
- 'fieldname': u'designation',
- 'fieldtype': u'Select',
- 'label': u'Designation',
- 'options': u'link:Designation'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Leave blank if considered for all grades',
- 'doctype': u'DocField',
- 'fieldname': u'grade',
- 'fieldtype': u'Select',
- 'label': u'Grade',
- 'options': u'link:Grade'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'options': u'link:Fiscal Year',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'leave_type',
- 'fieldtype': u'Select',
- 'label': u'Leave Type',
- 'options': u'link:Leave Type',
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u"Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
- 'doctype': u'DocField',
- 'fieldname': u'carry_forward',
- 'fieldtype': u'Check',
- 'label': u'Carry Forward'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'no_of_days',
- 'fieldtype': u'Currency',
- 'label': u'New Leaves Allocated (In Days)',
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'allocate',
- 'fieldtype': u'Button',
- 'label': u'Allocate',
- 'options': u'allocate_leave',
- 'trigger': u'Server'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:59",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:59"
+ },
+ {
+ "section_style": "Simple",
+ "allow_print": 1,
+ "module": "HR",
+ "doctype": "DocType",
+ "server_code_error": " ",
+ "read_only": 1,
+ "allow_email": 1,
+ "hide_heading": 0,
+ "issingle": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1297751828",
+ "show_in_menu": 0,
+ "version": 162,
+ "hide_toolbar": 0,
+ "allow_copy": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Control Panel",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Control Panel",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Leave Control Panel",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "permlevel": 0
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "HR User",
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "HR Manager",
+ "permlevel": 0
+ },
+ {
+ "role": "HR User",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "description": "Leave blank if considered for all employee types",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Employee Type",
+ "fieldname": "employee_type",
+ "fieldtype": "Select",
+ "options": "link:Employment Type"
+ },
+ {
+ "description": "Leave blank if considered for all branches",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Branch",
+ "fieldname": "branch",
+ "fieldtype": "Select",
+ "options": "link:Branch"
+ },
+ {
+ "description": "Leave blank if considered for all departments",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Department",
+ "fieldname": "department",
+ "fieldtype": "Select",
+ "options": "link:Department"
+ },
+ {
+ "description": "Leave blank if considered for all designations",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Designation",
+ "fieldname": "designation",
+ "fieldtype": "Select",
+ "options": "link:Designation"
+ },
+ {
+ "description": "Leave blank if considered for all grades",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Grade",
+ "fieldname": "grade",
+ "fieldtype": "Select",
+ "options": "link:Grade"
+ },
+ {
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year",
+ "in_filter": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Leave Type",
+ "fieldname": "leave_type",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Leave Type"
+ },
+ {
+ "description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Carry Forward",
+ "fieldname": "carry_forward",
+ "fieldtype": "Check"
+ },
+ {
+ "doctype": "DocField",
+ "label": "New Leaves Allocated (In Days)",
+ "fieldname": "no_of_days",
+ "fieldtype": "Currency",
+ "reqd": 1
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Allocate",
+ "trigger": "Server",
+ "fieldname": "allocate",
+ "fieldtype": "Button",
+ "options": "allocate_leave"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt
index a6a1f2d08a9..a2988e6df30 100644
--- a/hr/doctype/leave_type/leave_type.txt
+++ b/hr/doctype/leave_type/leave_type.txt
@@ -1,143 +1,114 @@
-# DocType, Leave Type
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:59',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'allow_trash': 1,
- 'autoname': u'field:leave_type_name',
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Master',
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 23
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Leave Type',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Leave Type',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Leave Type
- {
- 'doctype': 'DocType',
- 'name': u'Leave Type'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'trash_reason',
- 'fieldtype': u'Small Text',
- 'label': u'Trash Reason',
- 'oldfieldname': u'trash_reason',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'leave_type_name',
- 'fieldtype': u'Data',
- 'label': u'Leave Type Name',
- 'oldfieldname': u'leave_type_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'max_days_allowed',
- 'fieldtype': u'Data',
- 'label': u'Max Days Leave Allowed',
- 'oldfieldname': u'max_days_allowed',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'reqd': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_carry_forward',
- 'fieldtype': u'Check',
- 'label': u'Is Carry Forward',
- 'oldfieldname': u'is_carry_forward',
- 'oldfieldtype': u'Check',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_encash',
- 'fieldtype': u'Check',
- 'hidden': 1,
- 'label': u'Is Encash',
- 'oldfieldname': u'is_encash',
- 'oldfieldtype': u'Check',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'is_lwp',
- 'fieldtype': u'Check',
- 'label': u'Is LWP',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:59",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:59"
+ },
+ {
+ "section_style": "Simple",
+ "module": "HR",
+ "server_code_error": " ",
+ "allow_trash": 1,
+ "doctype": "DocType",
+ "autoname": "field:leave_type_name",
+ "document_type": "Master",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "show_in_menu": 0,
+ "version": 23
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Type",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Leave Type",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "cancel": 1,
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Leave Type",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Leave Type Name",
+ "oldfieldname": "leave_type_name",
+ "fieldname": "leave_type_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Max Days Leave Allowed",
+ "oldfieldname": "max_days_allowed",
+ "fieldname": "max_days_allowed",
+ "fieldtype": "Data",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Check",
+ "doctype": "DocField",
+ "label": "Is Carry Forward",
+ "oldfieldname": "is_carry_forward",
+ "fieldname": "is_carry_forward",
+ "fieldtype": "Check",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Check",
+ "doctype": "DocField",
+ "label": "Is Encash",
+ "oldfieldname": "is_encash",
+ "fieldname": "is_encash",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "permlevel": 0,
+ "report_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Is LWP",
+ "fieldname": "is_lwp",
+ "fieldtype": "Check",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/other_income_detail/other_income_detail.txt b/hr/doctype/other_income_detail/other_income_detail.txt
index 93a9ea0f358..f5afa9ff6b0 100644
--- a/hr/doctype/other_income_detail/other_income_detail.txt
+++ b/hr/doctype/other_income_detail/other_income_detail.txt
@@ -1,133 +1,106 @@
-# DocType, Other Income Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:59',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 6
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Other Income Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Other Income Detail',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1,
- 'role': u'System Manager'
- },
-
- # DocType, Other Income Detail
- {
- 'doctype': 'DocType',
- 'name': u'Other Income Detail'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'particulars2',
- 'fieldtype': u'Small Text',
- 'label': u'Particulars',
- 'oldfieldname': u'particulars2',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 1,
- 'reqd': 1,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'under_section2',
- 'fieldtype': u'Data',
- 'label': u'Under Section',
- 'oldfieldname': u'under_section2',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'max_limit2',
- 'fieldtype': u'Currency',
- 'label': u'Max. Limit',
- 'oldfieldname': u'max_limit2',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'actual_amount2',
- 'fieldtype': u'Currency',
- 'label': u'Actual Amount',
- 'oldfieldname': u'actual_amount2',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'eligible_amount2',
- 'fieldtype': u'Currency',
- 'label': u'Eligible Amount',
- 'oldfieldname': u'eligible_amount2',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'modified_amount2',
- 'fieldtype': u'Currency',
- 'label': u'Modified Amount',
- 'oldfieldname': u'modified_amount2',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:59",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:59"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 6,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Other Income Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Other Income Detail",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Other Income Detail",
+ "doctype": "DocType"
+ },
+ {
+ "write": 1,
+ "permlevel": 0,
+ "doctype": "DocPerm"
+ },
+ {
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Particulars",
+ "oldfieldname": "particulars2",
+ "width": "200px",
+ "fieldname": "particulars2",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Under Section",
+ "oldfieldname": "under_section2",
+ "fieldname": "under_section2",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Max. Limit",
+ "oldfieldname": "max_limit2",
+ "fieldname": "max_limit2",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Actual Amount",
+ "oldfieldname": "actual_amount2",
+ "fieldname": "actual_amount2",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Eligible Amount",
+ "oldfieldname": "eligible_amount2",
+ "fieldname": "eligible_amount2",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Modified Amount",
+ "oldfieldname": "modified_amount2",
+ "fieldname": "modified_amount2",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/salary_manager/salary_manager.txt b/hr/doctype/salary_manager/salary_manager.txt
index 7c47f1c339f..173af8abe84 100644
--- a/hr/doctype/salary_manager/salary_manager.txt
+++ b/hr/doctype/salary_manager/salary_manager.txt
@@ -1,266 +1,207 @@
-# DocType, Salary Manager
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:59',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:59',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1314253977',
- 'allow_copy': 1,
- 'allow_email': 1,
- 'allow_print': 1,
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'document_type': u'Other',
- 'issingle': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'show_in_menu': 1,
- 'version': 30
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Salary Manager',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # These values are common for all DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Salary Manager',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
- },
-
- # DocType, Salary Manager
- {
- 'doctype': 'DocType',
- 'name': u'Salary Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'role': u'HR Manager'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'document_description',
- 'fieldtype': u'HTML',
- 'label': u'Document Description',
- 'options': u'You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here
'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'section_break0',
- 'fieldtype': u'Section Break'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Select',
- 'label': u'Company',
- 'options': u'link:Company',
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'branch',
- 'fieldtype': u'Link',
- 'label': u'Branch',
- 'options': u'Branch'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'department',
- 'fieldtype': u'Link',
- 'label': u'Department',
- 'options': u'Department'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'designation',
- 'fieldtype': u'Link',
- 'label': u'Designation',
- 'options': u'Designation'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break1',
- 'fieldtype': u'Column Break',
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'grade',
- 'fieldtype': u'Select',
- 'label': u'Grade',
- 'options': u'link:Grade'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'label': u'Fiscal Year',
- 'options': u'link:Fiscal Year',
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'month',
- 'fieldtype': u'Select',
- 'label': u'Month',
- 'options': u'\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Check if you want to send salary slip in mail to each employee while submitting salary slip',
- 'doctype': u'DocField',
- 'fieldname': u'send_email',
- 'fieldtype': u'Check',
- 'label': u'Send Email'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'section_break1',
- 'fieldtype': u'Section Break'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break2',
- 'fieldtype': u'Column Break',
- 'width': u'50%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Creates salary slip for above mentioned criteria.',
- 'doctype': u'DocField',
- 'fieldname': u'create_salary_slip',
- 'fieldtype': u'Button',
- 'label': u'Create Salary Slip',
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break3',
- 'fieldtype': u'Column Break',
- 'width': u'25%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Submit all salary slips for the above selected criteria',
- 'doctype': u'DocField',
- 'fieldname': u'submit_salary_slip',
- 'fieldtype': u'Button',
- 'label': u'Submit Salary Slip',
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break4',
- 'fieldtype': u'Column Break',
- 'width': u'25%'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Create Bank Voucher for the total salary paid for the above selected criteria',
- 'doctype': u'DocField',
- 'fieldname': u'make_bank_voucher',
- 'fieldtype': u'Button',
- 'label': u'Make Bank Voucher',
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'section_break2',
- 'fieldtype': u'Section Break'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'activity_log',
- 'fieldtype': u'HTML',
- 'label': u'Activity Log'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:59",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:59"
+ },
+ {
+ "section_style": "Simple",
+ "allow_print": 1,
+ "module": "HR",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "allow_email": 1,
+ "issingle": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1314253977",
+ "show_in_menu": 1,
+ "version": 30,
+ "allow_copy": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Manager",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Manager",
+ "read": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Salary Manager",
+ "doctype": "DocType"
+ },
+ {
+ "role": "System Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR User",
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "HR Manager",
+ "doctype": "DocPerm"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Document Description",
+ "fieldname": "document_description",
+ "fieldtype": "HTML",
+ "options": "You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here
"
+ },
+ {
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "doctype": "DocField"
+ },
+ {
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Company",
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Company"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Branch",
+ "fieldname": "branch",
+ "fieldtype": "Link",
+ "options": "Branch"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Department",
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "options": "Department"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Designation",
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "options": "Designation"
+ },
+ {
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Grade",
+ "fieldname": "grade",
+ "fieldtype": "Select",
+ "options": "link:Grade"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year"
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Month",
+ "fieldname": "month",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12"
+ },
+ {
+ "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Send Email",
+ "fieldname": "send_email",
+ "fieldtype": "Check"
+ },
+ {
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
+ "doctype": "DocField"
+ },
+ {
+ "width": "50%",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "description": "Creates salary slip for above mentioned criteria.",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Create Salary Slip",
+ "trigger": "Client",
+ "fieldname": "create_salary_slip",
+ "fieldtype": "Button"
+ },
+ {
+ "width": "25%",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "description": "Submit all salary slips for the above selected criteria",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Submit Salary Slip",
+ "trigger": "Client",
+ "fieldname": "submit_salary_slip",
+ "fieldtype": "Button"
+ },
+ {
+ "width": "25%",
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "doctype": "DocField"
+ },
+ {
+ "description": "Create Bank Voucher for the total salary paid for the above selected criteria",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Make Bank Voucher",
+ "trigger": "Client",
+ "fieldname": "make_bank_voucher",
+ "fieldtype": "Button"
+ },
+ {
+ "fieldname": "section_break2",
+ "fieldtype": "Section Break",
+ "doctype": "DocField"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "activity_log",
+ "fieldtype": "HTML",
+ "label": "Activity Log"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
index e76a1bae42d..2272aea77dc 100644
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -1,104 +1,83 @@
-# DocType, Salary Slip Deduction
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:36:00',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:36:00',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 9
- },
-
- # These values are common for all DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Salary Slip Deduction',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Salary Slip Deduction',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocType, Salary Slip Deduction
- {
- 'doctype': 'DocType',
- 'name': u'Salary Slip Deduction'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_type',
- 'fieldtype': u'Link',
- 'label': u'Type',
- 'oldfieldname': u'd_type',
- 'oldfieldtype': u'Data',
- 'options': u'Deduction Type',
- 'permlevel': 0,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'd_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_modified_amount',
- 'fieldtype': u'Currency',
- 'label': u'Modified Amount',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_depends_on_lwp',
- 'fieldtype': u'Check',
- 'label': u'Depends on LWP',
- 'permlevel': 0,
- 'trigger': u'Client'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:36:00",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:36:00"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 9,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Slip Deduction",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "parent": "Salary Slip Deduction",
+ "read": 1,
+ "name": "__common__",
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Salary Slip Deduction",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocPerm"
+ },
+ {
+ "permlevel": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "d_type",
+ "width": "200px",
+ "fieldname": "d_type",
+ "fieldtype": "Link",
+ "options": "Deduction Type"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "d_amount",
+ "fieldname": "d_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Modified Amount",
+ "trigger": "Client",
+ "fieldname": "d_modified_amount",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Depends on LWP",
+ "trigger": "Client",
+ "fieldname": "d_depends_on_lwp",
+ "fieldtype": "Check",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
index d8c4c9b6097..b8ad5961ad0 100644
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -1,105 +1,84 @@
-# DocType, Salary Slip Earning
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:36:00',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:36:00',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 7
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Salary Slip Earning',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Salary Slip Earning',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocType, Salary Slip Earning
- {
- 'doctype': 'DocType',
- 'name': u'Salary Slip Earning'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'e_type',
- 'fieldtype': u'Link',
- 'label': u'Type',
- 'oldfieldname': u'e_type',
- 'oldfieldtype': u'Data',
- 'options': u'Earning Type',
- 'permlevel': 0,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'e_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'e_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'e_modified_amount',
- 'fieldtype': u'Currency',
- 'label': u'Modified Amount',
- 'permlevel': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'e_depends_on_lwp',
- 'fieldtype': u'Check',
- 'label': u'Depends on LWP',
- 'permlevel': 0,
- 'trigger': u'Client'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:36:00",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:36:00"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 7,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Slip Earning",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "parent": "Salary Slip Earning",
+ "read": 1,
+ "name": "__common__",
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Salary Slip Earning",
+ "doctype": "DocType"
+ },
+ {
+ "doctype": "DocPerm"
+ },
+ {
+ "permlevel": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "e_type",
+ "width": "200px",
+ "fieldname": "e_type",
+ "fieldtype": "Link",
+ "options": "Earning Type"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "e_amount",
+ "fieldname": "e_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Modified Amount",
+ "trigger": "Client",
+ "fieldname": "e_modified_amount",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Depends on LWP",
+ "trigger": "Client",
+ "fieldname": "e_depends_on_lwp",
+ "fieldtype": "Check",
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
index 1815ca35a89..1f4d246ae74 100644
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -1,74 +1,59 @@
-# DocType, Salary Structure Deduction
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 14
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Salary Structure Deduction',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Salary Structure Deduction
- {
- 'doctype': 'DocType',
- 'name': u'Salary Structure Deduction'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_type',
- 'fieldtype': u'Link',
- 'label': u'Type',
- 'oldfieldname': u'd_type',
- 'oldfieldtype': u'Select',
- 'options': u'Deduction Type',
- 'reqd': 1,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'd_modified_amt',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'd_modified_amt',
- 'oldfieldtype': u'Currency'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'depend_on_lwp',
- 'fieldtype': u'Check',
- 'label': u'Depend on LWP',
- 'oldfieldname': u'depend_on_lwp',
- 'oldfieldtype': u'Check'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "module": "HR",
+ "show_in_menu": 0,
+ "version": 14,
+ "server_code_error": " ",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Structure Deduction",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Salary Structure Deduction",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "d_type",
+ "width": "200px",
+ "fieldname": "d_type",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Deduction Type"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "d_modified_amt",
+ "fieldname": "d_modified_amt",
+ "fieldtype": "Currency"
+ },
+ {
+ "oldfieldtype": "Check",
+ "doctype": "DocField",
+ "label": "Depend on LWP",
+ "oldfieldname": "depend_on_lwp",
+ "fieldname": "depend_on_lwp",
+ "fieldtype": "Check"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.txt b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
index 09ac7f5151a..93961d569f7 100644
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -1,77 +1,62 @@
-# DocType, Salary Structure Earning
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:54',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:54',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'hide_heading': 0,
- 'hide_toolbar': 0,
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 26
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Salary Structure Earning',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Salary Structure Earning
- {
- 'doctype': 'DocType',
- 'name': u'Salary Structure Earning'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'e_type',
- 'fieldtype': u'Link',
- 'label': u'Type',
- 'oldfieldname': u'e_type',
- 'oldfieldtype': u'Data',
- 'options': u'Earning Type',
- 'reqd': 1,
- 'width': u'200px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'modified_value',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'modified_value',
- 'oldfieldtype': u'Currency',
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'depend_on_lwp',
- 'fieldtype': u'Check',
- 'label': u'Depend on LWP',
- 'oldfieldname': u'depend_on_lwp',
- 'oldfieldtype': u'Check'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:35:54",
+ "modified_by": "Administrator",
+ "modified": "2012-03-27 14:35:54"
+ },
+ {
+ "section_style": "Simple",
+ "istable": 1,
+ "module": "HR",
+ "doctype": "DocType",
+ "show_in_menu": 0,
+ "hide_heading": 0,
+ "name": "__common__",
+ "colour": "White:FFF",
+ "server_code_error": " ",
+ "version": 26,
+ "hide_toolbar": 0
+ },
+ {
+ "name": "__common__",
+ "parent": "Salary Structure Earning",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Salary Structure Earning",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Type",
+ "oldfieldname": "e_type",
+ "width": "200px",
+ "fieldname": "e_type",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Earning Type"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "modified_value",
+ "trigger": "Client",
+ "fieldname": "modified_value",
+ "fieldtype": "Currency"
+ },
+ {
+ "oldfieldtype": "Check",
+ "doctype": "DocField",
+ "label": "Depend on LWP",
+ "oldfieldname": "depend_on_lwp",
+ "fieldname": "depend_on_lwp",
+ "fieldtype": "Check"
+ }
]
\ No newline at end of file
diff --git a/hr/page/hr_home/hr_home.txt b/hr/page/hr_home/hr_home.txt
index a5a4ba9d317..e58fa6ff580 100644
--- a/hr/page/hr_home/hr_home.txt
+++ b/hr/page/hr_home/hr_home.txt
@@ -1,28 +1,21 @@
-# Page, hr-home
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-02-21 13:24:05',
- 'docstatus': 0,
- 'modified': '2012-02-21 13:24:05',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Page
- {
- 'doctype': 'Page',
- 'module': u'HR',
- 'name': '__common__',
- 'page_name': u'hr-home',
- 'standard': u'Yes',
- 'title': u'Human Resources Home'
- },
-
- # Page, hr-home
- {
- 'doctype': 'Page',
- 'name': u'hr-home'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-02-21 13:24:05",
+ "modified_by": "Administrator",
+ "modified": "2012-02-21 13:24:05"
+ },
+ {
+ "name": "__common__",
+ "title": "Human Resources Home",
+ "module": "HR",
+ "doctype": "Page",
+ "page_name": "hr-home",
+ "standard": "Yes"
+ },
+ {
+ "name": "hr-home",
+ "doctype": "Page"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/employee_appraisals/employee_appraisals.txt b/hr/search_criteria/employee_appraisals/employee_appraisals.txt
index c3387704eb8..ce12a0e97f4 100644
--- a/hr/search_criteria/employee_appraisals/employee_appraisals.txt
+++ b/hr/search_criteria/employee_appraisals/employee_appraisals.txt
@@ -1,33 +1,26 @@
-# Search Criteria, employee_appraisals
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Appraisal\x01ID,Appraisal\x01Status,Appraisal\x01Employee,Appraisal\x01Employee Name,Appraisal\x01Start Date,Appraisal\x01End Date,Appraisal\x01Approver,Appraisal\x01Total Score',
- 'criteria_name': u'Employee Appraisals',
- 'doc_type': u'Appraisal',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Appraisal\x01Saved':1,'Appraisal\x01Submitted':1,'Appraisal\x01Status':'','Appraisal\x01Fiscal Year':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabAppraisal`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, employee_appraisals
- {
- 'doctype': 'Search Criteria',
- 'name': u'employee_appraisals'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Appraisal\u0001Saved':1,'Appraisal\u0001Submitted':1,'Appraisal\u0001Status':'','Appraisal\u0001Fiscal Year':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Appraisal",
+ "name": "__common__",
+ "sort_by": "`tabAppraisal`.`name`",
+ "page_len": 50,
+ "criteria_name": "Employee Appraisals",
+ "columns": "Appraisal\u0001ID,Appraisal\u0001Status,Appraisal\u0001Employee,Appraisal\u0001Employee Name,Appraisal\u0001Start Date,Appraisal\u0001End Date,Appraisal\u0001Approver,Appraisal\u0001Total Score"
+ },
+ {
+ "name": "employee_appraisals",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/employee_information/employee_information.txt b/hr/search_criteria/employee_information/employee_information.txt
index 84cb448f67e..d05461380f0 100644
--- a/hr/search_criteria/employee_information/employee_information.txt
+++ b/hr/search_criteria/employee_information/employee_information.txt
@@ -1,33 +1,26 @@
-# Search Criteria, employee_information
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Number,Employee\x01Date of Joining,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Employment Type,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Reports to,Employee\x01Email (By company),Employee\x01Bank Name,Employee\x01Relieving Date',
- 'criteria_name': u'Employee Information',
- 'doc_type': u'Employee',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabEmployee`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, employee_information
- {
- 'doctype': 'Search Criteria',
- 'name': u'employee_information'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Employee\u0001Saved':1,'Employee\u0001Submitted':1,'Employee\u0001Gender':'','Employee\u0001Month of Birth':'','Employee\u0001Status':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Employee",
+ "name": "__common__",
+ "sort_by": "`tabEmployee`.`name`",
+ "page_len": 50,
+ "criteria_name": "Employee Information",
+ "columns": "Employee\u0001ID,Employee\u0001Employee Name,Employee\u0001Employee Number,Employee\u0001Date of Joining,Employee\u0001Gender,Employee\u0001Date of Birth,Employee\u0001Employment Type,Employee\u0001Scheduled Confirmation Date,Employee\u0001Contract End Date,Employee\u0001Status,Employee\u0001Branch,Employee\u0001Department,Employee\u0001Designation,Employee\u0001Grade,Employee\u0001Reports to,Employee\u0001Email (By company),Employee\u0001Bank Name,Employee\u0001Relieving Date"
+ },
+ {
+ "name": "employee_information",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/employee_leave_balance_report/employee_leave_balance_report.txt b/hr/search_criteria/employee_leave_balance_report/employee_leave_balance_report.txt
index 7a7f04988e4..74c0d82c0e9 100644
--- a/hr/search_criteria/employee_leave_balance_report/employee_leave_balance_report.txt
+++ b/hr/search_criteria/employee_leave_balance_report/employee_leave_balance_report.txt
@@ -1,34 +1,27 @@
-# Search Criteria, employeewise_balance_leave_report
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-12-14 10:33:09',
- 'docstatus': 0,
- 'modified': '2011-10-31 15:42:36',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': 'Employee\x01ID',
- 'criteria_name': 'Employee Leave Balance Report',
- 'description': 'Employeewise Balance Leave Report',
- 'doc_type': 'Employee',
- 'doctype': 'Search Criteria',
- 'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':'Active'}",
- 'module': 'HR',
- 'name': '__common__',
- 'page_len': 100,
- 'sort_by': '`tabEmployee`.`name`',
- 'sort_order': 'ASC',
- 'standard': 'Yes'
- },
-
- # Search Criteria, employeewise_balance_leave_report
- {
- 'doctype': 'Search Criteria',
- 'name': 'employeewise_balance_leave_report'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2010-12-14 10:33:09",
+ "modified_by": "Administrator",
+ "modified": "2011-10-31 15:42:36"
+ },
+ {
+ "description": "Employeewise Balance Leave Report",
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "ASC",
+ "filters": "{'Employee\u0001Saved':1,'Employee\u0001Submitted':1,'Employee\u0001Gender':'','Employee\u0001Month of Birth':'','Employee\u0001Status':'Active'}",
+ "doc_type": "Employee",
+ "name": "__common__",
+ "doctype": "Search Criteria",
+ "sort_by": "`tabEmployee`.`name`",
+ "page_len": 100,
+ "criteria_name": "Employee Leave Balance Report",
+ "columns": "Employee\u0001ID"
+ },
+ {
+ "name": "employeewise_balance_leave_report",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/employees_birthday/employees_birthday.txt b/hr/search_criteria/employees_birthday/employees_birthday.txt
index 42cfff2bd29..a96b8698b90 100644
--- a/hr/search_criteria/employees_birthday/employees_birthday.txt
+++ b/hr/search_criteria/employees_birthday/employees_birthday.txt
@@ -1,33 +1,26 @@
-# Search Criteria, employees_birthday
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Employee\x01ID,Employee\x01Employee Name,Employee\x01Department,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Month of Birth',
- 'criteria_name': u"Employee's Birthday",
- 'doc_type': u'Employee',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Employee\x01Saved':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'May','Employee\x01Status':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabEmployee`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, employees_birthday
- {
- 'doctype': 'Search Criteria',
- 'name': u'employees_birthday'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Employee\u0001Saved':1,'Employee\u0001Gender':'','Employee\u0001Month of Birth':'May','Employee\u0001Status':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Employee",
+ "name": "__common__",
+ "sort_by": "`tabEmployee`.`name`",
+ "page_len": 50,
+ "criteria_name": "Employee's Birthday",
+ "columns": "Employee\u0001ID,Employee\u0001Employee Name,Employee\u0001Department,Employee\u0001Gender,Employee\u0001Date of Birth,Employee\u0001Month of Birth"
+ },
+ {
+ "name": "employees_birthday",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/expense_claims/expense_claims.txt b/hr/search_criteria/expense_claims/expense_claims.txt
index 0032df50812..f1324d2e1cf 100644
--- a/hr/search_criteria/expense_claims/expense_claims.txt
+++ b/hr/search_criteria/expense_claims/expense_claims.txt
@@ -1,33 +1,26 @@
-# Search Criteria, expense_claims
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-30 13:33:32',
- 'docstatus': 0,
- 'modified': '2012-03-30 13:33:32',
- 'modified_by': u'Administrator',
- 'owner': u'ashwini@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Expense Claim\x01ID,Expense Claim\x01Approval Status,Expense Claim\x01From Employee,Expense Claim\x01Employee Name,Expense Claim\x01Approver,Expense Claim\x01Posting Date,Expense Claim\x01Total Claimed Amount,Expense Claim\x01Total Sanctioned Amount',
- 'criteria_name': u'Expense Claims',
- 'doc_type': u'Expense Claim',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Expense Claim\x01Saved':1,'Expense Claim\x01Submitted':1,'Expense Claim\x01Approval Status':'','Expense Claim\x01Fiscal Year':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabExpense Claim`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, expense_claims
- {
- 'doctype': 'Search Criteria',
- 'name': u'expense_claims'
- }
+ {
+ "owner": "ashwini@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-03-30 13:33:32",
+ "modified_by": "Administrator",
+ "modified": "2012-03-30 13:33:32"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Expense Claim\u0001Saved':1,'Expense Claim\u0001Submitted':1,'Expense Claim\u0001Approval Status':'','Expense Claim\u0001Fiscal Year':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Expense Claim",
+ "name": "__common__",
+ "sort_by": "`tabExpense Claim`.`name`",
+ "page_len": 50,
+ "criteria_name": "Expense Claims",
+ "columns": "Expense Claim\u0001ID,Expense Claim\u0001Approval Status,Expense Claim\u0001From Employee,Expense Claim\u0001Employee Name,Expense Claim\u0001Approver,Expense Claim\u0001Posting Date,Expense Claim\u0001Total Claimed Amount,Expense Claim\u0001Total Sanctioned Amount"
+ },
+ {
+ "name": "expense_claims",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
index 64a0eb2a38e..abbacae1e93 100644
--- a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
+++ b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
@@ -1,33 +1,26 @@
-# Search Criteria, monthly_attendance_details
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Attendance\x01Employee',
- 'criteria_name': u'Monthly Attendance Details',
- 'doc_type': u'Attendance',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Attendance\x01Status':'','Attendance\x01Fiscal Year':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabAttendance`.`employee`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, monthly_attendance_details
- {
- 'doctype': 'Search Criteria',
- 'name': u'monthly_attendance_details'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Attendance\u0001Status':'','Attendance\u0001Fiscal Year':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Attendance",
+ "name": "__common__",
+ "sort_by": "`tabAttendance`.`employee`",
+ "page_len": 50,
+ "criteria_name": "Monthly Attendance Details",
+ "columns": "Attendance\u0001Employee"
+ },
+ {
+ "name": "monthly_attendance_details",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt b/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
index b24bfb1b930..2e1db8c7cf2 100644
--- a/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
+++ b/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
@@ -1,33 +1,26 @@
-# Search Criteria, monthly_salary_register
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-30 14:50:44',
- 'docstatus': 0,
- 'modified': '2012-04-05 17:23:13',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Leave Without Pay,Salary Slip\x01Arrear Amount',
- 'criteria_name': u'Monthly Salary Register',
- 'doc_type': u'Salary Slip',
- 'doctype': 'Search Criteria',
- 'filters': u'{"Salary Slip\\u0001Submitted":1,"Salary Slip\\u0001Company":[""],"Salary Slip\\u0001Month":[""]}',
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabSalary Slip`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, monthly_salary_register
- {
- 'doctype': 'Search Criteria',
- 'name': u'monthly_salary_register'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-30 14:50:44",
+ "modified_by": "Administrator",
+ "modified": "2012-04-05 17:23:13"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{\"Salary Slip\\u0001Submitted\":1,\"Salary Slip\\u0001Company\":[\"\"],\"Salary Slip\\u0001Month\":[\"\"]}",
+ "doctype": "Search Criteria",
+ "doc_type": "Salary Slip",
+ "name": "__common__",
+ "sort_by": "`tabSalary Slip`.`name`",
+ "page_len": 50,
+ "criteria_name": "Monthly Salary Register",
+ "columns": "Salary Slip\u0001ID,Salary Slip\u0001Employee,Salary Slip\u0001Employee Name,Salary Slip\u0001Leave Without Pay,Salary Slip\u0001Arrear Amount"
+ },
+ {
+ "name": "monthly_salary_register",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
index eee5bfa8d47..86d09b53722 100644
--- a/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
+++ b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
@@ -1,33 +1,26 @@
-# Search Criteria, new_or_left_employees_for_a_month
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:51',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:51',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Employee\x01ID',
- 'criteria_name': u'New or left employees for a month',
- 'doc_type': u'Employee',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabEmployee`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, new_or_left_employees_for_a_month
- {
- 'doctype': 'Search Criteria',
- 'name': u'new_or_left_employees_for_a_month'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:51",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:51"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Employee\u0001Saved':1,'Employee\u0001Submitted':1,'Employee\u0001Gender':'','Employee\u0001Month of Birth':'','Employee\u0001Status':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Employee",
+ "name": "__common__",
+ "sort_by": "`tabEmployee`.`name`",
+ "page_len": 50,
+ "criteria_name": "New or left employees for a month",
+ "columns": "Employee\u0001ID"
+ },
+ {
+ "name": "new_or_left_employees_for_a_month",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_register/salary_register.txt b/hr/search_criteria/salary_register/salary_register.txt
index 700423b68f7..aab7f2518e5 100644
--- a/hr/search_criteria/salary_register/salary_register.txt
+++ b/hr/search_criteria/salary_register/salary_register.txt
@@ -1,33 +1,26 @@
-# Search Criteria, salary_register
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:52',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:52',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Year,Salary Slip\x01Month,Salary Slip\x01Total days in month,Salary Slip\x01Payment days',
- 'criteria_name': u'Salary Register',
- 'doc_type': u'Salary Slip',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Salary Slip\x01Submitted':1,'Salary Slip\x01Month':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabSalary Slip`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, salary_register
- {
- 'doctype': 'Search Criteria',
- 'name': u'salary_register'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:52",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:52"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Salary Slip\u0001Submitted':1,'Salary Slip\u0001Month':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Salary Slip",
+ "name": "__common__",
+ "sort_by": "`tabSalary Slip`.`name`",
+ "page_len": 50,
+ "criteria_name": "Salary Register",
+ "columns": "Salary Slip\u0001ID,Salary Slip\u0001Employee,Salary Slip\u0001Employee Name,Salary Slip\u0001Year,Salary Slip\u0001Month,Salary Slip\u0001Total days in month,Salary Slip\u0001Payment days"
+ },
+ {
+ "name": "salary_register",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_slips/salary_slips.txt b/hr/search_criteria/salary_slips/salary_slips.txt
index 9951896d585..e1bcccf2590 100644
--- a/hr/search_criteria/salary_slips/salary_slips.txt
+++ b/hr/search_criteria/salary_slips/salary_slips.txt
@@ -1,33 +1,26 @@
-# Search Criteria, salary_slips
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:52',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:52',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Salary Slip\x01ID,Salary Slip\x01Fiscal Year,Salary Slip\x01Month,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Department,Salary Slip\x01Designation,Salary Slip\x01Branch,Salary Slip\x01Grade,Salary Slip\x01PF No.,Salary Slip\x01ESIC No.,Salary Slip\x01Leave Without Pay,Salary Slip\x01Bank Name,Salary Slip\x01Bank Account No.,Salary Slip\x01Payment days,Salary Slip\x01Arrear Amount,Salary Slip\x01Encashment Amount,Salary Slip\x01Gross Pay,Salary Slip\x01Total Deduction,Salary Slip\x01Net Pay',
- 'criteria_name': u'Salary Slips',
- 'doc_type': u'Salary Slip',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Salary Slip\x01Saved':1,'Salary Slip\x01Submitted':1}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabSalary Slip`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, salary_slips
- {
- 'doctype': 'Search Criteria',
- 'name': u'salary_slips'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:52",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:52"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Salary Slip\u0001Saved':1,'Salary Slip\u0001Submitted':1}",
+ "doctype": "Search Criteria",
+ "doc_type": "Salary Slip",
+ "name": "__common__",
+ "sort_by": "`tabSalary Slip`.`name`",
+ "page_len": 50,
+ "criteria_name": "Salary Slips",
+ "columns": "Salary Slip\u0001ID,Salary Slip\u0001Fiscal Year,Salary Slip\u0001Month,Salary Slip\u0001Employee,Salary Slip\u0001Employee Name,Salary Slip\u0001Department,Salary Slip\u0001Designation,Salary Slip\u0001Branch,Salary Slip\u0001Grade,Salary Slip\u0001PF No.,Salary Slip\u0001ESIC No.,Salary Slip\u0001Leave Without Pay,Salary Slip\u0001Bank Name,Salary Slip\u0001Bank Account No.,Salary Slip\u0001Payment days,Salary Slip\u0001Arrear Amount,Salary Slip\u0001Encashment Amount,Salary Slip\u0001Gross Pay,Salary Slip\u0001Total Deduction,Salary Slip\u0001Net Pay"
+ },
+ {
+ "name": "salary_slips",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_structure_details/salary_structure_details.txt b/hr/search_criteria/salary_structure_details/salary_structure_details.txt
index a0e343899dd..c1ed01bc842 100644
--- a/hr/search_criteria/salary_structure_details/salary_structure_details.txt
+++ b/hr/search_criteria/salary_structure_details/salary_structure_details.txt
@@ -1,33 +1,26 @@
-# Search Criteria, salary_structure_details
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-03 12:49:52',
- 'docstatus': 0,
- 'modified': '2012-04-03 12:49:52',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Search Criteria
- {
- 'columns': u'Salary Structure\x01ID,Salary Structure\x01Employee,Salary Structure\x01From Date,Salary Structure\x01To Date,Salary Structure\x01Fiscal Year,Salary Structure\x01Branch,Salary Structure\x01Designation,Salary Structure\x01Department,Salary Structure\x01Grade,Salary Structure\x01Is Active,Salary Structure\x01Total Earning,Salary Structure\x01Total Deduction,Salary Structure\x01CTC,Salary Structure\x01Total',
- 'criteria_name': u'Salary Structure Details',
- 'doc_type': u'Salary Structure',
- 'doctype': 'Search Criteria',
- 'filters': u"{'Salary Structure\x01Branch':'','Salary Structure\x01Designation':'','Salary Structure\x01Department':'','Salary Structure\x01Grade':'','Salary Structure\x01Is Active':''}",
- 'module': u'HR',
- 'name': '__common__',
- 'page_len': 50,
- 'sort_by': u'`tabSalary Structure`.`name`',
- 'sort_order': u'DESC',
- 'standard': u'Yes'
- },
-
- # Search Criteria, salary_structure_details
- {
- 'doctype': 'Search Criteria',
- 'name': u'salary_structure_details'
- }
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-04-03 12:49:52",
+ "modified_by": "Administrator",
+ "modified": "2012-04-03 12:49:52"
+ },
+ {
+ "module": "HR",
+ "standard": "Yes",
+ "sort_order": "DESC",
+ "filters": "{'Salary Structure\u0001Branch':'','Salary Structure\u0001Designation':'','Salary Structure\u0001Department':'','Salary Structure\u0001Grade':'','Salary Structure\u0001Is Active':''}",
+ "doctype": "Search Criteria",
+ "doc_type": "Salary Structure",
+ "name": "__common__",
+ "sort_by": "`tabSalary Structure`.`name`",
+ "page_len": 50,
+ "criteria_name": "Salary Structure Details",
+ "columns": "Salary Structure\u0001ID,Salary Structure\u0001Employee,Salary Structure\u0001From Date,Salary Structure\u0001To Date,Salary Structure\u0001Fiscal Year,Salary Structure\u0001Branch,Salary Structure\u0001Designation,Salary Structure\u0001Department,Salary Structure\u0001Grade,Salary Structure\u0001Is Active,Salary Structure\u0001Total Earning,Salary Structure\u0001Total Deduction,Salary Structure\u0001CTC,Salary Structure\u0001Total"
+ },
+ {
+ "name": "salary_structure_details",
+ "doctype": "Search Criteria"
+ }
]
\ No newline at end of file
diff --git a/manufacturing/__init__.py b/manufacturing/__init__.py
new file mode 100644
index 00000000000..07594ad89c3
--- /dev/null
+++ b/manufacturing/__init__.py
@@ -0,0 +1,5 @@
+from __future__ import unicode_literals
+install_docs = [
+ {"doctype":"Role", "role_name":"Manufacturing Manager", "name":"Manufacturing Manager"},
+ {"doctype":"Role", "role_name":"Manufacturing User", "name":"Manufacturing User"},
+]
diff --git a/patches/before_jan_2012/__init__.py b/manufacturing/doctype/__init__.py
similarity index 100%
rename from patches/before_jan_2012/__init__.py
rename to manufacturing/doctype/__init__.py
diff --git a/patches/jan_mar_2012/__init__.py b/manufacturing/doctype/bom/__init__.py
similarity index 100%
rename from patches/jan_mar_2012/__init__.py
rename to manufacturing/doctype/bom/__init__.py
diff --git a/production/doctype/bom/bom.js b/manufacturing/doctype/bom/bom.js
similarity index 58%
rename from production/doctype/bom/bom.js
rename to manufacturing/doctype/bom/bom.js
index 9dffd6cb32f..179e63fd9ef 100644
--- a/production/doctype/bom/bom.js
+++ b/manufacturing/doctype/bom/bom.js
@@ -17,18 +17,54 @@
// On REFRESH
cur_frm.cscript.refresh = function(doc,dt,dn){
cur_frm.toggle_enable("item", doc.__islocal);
+
+ if (!doc.__islocal && doc.docstatus==0) {
+ cur_frm.set_intro("Submit the BOM to use it for manufacturing or repacking.");
+ } else cur_frm.set_intro("");
+
+ cur_frm.cscript.with_operations(doc);
+ set_operation_no(doc);
}
+cur_frm.cscript.with_operations = function(doc) {
+ cur_frm.fields_dict["bom_materials"].grid.set_column_disp("operation_no", doc.with_operations);
+ cur_frm.fields_dict["bom_materials"].grid.toggle_reqd("operation_no", doc.with_operations)
+}
+
+cur_frm.cscript.operation_no = function(doc, cdt, cdn) {
+ var child = locals[cdt][cdn];
+ if(child.parentfield=="bom_operations") set_operation_no(doc);
+}
+
+var set_operation_no = function(doc) {
+ var op_table = getchildren('BOM Operation', doc.name, 'bom_operations');
+ var operations = [];
+
+ for (var i=0, j=op_table.length; i NOW()) AND `tabItem`.`%(key)s` like "%s" ORDER BY `tabItem`.`name` LIMIT 50';
+ return 'SELECT DISTINCT `tabItem`.`name`, `tabItem`.description FROM `tabItem` \
+ WHERE is_manufactured_item = "Yes" and (IFNULL(`tabItem`.`end_of_life`,"") = "" OR \
+ `tabItem`.`end_of_life` = "0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND \
+ `tabItem`.`%(key)s` like "%s" ORDER BY `tabItem`.`name` LIMIT 50';
}
cur_frm.fields_dict['project_name'].get_query = function(doc, dt, dn) {
@@ -152,12 +187,18 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, dt, dn) {
}
cur_frm.fields_dict['bom_materials'].grid.get_field('item_code').get_query = function(doc) {
- return 'SELECT DISTINCT `tabItem`.`name`, `tabItem`.description FROM `tabItem` WHERE (IFNULL(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` = "0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND `tabItem`.`%(key)s` like "%s" ORDER BY `tabItem`.`name` LIMIT 50';
+ return 'SELECT DISTINCT `tabItem`.`name`, `tabItem`.description FROM `tabItem` \
+ WHERE (IFNULL(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` = "0000-00-00" \
+ OR `tabItem`.`end_of_life` > NOW()) AND `tabItem`.`%(key)s` like "%s" \
+ ORDER BY `tabItem`.`name` LIMIT 50';
}
-cur_frm.fields_dict['bom_materials'].grid.get_field('bom_no').get_query = function(doc) {
- var d = locals[this.doctype][this.docname];
- return 'SELECT DISTINCT `tabBOM`.`name`, `tabBOM`.`remarks` FROM `tabBOM` WHERE `tabBOM`.`item` = "' + d.item_code + '" AND `tabBOM`.`is_active` = "Yes" AND `tabBOM`.docstatus = 1 AND `tabBOM`.`name` like "%s" ORDER BY `tabBOM`.`name` LIMIT 50';
+cur_frm.fields_dict['bom_materials'].grid.get_field('bom_no').get_query = function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return 'SELECT DISTINCT `tabBOM`.`name`, `tabBOM`.`remarks` FROM `tabBOM` \
+ WHERE `tabBOM`.`item` = "' + d.item_code + '" AND `tabBOM`.`is_active` = 1 AND \
+ `tabBOM`.docstatus = 1 AND `tabBOM`.`name` like "%s" \
+ ORDER BY `tabBOM`.`name` LIMIT 50';
}
cur_frm.cscript.validate = function(doc, dt, dn) {
diff --git a/production/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py
similarity index 59%
rename from production/doctype/bom/bom.py
rename to manufacturing/doctype/bom/bom.py
index af0a7dd0e19..2611b7ab17c 100644
--- a/production/doctype/bom/bom.py
+++ b/manufacturing/doctype/bom/bom.py
@@ -20,7 +20,7 @@ from webnotes.utils import cint, cstr, flt, now, nowdate
from webnotes.model.doc import Document, addchild
from webnotes.model.wrapper import getlist
from webnotes.model.code import get_obj
-from webnotes import msgprint
+from webnotes import msgprint, _
sql = webnotes.conn.sql
@@ -38,54 +38,61 @@ class DocType:
else:
idx = 1
self.doc.name = 'BOM/' + self.doc.item + ('/%.3i' % idx)
+
+ def validate(self):
+ self.clear_operations()
+ self.validate_main_item()
+ self.validate_operations()
+ self.validate_materials()
+
+ def on_update(self):
+ self.check_recursion()
+ self.calculate_cost()
+ self.update_exploded_items()
+ self.doc.save()
+
+ def on_submit(self):
+ self.manage_default_bom()
+ def on_cancel(self):
+ webnotes.conn.set(self.doc, "is_active", 0)
+ webnotes.conn.set(self.doc, "is_default", 0)
+
+ # check if used in any other bom
+ self.validate_bom_links()
+ self.manage_default_bom()
+
+ def on_update_after_submit(self):
+ self.validate_bom_links()
+ self.manage_default_bom()
def get_item_det(self, item_code):
- item = sql("""select name, is_asset_item, is_purchase_item, docstatus,
- is_sub_contracted_item, description, stock_uom, default_bom,
+ item = sql("""select name, is_asset_item, is_purchase_item, docstatus, description,
+ is_sub_contracted_item, stock_uom, default_bom,
last_purchase_rate, standard_rate, is_manufactured_item
from `tabItem` where item_code = %s""", item_code, as_dict = 1)
return item
-
- def get_item_detail(self, item_code):
- """ Get stock uom and description for finished good item"""
-
- item = self.get_item_det(item_code)
- ret={
- 'description' : item and item[0]['description'] or '',
- 'uom' : item and item[0]['stock_uom'] or ''
- }
- return ret
-
-
+ def get_item_details(self, item_code):
+ res = sql("""select description, stock_uom as uom
+ from `tabItem` where item_code = %s""", item_code, as_dict = 1, debug=1)
+ return res and res[0] or {}
def get_workstation_details(self,workstation):
- """ Fetch hour rate from workstation master"""
-
- ws = sql("select hour_rate from `tabWorkstation` where name = %s",workstation , as_dict = 1)
- ret = {
- 'hour_rate' : ws and flt(ws[0]['hour_rate']) or '',
- }
- return ret
-
-
+ return {'hour_rate': webnotes.conn.get_value("Workstation", workstation, "hour_rate")}
def validate_rm_item(self, item):
- """ Validate raw material items"""
-
if item[0]['name'] == self.doc.item:
- msgprint(" Item_code: "+item[0]['name']+" in materials tab cannot be same as FG Item in BOM := " +cstr(self.doc.name), raise_exception=1)
+ msgprint("Item_code: %s in materials tab cannot be same as FG Item",
+ item[0]['name'], raise_exception=1)
if item and item[0]['is_asset_item'] == 'Yes':
- msgprint("Sorry!!! Item " + item[0]['name'] + " is an Asset of the company. Entered in BOM => " + cstr(self.doc.name), raise_exception = 1)
+ msgprint("Item: %s is an asset item, please check", item[0]['name'], raise_exception=1)
if not item or item[0]['docstatus'] == 2:
msgprint("Item %s does not exist in system" % item[0]['item_code'], raise_exception = 1)
-
-
def get_bom_material_detail(self):
""" Get raw material details like uom, desc and rate"""
@@ -108,14 +115,11 @@ class DocType:
}
return ret_item
-
def get_rm_rate(self, arg):
""" Get raw material rate as per selected method, if bom exists takes bom cost """
if arg['bom_no']:
- bom = sql("""select name, total_cost/quantity as unit_cost from `tabBOM`
- where is_active = 'Yes' and name = %s""", arg['bom_no'], as_dict=1)
- rate = bom and bom[0]['unit_cost'] or 0
+ rate = self.get_bom_unitcost(arg['bom_no'])
elif arg and (arg['is_purchase_item'] == 'Yes' or arg['is_sub_contracted_item'] == 'Yes'):
if self.doc.rm_cost_as_per == 'Valuation Rate':
rate = self.get_valuation_rate(arg)
@@ -126,119 +130,69 @@ class DocType:
return rate
-
+ def get_bom_unitcost(self, bom_no):
+ bom = sql("""select name, total_cost/quantity as unit_cost from `tabBOM`
+ where is_active = 1 and name = %s""", bom_no, as_dict=1)
+ return bom and bom[0]['unit_cost'] or 0
def get_valuation_rate(self, arg):
""" Get average valuation rate of relevant warehouses
as per valuation method (MAR/FIFO)
as on costing date
"""
-
dt = self.doc.costing_date or nowdate()
time = self.doc.costing_date == nowdate() and now().split()[1] or '23:59'
warehouse = sql("select warehouse from `tabBin` where item_code = %s", arg['item_code'])
rate = []
for wh in warehouse:
- r = get_obj('Valuation Control').get_incoming_rate(dt, time, arg['item_code'], wh[0], qty = arg.get('qty', 0))
+ r = get_obj('Valuation Control').get_incoming_rate(dt, time,
+ arg['item_code'], wh[0], qty=arg.get('qty', 0))
if r:
rate.append(r)
return rate and flt(sum(rate))/len(rate) or 0
-
-
def manage_default_bom(self):
- """ Uncheck others if current one is selected as default, update default bom in item master"""
- webnotes.conn.set(self.doc, "is_default", cint(self.doc.is_default))
+ """ Uncheck others if current one is selected as default,
+ update default bom in item master
+ """
+ if self.doc.is_default and self.doc.is_active:
+ from webnotes.model.utils import set_default
+ set_default(self.doc, "item")
+ webnotes.conn.set_value("Item", self.doc.item, "default_bom", self.doc.name)
- if self.doc.is_default and self.doc.is_active == 'Yes':
- sql("update `tabBOM` set is_default = 0 where name != %s and item=%s", (self.doc.name, self.doc.item))
-
- # update default bom in Item Master
- sql("update `tabItem` set default_bom = %s where name = %s", (self.doc.name, self.doc.item))
else:
- sql("update `tabItem` set default_bom = '' where name = %s and default_bom = %s", (self.doc.item, self.doc.name))
-
-
- def manage_active_bom(self):
- """ Manage active/inactive """
- if self.doc.is_active == 'Yes':
- self.validate()
- else:
- self.check_active_parent_boms()
-
-
-
- def check_active_parent_boms(self):
- """ Check parent BOM before making it inactive """
- act_pbom = sql("""select distinct t1.parent from `tabBOM Item` t1, `tabBOM` t2
- where t1.bom_no =%s and t2.name = t1.parent and t2.is_active = 'Yes'
- and t2.docstatus = 1 and t1.docstatus =1 """, self.doc.name)
- if act_pbom and act_pbom[0][0]:
- msgprint("""Sorry cannot inactivate as BOM: %s is child
- of one or many other active parent BOMs""" % self.doc.name, raise_exception=1)
-
-
-
- def calculate_cost(self):
- """Calculate bom totals"""
- self.doc.costing_date = nowdate()
- self.calculate_op_cost()
- self.calculate_rm_cost()
- self.doc.total_cost = self.doc.raw_material_cost + self.doc.operating_cost
- self.doc.modified = now()
- self.doc.save()
-
- self.update_flat_bom_engine(is_submit = self.doc.docstatus)
-
-
-
- def calculate_op_cost(self):
- """Update workstation rate and calculates totals"""
- total_op_cost = 0
- for d in getlist(self.doclist, 'bom_operations'):
- hour_rate = sql("select hour_rate from `tabWorkstation` where name = %s", cstr(d.workstation))
- d.hour_rate = hour_rate and flt(hour_rate[0][0]) or d.hour_rate or 0
- d.operating_cost = d.hour_rate and d.time_in_mins and \
- flt(d.hour_rate) * flt(d.time_in_mins) / 60 or d.operating_cost
- d.save()
- total_op_cost += d.operating_cost
- self.doc.operating_cost = total_op_cost
-
-
- def calculate_rm_cost(self):
- """Fetch RM rate as per today's valuation rate and calculate totals"""
- total_rm_cost = 0
- for d in getlist(self.doclist, 'bom_materials'):
- arg = {'item_code': d.item_code, 'qty': d.qty, 'bom_no': d.bom_no}
- ret = self.get_bom_material_detail(cstr(arg))
- for k in ret:
- d.fields[k] = ret[k]
- d.amount = flt(d.rate) * flt(d.qty)
- d.save()
- total_rm_cost += d.amount
- self.doc.raw_material_cost = total_rm_cost
-
+ if not self.doc.is_active:
+ webnotes.conn.set(self.doc, "is_default", 0)
+
+ sql("update `tabItem` set default_bom = null where name = %s and default_bom = %s",
+ (self.doc.item, self.doc.name))
+ def clear_operations(self):
+ if not self.doc.with_operations:
+ self.doclist = self.doc.clear_table(self.doclist, 'bom_operations')
+ for d in self.doclist.get({"parentfield": "bom_materials"}):
+ d.operation_no = None
def validate_main_item(self):
""" Validate main FG item"""
item = self.get_item_det(self.doc.item)
if not item:
- msgprint("Item %s does not exists in the system or expired." % self.doc.item, raise_exception = 1)
+ msgprint("Item %s does not exists in the system or expired." %
+ self.doc.item, raise_exception = 1)
- elif item[0]['is_manufactured_item'] != 'Yes' and item[0]['is_sub_contracted_item'] != 'Yes':
- msgprint("""As Item: %s is not a manufactured / sub-contracted item,
+ elif item[0]['is_manufactured_item'] != 'Yes' \
+ and item[0]['is_sub_contracted_item'] != 'Yes':
+ msgprint("""As Item: %s is not a manufactured / sub-contracted item, \
you can not make BOM for it""" % self.doc.item, raise_exception = 1)
-
-
def validate_operations(self):
""" Check duplicate operation no"""
self.op = []
for d in getlist(self.doclist, 'bom_operations'):
if cstr(d.operation_no) in self.op:
- msgprint("Operation no: %s is repeated in Operations Table"% d.operation_no, raise_exception=1)
+ msgprint("Operation no: %s is repeated in Operations Table" %
+ d.operation_no, raise_exception=1)
else:
# add operation in op list
self.op.append(cstr(d.operation_no))
@@ -248,58 +202,56 @@ class DocType:
check_list = []
for m in getlist(self.doclist, 'bom_materials'):
# check if operation no not in op table
- if cstr(m.operation_no) not in self.op:
- msgprint("""Operation no: %s against item: %s at row no: %s is not present
- at Operations table"""% (m.operation_no, m.item_code, m.idx), raise_exception = 1)
+ if self.doc.with_operations and cstr(m.operation_no) not in self.op:
+ msgprint("""Operation no: %s against item: %s at row no: %s \
+ is not present at Operations table""" %
+ (m.operation_no, m.item_code, m.idx), raise_exception = 1)
item = self.get_item_det(m.item_code)
- if item[0]['is_manufactured_item'] == 'Yes' or item[0]['is_sub_contracted_item'] == 'Yes':
+ if item[0]['is_manufactured_item'] == 'Yes':
if not m.bom_no:
- msgprint("Please enter BOM No aginst item: %s at row no: %s"% (m.item_code, m.idx), raise_exception=1)
+ msgprint("Please enter BOM No aginst item: %s at row no: %s" %
+ (m.item_code, m.idx), raise_exception=1)
else:
self.validate_bom_no(m.item_code, m.bom_no, m.idx)
elif m.bom_no:
- msgprint("""As Item %s is not a manufactured / sub-contracted item,
- you can enter BOM against it (Row No: %s)."""% (m.item_code, m.idx), raise_excepiton = 1)
+ msgprint("""As Item %s is not a manufactured / sub-contracted item, \
+ you can enter BOM against it (Row No: %s).""" %
+ (m.item_code, m.idx), raise_exception = 1)
if flt(m.qty) <= 0:
- msgprint("Please enter qty against raw material: %s at row no: %s"% (m.item_code, m.idx), raise_exception = 1)
+ msgprint("Please enter qty against raw material: %s at row no: %s" %
+ (m.item_code, m.idx), raise_exception = 1)
self.check_if_item_repeated(m.item_code, m.operation_no, check_list)
-
-
def validate_bom_no(self, item, bom_no, idx):
"""Validate BOM No of sub-contracted items"""
bom = sql("""select name from `tabBOM` where name = %s and item = %s
- and ifnull(is_active, 'No') = 'Yes' and docstatus < 2 """, (bom_no, item), as_dict =1)
+ and is_active=1 and docstatus=1""",
+ (bom_no, item), as_dict =1)
if not bom:
msgprint("""Incorrect BOM No: %s against item: %s at row no: %s.
- It may be inactive or cancelled or for some other item."""% (bom_no, item, idx), raise_exception = 1)
-
-
+ It may be inactive or cancelled or for some other item.""" %
+ (bom_no, item, idx), raise_exception = 1)
def check_if_item_repeated(self, item, op, check_list):
if [cstr(item), cstr(op)] in check_list:
- msgprint("Item %s has been entered twice against same operation" % item, raise_exception = 1)
+ msgprint(_("Item") + " %s " % (item,) + _("has been entered atleast twice")
+ + (cstr(op) and _(" against same operation") or ""), raise_exception=1)
else:
check_list.append([cstr(item), cstr(op)])
-
- def validate(self):
- self.validate_main_item()
- self.validate_operations()
- self.validate_materials()
-
def check_recursion(self):
- """ Check whether reqursion occurs in any bom"""
+ """ Check whether recursion occurs in any bom"""
check_list = [['parent', 'bom_no', 'parent'], ['bom_no', 'parent', 'child']]
for d in check_list:
bom_list, count = [self.doc.name], 0
while (len(bom_list) > count ):
- boms = sql(" select %s from `tabBOM Item` where %s = '%s' " % (d[0], d[1], cstr(bom_list[count])))
+ boms = sql(" select %s from `tabBOM Item` where %s = '%s' " %
+ (d[0], d[1], cstr(bom_list[count])))
count = count + 1
for b in boms:
if b[0] == self.doc.name:
@@ -307,34 +259,88 @@ class DocType:
""" % (cstr(b), cstr(d[2]), self.doc.name), raise_exception = 1)
if b[0]:
bom_list.append(b[0])
+
+ def update_cost_and_exploded_items(self):
+ bom_list = self.traverse_tree()
+ for bom in bom_list:
+ bom_obj = get_obj("BOM", bom, with_children=1)
+ bom_obj.on_update()
+
+ def traverse_tree(self):
+ def _get_children(bom_no):
+ return [cstr(d[0]) for d in webnotes.conn.sql("""select bom_no from `tabBOM Item`
+ where parent = %s and ifnull(bom_no, '') != ''""", bom_no)]
+
+ bom_list, count = [self.doc.name], 0
+ while(count < len(bom_list)):
+ for child_bom in _get_children(bom_list[count]):
+ if child_bom not in bom_list:
+ bom_list.append(child_bom)
+ count += 1
+ bom_list.reverse()
+ return bom_list
+
+ def calculate_cost(self):
+ """Calculate bom totals"""
+ self.calculate_op_cost()
+ self.calculate_rm_cost()
+ self.doc.total_cost = self.doc.raw_material_cost + self.doc.operating_cost
+ def calculate_op_cost(self):
+ """Update workstation rate and calculates totals"""
+ total_op_cost = 0
+ for d in getlist(self.doclist, 'bom_operations'):
+ if d.hour_rate and d.time_in_mins:
+ d.operating_cost = flt(d.hour_rate) * flt(d.time_in_mins) / 60.0
+ d.save()
+ total_op_cost += flt(d.operating_cost)
+ self.doc.operating_cost = total_op_cost
+
+ def calculate_rm_cost(self):
+ """Fetch RM rate as per today's valuation rate and calculate totals"""
+ total_rm_cost = 0
+ for d in getlist(self.doclist, 'bom_materials'):
+ if d.bom_no:
+ d.rate = self.get_bom_unitcost(d.bom_no)
+ d.amount = flt(d.rate) * flt(d.qty)
+ d.qty_consumed_per_unit = flt(d.qty) / flt(self.doc.quantity)
+ d.save()
+ total_rm_cost += d.amount
+ self.doc.raw_material_cost = total_rm_cost
+ def update_exploded_items(self):
+ """ Update Flat BOM, following will be correct data"""
+ self.get_exploded_items()
+ self.add_exploded_items()
- def on_update(self):
- self.check_recursion()
-
-
-
- def add_to_flat_bom_detail(self, is_submit = 0):
- "Add items to Flat BOM table"
- self.doclist = self.doc.clear_table(self.doclist, 'flat_bom_details', 1)
- for d in self.cur_flat_bom_items:
- ch = addchild(self.doc, 'flat_bom_details', 'BOM Explosion Item', 1, self.doclist)
- for i in d.keys():
- ch.fields[i] = d[i]
- ch.docstatus = is_submit
- ch.save(1)
- self.doc.save()
-
-
-
- def get_child_flat_bom_items(self, bom_no, qty):
+ def get_exploded_items(self):
+ """ Get all raw materials including items from child bom"""
+ self.cur_exploded_items = []
+ for d in getlist(self.doclist, 'bom_materials'):
+ if d.bom_no:
+ self.get_child_exploded_items(d.bom_no, d.qty)
+ else:
+ self.cur_exploded_items.append({
+ 'item_code' : d.item_code,
+ 'description' : d.description,
+ 'stock_uom' : d.stock_uom,
+ 'qty' : flt(d.qty),
+ 'rate' : flt(d.rate),
+ 'amount' : flt(d.amount),
+ 'parent_bom' : d.parent,
+ 'mat_detail_no' : d.name,
+ 'qty_consumed_per_unit' : flt(d.qty_consumed_per_unit)
+ })
+
+ def get_child_exploded_items(self, bom_no, qty):
""" Add all items from Flat BOM of child BOM"""
-
- child_fb_items = sql("""select item_code, description, stock_uom, qty, rate, amount, parent_bom, mat_detail_no, qty_consumed_per_unit
- from `tabBOM Explosion Item` where parent = '%s' and docstatus = 1""" % bom_no, as_dict = 1)
+
+ child_fb_items = sql("""select item_code, description, stock_uom, qty, rate,
+ amount, parent_bom, mat_detail_no, qty_consumed_per_unit
+ from `tabBOM Explosion Item` where parent = '%s' and docstatus = 1""" %
+ bom_no, as_dict = 1)
for d in child_fb_items:
- self.cur_flat_bom_items.append({
+ self.cur_exploded_items.append({
'item_code' : d['item_code'],
'description' : d['description'],
'stock_uom' : d['stock_uom'],
@@ -347,52 +353,28 @@ class DocType:
})
-
- # Get Current Flat BOM Items
- # -----------------------------
- def get_current_flat_bom_items(self):
- """ Get all raw materials including items from child bom"""
- self.cur_flat_bom_items = []
- for d in getlist(self.doclist, 'bom_materials'):
- self.cur_flat_bom_items.append({
- 'item_code' : d.item_code,
- 'description' : d.description,
- 'stock_uom' : d.stock_uom,
- 'qty' : flt(d.qty),
- 'rate' : flt(d.rate),
- 'amount' : flt(d.amount),
- 'parent_bom' : d.parent, #item and item[0][0]=='No' and d.bom_no or d.parent,
- 'mat_detail_no' : d.name,
- 'qty_consumed_per_unit' : flt(d.qty_consumed_per_unit)
- })
- if d.bom_no:
- self.get_child_flat_bom_items(d.bom_no, d.qty)
-
-
- def update_flat_bom_engine(self, is_submit = 0):
- """ Update Flat BOM, following will be correct data"""
- self.get_current_flat_bom_items()
- self.add_to_flat_bom_detail(is_submit)
-
+ def add_exploded_items(self):
+ "Add items to Flat BOM table"
+ self.doclist = self.doc.clear_table(self.doclist, 'flat_bom_details', 1)
+ for d in self.cur_exploded_items:
+ ch = addchild(self.doc, 'flat_bom_details', 'BOM Explosion Item', 1, self.doclist)
+ for i in d.keys():
+ ch.fields[i] = d[i]
+ ch.docstatus = self.doc.docstatus
+ ch.save(1)
def get_parent_bom_list(self, bom_no):
p_bom = sql("select parent from `tabBOM Item` where bom_no = '%s'" % bom_no)
return p_bom and [i[0] for i in p_bom] or []
+ def validate_bom_links(self):
+ if not self.doc.is_active:
+ act_pbom = sql("""select distinct bom_item.parent from `tabBOM Item` bom_item
+ where bom_item.bom_no = %s and bom_item.docstatus = 1
+ and exists (select * from `tabBOM` where name = bom_item.parent
+ and docstatus = 1 and is_active = 1)""", self.doc.name)
- def on_submit(self):
- self.manage_default_bom()
- self.update_flat_bom_engine(1)
-
-
- def on_cancel(self):
- # check if used in any other bom
- par = sql("""select t1.parent from `tabBOM Item` t1, `tabBOM` t2
- where t1.parent = t2.name and t1.bom_no = %s and t1.docstatus = 1 and t2.is_active = 'Yes'""", self.doc.name)
- if par:
- msgprint("BOM can not be cancelled, as it is a child item in following active BOM %s"% [d[0] for d in par])
- raise Exception
-
- webnotes.conn.set(self.doc, "is_active", "No")
- webnotes.conn.set(self.doc, "is_default", 0)
- self.manage_default_bom()
+ if act_pbom and act_pbom[0][0]:
+ action = self.doc.docstatus < 2 and _("deactivate") or _("cancel")
+ msgprint(_("Cannot ") + action + _(": It is linked to other active BOM(s)"),
+ raise_exception=1)
\ No newline at end of file
diff --git a/production/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
similarity index 67%
rename from production/doctype/bom/bom.txt
rename to manufacturing/doctype/bom/bom.txt
index ed7004596f5..cd4916f233b 100644
--- a/production/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -2,16 +2,16 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-07-03 13:30:03",
+ "creation": "2012-12-19 12:29:06",
"modified_by": "Administrator",
- "modified": "2012-12-03 13:29:26"
+ "modified": "2012-12-19 15:52:47"
},
{
"istable": 0,
"in_create": 0,
"allow_print": 0,
"search_fields": "item",
- "module": "Production",
+ "module": "Manufacturing",
"document_type": "Master",
"allow_attach": 0,
"read_only": 0,
@@ -45,22 +45,12 @@
"doctype": "DocType"
},
{
- "oldfieldtype": "Column Break",
- "doctype": "DocField",
- "width": "50%",
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0
- },
- {
- "description": "Select the item code for which Bill of Material is being created",
+ "description": "Item to be manufactured or repacked",
"oldfieldtype": "Link",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Item",
"oldfieldname": "item",
"permlevel": 0,
- "trigger": "Client",
"fieldname": "item",
"fieldtype": "Link",
"search_index": 1,
@@ -69,44 +59,29 @@
"options": "Item"
},
{
- "description": "Total quantity of items for which raw materials required and operations done will be defined",
- "oldfieldtype": "Currency",
- "colour": "White:FFF",
"doctype": "DocField",
- "label": "Quantity",
- "oldfieldname": "quantity",
- "fieldname": "quantity",
- "fieldtype": "Currency",
- "reqd": 1,
- "permlevel": 0
- },
- {
- "doctype": "DocField",
- "width": "50%",
- "fieldname": "column_break1",
+ "fieldname": "cb0",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"no_copy": 1,
"oldfieldtype": "Select",
- "colour": "White:FFF",
"allow_on_submit": 1,
"doctype": "DocField",
"label": "Is Active",
"oldfieldname": "is_active",
- "permlevel": 0,
+ "default": "1",
"fieldname": "is_active",
- "fieldtype": "Select",
- "reqd": 1,
+ "fieldtype": "Check",
+ "reqd": 0,
"hidden": 0,
- "options": "\nYes\nNo"
+ "permlevel": 0
},
{
- "allow_on_submit": 1,
"no_copy": 1,
"oldfieldtype": "Check",
- "colour": "White:FFF",
+ "allow_on_submit": 1,
"doctype": "DocField",
"label": "Is Default",
"oldfieldname": "is_default",
@@ -115,17 +90,25 @@
"permlevel": 0
},
{
- "oldfieldtype": "Section Break",
+ "description": "Manage cost of operations",
"doctype": "DocField",
- "label": "Operations",
- "fieldname": "operations",
- "fieldtype": "Section Break",
+ "label": "With Operations",
+ "fieldname": "with_operations",
+ "fieldtype": "Check",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Operations",
+ "options": "Specify the operations, operating cost and give a unique Operation no to your operations.",
+ "fieldname": "operations",
+ "fieldtype": "Section Break",
+ "depends_on": "with_operations",
"permlevel": 0
},
{
- "description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"oldfieldtype": "Table",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "BOM Operations",
"oldfieldname": "bom_operations",
@@ -143,17 +126,7 @@
"permlevel": 0
},
{
- "doctype": "DocField",
- "label": "Consider Raw Material Cost As Per",
- "options": "Valuation Rate\nLast Purchase Rate\nStandard Rate",
- "fieldname": "rm_cost_as_per",
- "fieldtype": "Select",
- "permlevel": 0
- },
- {
- "description": "Enter the raw materials required to manufacture the BOM item. Specify the operation no as entered in the previous tab which will be performed on the raw materials entered.",
"oldfieldtype": "Table",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "BOM Item",
"oldfieldname": "bom_materials",
@@ -172,23 +145,37 @@
},
{
"doctype": "DocField",
- "label": "Raw Material Cost",
- "fieldname": "raw_material_cost",
- "fieldtype": "Float",
- "permlevel": 1
- },
- {
- "doctype": "DocField",
- "label": "Operating Cost",
- "fieldname": "operating_cost",
- "fieldtype": "Float",
- "permlevel": 1
+ "label": "Rate Of Materials Based On",
+ "options": "Valuation Rate\nLast Purchase Rate",
+ "fieldname": "rm_cost_as_per",
+ "fieldtype": "Select",
+ "permlevel": 0
},
{
"doctype": "DocField",
"label": "Total Cost",
"fieldname": "total_cost",
- "fieldtype": "Float",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "cb1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Raw Material Cost",
+ "fieldname": "raw_material_cost",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Total Operating Cost",
+ "fieldname": "operating_cost",
+ "fieldtype": "Currency",
"permlevel": 1
},
{
@@ -199,17 +186,16 @@
"permlevel": 0
},
{
- "description": "Select name of the project if BOM need to be created against any project",
- "oldfieldtype": "Link",
- "label": "Project Name",
- "oldfieldname": "project_name",
- "trigger": "Client",
- "fieldname": "project_name",
- "fieldtype": "Link",
+ "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials",
+ "default": "1",
+ "oldfieldtype": "Currency",
"doctype": "DocField",
- "options": "Project",
- "permlevel": 0,
- "in_filter": 1
+ "label": "Quantity",
+ "oldfieldname": "quantity",
+ "fieldname": "quantity",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
},
{
"doctype": "DocField",
@@ -219,16 +205,6 @@
"fieldtype": "Select",
"permlevel": 1
},
- {
- "oldfieldtype": "Text",
- "doctype": "DocField",
- "label": "Item Description",
- "oldfieldname": "description",
- "width": "300px",
- "fieldname": "description",
- "fieldtype": "Small Text",
- "permlevel": 0
- },
{
"doctype": "DocField",
"fieldname": "col_break23",
@@ -236,51 +212,38 @@
"permlevel": 0
},
{
- "oldfieldtype": "Data",
+ "oldfieldtype": "Link",
"doctype": "DocField",
- "label": "Maintained By",
- "oldfieldname": "maintained_by",
- "fieldname": "maintained_by",
- "fieldtype": "Data",
- "permlevel": 0
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "options": "Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Item Desription",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "permlevel": 1
},
{
"print_hide": 1,
"no_copy": 1,
"doctype": "DocField",
"label": "Amended From",
- "options": "Sales Invoice",
+ "options": "BOM",
"fieldname": "amended_from",
"fieldtype": "Link",
"permlevel": 1
},
- {
- "print_hide": 1,
- "description": "The date at which current entry is corrected in the system.",
- "no_copy": 1,
- "depends_on": "eval:doc.amended_from",
- "doctype": "DocField",
- "label": "Amendment Date",
- "fieldname": "amendment_date",
- "fieldtype": "Date",
- "permlevel": 0
- },
- {
- "no_copy": 1,
- "oldfieldtype": "Text",
- "colour": "White:FFF",
- "doctype": "DocField",
- "label": "Remarks",
- "oldfieldname": "remarks",
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "permlevel": 0
- },
{
"print_hide": 0,
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
- "label": "BOM Explosion Items",
- "options": "Simple",
+ "label": "Materials Required (Exploded)",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"hidden": 0,
@@ -291,9 +254,8 @@
"permlevel": 1,
"no_copy": 1,
"oldfieldtype": "Table",
- "colour": "White:FFF",
"doctype": "DocField",
- "label": "BOM Explosion Item",
+ "label": "Materials Required (Exploded)",
"oldfieldname": "flat_bom_details",
"default": "No Toolbar",
"fieldname": "flat_bom_details",
@@ -320,13 +282,13 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "role": "Production Manager",
+ "role": "Manufacturing Manager",
"cancel": 1,
"permlevel": 0
},
{
"doctype": "DocPerm",
- "role": "Production Manager",
+ "role": "Manufacturing Manager",
"permlevel": 1
},
{
@@ -334,13 +296,13 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "role": "Production User",
+ "role": "Manufacturing User",
"cancel": 1,
"permlevel": 0
},
{
"doctype": "DocPerm",
- "role": "Production User",
+ "role": "Manufacturing User",
"permlevel": 1
}
]
\ No newline at end of file
diff --git a/production/doctype/bom/bom_list.js b/manufacturing/doctype/bom/bom_list.js
similarity index 92%
rename from production/doctype/bom/bom_list.js
rename to manufacturing/doctype/bom/bom_list.js
index 2aae904b86a..8e355f38d79 100644
--- a/production/doctype/bom/bom_list.js
+++ b/manufacturing/doctype/bom/bom_list.js
@@ -17,7 +17,7 @@ wn.doclistviews['BOM'] = wn.views.ListView.extend({
prepare_data: function(data) {
this._super(data);
data.costing_date = wn.datetime.str_to_user(data.costing_date);
- data.description = (data.is_active === 'Yes' ? '' : '[Inactive] ') + data.description;
+ data.description = (data.is_active ? '' : '[Inactive] ') + data.description;
},
columns: [
diff --git a/manufacturing/doctype/bom/test_bom.py b/manufacturing/doctype/bom/test_bom.py
new file mode 100644
index 00000000000..68d9ce85f43
--- /dev/null
+++ b/manufacturing/doctype/bom/test_bom.py
@@ -0,0 +1,147 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+
+from __future__ import unicode_literals
+import unittest
+import webnotes
+import webnotes.model
+from webnotes.utils import nowdate, flt
+from accounts.utils import get_fiscal_year
+from webnotes.model.doclist import DocList
+import copy
+
+company = webnotes.conn.get_default("company")
+
+
+def load_data():
+
+ # create default warehouse
+ if not webnotes.conn.exists("Warehouse", "Default Warehouse"):
+ webnotes.insert({"doctype": "Warehouse",
+ "warehouse_name": "Default Warehouse",
+ "warehouse_type": "Stores"})
+
+ # create UOM: Nos.
+ if not webnotes.conn.exists("UOM", "Nos"):
+ webnotes.insert({"doctype": "UOM", "uom_name": "Nos"})
+
+ from webnotes.tests import insert_test_data
+ # create item groups and items
+ insert_test_data("Item Group",
+ sort_fn=lambda ig: (ig[0].get('parent_item_group'), ig[0].get('name')))
+ insert_test_data("Item")
+
+base_bom_fg = [
+ {"doctype": "BOM", "item": "Android Jack D", "quantity": 1,
+ "is_active": "Yes", "is_default": 1, "uom": "Nos"},
+ {"doctype": "BOM Operation", "operation_no": 1, "parentfield": "bom_operations",
+ "opn_description": "Development", "hour_rate": 10, "time_in_mins": 90},
+ {"doctype": "BOM Item", "item_code": "Home Desktop 300", "operation_no": 1,
+ "qty": 2, "rate": 20, "stock_uom": "Nos", "parentfield": "bom_materials"},
+ {"doctype": "BOM Item", "item_code": "Home Desktop 100", "operation_no": 1,
+ "qty": 1, "rate": 300, "stock_uom": "Nos", "parentfield": "bom_materials"},
+ {"doctype": "BOM Item", "item_code": "Nebula 7", "operation_no": 1,
+ "qty": 5, "stock_uom": "Nos", "parentfield": "bom_materials"},
+]
+
+base_bom_child = [
+ {"doctype": "BOM", "item": "Nebula 7", "quantity": 5,
+ "is_active": "Yes", "is_default": 1, "uom": "Nos"},
+ {"doctype": "BOM Operation", "operation_no": 1, "parentfield": "bom_operations",
+ "opn_description": "Development"},
+ {"doctype": "BOM Item", "item_code": "Android Jack S", "operation_no": 1,
+ "qty": 10, "stock_uom": "Nos", "parentfield": "bom_materials"}
+]
+
+base_bom_grandchild = [
+ {"doctype": "BOM", "item": "Android Jack S", "quantity": 1,
+ "is_active": "Yes", "is_default": 1, "uom": "Nos"},
+ {"doctype": "BOM Operation", "operation_no": 1, "parentfield": "bom_operations",
+ "opn_description": "Development"},
+ {"doctype": "BOM Item", "item_code": "Home Desktop 300", "operation_no": 1,
+ "qty": 3, "rate": 10, "stock_uom": "Nos", "parentfield": "bom_materials"}
+]
+
+
+class TestPurchaseReceipt(unittest.TestCase):
+ def setUp(self):
+ webnotes.conn.begin()
+ load_data()
+
+ def test_bom_validation(self):
+ # show throw error bacause bom no missing for sub-assembly item
+ bom_fg = copy.deepcopy(base_bom_fg)
+ self.assertRaises(webnotes.ValidationError, webnotes.insert, DocList(bom_fg))
+
+ # main item is not a manufacturing item
+ bom_fg = copy.deepcopy(base_bom_fg)
+ bom_fg[0]["item"] = "Home Desktop 200"
+ bom_fg.pop(4)
+ self.assertRaises(webnotes.ValidationError, webnotes.insert, DocList(bom_fg))
+
+ # operation no mentioed in material table not matching with operation table
+ bom_fg = copy.deepcopy(base_bom_fg)
+ bom_fg.pop(4)
+ bom_fg[2]["operation_no"] = 2
+ self.assertRaises(webnotes.ValidationError, webnotes.insert, DocList(bom_fg))
+
+
+ def test_bom(self):
+ gc_wrapper = webnotes.insert(DocList(base_bom_grandchild))
+ gc_wrapper.submit()
+
+ bom_child = copy.deepcopy(base_bom_child)
+ bom_child[2]["bom_no"] = gc_wrapper.doc.name
+ child_wrapper = webnotes.insert(DocList(bom_child))
+ child_wrapper.submit()
+
+ bom_fg = copy.deepcopy(base_bom_fg)
+ bom_fg[4]["bom_no"] = child_wrapper.doc.name
+ fg_wrapper = webnotes.insert(DocList(bom_fg))
+ fg_wrapper.load_from_db()
+
+ self.check_bom_cost(fg_wrapper)
+
+ self.check_flat_bom(fg_wrapper, child_wrapper, gc_wrapper)
+
+ def check_bom_cost(self, fg_wrapper):
+ expected_values = {
+ "operating_cost": 15,
+ "raw_material_cost": 640,
+ "total_cost": 655
+ }
+
+ for key in expected_values:
+ self.assertEqual(flt(expected_values[key]), flt(fg_wrapper.doc.fields.get(key)))
+
+ def check_flat_bom(self, fg_wrapper, child_wrapper, gc_wrapper):
+ expected_flat_bom_items = {
+ ("Home Desktop 300", fg_wrapper.doc.name): (2, 20),
+ ("Home Desktop 100", fg_wrapper.doc.name): (1, 300),
+ ("Home Desktop 300", gc_wrapper.doc.name): (30, 10)
+ }
+
+ self.assertEqual(len(fg_wrapper.doclist.get({"parentfield": "flat_bom_details"})), 3)
+
+ for key, val in expected_flat_bom_items.items():
+ flat_bom = fg_wrapper.doclist.get({"parentfield": "flat_bom_details",
+ "item_code": key[0], "parent_bom": key[1]})[0]
+ self.assertEqual(val, (flat_bom.qty, flat_bom.rate))
+
+
+ def tearDown(self):
+ webnotes.conn.rollback()
\ No newline at end of file
diff --git a/patches/jan_mar_2012/apps/__init__.py b/manufacturing/doctype/bom_explosion_item/__init__.py
similarity index 100%
rename from patches/jan_mar_2012/apps/__init__.py
rename to manufacturing/doctype/bom_explosion_item/__init__.py
diff --git a/production/doctype/bom_explosion_item/bom_explosion_item.py b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py
similarity index 100%
rename from production/doctype/bom_explosion_item/bom_explosion_item.py
rename to manufacturing/doctype/bom_explosion_item/bom_explosion_item.py
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
new file mode 100644
index 00000000000..52c77963298
--- /dev/null
+++ b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
@@ -0,0 +1,107 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-12-14 10:15:16",
+ "modified_by": "Administrator",
+ "modified": "2012-12-14 16:53:30"
+ },
+ {
+ "read_only": 0,
+ "istable": 1,
+ "autoname": "FBD/.######",
+ "name": "__common__",
+ "default_print_format": "Standard",
+ "doctype": "DocType",
+ "module": "Manufacturing"
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Explosion Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 1,
+ "parentfield": "fields"
+ },
+ {
+ "name": "BOM Explosion Item",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "options": "Item"
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Text"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "fieldname": "qty",
+ "fieldtype": "Float"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate",
+ "oldfieldname": "standard_rate",
+ "fieldname": "rate",
+ "fieldtype": "Float"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "amount_as_per_sr",
+ "fieldname": "amount",
+ "fieldtype": "Currency"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "options": "UOM"
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Parent BOM",
+ "oldfieldname": "parent_bom",
+ "width": "250px",
+ "fieldname": "parent_bom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "options": "BOM"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Mat Detail No",
+ "fieldname": "mat_detail_no",
+ "fieldtype": "Data",
+ "hidden": 1
+ },
+ {
+ "no_copy": 0,
+ "doctype": "DocField",
+ "label": "Qty Consumed Per Unit",
+ "fieldname": "qty_consumed_per_unit",
+ "fieldtype": "Float",
+ "hidden": 0
+ }
+]
\ No newline at end of file
diff --git a/production/doctype/__init__.py b/manufacturing/doctype/bom_item/__init__.py
similarity index 100%
rename from production/doctype/__init__.py
rename to manufacturing/doctype/bom_item/__init__.py
diff --git a/production/doctype/bom_item/bom_item.py b/manufacturing/doctype/bom_item/bom_item.py
similarity index 100%
rename from production/doctype/bom_item/bom_item.py
rename to manufacturing/doctype/bom_item/bom_item.py
diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/manufacturing/doctype/bom_item/bom_item.txt
new file mode 100644
index 00000000000..e9f9bd6679a
--- /dev/null
+++ b/manufacturing/doctype/bom_item/bom_item.txt
@@ -0,0 +1,150 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-12-14 10:15:16",
+ "modified_by": "Administrator",
+ "modified": "2012-12-14 16:35:33"
+ },
+ {
+ "istable": 1,
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "Manufacturing"
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Item",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "BOM Item",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Operation No",
+ "oldfieldname": "operation_no",
+ "fieldname": "operation_no",
+ "fieldtype": "Select",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "options": "Item",
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "permlevel": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "BOM No",
+ "oldfieldname": "bom_no",
+ "width": "150px",
+ "fieldname": "bom_no",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 0,
+ "options": "BOM",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "doctype": "DocField",
+ "label": "Rate",
+ "fieldname": "rate",
+ "fieldtype": "Float",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "amount_as_per_mar",
+ "width": "150px",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Scrap %",
+ "oldfieldname": "scrap",
+ "fieldname": "scrap",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Item Description",
+ "oldfieldname": "description",
+ "width": "250px",
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Float",
+ "doctype": "DocField",
+ "label": "Qty Consumed Per Unit",
+ "oldfieldname": "qty_consumed_per_unit",
+ "fieldname": "qty_consumed_per_unit",
+ "fieldtype": "Float",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "write": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocPerm",
+ "permlevel": 1
+ }
+]
\ No newline at end of file
diff --git a/production/doctype/bom/__init__.py b/manufacturing/doctype/bom_operation/__init__.py
similarity index 100%
rename from production/doctype/bom/__init__.py
rename to manufacturing/doctype/bom_operation/__init__.py
diff --git a/production/doctype/bom_operation/bom_operation.py b/manufacturing/doctype/bom_operation/bom_operation.py
similarity index 100%
rename from production/doctype/bom_operation/bom_operation.py
rename to manufacturing/doctype/bom_operation/bom_operation.py
diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/manufacturing/doctype/bom_operation/bom_operation.txt
new file mode 100644
index 00000000000..6333dc5d9cd
--- /dev/null
+++ b/manufacturing/doctype/bom_operation/bom_operation.txt
@@ -0,0 +1,101 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-12-14 10:15:16",
+ "modified_by": "Administrator",
+ "modified": "2012-12-14 16:06:37"
+ },
+ {
+ "istable": 1,
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "Manufacturing"
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Operation",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Operation",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "role": "System Manager",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "BOM Operation",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Operation No",
+ "oldfieldname": "operation_no",
+ "fieldname": "operation_no",
+ "fieldtype": "Data",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Operation Description",
+ "oldfieldname": "opn_description",
+ "fieldname": "opn_description",
+ "fieldtype": "Text",
+ "reqd": 1
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Workstation",
+ "oldfieldname": "workstation",
+ "fieldname": "workstation",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "options": "Workstation"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Hour Rate",
+ "oldfieldname": "hour_rate",
+ "fieldname": "hour_rate",
+ "fieldtype": "Currency",
+ "reqd": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Operation Time (mins)",
+ "oldfieldname": "time_in_mins",
+ "fieldname": "time_in_mins",
+ "fieldtype": "Currency",
+ "reqd": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Operating Cost",
+ "oldfieldname": "operating_cost",
+ "fieldname": "operating_cost",
+ "fieldtype": "Currency",
+ "reqd": 0
+ },
+ {
+ "write": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocPerm",
+ "permlevel": 1
+ }
+]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_replace_tool/__init__.py b/manufacturing/doctype/bom_replace_tool/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
new file mode 100644
index 00000000000..c98603cfb97
--- /dev/null
+++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
@@ -0,0 +1,29 @@
+// ERPNext - web based ERP (http://erpnext.com)
+// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+
+cur_frm.cscript.refresh = function(doc) {
+ cur_frm.disable_save();
+}
+
+cur_frm.set_query("current_bom", function(doc) {
+ return erpnext.queries.bom({name: "!" + doc.new_bom});
+});
+
+
+cur_frm.set_query("new_bom", function(doc) {
+ return erpnext.queries.bom({name: "!" + doc.current_bom});
+});
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py
new file mode 100644
index 00000000000..177adcda83b
--- /dev/null
+++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py
@@ -0,0 +1,57 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cstr, flt
+from webnotes.model.code import get_obj
+from webnotes import msgprint, _
+
+class DocType:
+ def __init__( self, doc, doclist=[]):
+ self.doc = doc
+ self.doclist = doclist
+
+ def replace_bom(self):
+ self.validate_bom()
+ self.update_new_bom()
+ bom_list = self.get_parent_boms()
+ for bom in bom_list:
+ bom_obj = get_obj("BOM", bom, with_children=1)
+ bom_obj.update_cost_and_exploded_items()
+
+ webnotes.msgprint(_("BOM replaced"))
+
+ def validate_bom(self):
+ if cstr(self.doc.current_bom) == cstr(self.doc.new_bom):
+ msgprint("Current BOM and New BOM can not be same", raise_exception=1)
+
+ def update_new_bom(self):
+ current_bom_unitcost = webnotes.conn.sql("""select total_cost/quantity
+ from `tabBOM` where name = %s""", self.doc.current_bom)
+ current_bom_unitcost = current_bom_unitcost and flt(current_bom_unitcost[0][0]) or 0
+ webnotes.conn.sql("""update `tabBOM Item` set bom_no=%s,
+ rate=%s, amount=qty*%s where bom_no = %s and docstatus < 2""",
+ (self.doc.new_bom, current_bom_unitcost, current_bom_unitcost, self.doc.current_bom))
+
+ def get_parent_boms(bom_no):
+ return [d[0] for d in webnotes.conn.sql("""select distinct parent from
+ `tabBOM Item` where ifnull(bom_no, '')=%s and docstatus < 2""", bom_no)]
+
+ def get_parent_boms(self):
+ return [d[0] for d in webnotes.conn.sql("""select distinct parent
+ from `tabBOM Item` where ifnull(bom_no, '') = %s and docstatus < 2""",
+ self.doc.new_bom)]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
new file mode 100644
index 00000000000..bb2c56b3f8c
--- /dev/null
+++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
@@ -0,0 +1,78 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-12-06 12:10:10",
+ "modified_by": "Administrator",
+ "modified": "2012-12-06 12:32:22"
+ },
+ {
+ "in_create": 1,
+ "allow_print": 1,
+ "module": "Production",
+ "document_type": "Other",
+ "description": "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM",
+ "read_only": 1,
+ "allow_email": 1,
+ "hide_heading": 1,
+ "issingle": 1,
+ "name": "__common__",
+ "doctype": "DocType",
+ "hide_toolbar": 1,
+ "allow_copy": 1
+ },
+ {
+ "name": "__common__",
+ "parent": "BOM Replace Tool",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "parent": "BOM Replace Tool",
+ "read": 1,
+ "name": "__common__",
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "parenttype": "DocType",
+ "role": "Administrator",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "BOM Replace Tool",
+ "doctype": "DocType"
+ },
+ {
+ "description": "The BOM which will be replaced",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Current BOM",
+ "fieldname": "current_bom",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "BOM"
+ },
+ {
+ "description": "The new BOM after replacement",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "New BOM",
+ "fieldname": "new_bom",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "BOM"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Replace",
+ "fieldname": "replace",
+ "fieldtype": "Button",
+ "options": "replace_bom"
+ },
+ {
+ "doctype": "DocPerm"
+ }
+]
\ No newline at end of file
diff --git a/production/doctype/bom_control/__init__.py b/manufacturing/doctype/production_order/__init__.py
similarity index 100%
rename from production/doctype/bom_control/__init__.py
rename to manufacturing/doctype/production_order/__init__.py
diff --git a/manufacturing/doctype/production_order/production_order.js b/manufacturing/doctype/production_order/production_order.js
new file mode 100644
index 00000000000..5242dcecddc
--- /dev/null
+++ b/manufacturing/doctype/production_order/production_order.js
@@ -0,0 +1,112 @@
+// ERPNext - web based ERP (http://erpnext.com)
+// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+cur_frm.cscript.onload = function(doc, dt, dn) {
+ if (!doc.status) doc.status = 'Draft';
+ cfn_set_fields(doc, dt, dn);
+}
+
+cur_frm.cscript.refresh = function(doc, dt, dn) {
+ cur_frm.set_intro("");
+ cfn_set_fields(doc, dt, dn);
+ if(doc.docstatus===0 && !doc.__islocal) {
+ cur_frm.set_intro("Submit this Production Order for further processing.");
+ } else if(doc.docstatus===1) {
+ if(doc.status === "Stopped") {
+ cur_frm.set_intro("This Production Order is Stopped.");
+ } else {
+ if(doc.produced_qty == doc.qty) {
+ cur_frm.set_intro("This Production Order is Completed.");
+ } else {
+ cur_frm.set_intro("This Production Order is in progress.");
+ }
+ }
+ }
+}
+
+var cfn_set_fields = function(doc, dt, dn) {
+ if (doc.docstatus == 1) {
+ if (doc.status != 'Stopped' && doc.status != 'Completed')
+ cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Production Order']);
+ else if (doc.status == 'Stopped')
+ cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Production Order']);
+
+ if (doc.status == 'Submitted' || doc.status == 'Material Transferred' || doc.status == 'In Process'){
+ cur_frm.add_custom_button('Issue Raw Materials', cur_frm.cscript['Issue Raw Materials']);
+ cur_frm.add_custom_button('Update Finished Goods', cur_frm.cscript['Update Finished Goods']);
+ }
+ }
+}
+
+cur_frm.cscript.production_item = function(doc) {
+ cur_frm.call({
+ method: "get_item_details",
+ args: { item: doc.production_item }
+ });
+}
+
+cur_frm.cscript['Stop Production Order'] = function() {
+ var doc = cur_frm.doc;
+ var check = confirm("Do you really want to stop production order: " + doc.name);
+ if (check) {
+ $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();});
+ }
+}
+
+cur_frm.cscript['Unstop Production Order'] = function() {
+ var doc = cur_frm.doc;
+ var check = confirm("Do really want to unstop production order: " + doc.name);
+ if (check)
+ $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();});
+}
+
+cur_frm.cscript['Issue Raw Materials'] = function() {
+ var doc = cur_frm.doc;
+ cur_frm.cscript.make_se(doc, 'Material Transfer');
+}
+
+cur_frm.cscript['Update Finished Goods'] = function() {
+ var doc = cur_frm.doc;
+ cur_frm.cscript.make_se(doc, 'Manufacture/Repack');
+}
+
+cur_frm.cscript.make_se = function(doc, purpose) {
+ var se = wn.model.get_new_doc("Stock Entry");
+ se.purpose = purpose;
+ se.production_order = doc.name;
+ se.company = doc.company;
+ se.fg_completed_qty = doc.qty - doc.produced_qty;
+ se.bom_no = doc.bom_no;
+ se.use_multi_level_bom = 1;
+ loaddoc('Stock Entry', se.name);
+}
+
+cur_frm.fields_dict['production_item'].get_query = function(doc) {
+ return 'SELECT DISTINCT `tabItem`.`name`, `tabItem`.`description` FROM `tabItem` WHERE (IFNULL(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` = "0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND `tabItem`.docstatus != 2 AND `tabItem`.is_pro_applicable = "Yes" AND `tabItem`.%(key)s LIKE "%s" ORDER BY `tabItem`.`name` LIMIT 50';
+}
+
+cur_frm.fields_dict['project_name'].get_query = function(doc, dt, dn) {
+ return 'SELECT `tabProject`.name FROM `tabProject` \
+ WHERE `tabProject`.status not in ("Completed", "Cancelled") \
+ AND `tabProject`.name LIKE "%s" ORDER BY `tabProject`.name ASC LIMIT 50';
+}
+
+
+cur_frm.set_query("bom_no", function(doc) {
+ if (doc.production_item) {
+ return erpnext.queries.bom({item: cstr(doc.production_item)});
+ } else msgprint(" Please enter Production Item first");
+});
\ No newline at end of file
diff --git a/production/doctype/production_order/production_order.py b/manufacturing/doctype/production_order/production_order.py
similarity index 66%
rename from production/doctype/production_order/production_order.py
rename to manufacturing/doctype/production_order/production_order.py
index 53149715558..0b9a94a6fb5 100644
--- a/production/doctype/production_order/production_order.py
+++ b/manufacturing/doctype/production_order/production_order.py
@@ -35,20 +35,8 @@ class DocType:
def autoname(self):
- p = self.doc.fiscal_year
- self.doc.name = make_autoname('PRO/' + self.doc.fiscal_year[2:5]+self.doc.fiscal_year[7:9] + '/.######')
-
-
- def get_item_detail(self, prod_item):
- item = sql("""select description, stock_uom, default_bom from `tabItem`
- where (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now()) and name = %s""", prod_item, as_dict = 1 )
- ret = {
- 'description' : item and item[0]['description'] or '',
- 'stock_uom' : item and item[0]['stock_uom'] or '',
- 'default_bom' : item and item[0]['default_bom'] or ''
- }
- return ret
-
+ self.doc.name = make_autoname('PRO/' + self.doc.fiscal_year[2:5] +
+ self.doc.fiscal_year[7:9] + '/.######')
def validate(self):
if self.doc.production_item :
@@ -59,8 +47,8 @@ class DocType:
% cstr(self.doc.production_item), raise_exception=1)
if self.doc.bom_no:
- bom = sql("""select name from `tabBOM` where name = %s and docstatus = 1
- and is_active = 'Yes' and item = %s"""
+ bom = sql("""select name from `tabBOM` where name=%s and docstatus=1
+ and is_active=1 and item=%s"""
, (self.doc.bom_no, self.doc.production_item), as_dict =1)
if not bom:
msgprint("""Incorrect BOM: %s entered.
@@ -72,8 +60,33 @@ class DocType:
where name=%s and docstatus = 1""", self.doc.sales_order):
msgprint("Sales Order: %s is not valid" % self.doc.sales_order, raise_exception=1)
- get_obj("Production Control").validate_production_order_against_so(
- self.doc.production_item, self.doc.sales_order, self.doc.qty, self.doc.name)
+ self.validate_production_order_against_so()
+
+
+ def validate_production_order_against_so(self):
+ # already ordered qty
+ ordered_qty_against_so = webnotes.conn.sql("""select sum(qty) from `tabProduction Order`
+ where production_item = %s and sales_order = %s and docstatus < 2""",
+ (self.doc.production_item, self.doc.sales_order))[0][0]
+
+
+ # get qty from Sales Order Item table
+ so_item_qty = webnotes.conn.sql("""select sum(qty) from `tabSales Order Item`
+ where parent = %s and item_code = %s""",
+ (self.doc.sales_order, self.doc.production_item))[0][0]
+ # get qty from Packing Item table
+ dnpi_qty = webnotes.conn.sql("""select sum(qty) from `tabDelivery Note Packing Item`
+ where parent = %s and parenttype = 'Sales Order' and item_code = %s""",
+ (self.doc.sales_order, self.doc.production_item))[0][0]
+ # total qty in SO
+ so_qty = flt(so_item_qty) + flt(dnpi_qty)
+
+ if ordered_qty_against_so > so_qty:
+ msgprint("""Total production order qty for item: %s against sales order: %s \
+ will be %s, which is greater than sales order qty (%s).
+ Please reduce qty or remove the item.""" %
+ (self.doc.production_item, self.doc.sales_order,
+ ordered_qty_against_so, so_qty), raise_exception=1)
def stop_unstop(self, status):
@@ -119,4 +132,21 @@ class DocType:
"posting_date": nowdate(),
"planned_qty": flt(qty)
}
- get_obj('Warehouse', self.doc.fg_warehouse).update_bin(args)
\ No newline at end of file
+ get_obj('Warehouse', self.doc.fg_warehouse).update_bin(args)
+
+@webnotes.whitelist()
+def get_item_details(item):
+ res = webnotes.conn.sql("""select stock_uom
+ from `tabItem` where (ifnull(end_of_life, "")="" or end_of_life > now())
+ and name=%s""", (item,), as_dict=1)
+
+ if not res:
+ return {}
+
+ res = res[0]
+ bom = webnotes.conn.sql("""select name from `tabBOM` where item=%s
+ and ifnull(is_default, 0)=1""", (item,))
+ if bom:
+ res.bom_no = bom[0][0]
+
+ return res
\ No newline at end of file
diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt
new file mode 100644
index 00000000000..163e93363aa
--- /dev/null
+++ b/manufacturing/doctype/production_order/production_order.txt
@@ -0,0 +1,201 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-12-19 12:29:07",
+ "modified_by": "Administrator",
+ "modified": "2012-12-19 17:45:59"
+ },
+ {
+ "is_submittable": 1,
+ "in_create": 0,
+ "doctype": "DocType",
+ "module": "Manufacturing",
+ "name": "__common__"
+ },
+ {
+ "name": "__common__",
+ "parent": "Production Order",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "parent": "Production Order",
+ "read": 1,
+ "cancel": 1,
+ "name": "__common__",
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "parenttype": "DocType",
+ "role": "Manufacturing User",
+ "permlevel": 0,
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Production Order",
+ "doctype": "DocType"
+ },
+ {
+ "read_only": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "no_copy": 1,
+ "search_index": 1,
+ "doctype": "DocField",
+ "label": "Status",
+ "oldfieldname": "status",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "oldfieldtype": "Select",
+ "reqd": 1,
+ "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled",
+ "in_filter": 1
+ },
+ {
+ "read_only": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item To Manufacture",
+ "oldfieldname": "production_item",
+ "fieldname": "production_item",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "read_only": 0,
+ "description": "Bill of Material to be considered for manufacturing",
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "BOM No",
+ "oldfieldname": "bom_no",
+ "fieldname": "bom_no",
+ "fieldtype": "Link",
+ "depends_on": "production_item",
+ "reqd": 1,
+ "options": "BOM"
+ },
+ {
+ "read_only": 0,
+ "description": "Update Planned Quantity in this Warehouse",
+ "depends_on": "production_item",
+ "doctype": "DocField",
+ "label": "For Warehouse",
+ "fieldname": "fg_warehouse",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Warehouse"
+ },
+ {
+ "read_only": 0,
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break"
+ },
+ {
+ "read_only": 0,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Qty To Manufacture",
+ "oldfieldname": "qty",
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "depends_on": "production_item",
+ "reqd": 1
+ },
+ {
+ "read_only": 1,
+ "description": "Automatically updated via Backflush (Stock Entry)",
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Manufactured Qty",
+ "oldfieldname": "produced_qty",
+ "fieldname": "produced_qty",
+ "fieldtype": "Float",
+ "depends_on": "eval:doc.docstatus==1"
+ },
+ {
+ "read_only": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "depends_on": "production_item"
+ },
+ {
+ "read_only": 0,
+ "doctype": "DocField",
+ "label": "More Info",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break"
+ },
+ {
+ "read_only": 0,
+ "description": "Manufacture against Sales Order",
+ "doctype": "DocField",
+ "label": "Sales Order",
+ "fieldname": "sales_order",
+ "fieldtype": "Link",
+ "options": "Sales Order"
+ },
+ {
+ "read_only": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "options": "Project",
+ "in_filter": 1
+ },
+ {
+ "read_only": 0,
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "read_only": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Company"
+ },
+ {
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Fiscal Year"
+ },
+ {
+ "read_only": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "fieldname": "amended_from",
+ "fieldtype": "Data"
+ },
+ {
+ "doctype": "DocPerm"
+ }
+]
\ No newline at end of file
diff --git a/production/doctype/production_order/production_order_list.js b/manufacturing/doctype/production_order/production_order_list.js
similarity index 86%
rename from production/doctype/production_order/production_order_list.js
rename to manufacturing/doctype/production_order/production_order_list.js
index 73b9535d469..dd56b719746 100644
--- a/production/doctype/production_order/production_order_list.js
+++ b/manufacturing/doctype/production_order/production_order_list.js
@@ -7,7 +7,7 @@ wn.doclistviews['Production Order'] = wn.views.ListView.extend({
'`tabProduction Order`.fg_warehouse',
'`tabProduction Order`.stock_uom',
'IFNULL(`tabProduction Order`.qty, 0) as qty',
- '`tabProduction Order`.posting_date',
+ '`tabProduction Order`.creation',
'`tabProduction Order`.status',
]);
this.stats = this.stats.concat(['company']);
@@ -15,7 +15,7 @@ wn.doclistviews['Production Order'] = wn.views.ListView.extend({
prepare_data: function(data) {
this._super(data);
- data.posting_date = wn.datetime.str_to_user(data.posting_date);
+ data.creation = wn.datetime.str_to_user(data.creation);
},
columns: [
@@ -33,7 +33,7 @@ wn.doclistviews['Production Order'] = wn.views.ListView.extend({
},
css: {'text-align':'right'}
},
- {width: '12%', content:'posting_date', css: {
+ {width: '12%', content:'creation', css: {
'text-align': 'right', 'color':'#777'
}},
]
diff --git a/production/doctype/bom_explosion_item/__init__.py b/manufacturing/doctype/production_plan_item/__init__.py
similarity index 100%
rename from production/doctype/bom_explosion_item/__init__.py
rename to manufacturing/doctype/production_plan_item/__init__.py
diff --git a/production/doctype/production_plan_item/production_plan_item.py b/manufacturing/doctype/production_plan_item/production_plan_item.py
similarity index 100%
rename from production/doctype/production_plan_item/production_plan_item.py
rename to manufacturing/doctype/production_plan_item/production_plan_item.py
diff --git a/production/doctype/production_plan_item/production_plan_item.txt b/manufacturing/doctype/production_plan_item/production_plan_item.txt
similarity index 97%
rename from production/doctype/production_plan_item/production_plan_item.txt
rename to manufacturing/doctype/production_plan_item/production_plan_item.txt
index b2cbf8dcf02..ab3ce110dd4 100644
--- a/production/doctype/production_plan_item/production_plan_item.txt
+++ b/manufacturing/doctype/production_plan_item/production_plan_item.txt
@@ -4,14 +4,14 @@
"docstatus": 0,
"creation": "2012-07-03 13:30:04",
"modified_by": "Administrator",
- "modified": "2012-11-29 19:02:38"
+ "modified": "2012-12-10 18:30:00"
},
{
"istable": 1,
"autoname": "PPID/.#####",
"name": "__common__",
"doctype": "DocType",
- "module": "Production"
+ "module": "Manufacturing"
},
{
"name": "__common__",
diff --git a/production/doctype/bom_item/__init__.py b/manufacturing/doctype/production_plan_sales_order/__init__.py
similarity index 100%
rename from production/doctype/bom_item/__init__.py
rename to manufacturing/doctype/production_plan_sales_order/__init__.py
diff --git a/production/doctype/production_plan_sales_order/production_plan_sales_order.py b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py
similarity index 100%
rename from production/doctype/production_plan_sales_order/production_plan_sales_order.py
rename to manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py
diff --git a/production/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
similarity index 96%
rename from production/doctype/production_plan_sales_order/production_plan_sales_order.txt
rename to manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index 79adc14ecc5..37e0f8a72e9 100644
--- a/production/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -4,14 +4,14 @@
"docstatus": 0,
"creation": "2012-07-03 13:30:04",
"modified_by": "Administrator",
- "modified": "2012-11-29 17:49:15"
+ "modified": "2012-12-10 18:30:00"
},
{
"istable": 1,
"autoname": "PP/.SO/.#####",
"name": "__common__",
"doctype": "DocType",
- "module": "Production"
+ "module": "Manufacturing"
},
{
"name": "__common__",
diff --git a/production/doctype/bom_operation/__init__.py b/manufacturing/doctype/production_planning_tool/__init__.py
similarity index 100%
rename from production/doctype/bom_operation/__init__.py
rename to manufacturing/doctype/production_planning_tool/__init__.py
diff --git a/production/doctype/production_planning_tool/production_planning_tool.js b/manufacturing/doctype/production_planning_tool/production_planning_tool.js
similarity index 89%
rename from production/doctype/production_planning_tool/production_planning_tool.js
rename to manufacturing/doctype/production_planning_tool/production_planning_tool.js
index ac4d76d0f75..5d9a9362687 100644
--- a/production/doctype/production_planning_tool/production_planning_tool.js
+++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -19,6 +19,10 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
refresh_field("company");
}
+cur_frm.cscript.refresh = function(doc) {
+ cur_frm.disable_save();
+}
+
cur_frm.cscript.sales_order = function(doc,cdt,cdn) {
var d = locals[cdt][cdn];
if (d.sales_order) {
@@ -51,10 +55,9 @@ cur_frm.fields_dict['pp_details'].grid.get_field('item_code').get_query = functi
cur_frm.fields_dict['pp_details'].grid.get_field('bom_no').get_query = function(doc) {
var d = locals[this.doctype][this.docname];
- return 'SELECT DISTINCT `tabBOM`.`name` \
- FROM `tabBOM` WHERE `tabBOM`.`item` = "' + d.item_code +
- '" AND `tabBOM`.`is_active` = "Yes" AND `tabBOM`.docstatus = 1 \
- AND `tabBOM`.`name` like "%s" ORDER BY `tabBOM`.`name` LIMIT 50';
+ if (d.item_code) {
+ return erpnext.queries.bom({item: cstr(d.item_code)});
+ } else msgprint(" Please enter Item first");
}
cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
diff --git a/production/doctype/production_planning_tool/production_planning_tool.py b/manufacturing/doctype/production_planning_tool/production_planning_tool.py
similarity index 89%
rename from production/doctype/production_planning_tool/production_planning_tool.py
rename to manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 64ac73d2b09..51cb3a76128 100644
--- a/production/doctype/production_planning_tool/production_planning_tool.py
+++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -16,8 +16,8 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import cstr, flt
-from webnotes.model.doc import addchild
+from webnotes.utils import cstr, flt, nowdate, get_defaults
+from webnotes.model.doc import addchild, Document
from webnotes.model.wrapper import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
@@ -173,7 +173,7 @@ class DocType:
(d.item_code, d.idx), raise_exception=1)
else:
bom = sql("""select name from `tabBOM` where name = %s and item = %s
- and docstatus = 1 and ifnull(is_active, 'No') = 'Yes'""",
+ and docstatus = 1 and is_active = 1""",
(d.bom_no, d.item_code), as_dict = 1)
if not bom:
msgprint("""Incorrect BOM No: %s entered for item: %s at row no: %s
@@ -186,8 +186,10 @@ class DocType:
self.validate_data()
items = self.get_distinct_items_and_boms()[1]
- pro = get_obj('Production Control').create_production_order(items)
+ pro = self.create_production_order(items)
if pro:
+ pro = ["""%s""" % \
+ (p, p) for p in pro]
msgprint("Following Production Order has been generated:\n" + '\n'.join(pro))
else :
msgprint("No Production Order generated.")
@@ -199,15 +201,36 @@ class DocType:
for d in self.doclist.get({"parentfield": "pp_details"}):
bom_dict[d.bom_no] = bom_dict.get(d.bom_no, 0) + flt(d.planned_qty)
item_dict[(d.item_code, d.sales_order)] = {
- "qty" : flt(item_dict.get((d.item_code, d.sales_order), {}).get("qty")) + \
- flt(d.planned_qty),
- "bom_no": d.bom_no,
- "description": d.description,
- "stock_uom": d.stock_uom,
- "use_multi_level_bom": self.doc.use_multi_level_bom,
- "company": self.doc.company,
+ "qty" : flt(item_dict.get((d.item_code, d.sales_order), \
+ {}).get("qty")) + flt(d.planned_qty),
+ "bom_no" : d.bom_no,
+ "description" : d.description,
+ "stock_uom" : d.stock_uom,
+ "company" : self.doc.company,
+ "wip_warehouse" : "",
+ "fg_warehouse" : "",
+ "status" : "Draft",
+ "fiscal_year" : get_defaults()["fiscal_year"]
}
return bom_dict, item_dict
+
+ def create_production_order(self, items):
+ """Create production order. Called from Production Planning Tool"""
+
+ pro_list = []
+ for item_so in items:
+ pro_doc = Document('Production Order')
+ pro_doc.production_item = item_so[0]
+ pro_doc.sales_order = item_so[1]
+ for key in items[item_so]:
+ pro_doc.fields[key] = items[item_so][key]
+
+ pro_doc.save(new = 1)
+
+ get_obj("Production Order", pro_doc.name).validate_production_order_against_so()
+ pro_list.append(pro_doc.name)
+
+ return pro_list
def download_raw_materials(self):
""" Create csv data for required raw material to produce finished goods"""
diff --git a/production/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
similarity index 87%
rename from production/doctype/production_planning_tool/production_planning_tool.txt
rename to manufacturing/doctype/production_planning_tool/production_planning_tool.txt
index 9bda9ab0e72..dd7acfdb14e 100644
--- a/production/doctype/production_planning_tool/production_planning_tool.txt
+++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
@@ -2,16 +2,17 @@
{
"owner": "jai@webnotestech.com",
"docstatus": 0,
- "creation": "2012-07-03 13:30:03",
+ "creation": "2012-12-14 10:15:16",
"modified_by": "Administrator",
- "modified": "2012-12-03 15:39:44"
+ "modified": "2012-12-14 11:37:40"
},
{
"read_only": 1,
"issingle": 1,
"in_create": 1,
+ "default_print_format": "Standard",
"doctype": "DocType",
- "module": "Production",
+ "module": "Manufacturing",
"name": "__common__"
},
{
@@ -39,7 +40,6 @@
},
{
"description": "Select Sales Orders from which you want to create Production Orders.",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Select Sales Orders",
"fieldname": "select_sales_orders",
@@ -68,9 +68,9 @@
{
"doctype": "DocField",
"label": "Company",
- "reqd": 1,
"fieldname": "company",
"fieldtype": "Link",
+ "reqd": 1,
"options": "Company"
},
{
@@ -99,7 +99,6 @@
},
{
"description": "Pull sales orders (pending to deliver) based on the above criteria",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Get Sales Orders",
"fieldname": "get_sales_orders",
@@ -107,7 +106,6 @@
"options": "get_open_sales_orders"
},
{
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Production Plan Sales Orders",
"fieldname": "pp_so_details",
@@ -115,17 +113,14 @@
"options": "Production Plan Sales Order"
},
{
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Clear Table",
- "trigger": "Client",
"fieldname": "clear_so_table",
"fieldtype": "Button",
"options": "clear_so_table"
},
{
"description": "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Create Production Orders",
"fieldname": "create_production_orders",
@@ -133,7 +128,6 @@
},
{
"description": "Pull items from Sales Order mentioned in the above table.",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Get Items",
"fieldname": "get_items_from_so",
@@ -141,7 +135,6 @@
"options": "get_items_from_so"
},
{
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Production Plan Items",
"fieldname": "pp_details",
@@ -149,24 +142,12 @@
"options": "Production Plan Item"
},
{
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Clear Table",
- "trigger": "Client",
"fieldname": "clear_item_table",
"fieldtype": "Button",
"options": "clear_item_table"
},
- {
- "description": "If checked, BOM for sub-assembly items will be considered for raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
- "default": "1",
- "colour": "White:FFF",
- "doctype": "DocField",
- "label": "Use Multi-Level BOM",
- "reqd": 0,
- "fieldname": "use_multi_level_bom",
- "fieldtype": "Check"
- },
{
"doctype": "DocField",
"fieldname": "section_break3",
@@ -181,7 +162,6 @@
},
{
"description": "Separate production order will be created for each finished good item.",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Raise Production Order",
"fieldname": "raise_production_order",
@@ -194,12 +174,19 @@
"fieldname": "column_break6",
"fieldtype": "Column Break"
},
+ {
+ "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
+ "default": "1",
+ "doctype": "DocField",
+ "label": "Use Multi-Level BOM",
+ "fieldname": "use_multi_level_bom",
+ "fieldtype": "Check",
+ "reqd": 0
+ },
{
"description": "Download a report containing all raw materials with their latest inventory status",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Download Materials Required",
- "trigger": "Client",
"fieldname": "download_materials_required",
"fieldtype": "Button"
},
@@ -208,11 +195,11 @@
"doctype": "DocPerm"
},
{
- "role": "Production User",
+ "role": "Manufacturing User",
"doctype": "DocPerm"
},
{
- "role": "Production Manager",
+ "role": "Manufacturing Manager",
"doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/production/doctype/production_control/__init__.py b/manufacturing/doctype/workstation/__init__.py
similarity index 100%
rename from production/doctype/production_control/__init__.py
rename to manufacturing/doctype/workstation/__init__.py
diff --git a/production/doctype/workstation/workstation.js b/manufacturing/doctype/workstation/workstation.js
similarity index 100%
rename from production/doctype/workstation/workstation.js
rename to manufacturing/doctype/workstation/workstation.js
diff --git a/production/doctype/workstation/workstation.py b/manufacturing/doctype/workstation/workstation.py
similarity index 100%
rename from production/doctype/workstation/workstation.py
rename to manufacturing/doctype/workstation/workstation.py
diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt
new file mode 100644
index 00000000000..873bf30ce07
--- /dev/null
+++ b/manufacturing/doctype/workstation/workstation.txt
@@ -0,0 +1,217 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2012-03-27 14:36:05",
+ "modified_by": "Administrator",
+ "modified": "2012-12-10 18:30:00"
+ },
+ {
+ "section_style": "Simple",
+ "module": "Manufacturing",
+ "doctype": "DocType",
+ "allow_trash": 1,
+ "server_code_error": " ",
+ "document_type": "Master",
+ "allow_email": 0,
+ "autoname": "field:workstation_name",
+ "name": "__common__",
+ "colour": "White:FFF",
+ "_last_update": "1322125389",
+ "show_in_menu": 0,
+ "version": 14
+ },
+ {
+ "name": "__common__",
+ "parent": "Workstation",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Workstation",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Workstation",
+ "doctype": "DocType"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "System Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "role": "System Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Manufacturing User",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Manufacturing User",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "role": "Manufacturing Manager",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "role": "Manufacturing User",
+ "permlevel": 1,
+ "doctype": "DocPerm"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Workstation Name",
+ "oldfieldname": "workstation_name",
+ "fieldname": "workstation_name",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "permlevel": 0,
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "options": "Warehouse"
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Capacity",
+ "oldfieldname": "capacity",
+ "fieldname": "capacity",
+ "fieldtype": "Data",
+ "reqd": 0,
+ "hidden": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Capacity Units",
+ "oldfieldname": "capacity_units",
+ "permlevel": 0,
+ "fieldname": "capacity_units",
+ "fieldtype": "Select",
+ "reqd": 0,
+ "hidden": 1,
+ "options": "\nUnits/Shifts\nUnits/Hour"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Hour Rate Labour",
+ "oldfieldname": "hour_rate_labour",
+ "fieldname": "hour_rate_labour",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Over Heads",
+ "fieldname": "over_heads",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Hour Rate Electricity",
+ "oldfieldname": "hour_rate_electricity",
+ "fieldname": "hour_rate_electricity",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Hour Rate Consumable",
+ "oldfieldname": "hour_rate_consumable",
+ "fieldname": "hour_rate_consumable",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Hour Rate Rent",
+ "oldfieldname": "hour_rate_rent",
+ "fieldname": "hour_rate_rent",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Overhead",
+ "oldfieldname": "overhead",
+ "fieldname": "overhead",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Hour Rate",
+ "fieldname": "hour_rate_section_break",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Hour Rate",
+ "oldfieldname": "hour_rate",
+ "fieldname": "hour_rate",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ }
+]
\ No newline at end of file
diff --git a/production/doctype/production_order/__init__.py b/manufacturing/page/__init__.py
similarity index 100%
rename from production/doctype/production_order/__init__.py
rename to manufacturing/page/__init__.py
diff --git a/production/doctype/production_plan_item/__init__.py b/manufacturing/page/manufacturing_home/__init__.py
similarity index 100%
rename from production/doctype/production_plan_item/__init__.py
rename to manufacturing/page/manufacturing_home/__init__.py
diff --git a/production/page/production_home/production_home.html b/manufacturing/page/manufacturing_home/manufacturing_home.html
similarity index 80%
rename from production/page/production_home/production_home.html
rename to manufacturing/page/manufacturing_home/manufacturing_home.html
index 028e752d89c..b87d30ac6b5 100644
--- a/production/page/production_home/production_home.html
+++ b/manufacturing/page/manufacturing_home/manufacturing_home.html
@@ -22,6 +22,16 @@