[conflict] merged for get_query
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 11481d7..5e98cb0 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
- "modified": "2013-07-05 11:05:59",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"doctype": "DocField",
"fieldname": "voucher_id",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Voucher ID",
"oldfieldname": "voucher_id",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "against_account",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Against Account",
"oldfieldname": "against_account",
"oldfieldtype": "Data",
@@ -49,6 +51,7 @@
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Posting Date",
"oldfieldname": "posting_date",
"oldfieldtype": "Date",
@@ -58,6 +61,7 @@
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
@@ -66,6 +70,7 @@
"doctype": "DocField",
"fieldname": "cheque_number",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Cheque Number",
"oldfieldname": "cheque_number",
"oldfieldtype": "Data",
@@ -75,6 +80,7 @@
"doctype": "DocField",
"fieldname": "cheque_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Cheque Date",
"oldfieldname": "cheque_date",
"oldfieldtype": "Date",
diff --git a/accounts/doctype/budget_control/budget_control.txt b/accounts/doctype/budget_control/budget_control.txt
index e86fef8..13adf4b 100644
--- a/accounts/doctype/budget_control/budget_control.txt
+++ b/accounts/doctype/budget_control/budget_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:41",
"docstatus": 0,
- "modified": "2012-03-27 14:35:41",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "nabin@webnotestech.com"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Accounts",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 23
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index 10d3a19..f16190d 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:04",
"docstatus": 0,
- "modified": "2013-07-09 14:44:37",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Budget Detail",
"parentfield": "fields",
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index ff5d8fd..c8207bd 100644
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Budget Distribution Detail",
"parentfield": "fields",
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 ba247d3..487c982 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "C-Form Invoice Detail",
"parentfield": "fields",
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 9946bfb..750449b 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:39",
"docstatus": 0,
- "modified": "2013-07-01 13:53:33",
+ "modified": "2013-07-10 14:56:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "account",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Account",
"oldfieldname": "account",
"oldfieldtype": "Link",
@@ -40,29 +41,13 @@
"width": "250px"
},
{
- "doctype": "DocField",
- "fieldname": "debit",
- "fieldtype": "Currency",
- "label": "Debit",
- "oldfieldname": "debit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency"
- },
- {
- "doctype": "DocField",
- "fieldname": "credit",
- "fieldtype": "Currency",
- "label": "Credit",
- "oldfieldname": "credit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency"
- },
- {
"default": ":Company",
+ "description": "If Income or Expense",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -73,8 +58,29 @@
},
{
"doctype": "DocField",
+ "fieldname": "debit",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Debit",
+ "oldfieldname": "debit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "credit",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Credit",
+ "oldfieldname": "credit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "balance",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Account Balance",
"no_copy": 1,
"oldfieldname": "balance",
@@ -87,6 +93,7 @@
"fieldname": "against_voucher",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Against Purchase Invoice",
"no_copy": 1,
"oldfieldname": "against_voucher",
diff --git a/accounts/doctype/mis_control/mis_control.txt b/accounts/doctype/mis_control/mis_control.txt
index 5d42bde..ed0bedb 100644
--- a/accounts/doctype/mis_control/mis_control.txt
+++ b/accounts/doctype/mis_control/mis_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:49",
"docstatus": 0,
- "modified": "2012-03-27 14:35:49",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Accounts",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 120
+ "name": "__common__"
},
{
"doctype": "DocType",
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 1908101..5259f74 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
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:39",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "voucher_no",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Voucher No",
"options": "Journal Voucher",
"print_width": "140px",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "amt_due",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Unmatched Amount",
"options": "Company:company:default_currency",
"read_only": 1
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "amt_to_be_reconciled",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated Amount",
"options": "Company:company:default_currency",
"reqd": 1
@@ -55,6 +58,7 @@
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Posting Date",
"read_only": 1
},
@@ -62,6 +66,7 @@
"doctype": "DocField",
"fieldname": "total_amt",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Total Amount",
"options": "Company:company:default_currency",
"read_only": 1
@@ -70,6 +75,7 @@
"doctype": "DocField",
"fieldname": "against_account",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Against Account",
"read_only": 1
},
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
index 6b31684..49aa688 100644
--- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-08 15:36:46",
"docstatus": 0,
- "modified": "2013-03-20 16:52:12",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "journal_voucher",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Journal Voucher",
"oldfieldname": "journal_voucher",
"oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"fieldname": "jv_detail_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Journal Voucher Detail No",
"oldfieldname": "jv_detail_no",
"oldfieldtype": "Date",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "advance_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Advance Amount",
"oldfieldname": "advance_amount",
"oldfieldtype": "Currency",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated Amount",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Remarks",
"oldfieldname": "remarks",
"oldfieldtype": "Small Text",
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 867cd7a..d7fb8e5 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-07-09 12:21:47",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -55,6 +57,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -64,8 +67,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -77,6 +88,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"options": "UOM",
"print_hide": 1,
@@ -86,6 +98,7 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
@@ -95,6 +108,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -103,6 +117,7 @@
"doctype": "DocField",
"fieldname": "import_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -115,6 +130,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -126,6 +142,7 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
@@ -135,6 +152,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Rate (Company Currency)",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
@@ -147,6 +165,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -157,8 +176,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "accounting",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Accounting"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "expense_head",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Expense Head",
"oldfieldname": "expense_head",
"oldfieldtype": "Link",
@@ -174,6 +201,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -185,9 +213,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -198,6 +234,7 @@
"fieldname": "brand",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Data",
@@ -210,6 +247,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -223,6 +261,7 @@
"fieldname": "purchase_order",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Purchase Order",
"no_copy": 1,
"oldfieldname": "purchase_order",
@@ -238,6 +277,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Purchase Order Item",
"no_copy": 1,
"oldfieldname": "po_detail",
@@ -251,6 +291,7 @@
"fieldname": "purchase_receipt",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Purchase Receipt",
"no_copy": 1,
"oldfieldname": "purchase_receipt",
@@ -266,6 +307,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "PR Detail",
"no_copy": 1,
"oldfieldname": "pr_detail",
@@ -280,6 +322,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -292,6 +335,7 @@
"fieldname": "item_tax_amount",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Amount",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -306,6 +350,7 @@
"fieldname": "valuation_rate",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Valuation Rate",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -316,6 +361,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Conversion Factor",
"print_hide": 1,
"read_only": 0
@@ -325,6 +371,7 @@
"fieldname": "rm_supp_cost",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Raw Materials Supplied Cost",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -336,6 +383,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"print_hide": 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 d6d2a92..5ea7fc0 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
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:04",
"docstatus": 0,
- "modified": "2013-05-28 12:02:02",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"doctype": "DocField",
"fieldname": "category",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Consider Tax or Charge for",
"oldfieldname": "category",
"oldfieldtype": "Select",
@@ -42,6 +43,7 @@
"doctype": "DocField",
"fieldname": "charge_type",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Type",
"oldfieldname": "charge_type",
"oldfieldtype": "Select",
@@ -53,6 +55,7 @@
"doctype": "DocField",
"fieldname": "account_head",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Account Head",
"oldfieldname": "account_head",
"oldfieldtype": "Link",
@@ -65,6 +68,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -75,6 +79,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -87,6 +92,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index 32ef4c5..b82f4ac 100644
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:41",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "journal_voucher",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Journal Voucher",
"oldfieldname": "journal_voucher",
"oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"fieldname": "jv_detail_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Journal Voucher Detail No",
"oldfieldname": "jv_detail_no",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "advance_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Advance amount",
"oldfieldname": "advance_amount",
"oldfieldtype": "Currency",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated amount",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Remarks",
"oldfieldname": "remarks",
"oldfieldtype": "Small Text",
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index b0fd7c7..03b9f8b 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-07-09 12:46:12",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "barcode",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Barcode",
"print_hide": 1,
"read_only": 0
@@ -38,6 +39,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -52,6 +54,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -61,6 +64,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -73,6 +77,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -83,8 +88,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -95,6 +108,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"read_only": 1
},
@@ -102,6 +116,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -114,6 +129,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -124,6 +140,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Basic Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -135,6 +152,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -146,6 +164,7 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
@@ -158,6 +177,7 @@
"fieldname": "basic_rate",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -171,6 +191,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -181,21 +202,17 @@
},
{
"doctype": "DocField",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 1,
- "read_only": 0
+ "fieldname": "accounting",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Accounting"
},
{
"doctype": "DocField",
"fieldname": "income_account",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Income Account",
"oldfieldname": "income_account",
"oldfieldtype": "Link",
@@ -212,6 +229,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Expense Account",
"options": "Account",
"print_hide": 1,
@@ -224,6 +242,7 @@
"fieldname": "cost_center",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -236,9 +255,30 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text",
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 ba9f907..fbba643 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
@@ -2,7 +2,7 @@
{
"creation": "2013-04-24 11:39:32",
"docstatus": 0,
- "modified": "2013-05-28 11:59:02",
+ "modified": "2013-07-10 14:54:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"doctype": "DocField",
"fieldname": "charge_type",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Type",
"oldfieldname": "charge_type",
"oldfieldtype": "Select",
@@ -40,6 +41,7 @@
"doctype": "DocField",
"fieldname": "account_head",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Account Head",
"oldfieldname": "account_head",
"oldfieldtype": "Link",
@@ -52,6 +54,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center_other_charges",
"oldfieldtype": "Link",
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -72,6 +76,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
@@ -81,6 +86,7 @@
"doctype": "DocField",
"fieldname": "tax_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "tax_amount",
"oldfieldtype": "Currency",
diff --git a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
index 2fe43db..3784ecb 100644
--- a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
+++ b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 11:54:50",
"docstatus": 0,
- "modified": "2013-06-25 11:58:04",
+ "modified": "2013-07-10 14:54:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Shipping Rule Condition",
"parentfield": "fields",
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 9b05bc5..ada4beb 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -201,7 +201,7 @@
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.warehouse) {
this.frm.call({
- method: "buying.utils.get_conversion_factor",
+ method: "buying.utils.get_projected_qty",
child: item,
args: {
item_code: item.item_code,
diff --git a/buying/doctype/purchase_common/purchase_common.txt b/buying/doctype/purchase_common/purchase_common.txt
index 15ef574..40f5756 100644
--- a/buying/doctype/purchase_common/purchase_common.txt
+++ b/buying/doctype/purchase_common/purchase_common.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:51",
"docstatus": 0,
- "modified": "2012-03-27 14:35:51",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Buying",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 187
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index dac9a7b..c7233d0 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
- "modified": "2013-07-09 11:45:00",
+ "modified": "2013-07-10 14:54:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldtype": "Date",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Reqd By Date",
"no_copy": 0,
"oldfieldname": "schedule_date",
@@ -60,6 +62,7 @@
"fieldname": "supplier_part_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Supplier Part Number",
"print_hide": 1,
"read_only": 1
@@ -70,6 +73,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -80,8 +84,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -95,6 +107,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -107,6 +120,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -121,6 +135,7 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
@@ -130,6 +145,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -139,6 +155,7 @@
"fieldname": "import_rate",
"fieldtype": "Currency",
"hidden": 0,
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -150,6 +167,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -160,6 +178,7 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
@@ -170,6 +189,7 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
@@ -185,6 +205,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -195,9 +216,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -211,6 +240,7 @@
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -222,6 +252,7 @@
"fieldname": "conversion_factor",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 0,
"label": "UOM Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Currency",
@@ -236,6 +267,7 @@
"fieldname": "stock_uom",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -250,6 +282,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Prevdoc DocType",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -263,6 +296,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -280,6 +314,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Date",
"no_copy": 1,
"oldfieldname": "prevdoc_date",
@@ -294,6 +329,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -308,6 +344,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Supplier Quotation",
"no_copy": 1,
"options": "Supplier Quotation",
@@ -319,6 +356,7 @@
"fieldname": "supplier_quotation_item",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 1,
"label": "Supplier Quotation Item",
"no_copy": 1,
"options": "Supplier Quotation Item",
@@ -329,6 +367,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 1,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -342,6 +381,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -355,6 +395,7 @@
"fieldname": "stock_qty",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Stock Qty",
"no_copy": 1,
"oldfieldname": "stock_qty",
@@ -369,6 +410,7 @@
"fieldname": "received_qty",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Received Qty",
"no_copy": 1,
"oldfieldname": "received_qty",
@@ -380,6 +422,7 @@
"doctype": "DocField",
"fieldname": "billed_amt",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Billed Amt",
"no_copy": 1,
"options": "currency",
@@ -392,6 +435,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 1,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -405,6 +449,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 1,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
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 d08963b..1d91aa3 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
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:42",
"docstatus": 0,
- "modified": "2013-03-07 07:03:28",
+ "modified": "2013-07-10 14:54:15",
"modified_by": "Administrator",
"owner": "dhanalekshmi@webnotestech.com"
},
@@ -31,6 +31,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reference Name",
"oldfieldname": "reference_name",
"oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_detail_no",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "BOM Detail No",
"oldfieldname": "bom_detail_no",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "main_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "main_item_code",
"oldfieldtype": "Data",
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rm_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Raw Material Item Code",
"oldfieldname": "rm_item_code",
"oldfieldtype": "Data",
@@ -68,6 +72,7 @@
"doctype": "DocField",
"fieldname": "required_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Required Qty",
"oldfieldname": "required_qty",
"oldfieldtype": "Currency",
@@ -77,6 +82,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
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 4c0ce0d..0ee20a5 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
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:42",
"docstatus": 0,
- "modified": "2013-03-07 07:03:28",
+ "modified": "2013-07-10 14:54:17",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -31,6 +31,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reference Name",
"oldfieldname": "reference_name",
"oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_detail_no",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "BOM Detail No",
"oldfieldname": "bom_detail_no",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "main_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "main_item_code",
"oldfieldtype": "Data",
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rm_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Raw Material Item Code",
"oldfieldname": "rm_item_code",
"oldfieldtype": "Data"
@@ -67,6 +71,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -78,6 +83,7 @@
"doctype": "DocField",
"fieldname": "required_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Required Qty",
"oldfieldname": "required_qty",
"oldfieldtype": "Currency",
diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
index 066185e..0c68cc7 100644
--- a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
+++ b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:43",
"docstatus": 0,
- "modified": "2013-03-07 07:03:29",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "specification",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Parameter",
"oldfieldname": "specification",
"oldfieldtype": "Data",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "value",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Acceptance Criteria",
"oldfieldname": "value",
"oldfieldtype": "Data"
@@ -46,6 +48,7 @@
"doctype": "DocField",
"fieldname": "reading_1",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 1",
"oldfieldname": "reading_1",
"oldfieldtype": "Data"
@@ -54,6 +57,7 @@
"doctype": "DocField",
"fieldname": "reading_2",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 2",
"oldfieldname": "reading_2",
"oldfieldtype": "Data"
@@ -62,6 +66,7 @@
"doctype": "DocField",
"fieldname": "reading_3",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 3",
"oldfieldname": "reading_3",
"oldfieldtype": "Data"
@@ -70,6 +75,7 @@
"doctype": "DocField",
"fieldname": "reading_4",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 4",
"oldfieldname": "reading_4",
"oldfieldtype": "Data"
diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py
index d63d336..d1552f94 100644
--- a/buying/doctype/supplier/supplier.py
+++ b/buying/doctype/supplier/supplier.py
@@ -196,7 +196,7 @@
@webnotes.whitelist()
def get_dashboard_info(supplier):
- if not webnotes.has_permission("Supplier", supplier):
+ if not webnotes.has_permission("Supplier", "read", supplier):
webnotes.msgprint("No Permission", raise_exception=True)
out = {}
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.py b/buying/doctype/supplier_quotation/supplier_quotation.py
index f49782f..3e177a1 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -94,14 +94,15 @@
},
"Supplier Quotation Item": {
"doctype": "Purchase Order Item",
- "field_map": {
- "name": "supplier_quotation_item",
- "parent": "supplier_quotation",
- "uom": "stock_uom",
- "prevdoc_detail_docname": "prevdoc_detail_docname",
- "prevdoc_doctype": "prevdoc_doctype",
- "prevdoc_docname": "prevdoc_docname",
- },
+ "field_map": [
+ ["name", "supplier_quotation_item"],
+ ["parent", "supplier_quotation"],
+ ["uom", "stock_uom"],
+ ["uom", "uom"],
+ ["prevdoc_detail_docname", "prevdoc_detail_docname"],
+ ["prevdoc_doctype", "prevdoc_doctype"],
+ ["prevdoc_docname", "prevdoc_docname"]
+ ],
"postprocess": update_item
},
"Purchase Taxes and Charges": {
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index d4df404..3ac6200 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-07-09 12:15:15",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "supplier_part_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Supplier Part Number",
"print_hide": 1,
"read_only": 1
@@ -55,6 +57,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -67,6 +70,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -76,10 +80,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -92,6 +104,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -106,6 +119,7 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
@@ -115,6 +129,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -124,6 +139,7 @@
"fieldname": "import_rate",
"fieldtype": "Currency",
"hidden": 0,
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -135,6 +151,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -145,6 +162,7 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
@@ -155,6 +173,7 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
@@ -170,6 +189,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -180,9 +200,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -196,6 +224,7 @@
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -207,6 +236,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Prevdoc DocType",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -220,6 +250,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -237,6 +268,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Date",
"no_copy": 1,
"oldfieldname": "prevdoc_date",
@@ -251,6 +283,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -264,6 +297,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -277,6 +311,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -291,6 +326,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -304,6 +340,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.txt b/hr/doctype/appraisal_goal/appraisal_goal.txt
index ed71e69..794a879 100644
--- a/hr/doctype/appraisal_goal/appraisal_goal.txt
+++ b/hr/doctype/appraisal_goal/appraisal_goal.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:44",
"docstatus": 0,
- "modified": "2013-03-07 07:03:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Appraisal Goal",
"parentfield": "fields",
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
index da9fde0..074c247 100644
--- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
+++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:44",
"docstatus": 0,
- "modified": "2013-03-07 07:03:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Appraisal Template Goal",
"parentfield": "fields",
diff --git a/hr/doctype/attendance/attendance.js b/hr/doctype/attendance/attendance.js
index 94b32a3..d1a66ce 100644
--- a/hr/doctype/attendance/attendance.js
+++ b/hr/doctype/attendance/attendance.js
@@ -14,16 +14,15 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-cur_frm.add_fetch('employee', 'company', 'company');
+cur_frm.add_fetch('employee', 'company', 'company');
+cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
-//get employee's name based on employee id selected
-cur_frm.cscript.employee = function(doc,cdt,cdn){
- if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1);
- refresh_field('employee_name');
+cur_frm.cscript.onload = function(doc, cdt, cdn) {
+ if(doc.__islocal) cur_frm.set_value("att_date", get_today());
}
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
return{
query:"controllers.queries.employee_query"
}
-}
\ No newline at end of file
+}
diff --git a/hr/doctype/attendance/attendance.py b/hr/doctype/attendance/attendance.py
index ac41acf..16e2547 100644
--- a/hr/doctype/attendance/attendance.py
+++ b/hr/doctype/attendance/attendance.py
@@ -26,12 +26,6 @@
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
-
- def get_emp_name(self):
- return {
- "employee_name": webnotes.conn.get_value("Employee",
- self.doc.employee_name, "employee_name")
- }
def validate_duplicate_record(self):
res = sql("""select name from `tabAttendance` where employee = %s and att_date = %s
diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
index aa917ed..d948d6f 100644
--- a/hr/doctype/attendance/attendance.txt
+++ b/hr/doctype/attendance/attendance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:13",
"docstatus": 0,
- "modified": "2013-07-05 14:25:19",
+ "modified": "2013-07-10 17:39:22",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -25,6 +25,7 @@
"permlevel": 0
},
{
+ "cancel": 1,
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
@@ -33,6 +34,8 @@
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
+ "report": 1,
+ "submit": 1,
"write": 1
},
{
@@ -80,6 +83,7 @@
"oldfieldtype": "Data"
},
{
+ "default": "Present",
"doctype": "DocField",
"fieldname": "status",
"fieldtype": "Select",
@@ -157,15 +161,15 @@
"read_only": 1
},
{
- "cancel": 1,
"doctype": "DocPerm",
- "report": 1,
- "role": "HR User",
- "submit": 1
+ "role": "System Manager"
},
{
"doctype": "DocPerm",
- "match": "owner",
- "role": "Employee"
+ "role": "HR User"
+ },
+ {
+ "doctype": "DocPerm",
+ "role": "HR Manager"
}
]
\ No newline at end of file
diff --git a/hr/doctype/employee/employee.js b/hr/doctype/employee/employee.js
index 3c19548..398d8f8 100644
--- a/hr/doctype/employee/employee.js
+++ b/hr/doctype/employee/employee.js
@@ -32,13 +32,9 @@
refresh: function() {
var me = this;
erpnext.hide_naming_series();
- if(!this.frm.doc.__islocal) {
- cur_frm.add_custom_button('View Active Salary Structure', function() {
- me.view_active_salary_structure(this); });
-
+ if(!this.frm.doc.__islocal) {
cur_frm.add_custom_button('Make Salary Structure', function() {
me.make_salary_structure(this); });
-
}
},
@@ -47,7 +43,8 @@
this.frm.call({
method:"hr.utils.get_leave_approver_list",
callback: function(r) {
- me.frm.fields_dict.employee_leave_approvers.grid.get_field("leave_approver").df.options =
+ me.frm.fields_dict.employee_leave_approvers.grid
+ .get_field("leave_approver").df.options =
$.map(r.message, function(profile) {
return {value: profile, label: wn.user_info(profile).fullname};
});
@@ -77,9 +74,9 @@
if(r.message) {
msgprint(wn._("Employee") + ' "' + me.frm.doc.name + '": '
+ wn._("An active Salary Structure already exists. \
- If you want to create new one, please ensure that no active Salary Structure \
- exists for this Employee. Go to the active Salary Structure and set \
- \"Is Active\" = \"No\""));
+ If you want to create new one, please ensure that no active \
+ Salary Structure exists for this Employee. \
+ Go to the active Salary Structure and set \"Is Active\" = \"No\""));
} else if(!r.exc) {
wn.model.map({
source: wn.model.get_doclist(me.frm.doc.doctype, me.frm.doc.name),
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index 9d6dfae..44e1bb2 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
- "modified": "2013-07-05 14:36:19",
+ "modified": "2013-07-10 12:52:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Employee",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
+ "report": 1,
"submit": 0
},
{
@@ -55,7 +57,7 @@
"doctype": "DocField",
"fieldname": "image_view",
"fieldtype": "Image",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Image View",
"options": "image"
},
@@ -564,6 +566,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break6",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "marital_status",
"fieldtype": "Select",
"label": "Marital Status",
@@ -577,12 +585,6 @@
"options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-"
},
{
- "doctype": "DocField",
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
"description": "Here you can maintain family details like name and occupation of parent, spouse and children",
"doctype": "DocField",
"fieldname": "family_background",
@@ -748,17 +750,6 @@
"create": 0,
"doctype": "DocPerm",
"match": "employee",
- "permlevel": 0,
- "report": 1,
- "role": "Employee",
- "write": 0
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
"role": "Employee",
"write": 0
},
@@ -767,8 +758,6 @@
"create": 1,
"doctype": "DocPerm",
"match": "company",
- "permlevel": 0,
- "report": 1,
"role": "HR User",
"write": 1
},
@@ -776,27 +765,7 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "HR Manager",
"write": 1
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "HR User",
- "write": 0
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "HR Manager",
- "write": 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 46b6f00..69bbbde 100644
--- a/hr/doctype/employee_education/employee_education.txt
+++ b/hr/doctype/employee_education/employee_education.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee Education",
"parentfield": "fields",
diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.txt b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
index 05fc5c0..2d54729 100644
--- a/hr/doctype/employee_external_work_history/employee_external_work_history.txt
+++ b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee External Work History",
"parentfield": "fields",
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 d813e7c..9cd03ce 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
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee Internal Work History",
"parentfield": "fields",
diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
index 31e3e09..f175bbd 100644
--- a/hr/doctype/employee_leave_approver/employee_leave_approver.txt
+++ b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-12 06:56:15",
"docstatus": 0,
- "modified": "2013-04-12 07:53:33",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,6 +19,7 @@
"doctype": "DocField",
"fieldname": "leave_approver",
"fieldtype": "Select",
+ "in_list_view": 0,
"label": "Leave Approver",
"name": "__common__",
"parent": "Employee Leave Approver",
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.txt b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
index d2b5cf3..e9c5a99 100644
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:46",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Expense Claim Detail",
"parentfield": "fields",
diff --git a/hr/doctype/holiday/holiday.txt b/hr/doctype/holiday/holiday.txt
index 94f7936..3b87bb0 100644
--- a/hr/doctype/holiday/holiday.txt
+++ b/hr/doctype/holiday/holiday.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:46",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Holiday",
"parentfield": "fields",
diff --git a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt b/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
index 8e362f3..1e8c86b 100644
--- a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
+++ b/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:47",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "allow_user",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Allow User",
"name": "__common__",
"options": "Profile",
diff --git a/hr/doctype/leave_block_list_date/leave_block_list_date.txt b/hr/doctype/leave_block_list_date/leave_block_list_date.txt
index d0b9fbf..c13e2d5 100644
--- a/hr/doctype/leave_block_list_date/leave_block_list_date.txt
+++ b/hr/doctype/leave_block_list_date/leave_block_list_date.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:47",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Leave Block List Date",
"parentfield": "fields",
diff --git a/hr/doctype/salary_slip/salary_slip.js b/hr/doctype/salary_slip/salary_slip.js
index 9885763..f6853fc 100644
--- a/hr/doctype/salary_slip/salary_slip.js
+++ b/hr/doctype/salary_slip/salary_slip.js
@@ -20,13 +20,14 @@
// -------------------------------------------------------------------
cur_frm.cscript.onload = function(doc,dt,dn){
if((cint(doc.__islocal) == 1) && !doc.amended_from){
- var today=new Date();
- month = (today.getMonth()+01).toString();
- if(month.length>1) doc.month = month;
- else doc.month = '0'+month;
- doc.fiscal_year = sys_defaults['fiscal_year'];
+ if(!doc.month) {
+ var today=new Date();
+ month = (today.getMonth()+01).toString();
+ if(month.length>1) doc.month = month;
+ else doc.month = '0'+month;
+ }
+ if(!doc.fiscal_year) doc.fiscal_year = sys_defaults['fiscal_year'];
refresh_many(['month', 'fiscal_year']);
- cur_frm.cscript.fiscal_year(doc, dt, dn);
}
}
@@ -42,8 +43,6 @@
cur_frm.cscript.month = cur_frm.cscript.employee = cur_frm.cscript.fiscal_year;
-// Calculate total if lwp exists
-// ------------------------------------------------------------------------
cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
if (doc.employee && doc.fiscal_year && doc.month) {
$c_obj(make_doclist(doc.doctype,doc.name), 'get_leave_details',doc.leave_without_pay,function(r, rt) {
@@ -54,16 +53,12 @@
}
}
-// Calculate all
-// ------------------------------------------------------------------------
var calculate_all = function(doc, dt, dn) {
calculate_earning_total(doc, dt, dn);
calculate_ded_total(doc, dt, dn);
calculate_net_pay(doc, dt, dn);
}
-// Trigger on earning modified amount and depends on lwp
-// ------------------------------------------------------------------------
cur_frm.cscript.e_modified_amount = function(doc,dt,dn){
calculate_earning_total(doc, dt, dn);
calculate_net_pay(doc, dt, dn);
@@ -143,4 +138,4 @@
return{
query:"controllers.queries.employee_query"
}
-}
\ No newline at end of file
+}
diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py
index e3e43e4..2b1d80c 100644
--- a/hr/doctype/salary_slip/salary_slip.py
+++ b/hr/doctype/salary_slip/salary_slip.py
@@ -17,11 +17,11 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import add_days, cint, cstr, flt, getdate
+from webnotes.utils import add_days, cint, cstr, flt, getdate, nowdate
from webnotes.model.doc import make_autoname
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
-from webnotes import msgprint
+from webnotes import msgprint, _
from setup.utils import get_company_currency
sql = webnotes.conn.sql
@@ -40,9 +40,7 @@
def get_emp_and_leave_details(self):
if self.doc.employee:
- # Get payment days
- if self.doc.fiscal_year and self.doc.month:
- self.get_leave_details()
+ self.get_leave_details()
# check sal structure
struct = self.check_sal_struct()
@@ -59,20 +57,24 @@
def pull_sal_struct(self, struct):
- self.doclist = self.doc.clear_table(self.doclist, 'earning_details')
- self.doclist = self.doc.clear_table(self.doclist, 'deduction_details')
-
from hr.doctype.salary_structure.salary_structure import make_salary_slip
- make_salary_slip(struct, self.doclist)
-
- basic_info = sql("select bank_name, bank_ac_no, esic_card_no, pf_number from `tabEmployee` where name ='%s'" % self.doc.employee)
- self.doc.bank_name = basic_info[0][0]
- self.doc.bank_account_no = basic_info[0][1]
- self.doc.esic_no = basic_info[0][2]
- self.doc.pf_no = basic_info[0][3]
-
+ self.doclist = make_salary_slip(struct, self.doclist)
+
+ def pull_emp_details(self):
+ emp = webnotes.conn.get_value("Employee", self.doc.employee,
+ ["bank_name", "bank_ac_no", "esic_card_no", "pf_number"], as_dict=1)
+ if emp:
+ self.doc.bank_name = emp.bank_name
+ self.doc.bank_ac_no = emp.bank_ac_no
+ self.doc.esic_no = emp.esic_card_no
+ self.doc.pf_no = emp.pf_number
def get_leave_details(self, lwp=None):
+ if not self.doc.fiscal_year:
+ self.doc.fiscal_year = webnotes.get_default("fiscal_year")
+ if not self.doc.month:
+ self.doc.month = "%02d" % getdate(nowdate()).month
+
m = get_obj('Salary Manager').get_month_details(self.doc.fiscal_year, self.doc.month)
if not lwp:
@@ -92,7 +94,9 @@
if getdate(emp['relieving_date']) > m['month_start_date'] and getdate(emp['relieving_date']) < m['month_end_date']:
payment_days = getdate(emp['relieving_date']).day
elif getdate(emp['relieving_date']) < m['month_start_date']:
- payment_days = 0
+ webnotes.msgprint(_("Relieving Date of employee is ") + cstr(emp['relieving_date']
+ + _(". Please set status of the employee as 'Left'")), raise_exception=1)
+
if emp['date_of_joining']:
if getdate(emp['date_of_joining']) > m['month_start_date'] and getdate(emp['date_of_joining']) < m['month_end_date']:
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
index 86acef0..7fa4051 100644
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Slip Deduction",
"parentfield": "fields",
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
index 64f4dc6..4ac3f39 100644
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Slip Earning",
"parentfield": "fields",
diff --git a/hr/doctype/salary_structure/salary_structure.py b/hr/doctype/salary_structure/salary_structure.py
index f890024..37b0b47 100644
--- a/hr/doctype/salary_structure/salary_structure.py
+++ b/hr/doctype/salary_structure/salary_structure.py
@@ -99,14 +99,11 @@
from webnotes.model.mapper import get_mapped_doclist
def postprocess(source, target):
- emp = webnotes.conn.get_value("Employee", source.doc.employee,
- ["bank_name", "bank_ac_no", "esic_card_no", "pf_number"], as_dict=1)
- if emp:
- target[0].bank_name = emp.bank_name
- target[0].bank_ac_no = emp.bank_ac_no
- target[0].esic_no = emp.esic_card_no
- target[0].pf_no = emp.pf_number
-
+ sal_slip = webnotes.bean(target)
+ sal_slip.run_method("pull_emp_details")
+ sal_slip.run_method("get_leave_details")
+ sal_slip.run_method("calculate_net_pay")
+
doclist = get_mapped_doclist("Salary Structure", source_name, {
"Salary Structure": {
"doctype": "Salary Slip",
@@ -116,16 +113,19 @@
},
"Salary Structure Deduction": {
"doctype": "Salary Slip Deduction",
- "field_map": {
- "depend_on_lwp": "d_depends_on_lwp"
- }
+ "field_map": [
+ ["depend_on_lwp", "d_depends_on_lwp"],
+ ["d_modified_amt", "d_amount"],
+ ["d_modified_amt", "d_modified_amount"]
+ ]
},
"Salary Structure Earning": {
"doctype": "Salary Slip Earning",
- "field_map": {
- "depend_on_lwp": "e_depends_on_lwp",
- "modified_value": "e_modified_amount"
- }
+ "field_map": [
+ ["depend_on_lwp", "e_depends_on_lwp"],
+ ["modified_value", "e_modified_amount"],
+ ["modified_value", "e_amount"]
+ ]
}
}, target_doclist, postprocess)
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
index 53dbf69..81e9a46 100644
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Structure Deduction",
"parentfield": "fields",
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.txt b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
index 29c3f52..b2a8e30 100644
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Structure Earning",
"parentfield": "fields",
diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js
index 517fb77..dadc6fb 100644
--- a/hr/page/hr_home/hr_home.js
+++ b/hr/page/hr_home/hr_home.js
@@ -23,9 +23,14 @@
doctype:"Expense Claim"
},
{
- label: wn._("Job Applicant"),
- description: wn._("Applicant for a Job."),
- doctype:"Job Applicant"
+ label: wn._("Salary Slip"),
+ description: wn._("Monthly salary statement."),
+ doctype:"Salary Slip"
+ },
+ {
+ label: wn._("Attendance"),
+ description: wn._("Attendance record."),
+ doctype:"Attendance"
},
]
},
@@ -34,14 +39,9 @@
icon: "icon-copy",
items: [
{
- label: wn._("Attendance"),
- description: wn._("Attendance record."),
- doctype:"Attendance"
- },
- {
- label: wn._("Salary Slip"),
- description: wn._("Monthly salary statement."),
- doctype:"Salary Slip"
+ label: wn._("Job Applicant"),
+ description: wn._("Applicant for a Job."),
+ doctype:"Job Applicant"
},
{
label: wn._("Appraisal"),
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
index 3808cdf..abc74cd 100644
--- a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
+++ b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-06-04 13:13:28",
+ "modified": "2013-07-10 14:54:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -32,6 +32,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -51,6 +53,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency"
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "standard_rate",
"oldfieldtype": "Currency"
@@ -67,6 +71,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "amount_as_per_sr",
"oldfieldtype": "Currency"
@@ -75,6 +80,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Link",
@@ -85,6 +91,7 @@
"fieldname": "qty_consumed_per_unit",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Qty Consumed Per Unit",
"no_copy": 0
}
diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/manufacturing/doctype/bom_item/bom_item.txt
index 2554adf..85fbcf6 100644
--- a/manufacturing/doctype/bom_item/bom_item.txt
+++ b/manufacturing/doctype/bom_item/bom_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-06-27 11:30:07",
+ "modified": "2013-07-10 14:54:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,6 +41,7 @@
"doctype": "DocField",
"fieldname": "operation_no",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Operation No",
"oldfieldname": "operation_no",
"oldfieldtype": "Data",
@@ -51,6 +52,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -63,6 +65,7 @@
"fieldname": "bom_no",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "BOM No",
"oldfieldname": "bom_no",
"oldfieldtype": "Link",
@@ -76,6 +79,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -85,6 +89,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -96,12 +101,14 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate"
},
{
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "amount_as_per_mar",
"oldfieldtype": "Currency",
diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/manufacturing/doctype/bom_operation/bom_operation.txt
index 56805b5..86dffe9 100644
--- a/manufacturing/doctype/bom_operation/bom_operation.txt
+++ b/manufacturing/doctype/bom_operation/bom_operation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "BOM Operation",
"parentfield": "fields",
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.txt b/manufacturing/doctype/production_plan_item/production_plan_item.txt
index 3af1bea..37f56c9 100644
--- a/manufacturing/doctype/production_plan_item/production_plan_item.txt
+++ b/manufacturing/doctype/production_plan_item/production_plan_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_no",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "BOM No",
"oldfieldname": "bom_no",
"oldfieldtype": "Link",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "planned_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Planned Qty",
"oldfieldname": "planned_qty",
"oldfieldtype": "Currency",
@@ -65,6 +68,7 @@
"doctype": "DocField",
"fieldname": "sales_order",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Sales Order",
"oldfieldname": "source_docname",
"oldfieldtype": "Data",
@@ -76,6 +80,7 @@
"doctype": "DocField",
"fieldname": "so_pending_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "SO Pending Qty",
"oldfieldname": "prevdoc_reqd_qty",
"oldfieldtype": "Currency",
@@ -88,6 +93,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -100,6 +106,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index dc5b88d..e74f3bb 100644
--- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Production Plan Sales Order",
"parentfield": "fields",
diff --git a/projects/doctype/project_milestone/project_milestone.txt b/projects/doctype/project_milestone/project_milestone.txt
index 11c5d20..31722d6 100644
--- a/projects/doctype/project_milestone/project_milestone.txt
+++ b/projects/doctype/project_milestone/project_milestone.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:50",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Project Milestone",
"parentfield": "fields",
diff --git a/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt b/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
index 8bd554f..98eca10 100644
--- a/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
+++ b/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-05 09:11:06",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Time Log Batch Detail",
"parentfield": "fields",
diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py
index 83c10a5..2820fb3 100644
--- a/selling/doctype/customer/customer.py
+++ b/selling/doctype/customer/customer.py
@@ -177,7 +177,7 @@
@webnotes.whitelist()
def get_dashboard_info(customer):
- if not webnotes.has_permission("Customer", customer):
+ if not webnotes.has_permission("Customer", "read", customer):
webnotes.msgprint("No Permission", raise_exception=True)
out = {}
diff --git a/selling/doctype/installation_note_item/installation_note_item.txt b/selling/doctype/installation_note_item/installation_note_item.txt
index a2ccdc4..02871ad 100644
--- a/selling/doctype/installation_note_item/installation_note_item.txt
+++ b/selling/doctype/installation_note_item/installation_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -51,6 +53,7 @@
"fieldname": "prevdoc_date",
"fieldtype": "Date",
"hidden": 0,
+ "in_list_view": 1,
"label": "Delivery Date",
"oldfieldname": "prevdoc_date",
"oldfieldtype": "Date",
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text",
@@ -72,6 +76,7 @@
"fieldname": "prevdoc_detail_docname",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Against Document Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -87,6 +92,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Against Document No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -103,6 +109,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Document Type",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -117,6 +124,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Installed Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index ba7870e..fb1501c 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -59,6 +62,7 @@
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -71,6 +75,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -80,9 +85,26 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "oldfieldtype": "Currency"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Basic Rate",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -91,16 +113,9 @@
},
{
"doctype": "DocField",
- "fieldname": "qty",
- "fieldtype": "Float",
- "label": "Qty",
- "oldfieldname": "qty",
- "oldfieldtype": "Currency"
- },
- {
- "doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index a15166a..32b8421 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-07-09 12:24:21",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -47,6 +48,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -56,6 +58,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -70,6 +73,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -80,11 +84,19 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -99,6 +111,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -113,6 +126,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -128,6 +142,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -142,6 +157,7 @@
"fieldname": "export_rate",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -159,6 +175,7 @@
"fieldname": "export_amount",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -174,6 +191,7 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
@@ -189,6 +207,7 @@
"fieldname": "basic_rate",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -206,6 +225,7 @@
"fieldname": "amount",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -219,10 +239,18 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -237,6 +265,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -252,6 +281,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -263,6 +293,7 @@
"doctype": "DocField",
"fieldname": "prevdoc_docname",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Against Docname",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -278,6 +309,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Against Doctype",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -294,6 +326,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
diff --git a/selling/doctype/sales_bom_item/sales_bom_item.txt b/selling/doctype/sales_bom_item/sales_bom_item.txt
index f7906b7..1bd456b 100644
--- a/selling/doctype/sales_bom_item/sales_bom_item.txt
+++ b/selling/doctype/sales_bom_item/sales_bom_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-23 16:55:51",
"docstatus": 0,
- "modified": "2013-06-26 13:45:41",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -57,6 +60,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency"
@@ -65,6 +69,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
diff --git a/selling/doctype/sales_common/sales_common.txt b/selling/doctype/sales_common/sales_common.txt
index 4d00b51..a407493 100644
--- a/selling/doctype/sales_common/sales_common.txt
+++ b/selling/doctype/sales_common/sales_common.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:14",
"docstatus": 0,
- "modified": "2012-03-27 14:36:14",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Selling",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 290
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 0d1ca5b..84e44b0 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-07-09 12:28:31",
+ "modified": "2013-07-10 14:54:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -53,6 +55,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -67,6 +70,7 @@
"fieldname": "description",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -77,10 +81,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -94,6 +106,7 @@
"fieldname": "stock_uom",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -107,6 +120,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -122,6 +136,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount(%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -135,6 +150,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -149,6 +165,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"no_copy": 0,
"oldfieldname": "export_amount",
@@ -163,6 +180,7 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
@@ -177,6 +195,7 @@
"doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -192,6 +211,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"no_copy": 0,
"oldfieldname": "amount",
@@ -205,8 +225,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "reserved_warehouse",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Reserved Warehouse",
"no_copy": 1,
"oldfieldname": "reserved_warehouse",
@@ -224,6 +252,7 @@
"fieldname": "projected_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Projected Qty",
"no_copy": 1,
"oldfieldname": "projected_qty",
@@ -238,6 +267,7 @@
"doctype": "DocField",
"fieldname": "actual_qty",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Actual Qty",
"no_copy": 1,
"print_hide": 1,
@@ -252,6 +282,7 @@
"fieldtype": "Float",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 0,
"label": "Delivered Qty",
"no_copy": 1,
"oldfieldname": "delivered_qty",
@@ -266,6 +297,7 @@
"doctype": "DocField",
"fieldname": "billed_amt",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Billed Amt",
"no_copy": 1,
"options": "currency",
@@ -278,6 +310,7 @@
"fieldname": "planned_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Planned Quantity",
"no_copy": 1,
"oldfieldname": "planned_qty",
@@ -294,6 +327,7 @@
"fieldname": "produced_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Produced Quantity",
"oldfieldname": "produced_qty",
"oldfieldtype": "Currency",
@@ -309,6 +343,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Brand Name",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -323,6 +358,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -337,6 +373,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Quotation",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -351,6 +388,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 0,
"label": "Page Break",
"oldfieldname": "page_break",
"oldfieldtype": "Check",
@@ -363,6 +401,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -377,6 +416,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 0,
+ "in_list_view": 0,
"label": "Sales Order Date",
"oldfieldname": "transaction_date",
"oldfieldtype": "Date",
diff --git a/selling/doctype/sales_team/sales_team.txt b/selling/doctype/sales_team/sales_team.txt
index 29a951e..ae50814b 100644
--- a/selling/doctype/sales_team/sales_team.txt
+++ b/selling/doctype/sales_team/sales_team.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-19 13:30:51",
"docstatus": 0,
- "modified": "2013-05-21 17:04:45",
+ "modified": "2013-07-10 14:54:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"fieldname": "sales_person",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Sales Person",
"oldfieldname": "sales_person",
"oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"fieldname": "sales_designation",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 1,
"label": "Designation",
"oldfieldname": "sales_designation",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"fieldname": "contact_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 1,
"label": "Contact No.",
"oldfieldname": "contact_no",
"oldfieldtype": "Data",
@@ -64,6 +67,7 @@
"doctype": "DocField",
"fieldname": "allocated_percentage",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Contribution (%)",
"oldfieldname": "allocated_percentage",
"oldfieldtype": "Currency",
@@ -75,6 +79,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Contribution to Net Total",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -90,6 +95,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Parenttype",
"oldfieldname": "parenttype",
"oldfieldtype": "Data",
@@ -100,6 +106,7 @@
"doctype": "DocField",
"fieldname": "incentives",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Incentives",
"oldfieldname": "incentives",
"oldfieldtype": "Currency",
diff --git a/setup/doctype/authorization_control/authorization_control.txt b/setup/doctype/authorization_control/authorization_control.txt
index 601381e..897994b 100644
--- a/setup/doctype/authorization_control/authorization_control.txt
+++ b/setup/doctype/authorization_control/authorization_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:18",
"docstatus": 0,
- "modified": "2012-03-27 14:36:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,9 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Setup",
- "name": "__common__",
- "section_style": "Tabbed",
- "version": 216
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/setup/doctype/contact_control/contact_control.txt b/setup/doctype/contact_control/contact_control.txt
index 9fab367..80caeae 100644
--- a/setup/doctype/contact_control/contact_control.txt
+++ b/setup/doctype/contact_control/contact_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:19",
"docstatus": 0,
- "modified": "2012-03-27 14:36:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -12,14 +12,12 @@
"issingle": 1,
"module": "Setup",
"name": "__common__",
- "read_only": 1,
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 25
+ "read_only": 1
},
{
"doctype": "DocField",
"fieldtype": "Text",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Contact Control",
"parentfield": "fields",
@@ -43,9 +41,6 @@
"name": "Contact Control"
},
{
- "doctype": "DocPerm"
- },
- {
"doctype": "DocField",
"fieldname": "header",
"label": "Header"
@@ -59,5 +54,8 @@
"doctype": "DocField",
"fieldname": "supplier_intro",
"label": "Supplier Intro"
+ },
+ {
+ "doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/setup/doctype/for_territory/for_territory.txt b/setup/doctype/for_territory/for_territory.txt
index 658a11c..be454ec 100644
--- a/setup/doctype/for_territory/for_territory.txt
+++ b/setup/doctype/for_territory/for_territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 12:48:38",
"docstatus": 0,
- "modified": "2013-06-20 12:48:38",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Territory",
"name": "__common__",
"options": "Territory",
diff --git a/setup/doctype/notification_control/notification_control.txt b/setup/doctype/notification_control/notification_control.txt
index be86a96..c1f559b 100644
--- a/setup/doctype/notification_control/notification_control.txt
+++ b/setup/doctype/notification_control/notification_control.txt
@@ -1,208 +1,217 @@
[
{
- "owner": "Administrator",
- "docstatus": 0,
"creation": "2012-07-12 23:29:45",
+ "docstatus": 0,
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
- "modified": "2013-01-10 12:22:45"
+ "owner": "Administrator"
},
{
+ "allow_copy": 1,
"allow_email": 1,
- "issingle": 1,
- "description": "Send automatic emails to Contacts on Submitting transactions.",
- "name": "__common__",
"allow_print": 1,
+ "description": "Send automatic emails to Contacts on Submitting transactions.",
"doctype": "DocType",
+ "issingle": 1,
"module": "Setup",
- "allow_copy": 1
+ "name": "__common__"
},
{
- "name": "__common__",
- "parent": "Notification Control",
"doctype": "DocField",
- "parenttype": "DocType",
- "permlevel": 0,
- "parentfield": "fields"
- },
- {
"name": "__common__",
"parent": "Notification Control",
- "read": 1,
- "doctype": "DocPerm",
+ "parentfield": "fields",
"parenttype": "DocType",
- "permlevel": 0,
- "parentfield": "permissions"
+ "permlevel": 0
},
{
- "name": "Notification Control",
- "doctype": "DocType"
+ "doctype": "DocPerm",
+ "name": "__common__",
+ "parent": "Notification Control",
+ "parentfield": "permissions",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "read": 1
+ },
+ {
+ "doctype": "DocType",
+ "name": "Notification Control"
},
{
"description": "When any of the checked transactions are \"Submitted\", an email pop-up automatically opened to send an email to the associated \"Contact\" in that transaction, with the transaction as an attachment. The user may or may not send the email.",
"doctype": "DocField",
- "label": "Prompt for Email on Submission of",
"fieldname": "send_autonotification_for",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Prompt for Email on Submission of"
},
{
- "print_width": "50%",
"doctype": "DocField",
- "label": "Sales",
- "width": "50%",
"fieldname": "sales",
- "fieldtype": "Column Break"
- },
- {
- "doctype": "DocField",
- "label": "Quotation",
- "fieldname": "quotation",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Sales Order",
- "fieldname": "sales_order",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Delivery Note",
- "fieldname": "delivery_note",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Sales Invoice",
- "fieldname": "sales_invoice",
- "fieldtype": "Check"
- },
- {
+ "fieldtype": "Column Break",
+ "in_list_view": 0,
+ "label": "Sales",
"print_width": "50%",
+ "width": "50%"
+ },
+ {
"doctype": "DocField",
- "label": "Purchase",
- "width": "50%",
+ "fieldname": "quotation",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Quotation"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sales_order",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Sales Order"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "delivery_note",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Delivery Note"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sales_invoice",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Sales Invoice"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "purchase",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "in_list_view": 0,
+ "label": "Purchase",
+ "print_width": "50%",
+ "width": "50%"
},
{
"doctype": "DocField",
- "label": "Purchase Order",
"fieldname": "purchase_order",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Purchase Order"
},
{
"doctype": "DocField",
- "label": "Purchase Receipt",
"fieldname": "purchase_receipt",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Purchase Receipt"
},
{
"doctype": "DocField",
- "label": "Expense Claim",
"fieldname": "expense_claim",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "label": "Expense Claim"
},
{
"description": "Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.",
"doctype": "DocField",
- "label": "Customize the Notification",
"fieldname": "customize_the_notification",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "label": "Customize the Notification"
},
{
"doctype": "DocField",
- "label": "Select Transaction",
"fieldname": "select_transaction",
"fieldtype": "Select",
+ "label": "Select Transaction",
"options": "\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected"
},
{
"doctype": "DocField",
- "label": "Custom Message",
"fieldname": "custom_message",
- "fieldtype": "Text Editor"
+ "fieldtype": "Text Editor",
+ "label": "Custom Message"
},
{
"doctype": "DocField",
- "label": "Update",
"fieldname": "update",
"fieldtype": "Button",
+ "label": "Update",
"options": "set_message"
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Quotation Message",
"fieldname": "quotation_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Quotation Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Sales Order Message",
"fieldname": "sales_order_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Sales Order Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Delivery Note Message",
"fieldname": "delivery_note_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Delivery Note Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Sales Invoice Message",
"fieldname": "sales_invoice_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Sales Invoice Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Purchase Order Message",
"fieldname": "purchase_order_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Purchase Order Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Purchase Receipt Message",
"fieldname": "purchase_receipt_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Purchase Receipt Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Expense Claim Approved Message",
"fieldname": "expense_claim_approved_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Expense Claim Approved Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Expense Claim Rejected Message",
"fieldname": "expense_claim_rejected_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Expense Claim Rejected Message",
+ "print_hide": 1
},
{
"create": 0,
"doctype": "DocPerm",
- "write": 0,
- "role": "Guest"
+ "role": "Guest",
+ "write": 0
},
{
"create": 1,
"doctype": "DocPerm",
- "write": 1,
- "role": "System Manager"
+ "role": "System Manager",
+ "write": 1
}
]
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.py b/setup/doctype/sales_person/sales_person.py
index ea21cd0..2fe08fa 100644
--- a/setup/doctype/sales_person/sales_person.py
+++ b/setup/doctype/sales_person/sales_person.py
@@ -32,4 +32,13 @@
for d in getlist(self.doclist, 'target_details'):
if not flt(d.target_qty) and not flt(d.target_amount):
webnotes.msgprint("Either target qty or target amount is mandatory.")
- raise Exception
\ No newline at end of file
+ raise Exception
+
+ def get_email_id(self):
+ profile = webnotes.conn.get_value("Employee", self.doc.employee, "user_id")
+ if not profile:
+ webnotes.msgprint("User ID (Profile) no set for Employee %s" % self.doc.employee,
+ raise_exception=True)
+ else:
+ return webnotes.conn.get_value("Profile", profile, "email") or profile
+
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt
index 44a246d..56c6397 100644
--- a/setup/doctype/sales_person/sales_person.txt
+++ b/setup/doctype/sales_person/sales_person.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
- "modified": "2013-07-05 14:54:33",
+ "modified": "2013-07-10 12:51:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,12 +44,10 @@
},
{
"doctype": "DocField",
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "read_only": 1
+ "fieldname": "name_and_employee_id",
+ "fieldtype": "Section Break",
+ "label": "Name and Employee ID",
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -93,7 +91,8 @@
"fieldname": "employee",
"fieldtype": "Link",
"label": "Employee",
- "options": "Employee"
+ "options": "Employee",
+ "reqd": 1
},
{
"doctype": "DocField",
@@ -138,7 +137,8 @@
"fieldname": "target_details_section_break",
"fieldtype": "Section Break",
"label": "Sales Person Targets",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-bullseye"
},
{
"doctype": "DocField",
diff --git a/setup/doctype/sales_person/test_sales_person.py b/setup/doctype/sales_person/test_sales_person.py
index 2dea3e5..f4283de 100644
--- a/setup/doctype/sales_person/test_sales_person.py
+++ b/setup/doctype/sales_person/test_sales_person.py
@@ -1,21 +1,25 @@
+test_dependencies = ["Employee"]
test_records = [
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0001",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 1",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0002",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 2",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0003",
}]
diff --git a/setup/doctype/sms_parameter/sms_parameter.txt b/setup/doctype/sms_parameter/sms_parameter.txt
index cc7a002..38cca31 100755
--- a/setup/doctype/sms_parameter/sms_parameter.txt
+++ b/setup/doctype/sms_parameter/sms_parameter.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-03-07 07:03:32",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
{
"doctype": "DocField",
"fieldtype": "Data",
+ "in_list_view": 1,
"name": "__common__",
"parent": "SMS Parameter",
"parentfield": "fields",
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index b3e2886..5d22d88 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-03-07 07:03:33",
+ "modified": "2013-07-10 14:54:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Target Detail",
"parentfield": "fields",
diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt
index cf3fbb1..34681a8 100644
--- a/stock/doctype/bin/bin.txt
+++ b/stock/doctype/bin/bin.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:25",
"docstatus": 0,
- "modified": "2013-01-23 16:53:15",
+ "modified": "2013-07-10 14:54:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -45,6 +45,7 @@
"fieldname": "warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -55,6 +56,7 @@
"doctype": "DocField",
"fieldname": "warehouse_type",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Warehouse Type",
"oldfieldname": "warehouse_type",
"oldfieldtype": "Data"
@@ -64,6 +66,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -76,6 +79,7 @@
"fieldname": "reserved_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reserved Quantity",
"oldfieldname": "reserved_qty",
"oldfieldtype": "Currency",
@@ -87,6 +91,7 @@
"fieldname": "actual_qty",
"fieldtype": "Float",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Actual Quantity",
"oldfieldname": "actual_qty",
"oldfieldtype": "Currency",
@@ -98,6 +103,7 @@
"fieldname": "ordered_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Ordered Quantity",
"oldfieldname": "ordered_qty",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index ef5a984..346673f 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-07-09 12:42:09",
+ "modified": "2013-07-10 14:54:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "barcode",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Barcode",
"print_hide": 1,
"read_only": 0
@@ -38,6 +39,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -53,6 +55,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -74,6 +78,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -83,10 +88,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -99,6 +112,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -113,6 +127,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"no_copy": 0,
"oldfieldname": "ref_rate",
@@ -129,6 +144,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -141,6 +157,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -155,6 +172,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -169,6 +187,7 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
@@ -183,6 +202,7 @@
"doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -197,6 +217,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -209,8 +230,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -225,6 +254,7 @@
"fieldname": "serial_no",
"fieldtype": "Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
diff --git a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
index defd39d..441b13a 100644
--- a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
+++ b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:00",
"docstatus": 0,
- "modified": "2013-03-07 07:03:20",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "parent_item",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Parent Item",
"oldfieldname": "parent_item",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -50,6 +52,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -60,6 +63,7 @@
"fieldname": "parent_detail_docname",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Parent Detail docname",
"no_copy": 1,
"oldfieldname": "parent_detail_docname",
@@ -71,6 +75,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -82,6 +87,7 @@
"doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -91,6 +97,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/item_customer_detail/item_customer_detail.txt b/stock/doctype/item_customer_detail/item_customer_detail.txt
index 3b916a2..def1dff 100644
--- a/stock/doctype/item_customer_detail/item_customer_detail.txt
+++ b/stock/doctype/item_customer_detail/item_customer_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-08 15:37:16",
"docstatus": 0,
- "modified": "2013-03-21 17:29:45",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,6 +19,7 @@
{
"doctype": "DocField",
"in_filter": 1,
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Customer Detail",
"parentfield": "fields",
diff --git a/stock/doctype/item_price/item_price.txt b/stock/doctype/item_price/item_price.txt
index e4926cb..8062b57 100644
--- a/stock/doctype/item_price/item_price.txt
+++ b/stock/doctype/item_price/item_price.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-02 16:29:48",
"docstatus": 0,
- "modified": "2013-06-11 18:27:55",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -17,6 +17,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Price",
"parentfield": "fields",
diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
index 8233ede..df8c817 100644
--- a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
+++ b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
{
"doctype": "DocField",
"fieldtype": "Data",
+ "in_list_view": 1,
"name": "__common__",
"oldfieldtype": "Data",
"parent": "Item Quality Inspection Parameter",
diff --git a/stock/doctype/item_reorder/item_reorder.txt b/stock/doctype/item_reorder/item_reorder.txt
index b6933c7..ae9de1e 100644
--- a/stock/doctype/item_reorder/item_reorder.txt
+++ b/stock/doctype/item_reorder/item_reorder.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:59",
"docstatus": 0,
- "modified": "2013-03-19 12:22:44",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Reorder",
"parentfield": "fields",
diff --git a/stock/doctype/item_supplier/item_supplier.txt b/stock/doctype/item_supplier/item_supplier.txt
index 3129504..e0e0e6d 100644
--- a/stock/doctype/item_supplier/item_supplier.txt
+++ b/stock/doctype/item_supplier/item_supplier.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Supplier",
"parentfield": "fields",
diff --git a/stock/doctype/item_tax/item_tax.txt b/stock/doctype/item_tax/item_tax.txt
index 343f965..cbc112e 100644
--- a/stock/doctype/item_tax/item_tax.txt
+++ b/stock/doctype/item_tax/item_tax.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Tax",
"parentfield": "fields",
diff --git a/stock/doctype/item_website_specification/item_website_specification.txt b/stock/doctype/item_website_specification/item_website_specification.txt
index 1b371c7..c3c1d34 100644
--- a/stock/doctype/item_website_specification/item_website_specification.txt
+++ b/stock/doctype/item_website_specification/item_website_specification.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Website Specification",
"parentfield": "fields",
diff --git a/stock/doctype/landed_cost_item/landed_cost_item.txt b/stock/doctype/landed_cost_item/landed_cost_item.txt
index 1563fac..3e14ce8 100644
--- a/stock/doctype/landed_cost_item/landed_cost_item.txt
+++ b/stock/doctype/landed_cost_item/landed_cost_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Landed Cost Item",
"parentfield": "fields",
diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
index 8b80559..e47dd27 100644
--- a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
+++ b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Landed Cost Purchase Receipt",
"parentfield": "fields",
diff --git a/stock/doctype/material_request/material_request.py b/stock/doctype/material_request/material_request.py
index 861162a..71a9e13 100644
--- a/stock/doctype/material_request/material_request.py
+++ b/stock/doctype/material_request/material_request.py
@@ -254,12 +254,13 @@
},
"Material Request Item": {
"doctype": "Purchase Order Item",
- "field_map": {
- "name": "prevdoc_detail_docname",
- "parent": "prevdoc_docname",
- "parenttype": "prevdoc_doctype",
- "uom": "stock_uom"
- },
+ "field_map": [
+ ["name", "prevdoc_detail_docname"],
+ ["parent", "prevdoc_docname"],
+ ["parenttype", "prevdoc_doctype"],
+ ["uom", "stock_uom"],
+ ["uom", "uom"]
+ ],
"postprocess": update_item
}
}, target_doclist, set_missing_values)
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 992b4cf..86cc168 100644
--- a/stock/doctype/material_request_item/material_request_item.txt
+++ b/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-07-09 11:37:12",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"doctype": "DocField",
"fieldname": "schedule_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Required Date",
"no_copy": 1,
"oldfieldname": "schedule_date",
@@ -57,6 +59,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -66,8 +69,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_warehouse",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Warehouse"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -82,6 +93,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"no_copy": 0,
"oldfieldname": "qty",
@@ -94,6 +106,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Stock UOM",
"no_copy": 0,
"oldfieldname": "uom",
@@ -108,6 +121,7 @@
"doctype": "DocField",
"fieldname": "lead_time_date",
"fieldtype": "Date",
+ "in_list_view": 0,
"label": "Lead Time Date",
"no_copy": 1,
"oldfieldname": "lead_time_date",
@@ -120,6 +134,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
diff --git a/stock/doctype/packing_slip_item/packing_slip_item.txt b/stock/doctype/packing_slip_item/packing_slip_item.txt
index b186f40..8dea877 100644
--- a/stock/doctype/packing_slip_item/packing_slip_item.txt
+++ b/stock/doctype/packing_slip_item/packing_slip_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-08 13:10:16",
"docstatus": 0,
- "modified": "2013-04-11 15:06:05",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"options": "Item",
"print_width": "100px",
@@ -40,6 +41,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"print_width": "200px",
"read_only": 1,
@@ -49,6 +51,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"print_width": "100px",
"read_only": 0,
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"print_width": "100px",
"read_only": 1,
@@ -68,6 +72,7 @@
"doctype": "DocField",
"fieldname": "net_weight",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Net Weight",
"print_width": "100px",
"read_only": 0,
@@ -77,6 +82,7 @@
"doctype": "DocField",
"fieldname": "weight_uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Weight UOM",
"options": "UOM",
"print_width": "100px",
@@ -87,6 +93,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 1,
"label": "Page Break",
"read_only": 0
},
@@ -95,6 +102,7 @@
"fieldname": "dn_detail",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 1,
"label": "DN Detail",
"read_only": 0
}
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 186ab3d..60b1b56 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2013-07-09 12:20:50",
+ "modified": "2013-07-10 14:54:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -57,6 +59,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -66,10 +69,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "received_and_accepted",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Received and Accepted"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "received_qty",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Recd Quantity",
"oldfieldname": "received_qty",
"oldfieldtype": "Currency",
@@ -84,6 +95,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Accepted Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -97,6 +109,7 @@
"fieldname": "rejected_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Rejected Quantity",
"oldfieldname": "rejected_qty",
"oldfieldtype": "Currency",
@@ -110,6 +123,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -122,8 +136,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "rate_and_amount",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Rate and Amount"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
@@ -133,6 +155,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 1,
"read_only": 0
@@ -142,6 +165,7 @@
"doctype": "DocField",
"fieldname": "import_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -155,6 +179,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -165,6 +190,7 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
@@ -175,6 +201,7 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
@@ -190,6 +217,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -202,9 +230,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Accepted Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -218,6 +254,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Currency",
@@ -231,6 +268,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -245,6 +283,7 @@
"fieldname": "serial_no",
"fieldtype": "Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index 8426ddca..f47e192 100644
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-29 18:22:12",
"docstatus": 0,
- "modified": "2013-03-29 19:43:04",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "s_warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Source Warehouse",
"no_copy": 1,
"oldfieldname": "s_warehouse",
@@ -42,6 +43,7 @@
"fieldname": "t_warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Target Warehouse",
"no_copy": 1,
"oldfieldname": "t_warehouse",
@@ -54,6 +56,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -87,6 +92,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -98,6 +104,7 @@
"doctype": "DocField",
"fieldname": "incoming_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Valuation Rate",
"oldfieldname": "incoming_rate",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/stock_ledger/stock_ledger.txt b/stock/doctype/stock_ledger/stock_ledger.txt
index 1da37c6..afdaa4d 100644
--- a/stock/doctype/stock_ledger/stock_ledger.txt
+++ b/stock/doctype/stock_ledger/stock_ledger.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-01-22 14:57:24",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
index 381c7f7..8b35f64 100644
--- a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
+++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:04",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Float"
diff --git a/stock/doctype/warehouse_user/warehouse_user.txt b/stock/doctype/warehouse_user/warehouse_user.txt
index 6912e30..fee6221 100644
--- a/stock/doctype/warehouse_user/warehouse_user.txt
+++ b/stock/doctype/warehouse_user/warehouse_user.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -17,6 +17,7 @@
"doctype": "DocField",
"fieldname": "user",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "User",
"name": "__common__",
"options": "Profile",
diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js
index cd744ec..2268493 100644
--- a/support/doctype/customer_issue/customer_issue.js
+++ b/support/doctype/customer_issue/customer_issue.js
@@ -18,10 +18,9 @@
// TODO commonify this code
erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
refresh: function() {
- if(cur_frm.doc.docstatus==1 && (cur_frm.doc.status=='Open' ||
- cur_frm.doc.status == 'Work In Progress')) {
- cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
- }
+ if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
+ cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
+ }
},
customer: function() {
@@ -125,4 +124,4 @@
}
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
\ No newline at end of file
+ return{ query:"controllers.queries.customer_query" } }
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index 1850f57..5f89ade 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-05 14:34:37",
+ "modified": "2013-07-10 13:13:27",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -10,7 +10,7 @@
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-bug",
- "is_submittable": 1,
+ "is_submittable": 0,
"module": "Support",
"name": "__common__",
"search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory"
@@ -24,6 +24,8 @@
"permlevel": 0
},
{
+ "amend": 0,
+ "cancel": 1,
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
@@ -33,6 +35,8 @@
"permlevel": 0,
"read": 1,
"report": 1,
+ "role": "Maintenance User",
+ "submit": 0,
"write": 1
},
{
@@ -412,28 +416,6 @@
"width": "150px"
},
{
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "System Manager",
- "submit": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "Maintenance Manager",
- "submit": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "Maintenance User",
- "submit": 1
- },
- {
- "doctype": "DocPerm",
- "role": "Guest"
+ "doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js
index a4f954b..fab9b2a 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -17,6 +17,30 @@
wn.provide("erpnext.support");
// TODO commonify this code
erpnext.support.MaintenanceSchedule = wn.ui.form.Controller.extend({
+ refresh: function() {
+ if (this.frm.doc.docstatus===0) {
+ cur_frm.add_custom_button(wn._('From Sales Order'),
+ function() {
+ wn.model.map_current_doc({
+ method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
+ source_doctype: "Sales Order",
+ get_query_filters: {
+ docstatus: 1,
+ order_type: cur_frm.doc.order_type,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ } else if (this.frm.doc.docstatus===1) {
+ cur_frm.add_custom_button(wn._("Make Maintenance Visit"), function() {
+ wn.model.open_mapped_doc({
+ method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ source_name: cur_frm.doc.name
+ })
+ })
+ }
+ },
customer: function() {
var me = this;
if(this.frm.doc.customer) {
@@ -27,23 +51,8 @@
if(!r.exc) me.frm.refresh_fields();
}
});
-
- // TODO shift this to depends_on
- unhide_field(['customer_address', 'contact_person', 'customer_name',
- 'address_display', 'contact_display', 'contact_mobile', 'contact_email',
- 'territory', 'customer_group']);
-
- }
+ }
},
-
- get_items: function() {
- wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
- source_name: cur_frm.doc.quotation_no,
- });
- unhide_field(['customer_address', 'contact_person', 'customer_name', 'address_display',
- 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']);
- }
});
$.extend(cur_frm.cscript, new erpnext.support.MaintenanceSchedule({frm: cur_frm}));
@@ -88,21 +97,6 @@
}
}
-cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
- }
- return{
- query:"support.doctype.maintenance_schedule.maintenance_schedule.get_sales_order_no",
- filters: {
- 'cond': cond,
- 'company': doc.company
- }
- }
-}
-
cur_frm.cscript.periodicity = function(doc, cdt, cdn){
var d = locals[cdt][cdn];
if(d.start_date && d.end_date){
@@ -136,4 +130,4 @@
}
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
\ No newline at end of file
+ return{ query:"controllers.queries.customer_query" } }
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py
index 56dceaa..0e2d1f9 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -77,8 +77,8 @@
self.update_amc_date(d.serial_no, d.end_date)
if d.incharge_name not in email_map:
- e = sql("select email_id, name from `tabSales Person` where name='%s' " %(d.incharge_name),as_dict=1)[0]
- email_map[d.incharge_name] = (e['email_id'])
+ email_map[d.incharge_name] = webnotes.bean("Sales Person",
+ d.incharge_name).run_method("get_email_id")
scheduled_date =sql("select scheduled_date from `tabMaintenance Schedule Detail` \
where incharge_name='%s' and item_code='%s' and parent='%s' " %(d.incharge_name, \
@@ -312,6 +312,9 @@
def make_maintenance_visit(source_name, target_doclist=None):
from webnotes.model.mapper import get_mapped_doclist
+ def update_status(source, target, parent):
+ target.maintenance_type = "Scheduled"
+
doclist = get_mapped_doclist("Maintenance Schedule", source_name, {
"Maintenance Schedule": {
"doctype": "Maintenance Visit",
@@ -320,31 +323,17 @@
},
"validation": {
"docstatus": ["=", 1]
- }
+ },
+ "postprocess": update_status
},
"Maintenance Schedule Item": {
"doctype": "Maintenance Visit Purpose",
"field_map": {
"parent": "prevdoc_docname",
- "parenttype": "prevdoc_doctype"
+ "parenttype": "prevdoc_doctype",
+ "incharge_name": "service_person"
}
}
}, target_doclist)
- return [d.fields for d in doclist]
-def get_sales_order_no(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
-
- return webnotes.conn.sql(""" select distinct `tabSales Order`.name
- from `tabSales Order`, `tabSales Order Item`, `tabItem`
- where `tabSales Order`.company = "%(company)s"
- and `tabSales Order`.docstatus = 1
- and `tabSales Order Item`.parent = `tabSales Order`.name
- and `tabSales Order Item`.item_code = `tabItem`.name
- and `tabItem`.is_service_item = "Yes"
- and %(cond)s `tabSales Order`.name LIKE "%(txt)s"
- %(mcond)s
- order by `tabSales Order`.name desc
- limit %(start)s, %(page_len)s """ % {'company': filters["company"],
- 'cond': filters['cond'], 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield),
- 'start': start, 'page_len': page_len})
\ No newline at end of file
+ return [d.fields for d in doclist]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index fc95ec6..0491946 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-07 12:18:51",
+ "modified": "2013-07-10 12:18:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,13 +24,19 @@
"permlevel": 0
},
{
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Maintenance Schedule",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
- "report": 1
+ "report": 1,
+ "submit": 1,
+ "write": 1
},
{
"doctype": "DocType",
@@ -42,7 +48,7 @@
"fieldtype": "Section Break",
"label": "Customer Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -97,6 +103,7 @@
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
+ "hidden": 1,
"label": "Address",
"read_only": 1
},
@@ -104,20 +111,23 @@
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
+ "hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "contact_mobile",
- "fieldtype": "Text",
+ "fieldtype": "Data",
+ "hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "contact_email",
- "fieldtype": "Text",
+ "fieldtype": "Data",
+ "hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -202,26 +212,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
- "options": "Simple"
- },
- {
- "doctype": "DocField",
- "fieldname": "sales_order_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Order No",
- "oldfieldname": "sales_order_no",
- "oldfieldtype": "Link",
- "options": "Sales Order",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "get_items",
- "fieldtype": "Button",
- "label": "Get Items",
- "oldfieldtype": "Button",
- "report_hide": 1
+ "options": "icon-shopping-cart"
},
{
"doctype": "DocField",
@@ -238,7 +229,7 @@
"fieldtype": "Section Break",
"label": "Schedule",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-time"
},
{
"doctype": "DocField",
@@ -258,41 +249,11 @@
"read_only": 1
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "System Manager",
- "submit": 1,
- "write": 1
+ "role": "System Manager"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "role": "System Manager",
- "submit": 0
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance Manager",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance Manager",
- "submit": 0
+ "role": "Maintenance Manager"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
index 0aa4d0d..e55a69c 100644
--- a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"fieldname": "scheduled_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Scheduled Date",
"oldfieldname": "scheduled_date",
"oldfieldtype": "Date",
@@ -65,6 +68,7 @@
"fieldname": "actual_date",
"fieldtype": "Date",
"hidden": 1,
+ "in_list_view": 0,
"label": "Actual Date",
"no_copy": 1,
"oldfieldname": "actual_date",
@@ -78,6 +82,7 @@
"fieldname": "incharge_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Incharge Name",
"oldfieldname": "incharge_name",
"oldfieldtype": "Link",
@@ -90,6 +95,7 @@
"fieldname": "serial_no",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 0,
"oldfieldname": "serial_no",
diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
index 3a95b2c..648a328 100644
--- a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
+++ b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:24",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -59,9 +62,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "schedule_details",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Schedule Details"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "start_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Start Date",
"oldfieldname": "start_date",
"oldfieldtype": "Date",
@@ -73,6 +84,7 @@
"fieldname": "end_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "End Date",
"oldfieldname": "end_date",
"oldfieldtype": "Date",
@@ -83,6 +95,7 @@
"doctype": "DocField",
"fieldname": "periodicity",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Periodicity",
"oldfieldname": "periodicity",
"oldfieldtype": "Select",
@@ -102,7 +115,7 @@
"fieldname": "incharge_name",
"fieldtype": "Link",
"in_filter": 1,
- "label": "Incharge Name",
+ "label": "Sales Person Incharge",
"oldfieldname": "incharge_name",
"oldfieldtype": "Link",
"options": "Sales Person",
@@ -111,6 +124,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
"label": "Serial No",
diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js
index f803917..0b0d010 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/support/doctype/maintenance_visit/maintenance_visit.js
@@ -17,6 +17,48 @@
wn.provide("erpnext.support");
// TODO commonify this code
erpnext.support.MaintenanceVisit = wn.ui.form.Controller.extend({
+ refresh: function() {
+ if (this.frm.doc.docstatus===0) {
+ cur_frm.add_custom_button(wn._('From Maintenance Schedule'),
+ function() {
+ wn.model.map_current_doc({
+ method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ source_doctype: "Maintenance Schedule",
+ get_query_filters: {
+ docstatus: 1,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ cur_frm.add_custom_button(wn._('From Customer Issue'),
+ function() {
+ wn.model.map_current_doc({
+ method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
+ source_doctype: "Customer Issue",
+ get_query_filters: {
+ status: ["in", "Open, Work in Progress"],
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ cur_frm.add_custom_button(wn._('From Sales Order'),
+ function() {
+ wn.model.map_current_doc({
+ method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
+ source_doctype: "Sales Order",
+ get_query_filters: {
+ docstatus: 1,
+ order_type: cur_frm.doc.order_type,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ }
+ cur_frm.cscript.hide_contact_info();
+ },
customer: function() {
var me = this;
if(this.frm.doc.customer) {
@@ -29,29 +71,9 @@
});
// TODO shift this to depends_on
- hide_contact_info(this.frm.doc);
+ cur_frm.cscript.hide_contact_info();
}
},
-
- get_items: function() {
- if(cur_frm.doc.sales_order_no) {
- wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- } else if (cur_frm.doc.customer_issue_no) {
- wn.model.map_current_doc({
- method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- } else if (cur_frm.doc.maintenance_schedule) {
- wn.model.map_current_doc({
- method: "support.doctype.maintenance_schedule.maintenance_schedule\
- .make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- }
- }
});
$.extend(cur_frm.cscript, new erpnext.support.MaintenanceVisit({frm: cur_frm}));
@@ -59,17 +81,11 @@
cur_frm.cscript.onload = function(doc, dt, dn) {
if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
if(doc.__islocal) set_multiple(dt,dn,{mntc_date:get_today()});
- hide_contact_info(doc);
+ cur_frm.cscript.hide_contact_info();
}
-var hide_contact_info = function(doc) {
- if(doc.customer) $(cur_frm.fields_dict.contact_info_section.row.wrapper).toggle(true);
- else $(cur_frm.fields_dict.contact_info_section.row.wrapper).toggle(false);
-
-}
-
-cur_frm.cscript.refresh = function(doc) {
- hide_contact_info(doc);
+cur_frm.cscript.hide_contact_info = function() {
+ cur_frm.toggle_display("contact_info_section", cur_frm.doc.customer ? true : false);
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
@@ -88,14 +104,6 @@
}
}
-cur_frm.cscript.get_items = function(doc, dt, dn) {
- var callback = function(r,rt) {
- hide_contact_info(doc);
- cur_frm.refresh();
- }
- get_server_fields('fetch_items','','',doc, dt, dn,1,callback);
-}
-
cur_frm.fields_dict['maintenance_visit_details'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
return{
filters:{ 'is_service_item': "Yes"}
@@ -110,50 +118,6 @@
}
}
-cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
- }
- return{
- query:"support.doctype.maintenance_schedule.maintenance_schedule.get_sales_order_no",
- filters: {
- 'cond': cond,
- 'company': doc.company
- }
- }
-}
-
-cur_frm.fields_dict['customer_issue_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = [];
- var filter = [
- ['Customer Issue', 'company', '=', doc.company],
- ['Customer Issue', 'docstatus', '=', 1],
- ['Customer Issue', 'status', 'in', 'Open, Work In Progress']
- ];
- if(doc.customer) cond = ['Customer Issue', 'customer', '=', doc.customer];
- filter.push(cond);
- return {
- filters:filter
- }
-}
-
-cur_frm.fields_dict['maintenance_schedule'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = [];
- var filter = [
- ['Maintenance Schedule', 'company', '=', doc.company],
- ['Maintenance Schedule', 'docstatus', '=', 1]
- ];
- if(doc.customer) cond = ['Maintenance Schedule', 'customer', '=', doc.customer];
- filter.push(cond);
- return{
- filters:filter
- }
-}
-
//get query select Territory
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return{
@@ -164,4 +128,5 @@
}
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
\ No newline at end of file
+ return {query: "controllers.queries.customer_query" }
+}
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index c57787e..478d9ac 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:31",
"docstatus": 0,
- "modified": "2013-07-07 12:08:12",
+ "modified": "2013-07-10 12:26:15",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -24,13 +24,19 @@
"permlevel": 0
},
{
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Maintenance Visit",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
- "report": 1
+ "report": 1,
+ "submit": 1,
+ "write": 1
},
{
"doctype": "DocType",
@@ -42,7 +48,7 @@
"fieldtype": "Section Break",
"label": "Customer Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -137,7 +143,7 @@
"fieldtype": "Section Break",
"label": "Maintenance Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-wrench"
},
{
"doctype": "DocField",
@@ -151,6 +157,11 @@
"reqd": 1
},
{
+ "doctype": "DocField",
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break"
+ },
+ {
"default": "Unscheduled",
"doctype": "DocField",
"fieldname": "maintenance_type",
@@ -166,56 +177,10 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "sales_order_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Order No",
- "oldfieldname": "sales_order_no",
- "oldfieldtype": "Link",
- "options": "Sales Order",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "customer_issue_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Issue No",
- "oldfieldname": "customer_issue_no",
- "oldfieldtype": "Link",
- "options": "Customer Issue",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "maintenance_schedule",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Maintenance Schedule",
- "options": "Maintenance Schedule"
- },
- {
- "doctype": "DocField",
- "fieldname": "get_items",
- "fieldtype": "Button",
- "label": "Get Items",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "report_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-wrench"
},
{
"doctype": "DocField",
@@ -231,7 +196,8 @@
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text"
},
{
"doctype": "DocField",
@@ -301,7 +267,8 @@
"doctype": "DocField",
"fieldname": "contact_info_section",
"fieldtype": "Section Break",
- "label": "Contact Info"
+ "label": "Contact Info",
+ "options": "icon-bullhorn"
},
{
"doctype": "DocField",
@@ -341,60 +308,15 @@
"print_hide": 1
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "System Manager",
- "submit": 1,
- "write": 1
+ "role": "System Manager"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "role": "System Manager",
- "submit": 0
+ "role": "Maintenance Manager"
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance Manager",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance Manager",
- "submit": 0
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance User",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance User",
- "submit": 0
+ "role": "Maintenance User"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
index 694f871..53fa0a2 100644
--- a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
+++ b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:06",
"docstatus": 0,
- "modified": "2013-03-07 07:03:24",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -27,38 +27,9 @@
},
{
"doctype": "DocField",
- "fieldname": "description",
- "fieldtype": "Small Text",
- "label": "Description",
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "print_width": "300px",
- "reqd": 1,
- "width": "300px"
- },
- {
- "doctype": "DocField",
- "fieldname": "service_person",
- "fieldtype": "Link",
- "label": "Service Person",
- "oldfieldname": "service_person",
- "oldfieldtype": "Link",
- "options": "Sales Person",
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "work_done",
- "fieldtype": "Small Text",
- "label": "Work Done",
- "oldfieldname": "work_done",
- "oldfieldtype": "Small Text",
- "reqd": 1
- },
- {
- "doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -68,6 +39,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -77,12 +49,53 @@
"doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text"
},
{
"doctype": "DocField",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Small Text",
+ "print_width": "300px",
+ "reqd": 1,
+ "width": "300px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "work_details",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Work Details"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "service_person",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sales Person",
+ "oldfieldname": "service_person",
+ "oldfieldtype": "Link",
+ "options": "Sales Person",
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "work_done",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Work Done",
+ "oldfieldname": "work_done",
+ "oldfieldtype": "Small Text",
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "prevdoc_docname",
"fieldtype": "Data",
"hidden": 0,
diff --git a/utilities/doctype/note_user/note_user.txt b/utilities/doctype/note_user/note_user.txt
index 2d82bb0..fcc1d11 100644
--- a/utilities/doctype/note_user/note_user.txt
+++ b/utilities/doctype/note_user/note_user.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 14:24:48",
"docstatus": 0,
- "modified": "2013-05-24 14:24:48",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Note User",
"parentfield": "fields",
diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py
index 30a40da..74a75e6 100644
--- a/utilities/transaction_base.py
+++ b/utilities/transaction_base.py
@@ -301,23 +301,28 @@
def validate_with_previous_doc(self, source_dt, ref):
for key, val in ref.items():
+ is_child = val.get("is_child_table")
ref_doc = {}
for d in self.doclist.get({"doctype": source_dt}):
- if d.fields.get(val["ref_dn_field"]):
- ref_doc.setdefault(key, d.fields[val["ref_dn_field"]])
-
- if val.get("is_child_table"):
- self.compare_values(ref_doc, val["compare_fields"], d)
- else:
+ ref_dn = d.fields.get(val["ref_dn_field"])
+ if ref_dn:
+ if is_child:
+ self.compare_values({key: [ref_dn]}, val["compare_fields"], d)
+ elif ref_dn:
+ ref_doc.setdefault(key, [])
+ if ref_dn not in ref_doc[key]:
+ ref_doc[key].append(ref_dn)
+ if ref_doc:
self.compare_values(ref_doc, val["compare_fields"])
def compare_values(self, ref_doc, fields, doc=None):
- for ref_doctype, ref_docname in ref_doc.items():
- prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname,
- [d[0] for d in fields], as_dict=1)
-
- for field, condition in fields:
- self.validate_value(field, condition, prevdoc_values[field], doc)
+ for ref_doctype, ref_dn_list in ref_doc.items():
+ for ref_docname in ref_dn_list:
+ prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname,
+ [d[0] for d in fields], as_dict=1)
+
+ for field, condition in fields:
+ self.validate_value(field, condition, prevdoc_values[field], doc)
def get_default_address_and_contact(party_field, party_name, fetch_shipping_address=False):
out = {}
diff --git a/website/doctype/about_us_team_member/about_us_team_member.txt b/website/doctype/about_us_team_member/about_us_team_member.txt
index b1bf6b3..c5e6d16 100644
--- a/website/doctype/about_us_team_member/about_us_team_member.txt
+++ b/website/doctype/about_us_team_member/about_us_team_member.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:11",
"docstatus": 0,
- "modified": "2013-03-12 13:51:02",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "About Us Team Member",
"parentfield": "fields",
diff --git a/website/doctype/company_history/company_history.txt b/website/doctype/company_history/company_history.txt
index 544845d..c0f230c 100644
--- a/website/doctype/company_history/company_history.txt
+++ b/website/doctype/company_history/company_history.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Company History",
"parentfield": "fields",
diff --git a/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt b/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
index 57ddc21..cdda874 100644
--- a/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
+++ b/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:00:18",
"docstatus": 0,
- "modified": "2013-06-20 16:01:34",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "price_list",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Price List",
"name": "__common__",
"options": "Price List",
diff --git a/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt b/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
index caeba3d..302b0ae 100644
--- a/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
+++ b/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-07-03 13:15:34",
"docstatus": 0,
- "modified": "2013-07-03 13:19:02",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Shipping Rule",
"name": "__common__",
"options": "Shipping Rule",
diff --git a/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt b/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
index 6cd9f38..f00a23d 100644
--- a/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
+++ b/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:57:03",
"docstatus": 0,
- "modified": "2013-06-20 16:57:03",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "sales_taxes_and_charges_master",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Tax Master",
"name": "__common__",
"options": "Sales Taxes and Charges Master",
diff --git a/website/doctype/top_bar_item/top_bar_item.txt b/website/doctype/top_bar_item/top_bar_item.txt
index 0076f7f..58d101e 100644
--- a/website/doctype/top_bar_item/top_bar_item.txt
+++ b/website/doctype/top_bar_item/top_bar_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Top Bar Item",
"parentfield": "fields",
diff --git a/website/doctype/website_item_group/website_item_group.txt b/website/doctype/website_item_group/website_item_group.txt
index 0b64306..3d26e85 100644
--- a/website/doctype/website_item_group/website_item_group.txt
+++ b/website/doctype/website_item_group/website_item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:09",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -18,6 +18,7 @@
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Group",
"name": "__common__",
"options": "Item Group",
diff --git a/website/doctype/website_slideshow_item/website_slideshow_item.txt b/website/doctype/website_slideshow_item/website_slideshow_item.txt
index 53aa628..c6fd78c 100644
--- a/website/doctype/website_slideshow_item/website_slideshow_item.txt
+++ b/website/doctype/website_slideshow_item/website_slideshow_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 12:26:33",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Website Slideshow Item",
"parentfield": "fields",