Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index a09398d..56e2cb6 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,358 +1,286 @@
-# DocType, Purchase Invoice Item
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-04-13 11:56:17',
- 'docstatus': 0,
- 'modified': '2012-06-04 12:10:22',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'EVD.######',
- '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'Purchase Invoice Item',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Invoice Item
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Invoice Item'
- },
-
- # 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': 1,
- 'reqd': 0,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # 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,
- '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,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'qty',
- 'fieldtype': u'Currency',
- 'label': u'Qty',
- 'oldfieldname': u'qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'discount_rate',
- 'fieldtype': u'Currency',
- 'label': u'Discount %',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate ',
- 'oldfieldname': u'import_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'import_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate *(Default Curr.)',
- 'oldfieldname': u'rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount (Default Curr.)',
- 'oldfieldname': u'amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'expense_head',
- 'fieldtype': u'Link',
- 'label': u'Expense Head',
- 'oldfieldname': u'expense_head',
- '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',
- 'label': u'Cost Center',
- 'oldfieldname': u'cost_center',
- 'oldfieldtype': u'Link',
- 'options': u'Cost Center',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client',
- 'width': u'120px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'project_name',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Project Name',
- 'options': u'Project',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'uom',
- 'fieldtype': u'Link',
- 'label': u'UOM',
- 'options': u'UOM',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'brand',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Brand',
- 'oldfieldname': u'brand',
- 'oldfieldtype': u'Data',
- '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,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_order',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Pur Order',
- 'oldfieldname': u'purchase_order',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Order',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'po_detail',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Purchase Order Item',
- 'oldfieldname': u'po_detail',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_receipt',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Pur Receipt',
- 'oldfieldname': u'purchase_receipt',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Receipt',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'pr_detail',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'PR Detail',
- 'oldfieldname': u'pr_detail',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges',
- '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,
- 'report_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-07-03 13:29:48",
+ "modified_by": "Administrator",
+ "modified": "2012-12-19 11:57:47"
+ },
+ {
+ "istable": 1,
+ "autoname": "EVD.######",
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "Accounts"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Invoice Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Invoice Item",
+ "doctype": "DocType"
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item",
+ "oldfieldname": "item_code",
+ "permlevel": 0,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 0,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "search_index": 0,
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 0
+ },
+ {
+ "oldfieldtype": "Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "fieldname": "qty",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate ",
+ "fieldname": "import_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "doctype": "DocField",
+ "label": "Discount %",
+ "fieldname": "discount_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate ",
+ "oldfieldname": "import_rate",
+ "fieldname": "import_rate",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "import_amount",
+ "fieldname": "import_amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate *",
+ "fieldname": "purchase_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate *(Default Curr.)",
+ "oldfieldname": "rate",
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount (Default Curr.)",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Expense Head",
+ "oldfieldname": "expense_head",
+ "width": "120px",
+ "options": "Account",
+ "fieldname": "expense_head",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Cost Center",
+ "oldfieldname": "cost_center",
+ "width": "120px",
+ "options": "Cost Center",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Project Name",
+ "options": "Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "UOM",
+ "options": "UOM",
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Brand",
+ "oldfieldname": "brand",
+ "fieldname": "brand",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "permlevel": 1,
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "hidden": 1,
+ "options": "Item Group",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "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",
+ "doctype": "DocField",
+ "label": "Purchase Order Item",
+ "oldfieldname": "po_detail",
+ "fieldname": "po_detail",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "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",
+ "doctype": "DocField",
+ "label": "PR Detail",
+ "oldfieldname": "pr_detail",
+ "fieldname": "pr_detail",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1,
+ "report_hide": 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/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
index 4a01347..bc409f8 100644
--- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
+++ b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
@@ -2,16 +2,16 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-11-23 16:46:22",
+ "creation": "2012-11-28 11:24:29",
"modified_by": "Administrator",
- "modified": "2012-11-26 10:11:53"
+ "modified": "2012-12-19 11:54:55"
},
{
"name": "__common__",
"ref_doctype": "Sales Invoice",
"doctype": "Report",
"is_standard": "Yes",
- "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description\",\n `tabDelivery Note Item`.qty as \"Qty:Float\",\n `tabDelivery Note Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_qty,0) < ifnull(`tabDelivery Note Item`.qty,0)\norder by `tabDelivery Note`.posting_date asc"
+ "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.amount as \"Amount:Currency:110\",\n (`tabDelivery Note Item`.billed_amt * ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.amount,0) - (ifnull(`tabDelivery Note Item`.billed_amt,0) * ifnull(`tabDelivery Note`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc"
},
{
"name": "Delivered Items To Be Billed",
diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
index bf41093..b5d4229 100644
--- a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
+++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
@@ -2,16 +2,16 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-12-14 10:22:40",
+ "creation": "2012-12-14 14:27:05",
"modified_by": "Administrator",
- "modified": "2012-12-14 10:24:16"
+ "modified": "2012-12-19 11:52:26"
},
{
"name": "__common__",
"ref_doctype": "Sales Invoice",
"doctype": "Report",
"is_standard": "Yes",
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc"
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc"
},
{
"name": "Ordered Items To Be Billed",
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index 6f38e18..552ca4a7 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -1,492 +1,400 @@
-# DocType, Purchase Order Item
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-05-15 12:14:38',
- 'docstatus': 0,
- 'modified': '2012-08-06 15:55:11',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'POD/.#####',
- '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': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Order Item',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Purchase Order Item
- {
- 'doctype': 'DocType',
- 'name': u'Purchase Order Item'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'schedule_date',
- 'fieldtype': u'Date',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Reqd By Date',
- 'no_copy': 1,
- 'oldfieldname': u'schedule_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'search_index': 1
- },
-
- # 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,
- 'print_hide': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'If Supplier Part Number exists for given Item, it gets stored here',
- 'doctype': u'DocField',
- 'fieldname': u'supplier_part_no',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Supplier Part Number',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_name',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Item Name',
- 'oldfieldname': u'item_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'search_index': 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': 1,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'qty',
- 'fieldtype': u'Currency',
- 'label': u'Quantity',
- 'oldfieldname': u'qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'60px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'discount_rate',
- 'fieldtype': u'Currency',
- 'label': u'Discount %',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_rate',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Rate ',
- 'oldfieldname': u'import_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'import_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'purchase_rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate (Default Curr.) *',
- 'oldfieldname': u'purchase_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount (Default Curr.)',
- '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,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'project_name',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Project Name',
- 'options': u'Project',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'uom',
- 'fieldtype': u'Link',
- 'label': u'UOM',
- 'oldfieldname': u'uom',
- 'oldfieldtype': u'Link',
- 'options': u'UOM',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'conversion_factor',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'UOM Conversion Factor',
- 'oldfieldname': u'conversion_factor',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'stock_uom',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'label': u'Stock UOM',
- 'oldfieldname': u'stock_uom',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'reqd': 1,
- 'width': u'100px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_doctype',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Prevdoc DocType',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_doctype',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_docname',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Purchase Requisition No',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_docname',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Request',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_date',
- 'fieldtype': u'Date',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Purchase Request Date',
- 'oldfieldname': u'prevdoc_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_detail_docname',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Purchase Request Detail No',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_detail_docname',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'supplier_quotation',
- 'fieldtype': u'Link',
- 'hidden': 1,
- 'in_filter': 0,
- 'label': u'Supplier Quotation',
- 'options': u'Supplier Quotation',
- 'permlevel': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'supplier_quotation_item',
- 'fieldtype': u'Link',
- 'hidden': 1,
- 'label': u'Supplier Quotation Item',
- 'options': u'Supplier Quotation Item',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'brand',
- 'fieldtype': u'Link',
- 'hidden': 1,
- 'label': u'Brand',
- 'oldfieldname': u'brand',
- 'oldfieldtype': u'Link',
- 'options': u'Brand',
- 'permlevel': 1,
- '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,
- 'search_index': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'stock_qty',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Stock Qty',
- 'no_copy': 1,
- 'oldfieldname': u'stock_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'received_qty',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Received Qty',
- 'no_copy': 1,
- 'oldfieldname': u'received_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'billed_qty',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Billed Quantity',
- 'no_copy': 1,
- 'oldfieldname': u'billed_qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges',
- '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,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'page_break',
- 'fieldtype': u'Check',
- 'hidden': 0,
- '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-08-06 20:00:38",
+ "modified_by": "Administrator",
+ "modified": "2012-12-19 11:57:28"
+ },
+ {
+ "istable": 1,
+ "autoname": "POD/.#####",
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "Buying"
+ },
+ {
+ "name": "__common__",
+ "parent": "Purchase Order Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Purchase Order Item",
+ "doctype": "DocType"
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Reqd By Date",
+ "oldfieldname": "schedule_date",
+ "fieldname": "schedule_date",
+ "fieldtype": "Date",
+ "search_index": 1,
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "permlevel": 0,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "If Supplier Part Number exists for given Item, it gets stored here",
+ "doctype": "DocField",
+ "label": "Supplier Part Number",
+ "fieldname": "supplier_part_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Quantity",
+ "oldfieldname": "qty",
+ "width": "60px",
+ "fieldname": "qty",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate ",
+ "fieldname": "import_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "doctype": "DocField",
+ "label": "Discount %",
+ "fieldname": "discount_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate ",
+ "oldfieldname": "import_rate",
+ "fieldname": "import_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "import_amount",
+ "fieldname": "import_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate *",
+ "fieldname": "purchase_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate (Default Curr.) *",
+ "oldfieldname": "purchase_rate",
+ "width": "100px",
+ "fieldname": "purchase_rate",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount (Default Curr.)",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "options": "Warehouse",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Project Name",
+ "options": "Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "permlevel": 0,
+ "report_hide": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "UOM",
+ "oldfieldname": "uom",
+ "width": "100px",
+ "options": "UOM",
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "UOM Conversion Factor",
+ "oldfieldname": "conversion_factor",
+ "width": "100px",
+ "fieldname": "conversion_factor",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "width": "100px",
+ "fieldname": "stock_uom",
+ "fieldtype": "Data",
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Prevdoc DocType",
+ "oldfieldname": "prevdoc_doctype",
+ "fieldname": "prevdoc_doctype",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "permlevel": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Purchase Requisition No",
+ "oldfieldname": "prevdoc_docname",
+ "width": "120px",
+ "fieldname": "prevdoc_docname",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "hidden": 0,
+ "options": "Purchase Request",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Purchase Request Date",
+ "oldfieldname": "prevdoc_date",
+ "fieldname": "prevdoc_date",
+ "fieldtype": "Date",
+ "search_index": 0,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Purchase Request Detail No",
+ "oldfieldname": "prevdoc_detail_docname",
+ "fieldname": "prevdoc_detail_docname",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "search_index": 0,
+ "doctype": "DocField",
+ "label": "Supplier Quotation",
+ "options": "Supplier Quotation",
+ "fieldname": "supplier_quotation",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 0
+ },
+ {
+ "doctype": "DocField",
+ "label": "Supplier Quotation Item",
+ "options": "Supplier Quotation Item",
+ "fieldname": "supplier_quotation_item",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Brand",
+ "oldfieldname": "brand",
+ "options": "Brand",
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "permlevel": 1,
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "search_index": 0,
+ "hidden": 1,
+ "options": "Item Group",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Stock Qty",
+ "oldfieldname": "stock_qty",
+ "width": "100px",
+ "fieldname": "stock_qty",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Received Qty",
+ "oldfieldname": "received_qty",
+ "fieldname": "received_qty",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Billed Quantity",
+ "oldfieldname": "billed_qty",
+ "no_copy": 1,
+ "fieldname": "billed_qty",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "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",
+ "hidden": 0,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index a1a49b3..df74542 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,369 +1,301 @@
-# DocType, Supplier Quotation Item
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-08-01 20:07:22',
- 'docstatus': 0,
- 'modified': '2012-08-03 12:34:33',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'autoname': u'SQI-.#####',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Buying',
- 'name': '__common__',
- 'version': 1
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Supplier Quotation Item',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # DocType, Supplier Quotation Item
- {
- 'doctype': 'DocType',
- 'name': u'Supplier Quotation Item'
- },
-
- # 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,
- 'print_hide': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'If Supplier Part Number exists for given Item, it gets stored here',
- 'doctype': u'DocField',
- 'fieldname': u'supplier_part_no',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Supplier Part Number',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'item_name',
- 'fieldtype': u'Data',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Item Name',
- 'oldfieldname': u'item_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'search_index': 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': 1,
- 'width': u'300px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'qty',
- 'fieldtype': u'Currency',
- 'label': u'Quantity',
- 'oldfieldname': u'qty',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'60px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate ',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'discount_rate',
- 'fieldtype': u'Currency',
- 'label': u'Discount %',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_rate',
- 'fieldtype': u'Currency',
- 'hidden': 0,
- 'label': u'Rate ',
- 'oldfieldname': u'import_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'import_amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount',
- 'oldfieldname': u'import_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'purchase_ref_rate',
- 'fieldtype': u'Currency',
- 'label': u'Ref Rate *',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'purchase_rate',
- 'fieldtype': u'Currency',
- 'label': u'Rate (Default Curr.) *',
- 'oldfieldname': u'purchase_rate',
- 'oldfieldtype': u'Currency',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'default': u'0.00',
- 'doctype': u'DocField',
- 'fieldname': u'amount',
- 'fieldtype': u'Currency',
- 'label': u'Amount (Default Curr.)',
- '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,
- 'reqd': 0,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'project_name',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Project Name',
- 'options': u'Project',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'uom',
- 'fieldtype': u'Link',
- 'label': u'UOM',
- 'oldfieldname': u'uom',
- 'oldfieldtype': u'Link',
- 'options': u'UOM',
- 'permlevel': 0,
- 'print_hide': 0,
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'100px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_doctype',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Prevdoc DocType',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_doctype',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_docname',
- 'fieldtype': u'Link',
- 'hidden': 0,
- 'in_filter': 1,
- 'label': u'Purchase Request No',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_docname',
- 'oldfieldtype': u'Link',
- 'options': u'Purchase Request',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1,
- 'width': u'120px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_date',
- 'fieldtype': u'Date',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Purchase Request Date',
- 'oldfieldname': u'prevdoc_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'prevdoc_detail_docname',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'in_filter': 1,
- 'label': u'Purchase Request Detail No',
- 'no_copy': 0,
- 'oldfieldname': u'prevdoc_detail_docname',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'brand',
- 'fieldtype': u'Link',
- 'hidden': 1,
- 'label': u'Brand',
- 'oldfieldname': u'brand',
- 'oldfieldtype': u'Link',
- 'options': u'Brand',
- 'permlevel': 1,
- '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,
- 'search_index': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges',
- '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,
- 'report_hide': 1
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'page_break',
- 'fieldtype': u'Check',
- 'hidden': 0,
- '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-08-06 20:00:36",
+ "modified_by": "Administrator",
+ "modified": "2012-12-19 11:56:59"
+ },
+ {
+ "istable": 1,
+ "autoname": "SQI-.#####",
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "Buying"
+ },
+ {
+ "name": "__common__",
+ "parent": "Supplier Quotation Item",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "Supplier Quotation Item",
+ "doctype": "DocType"
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "permlevel": 0,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Item",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "If Supplier Part Number exists for given Item, it gets stored here",
+ "doctype": "DocField",
+ "label": "Supplier Part Number",
+ "fieldname": "supplier_part_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "reqd": 1,
+ "hidden": 0,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Quantity",
+ "oldfieldname": "qty",
+ "width": "60px",
+ "fieldname": "qty",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate ",
+ "fieldname": "import_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "doctype": "DocField",
+ "label": "Discount %",
+ "fieldname": "discount_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate ",
+ "oldfieldname": "import_rate",
+ "fieldname": "import_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount",
+ "oldfieldname": "import_amount",
+ "fieldname": "import_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Ref Rate *",
+ "fieldname": "purchase_ref_rate",
+ "fieldtype": "Currency",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Rate (Default Curr.) *",
+ "oldfieldname": "purchase_rate",
+ "width": "100px",
+ "fieldname": "purchase_rate",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "default": "0.00",
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Amount (Default Curr.)",
+ "oldfieldname": "amount",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "reqd": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "options": "Warehouse",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "reqd": 0,
+ "hidden": 0,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "doctype": "DocField",
+ "label": "Project Name",
+ "options": "Project",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "permlevel": 0,
+ "report_hide": 0,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "UOM",
+ "oldfieldname": "uom",
+ "width": "100px",
+ "options": "UOM",
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "reqd": 1,
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Prevdoc DocType",
+ "oldfieldname": "prevdoc_doctype",
+ "fieldname": "prevdoc_doctype",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "permlevel": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Purchase Request No",
+ "oldfieldname": "prevdoc_docname",
+ "width": "120px",
+ "fieldname": "prevdoc_docname",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "hidden": 0,
+ "options": "Purchase Request",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Purchase Request Date",
+ "oldfieldname": "prevdoc_date",
+ "fieldname": "prevdoc_date",
+ "fieldtype": "Date",
+ "search_index": 0,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 0,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Purchase Request Detail No",
+ "oldfieldname": "prevdoc_detail_docname",
+ "fieldname": "prevdoc_detail_docname",
+ "fieldtype": "Data",
+ "search_index": 1,
+ "hidden": 1,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Brand",
+ "oldfieldname": "brand",
+ "options": "Brand",
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "permlevel": 1
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "permlevel": 1,
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "search_index": 0,
+ "hidden": 1,
+ "options": "Item Group",
+ "in_filter": 1
+ },
+ {
+ "print_hide": 1,
+ "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "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",
+ "hidden": 0,
+ "permlevel": 0
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js
index 042ccca..7253bdb 100755
--- a/hr/doctype/leave_application/leave_application.js
+++ b/hr/doctype/leave_application/leave_application.js
@@ -16,6 +16,7 @@
cur_frm.add_fetch('employee','employee_name','employee_name');
+
cur_frm.cscript.onload = function(doc, dt, dn) {
if(!doc.posting_date)
set_multiple(dt,dn,{posting_date:get_today()});
diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
index c0a5179..d945367 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/hr/doctype/leave_application/leave_application.py
@@ -104,14 +104,14 @@
leave_all = webnotes.conn.sql("""select total_leaves_allocated
from `tabLeave Allocation` where employee = %s and leave_type = %s
and fiscal_year = %s and docstatus = 1""", (employee,
- leave_type, fiscal_year), debug=1)
+ leave_type, fiscal_year))
leave_all = leave_all and flt(leave_all[0][0]) or 0
leave_app = webnotes.conn.sql("""select SUM(total_leave_days)
from `tabLeave Application`
where employee = %s and leave_type = %s and fiscal_year = %s
- and docstatus = 1""", (employee, leave_type, fiscal_year), debug=1)
+ and docstatus = 1""", (employee, leave_type, fiscal_year))
leave_app = leave_app and flt(leave_app[0][0]) or 0
ret = {'leave_balance': leave_all - leave_app}
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
index 2e4d7c2..edebe4b 100644
--- a/hr/doctype/leave_application/leave_application.txt
+++ b/hr/doctype/leave_application/leave_application.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-12-07 18:27:12",
+ "creation": "2012-12-10 10:25:20",
"modified_by": "Administrator",
- "modified": "2012-12-07 18:47:48"
+ "modified": "2012-12-18 11:06:54"
},
{
"is_submittable": 1,
@@ -160,7 +160,7 @@
"search_index": 0,
"doctype": "DocField",
"label": "Fiscal Year",
- "options": "Link:Fiscal Year",
+ "options": "link:Fiscal Year",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"reqd": 1,
@@ -239,5 +239,10 @@
"role": "Leave Approver",
"cancel": 0,
"permlevel": 2
+ },
+ {
+ "doctype": "DocPerm",
+ "role": "All",
+ "permlevel": 3
}
]
\ No newline at end of file