[design] list views
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 2e1832e..b631503 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -448,7 +448,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-12-25 17:21:56.824371",
+ "modified": "2015-01-05 10:54:54.294810",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry",
@@ -502,5 +502,6 @@
"read_only_onload": 1,
"search_fields": "voucher_type,posting_date, due_date, cheque_no",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "voucher_type"
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_list.html b/erpnext/accounts/doctype/journal_entry/journal_entry_list.html
index aaa3854..0e08371 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry_list.html
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry_list.html
@@ -1,20 +1,15 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-10">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span class="text-muted" style="margin-right: 8px;">
- {%= doc.get_formatted("posting_date") %}</span>
- <span class="label label-info filterable"
- data-filter="voucher_type,=,{%= doc.voucher_type %}">
- {%= doc.voucher_type %}
- </span>
- {% if(doc.docstatus===0) { %}
- <span class="label label-danger filterable"
- data-filter="docstatus,=,0">{%= __("Draft") %}</span>
- {% } %}
- </div>
+ <div class="col-xs-12 col-sm-5 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
</div>
- <div class="col-xs-2 text-right">
+ <div class="col-sm-5 hidden-xs">
+ {% if(doc.docstatus===0) { %}
+ <span class="indicator red filterable"
+ data-filter="docstatus,=,0">{%= __("Draft") %}</span><br>
+ {% } %}
+ {%= doc.user_remark %}
+ </div>
+ <div class="col-sm-2 hidden-xs text-right">
{%= doc.get_formatted("total_debit") %}
</div>
</div>
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
index 42d7032..101793c 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
@@ -1,3 +1,3 @@
frappe.listview_settings['Journal Entry'] = {
- add_fields: ["voucher_type", "posting_date", "total_debit", "company"]
+ add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_remark"]
};
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 2ad9897..d1f1677 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -10,7 +10,7 @@
{
"fieldname": "mode_of_payment",
"fieldtype": "Data",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Mode of Payment",
"oldfieldname": "mode_of_payment",
"oldfieldtype": "Data",
@@ -41,7 +41,7 @@
],
"icon": "icon-credit-card",
"idx": 1,
- "modified": "2014-05-27 03:49:13.846602",
+ "modified": "2015-01-05 11:13:54.446006",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Mode of Payment",
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
index 3c11d87..70cbe8b 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
@@ -4,13 +4,13 @@
cur_frm.cscript.onload = function(doc,cdt,cdn){
if(doc.__islocal){
var callback1 = function(r,rt){
- refresh_field('budget_distribution_details');
+ refresh_field('percentages');
}
-
+
return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);
}
}
cur_frm.cscript.refresh = function(doc,cdt,cdn){
cur_frm.toggle_display('distribution_id', doc.__islocal);
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
index a0646b7..9bafb11 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
@@ -13,13 +13,15 @@
'October','November','December']
idx =1
for m in month_list:
- mnth = self.append('budget_distribution_details')
+ mnth = self.append('percentages')
mnth.month = m
+ mnth.percentage_allocation = 100.0/12
mnth.idx = idx
idx += 1
def validate(self):
- total = sum([flt(d.percentage_allocation) for d in self.get("budget_distribution_details")])
+ total = sum([flt(d.percentage_allocation) for d in self.get("percentages")])
- if total != 100.0:
- frappe.throw(_("Percentage Allocation should be equal to 100%"))
+ if flt(total, 2) != 100.0:
+ frappe.throw(_("Percentage Allocation should be equal to 100%") + \
+ " ({0}%)".format(str(flt(total, 2))))
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index c9e7dc2..b6faf83 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -14,7 +14,7 @@
{
"fieldname": "transaction_date",
"fieldtype": "Date",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Transaction Date",
"oldfieldname": "transaction_date",
"oldfieldtype": "Date",
@@ -23,7 +23,7 @@
{
"fieldname": "posting_date",
"fieldtype": "Date",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Posting Date",
"oldfieldname": "posting_date",
"oldfieldtype": "Date",
@@ -45,7 +45,7 @@
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Amended From",
"no_copy": 1,
"oldfieldname": "amended_from",
@@ -57,6 +57,7 @@
{
"fieldname": "company",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Company",
"oldfieldname": "company",
"oldfieldtype": "Select",
@@ -102,7 +103,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-06-23 07:55:49.946225",
+ "modified": "2015-01-05 11:27:11.937653",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Period Closing Voucher",
@@ -139,5 +140,6 @@
],
"search_fields": "posting_date, fiscal_year",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "closing_account_head"
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 7a79c1a..18515e8 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -14,6 +14,14 @@
"permlevel": 0
},
{
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "label": "Title",
+ "permlevel": 0,
+ "precision": "",
+ "reqd": 1
+ },
+ {
"default": "Item Code",
"fieldname": "apply_on",
"fieldtype": "Select",
@@ -236,7 +244,7 @@
"icon": "icon-gift",
"idx": 1,
"istable": 0,
- "modified": "2014-09-26 09:09:38.418765",
+ "modified": "2015-01-05 10:58:42.550092",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Pricing Rule",
@@ -296,5 +304,6 @@
}
],
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "title"
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index bdc87e3..f88d5bc 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1,974 +1,975 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-21 16:16:39",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:39",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "supplier_section",
- "fieldtype": "Section Break",
- "label": "Supplier",
- "options": "icon-user",
+ "fieldname": "supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Supplier",
+ "options": "icon-user",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "PINV-",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "PINV-",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "supplier",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Supplier",
- "oldfieldname": "supplier",
- "oldfieldtype": "Link",
- "options": "Supplier",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Supplier",
+ "oldfieldname": "supplier",
+ "oldfieldtype": "Link",
+ "options": "Supplier",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "depends_on": "supplier",
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_list_view": 1,
- "label": "Name",
- "oldfieldname": "supplier_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "depends_on": "supplier",
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_list_view": 1,
+ "label": "Name",
+ "oldfieldname": "supplier_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Address",
- "permlevel": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact",
- "permlevel": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Mobile No",
- "permlevel": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Mobile No",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Contact Email",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Contact Email",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 0,
"width": "50%"
- },
+ },
{
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date",
- "no_copy": 0,
- "oldfieldname": "posting_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date",
+ "no_copy": 0,
+ "oldfieldname": "posting_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "description": "",
- "fieldname": "bill_no",
- "fieldtype": "Data",
- "in_filter": 1,
- "label": "Supplier Invoice No",
- "oldfieldname": "bill_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 0,
+ "description": "",
+ "fieldname": "bill_no",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "label": "Supplier Invoice No",
+ "oldfieldname": "bill_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "bill_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Supplier Invoice Date",
- "oldfieldname": "bill_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 0,
+ "fieldname": "bill_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Supplier Invoice Date",
+ "oldfieldname": "bill_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Purchase Invoice",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Purchase Invoice",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "currency_price_list",
- "fieldtype": "Section Break",
- "label": "Currency and Price List",
- "options": "icon-tag",
- "permlevel": 0,
+ "fieldname": "currency_price_list",
+ "fieldtype": "Section Break",
+ "label": "Currency and Price List",
+ "options": "icon-tag",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "description": "The rate at which Bill Currency is converted into company's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "The rate at which Bill Currency is converted into company's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "buying_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "options": "Price List",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "buying_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
"print_hide": 1
- },
+ },
{
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "permlevel": 0,
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "oldfieldname": "entries",
- "oldfieldtype": "Table",
- "options": "Purchase Invoice Item",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "entries",
+ "oldfieldtype": "Table",
+ "options": "Purchase Invoice Item",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break_26",
- "fieldtype": "Section Break",
+ "fieldname": "section_break_26",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "description": "Will be calculated automatically when you enter the details",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "Will be calculated automatically when you enter the details",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break_28",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "net_total_import",
- "fieldtype": "Currency",
- "label": "Net Total",
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "net_total_import",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "label": "Taxes and Charges",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "label": "Taxes and Charges",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Taxes and Charges",
- "oldfieldname": "purchase_other_charges",
- "oldfieldtype": "Link",
- "options": "Purchase Taxes and Charges Master",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Taxes and Charges",
+ "oldfieldname": "purchase_other_charges",
+ "oldfieldtype": "Link",
+ "options": "Purchase Taxes and Charges Master",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Purchase Taxes and Charges",
- "oldfieldname": "purchase_tax_details",
- "oldfieldtype": "Table",
- "options": "Purchase Taxes and Charges",
- "permlevel": 0,
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Purchase Taxes and Charges",
+ "oldfieldname": "purchase_tax_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Taxes and Charges",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "Totals",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "Totals",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "other_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added (Company Currency)",
- "oldfieldname": "other_charges_added",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added (Company Currency)",
+ "oldfieldname": "other_charges_added",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "other_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Company Currency)",
- "oldfieldname": "other_charges_deducted",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted (Company Currency)",
+ "oldfieldname": "other_charges_deducted",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "description": "In Words will be visible once you save the Purchase Invoice.",
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "description": "In Words will be visible once you save the Purchase Invoice.",
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break8",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "column_break8",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "other_charges_added_import",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added",
- "oldfieldname": "other_charges_added_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_added_import",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added",
+ "oldfieldname": "other_charges_added_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "other_charges_deducted_import",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
- "oldfieldname": "other_charges_deducted_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "other_charges_deducted_import",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted",
+ "oldfieldname": "other_charges_deducted_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "grand_total_import",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "oldfieldname": "grand_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "grand_total_import",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "oldfieldname": "grand_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "in_words_import",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_import",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "in_words_import",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_import",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "total_amount_to_pay",
- "fieldtype": "Currency",
- "hidden": 0,
- "label": "Total Amount To Pay",
- "no_copy": 1,
- "oldfieldname": "total_amount_to_pay",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_amount_to_pay",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "label": "Total Amount To Pay",
+ "no_copy": 1,
+ "oldfieldname": "total_amount_to_pay",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "total_advance",
- "fieldtype": "Currency",
- "label": "Total Advance",
- "no_copy": 1,
- "oldfieldname": "total_advance",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_advance",
+ "fieldtype": "Currency",
+ "label": "Total Advance",
+ "no_copy": 1,
+ "oldfieldname": "total_advance",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "total_tax",
- "fieldtype": "Currency",
- "label": "Total Tax (Company Currency)",
- "oldfieldname": "total_tax",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "total_tax",
+ "fieldtype": "Currency",
+ "label": "Total Tax (Company Currency)",
+ "oldfieldname": "total_tax",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "fieldname": "outstanding_amount",
- "fieldtype": "Currency",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Outstanding Amount",
- "no_copy": 1,
- "oldfieldname": "outstanding_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 1,
+ "fieldname": "outstanding_amount",
+ "fieldtype": "Currency",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Outstanding Amount",
+ "no_copy": 1,
+ "oldfieldname": "outstanding_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "write_off_amount",
- "fieldtype": "Currency",
- "label": "Write Off Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "write_off_amount",
+ "fieldtype": "Currency",
+ "label": "Write Off Amount",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "depends_on": "eval:flt(doc.write_off_amount)!=0",
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "label": "Write Off Account",
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:flt(doc.write_off_amount)!=0",
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "label": "Write Off Account",
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "depends_on": "eval:flt(doc.write_off_amount)!=0",
- "fieldname": "write_off_cost_center",
- "fieldtype": "Link",
- "label": "Write Off Cost Center",
- "no_copy": 1,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:flt(doc.write_off_amount)!=0",
+ "fieldname": "write_off_cost_center",
+ "fieldtype": "Link",
+ "label": "Write Off Cost Center",
+ "no_copy": 1,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "against_expense_account",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Against Expense Account",
- "no_copy": 1,
- "oldfieldname": "against_expense_account",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "against_expense_account",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Against Expense Account",
+ "no_copy": 1,
+ "oldfieldname": "against_expense_account",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 0
- },
+ },
{
- "fieldname": "fold",
- "fieldtype": "Fold",
+ "fieldname": "fold",
+ "fieldtype": "Fold",
"permlevel": 0
- },
+ },
{
- "fieldname": "advances_section",
- "fieldtype": "Section Break",
- "label": "Advances",
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "advances_section",
+ "fieldtype": "Section Break",
+ "label": "Advances",
+ "oldfieldtype": "Section Break",
+ "options": "icon-money",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "get_advances_paid",
- "fieldtype": "Button",
- "label": "Get Advances Paid",
- "oldfieldtype": "Button",
- "options": "get_advances",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "get_advances_paid",
+ "fieldtype": "Button",
+ "label": "Get Advances Paid",
+ "oldfieldtype": "Button",
+ "options": "get_advances",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "advances",
- "fieldtype": "Table",
- "label": "Advances",
- "no_copy": 1,
- "oldfieldname": "advance_allocation_details",
- "oldfieldtype": "Table",
- "options": "Purchase Invoice Advance",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "advances",
+ "fieldtype": "Table",
+ "label": "Advances",
+ "no_copy": 1,
+ "oldfieldname": "advance_allocation_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Invoice Advance",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "options": "icon-legal",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "options": "icon-legal",
"permlevel": 0
- },
+ },
{
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "options": "Terms and Conditions",
- "permlevel": 0,
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "options": "Terms and Conditions",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions1",
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions1",
"permlevel": 0
- },
+ },
{
- "depends_on": "supplier",
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
- "permlevel": 0,
+ "depends_on": "supplier",
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "label": "Supplier Address",
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "label": "Supplier Address",
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "col_break23",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "col_break23",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "label": "Contact Person",
- "options": "Contact",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "label": "Contact Person",
+ "options": "Contact",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Info",
- "oldfieldtype": "Section Break",
- "options": "icon-file-text",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info",
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 0
- },
+ },
{
- "description": "Supplier (Payable) Account",
- "fieldname": "credit_to",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Credit To",
- "oldfieldname": "credit_to",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
+ "description": "Supplier (Payable) Account",
+ "fieldname": "credit_to",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Credit To",
+ "oldfieldname": "credit_to",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "default": "No",
- "description": "Considered as Opening Balance",
- "fieldname": "is_opening",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Is Opening",
- "oldfieldname": "is_opening",
- "oldfieldtype": "Select",
- "options": "No\nYes",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "default": "No",
+ "description": "Considered as Opening Balance",
+ "fieldname": "is_opening",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Is Opening",
+ "oldfieldname": "is_opening",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "description": "Actual Invoice Date",
- "fieldname": "aging_date",
- "fieldtype": "Date",
- "label": "Aging Date",
- "oldfieldname": "aging_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "description": "Actual Invoice Date",
+ "fieldname": "aging_date",
+ "fieldtype": "Date",
+ "label": "Aging Date",
+ "oldfieldname": "aging_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"report_hide": 1
- },
+ },
{
- "fieldname": "due_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Due Date",
- "no_copy": 0,
- "oldfieldname": "due_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "due_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Due Date",
+ "no_copy": 0,
+ "oldfieldname": "due_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "mode_of_payment",
- "fieldtype": "Link",
- "label": "Mode of Payment",
- "oldfieldname": "mode_of_payment",
- "oldfieldtype": "Select",
- "options": "Mode of Payment",
- "permlevel": 0,
+ "fieldname": "mode_of_payment",
+ "fieldtype": "Link",
+ "label": "Mode of Payment",
+ "oldfieldname": "mode_of_payment",
+ "oldfieldtype": "Select",
+ "options": "Mode of Payment",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break_63",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_63",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "label": "Remarks",
+ "no_copy": 1,
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
"reqd": 0
- },
+ },
{
- "depends_on": "eval:doc.docstatus<2",
- "fieldname": "recurring_invoice",
- "fieldtype": "Section Break",
- "label": "Recurring Invoice",
- "options": "icon-time",
- "permlevel": 0,
+ "depends_on": "eval:doc.docstatus<2",
+ "fieldname": "recurring_invoice",
+ "fieldtype": "Section Break",
+ "label": "Recurring Invoice",
+ "options": "icon-time",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_77",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break_77",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.docstatus<2",
- "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date",
- "fieldname": "is_recurring",
- "fieldtype": "Check",
- "label": "Is Recurring",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.docstatus<2",
+ "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date",
+ "fieldname": "is_recurring",
+ "fieldtype": "Check",
+ "label": "Is Recurring",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Start date of current invoice's period",
- "fieldname": "from_date",
- "fieldtype": "Date",
- "label": "From Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Start date of current invoice's period",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "End date of current invoice's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "End date of current invoice's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
- "fieldname": "repeat_on_day_of_month",
- "fieldtype": "Int",
- "label": "Repeat on Day of Month",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
+ "fieldname": "repeat_on_day_of_month",
+ "fieldtype": "Int",
+ "label": "Repeat on Day of Month",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which recurring invoice will be stop",
- "fieldname": "end_date",
- "fieldtype": "Date",
- "label": "End Date",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which recurring invoice will be stop",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
- },
+ },
{
- "fieldname": "column_break_82",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "column_break_82",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 1,
"width": "50%"
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The date on which next invoice will be generated. It is generated on submit.",
- "fieldname": "next_date",
- "fieldtype": "Date",
- "label": "Next Date",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The date on which next invoice will be generated. It is generated on submit.",
+ "fieldname": "next_date",
+ "fieldtype": "Date",
+ "label": "Next Date",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "depends_on": "eval:doc.is_recurring==1",
- "description": "The unique id for tracking all recurring invoices. It is generated on submit.",
- "fieldname": "recurring_id",
- "fieldtype": "Data",
- "label": "Recurring Id",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "The unique id for tracking all recurring invoices. It is generated on submit.",
+ "fieldname": "recurring_id",
+ "fieldtype": "Data",
+ "label": "Recurring Id",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
- },
+ },
{
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
- "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date",
- "fieldname": "notification_email_address",
- "fieldtype": "Small Text",
- "label": "Notification Email Address",
- "no_copy": 1,
- "permlevel": 0,
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
+ "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date",
+ "fieldname": "notification_email_address",
+ "fieldtype": "Small Text",
+ "label": "Notification Email Address",
+ "no_copy": 1,
+ "permlevel": 0,
"print_hide": 1
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2014-12-24 14:32:24.551641",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Purchase Invoice",
- "owner": "Administrator",
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "is_submittable": 1,
+ "modified": "2015-01-05 10:57:10.892210",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Purchase Invoice",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "apply_user_permissions": 1,
- "cancel": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Supplier",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Supplier",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts Manager",
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts Manager",
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Auditor",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Auditor",
+ "submit": 0,
"write": 0
- },
+ },
{
- "permlevel": 1,
- "read": 1,
- "role": "Accounts Manager",
+ "permlevel": 1,
+ "read": 1,
+ "role": "Accounts Manager",
"write": 1
}
- ],
- "read_only_onload": 1,
- "search_fields": "posting_date, supplier, fiscal_year, bill_no, grand_total, outstanding_amount",
- "sort_field": "modified",
- "sort_order": "DESC"
-}
+ ],
+ "read_only_onload": 1,
+ "search_fields": "posting_date, supplier, fiscal_year, bill_no, grand_total, outstanding_amount",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "supplier_name"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html
index cccd38a..37ebe7f 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html
@@ -1,42 +1,40 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-9">
+ <div class="col-xs-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="supplier,=,{%= doc.supplier %}">
- {%= doc.supplier_name %}</span></span>
- {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
- {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
- <span class="label label-danger filterable"
- title="{%= doc.get_formatted("due_date")%}"
- data-filter="outstanding_amount,>,0|due_date,<,Today">
- {%= __("Overdue: ") + comment_when(doc.due_date) %}
- </span>
- {% } else { %}
- <span class="label label-warning filterable"
- data-filter="outstanding_amount,>,0|due,>=,Today"
- title="{%= __("Payment Pending") %}">
- {%= doc.get_formatted("due_date") %}</span>
- {% } %}
- {% } %}
- {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
- <span class="label label-success filterable"
- title="{%= doc.get_formatted("due_date")%}"
- data-filter="outstanding_amount,=,0">
- <i class="icon-ok-sign"></i> {%= __("Paid") %}
- </span>
- {% } %}
- {% if(doc.docstatus===0) { %}
- <span class="label label-danger filterable"
- data-filter="docstatus,=,0">{%= __("Draft") %}</span>
- {% } %}
</div>
</div>
- <div class="col-xs-1 text-right">
- {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
- {% include "templates/form_grid/includes/progress.html" %}
- </div>
+ <div class="col-xs-2">
+ {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
+ {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
+ <span class="indicator red filterable"
+ title="{%= doc.get_formatted("due_date")%}"
+ data-filter="outstanding_amount,>,0|due_date,<,Today">
+ {%= __("Overdue: ") + comment_when(doc.due_date) %}
+ </span>
+ {% } else { %}
+ <span class="indictator orange filterable"
+ data-filter="outstanding_amount,>,0|due,>=,Today"
+ title="{%= __("Payment Pending") %}">
+ {%= doc.get_formatted("due_date") %}</span>
+ {% } %}
+ {% } %}
+ {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
+ <span class="indicator green filterable"
+ title="{%= doc.get_formatted("due_date")%}"
+ data-filter="outstanding_amount,=,0">
+ {%= __("Paid") %}
+ </span>
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ <span class="indicator red filterable"
+ data-filter="docstatus,=,0">{%= __("Draft") %}</span>
+ {% } %}
+ </div>
+ <!-- <div class="col-xs-1 text-right">
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+ </div> -->
<div class="col-xs-2 text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_import') %}">
{%= doc.get_formatted("grand_total_import") %}
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
index a80978b..2197aa8 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
@@ -12,7 +12,7 @@
"fieldname": "title",
"fieldtype": "Data",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Title",
"oldfieldname": "title",
"oldfieldtype": "Data",
@@ -71,7 +71,7 @@
],
"icon": "icon-money",
"idx": 1,
- "modified": "2014-12-24 17:19:29.921875",
+ "modified": "2015-01-05 11:12:27.944849",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges Master",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index a975198..54258ae 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1192,7 +1192,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-01 14:30:04.525035",
+ "modified": "2015-01-05 10:57:31.054236",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
@@ -1248,5 +1248,6 @@
"read_only_onload": 1,
"search_fields": "posting_date, due_date, customer, fiscal_year, grand_total, outstanding_amount",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html
index 47fadb5..6161b00 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html
@@ -1,42 +1,40 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-9">
+ <div class="col-xs-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="customer,=,{%= doc.customer %}">
- {%= doc.customer_name %}</span></span>
- {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
- {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
- <span class="label label-danger filterable"
- title="{%= doc.get_formatted("due_date")%}"
- data-filter="outstanding_amount,>,0|due_date,<,Today">
- {%= __("Overdue: ") + comment_when(doc.due_date) %}
- </span>
- {% } else { %}
- <span class="label label-warning filterable"
- data-filter="outstanding_amount,>,0|due_date,>=,Today"
- title="{%= __("Payment Pending") %}">
- {%= doc.get_formatted("due_date") %}</span>
- {% } %}
- {% } %}
- {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
- <span class="label label-success filterable"
- title="{%= doc.get_formatted("due_date")%}"
- data-filter="outstanding_amount,=,0">
- <i class="icon-ok-sign"></i> {%= __("Paid") %}
- </span>
- {% } %}
- {% if(doc.docstatus===0) { %}
- <span class="label label-danger filterable"
- data-filter="docstatus,=,0">{%= __("Draft") %}</span>
- {% } %}
</div>
</div>
- <div class="col-xs-1 text-right">
- {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
- {% include "templates/form_grid/includes/progress.html" %}
- </div>
+ <div class="col-xs-2">
+ {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
+ {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
+ <span class="indicator red filterable"
+ title="{%= doc.get_formatted("due_date")%}"
+ data-filter="outstanding_amount,>,0|due_date,<,Today">
+ {%= __("Overdue") %}
+ </span>
+ {% } else { %}
+ <span class="indicator orange filterable"
+ data-filter="outstanding_amount,>,0|due_date,>=,Today"
+ title="{%= __("Payment Pending") %}">
+ {%= doc.get_formatted("due_date") %}</span>
+ {% } %}
+ {% } %}
+ {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
+ <span class="indicator green filterable"
+ title="{%= doc.get_formatted("due_date")%}"
+ data-filter="outstanding_amount,=,0">
+ {%= __("Paid") %}
+ </span>
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ <span class="indicator red filterable"
+ data-filter="docstatus,=,0">{%= __("Draft") %}</span>
+ {% } %}
+ </div>
+ <!-- <div class="col-xs-1 text-right">
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+ </div> -->
<div class="col-xs-2 text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted("grand_total_export") %}">
{%= doc.get_formatted("grand_total_export") %}
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
index b35cc78..83d34e4 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
@@ -12,7 +12,7 @@
"fieldname": "title",
"fieldtype": "Data",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Title",
"oldfieldname": "title",
"oldfieldtype": "Data",
@@ -80,7 +80,7 @@
],
"icon": "icon-money",
"idx": 1,
- "modified": "2014-12-24 14:57:06.275853",
+ "modified": "2015-01-05 11:12:09.596733",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Taxes and Charges Master",
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index f5e56fd..37fc7d8 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -1,5 +1,5 @@
{
- "autoname": "Prompt",
+ "autoname": "field:label",
"creation": "2013-06-25 11:48:03",
"description": "Specify conditions to calculate shipping amount",
"docstatus": 0,
@@ -102,7 +102,7 @@
],
"icon": "icon-truck",
"idx": 1,
- "modified": "2014-12-24 14:59:04.430010",
+ "modified": "2015-01-05 14:59:25.045126",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Shipping Rule",
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
index 38fff6a..87f3c1b 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.py
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.py
@@ -67,7 +67,7 @@
frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
# validate purchase item
- if not (obj.doctype=="Material Request" and getattr(obj, "material_request_type", None)=="Transfer"):
+ if not (obj.doctype=="Material Request" and getattr(obj, "material_request_type", None)=="Material Transfer"):
if item[0][1] != 'Yes' and item[0][2] != 'Yes':
frappe.throw(_("{0} must be a Purchased or Sub-Contracted Item in row {1}").format(d.item_code, d.idx))
diff --git a/erpnext/buying/doctype/supplier/supplier_list.html b/erpnext/buying/doctype/supplier/supplier_list.html
index 5cab239..cf5e708 100644
--- a/erpnext/buying/doctype/supplier/supplier_list.html
+++ b/erpnext/buying/doctype/supplier/supplier_list.html
@@ -1,15 +1,15 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- {% if(doc.supplier_name != doc.name) { %}
- <span style="margin-right: 8px; display: inline-block">
- {%= doc.supplier_name %}</span>
- {% } %}
- <span class="label label-info filterable"
- data-filter="supplier_type,=,{%= doc.supplier_type %}">
- {%= doc.supplier_type %}
- </span>
- </div>
+ <div class="col-sm-8 col-xs-12 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.supplier_name != doc.name) { %}
+ <span style="margin-right: 8px; display: inline-block">
+ {%= doc.supplier_name %}</span>
+ {% } %}
</div>
+ <div class="col-sm-4 hidden-xs">
+ <span class="indicator darkgrey filterable"
+ data-filter="supplier_type,=,{%= doc.supplier_type %}">
+ {%= doc.supplier_type %}
+ </span>
+ </div>
</div>
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 0747ae1..da4866b 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -138,7 +138,7 @@
},
{
"type":"doctype",
- "name": "Budget Distribution",
+ "name": "Monthly Distribution",
"description": _("Seasonality for setting budgets.")
},
{
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 03e8ec3..093d59c 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -1,99 +1,99 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2013-01-10 16:34:18",
- "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-01-10 16:34:18",
+ "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "campaign",
- "fieldtype": "Section Break",
- "in_list_view": 0,
- "label": "Campaign",
- "oldfieldtype": "Section Break",
+ "fieldname": "campaign",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Campaign",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "campaign_name",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Campaign Name",
- "oldfieldname": "campaign_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "campaign_name",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Campaign Name",
+ "oldfieldname": "campaign_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "in_list_view": 0,
- "label": "Naming Series",
- "options": "Campaign-.####",
- "permlevel": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "in_list_view": 0,
+ "label": "Naming Series",
+ "options": "Campaign-.####",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "description",
- "fieldtype": "Text",
- "in_list_view": 1,
- "label": "Description",
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "permlevel": 0,
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
"width": "300px"
}
- ],
- "icon": "icon-bullhorn",
- "idx": 1,
- "modified": "2014-05-27 03:49:08.416532",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Campaign",
- "owner": "Administrator",
+ ],
+ "icon": "icon-bullhorn",
+ "idx": 1,
+ "modified": "2015-01-05 14:46:52.204964",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Campaign",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "Sales Manager",
- "submit": 0,
+ "amend": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Sales Manager",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Master Manager",
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Master Manager",
+ "submit": 0,
"write": 1
}
]
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer_list.html b/erpnext/selling/doctype/customer/customer_list.html
index 3656d10..b7cf358 100644
--- a/erpnext/selling/doctype/customer/customer_list.html
+++ b/erpnext/selling/doctype/customer/customer_list.html
@@ -1,5 +1,5 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
+ <div class="col-xs-12 col-sm-6">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
{% if(doc.customer_name != doc.name) { %}
@@ -9,21 +9,20 @@
<span style="margin-right: 8px; display: inline-block"
title="{%= doc.customer_type %}" class="filterable"
data-filter="customer_type,=,{%= doc.customer_type %}">
- {% if(doc.customer_type==="Company") { %}
- <i class="icon-building"></i>
- {% } else { %}
- <i class="icon-user"></i>
- {% } %}
</span>
- <span class="label label-info filterable"
- data-filter="customer_group,=,{%= doc.customer_group %}">
- {%= doc.customer_group %}</span>
- {% if(doc.territory) { %}
- <span class="label label-default filterable"
- data-filter="territory,=,{%= doc.territory %}">
- <i class="icon-map-marker"></i>
- {%= doc.territory %}</span>
- {% } %}
</div>
</div>
+ <div class="col-sm-3 hidden-xs text-ellipsis">
+ <span class="indicator darkgrey filterable"
+ data-filter="customer_group,=,{%= doc.customer_group %}">
+ {%= doc.customer_group %}</span>
+ </div>
+ <div class="col-sm-3 hidden-xs text-ellipsis">
+ {% if(doc.territory) { %}
+ <a class="h6 text-muted filterable"
+ data-filter="territory,=,{%= doc.territory %}">
+ <i class="icon-map-marker"></i>
+ {%= doc.territory %}</a>
+ {% } %}
+ </div>
</div>
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index fd2ec3f..43de09a 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -1,5 +1,6 @@
{
"allow_import": 1,
+ "allow_rename": 1,
"autoname": "field:industry",
"creation": "2012-03-27 14:36:09",
"docstatus": 0,
@@ -9,7 +10,7 @@
{
"fieldname": "industry",
"fieldtype": "Data",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Industry",
"oldfieldname": "industry",
"oldfieldtype": "Data",
@@ -19,7 +20,7 @@
],
"icon": "icon-flag",
"idx": 1,
- "modified": "2014-05-27 03:49:11.146729",
+ "modified": "2015-01-05 15:02:09.356985",
"modified_by": "Administrator",
"module": "Selling",
"name": "Industry Type",
diff --git a/erpnext/selling/doctype/lead/lead_list.html b/erpnext/selling/doctype/lead/lead_list.html
index d5799b9..7494f4c 100644
--- a/erpnext/selling/doctype/lead/lead_list.html
+++ b/erpnext/selling/doctype/lead/lead_list.html
@@ -1,18 +1,12 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- {%= doc.company_name %}</span>
- <span class="label
- {%= doc.status=="Open" ? "label-danger" : "label-info" %} filterable"
- data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
- {% if(doc.territory) { %}
- <span class="label label-default filterable"
- data-filter="territory,=,{%= doc.territory %}">
- <i class="icon-map-marker"></i>
- {%= doc.territory %}</span>
- {% } %}
- </div>
+ <div class="col-xs-12 col-sm-9 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
+ <span style="margin-right: 8px; display: inline-block">
+ {%= doc.company_name %}</span>
</div>
+ <div class="col-sm-3 hidden-xs">
+ <span class="indicator
+ {%= doc.status=="Open" ? "red" : "darkgrey" %} filterable"
+ data-filter="status,=,{%= doc.status %}">{%= __(doc.status) %}</span>
+ </div>
</div>
diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json
index 7f9b4d6..a351c42 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.json
+++ b/erpnext/selling/doctype/opportunity/opportunity.json
@@ -389,7 +389,7 @@
"icon": "icon-info-sign",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-01 14:30:03.287608",
+ "modified": "2015-01-05 12:14:59.101693",
"modified_by": "Administrator",
"module": "Selling",
"name": "Opportunity",
@@ -427,5 +427,6 @@
],
"search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/opportunity/opportunity_list.html b/erpnext/selling/doctype/opportunity/opportunity_list.html
index c0a9483..27566c4 100644
--- a/erpnext/selling/doctype/opportunity/opportunity_list.html
+++ b/erpnext/selling/doctype/opportunity/opportunity_list.html
@@ -1,23 +1,10 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="{%= doc.enquiry_from.toLowerCase() %},=,{%= doc[doc.enquiry_from.toLowerCase()] %}">
- {%= doc.customer_name %}</span> ({%= doc.enquiry_from %})</span>
- <span style="margin-right: 8px; display: inline-block"
- title="{%= doc.enquiry_type %}" class="filterable"
- data-filter="enquiry_type,=,{%= doc.enquiry_type %}">
- {% if(doc.enquiry_type==="Sales") { %}
- <i class="icon-tag"></i>
- {% } else { %}
- <i class="icon-wrench"></i>
- {% } %}
- </span>
- <span class="label
- {%= doc.status=="Draft" ? "label-danger" : "label-info" %} filterable"
- data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
- </div>
+ <div class="col-sm-9 col-xs-12 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
</div>
+ <div class="col-sm-3 hidden-xs text-ellipsis">
+ <span class="indicator
+ {%= doc.status=="Draft" ? "red" : "darkgrey" %} filterable"
+ data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
+ </div>
</div>
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 4f7c9dc..0bdd029 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -800,7 +800,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
- "modified": "2015-01-01 14:30:03.814148",
+ "modified": "2015-01-05 12:33:02.162194",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
@@ -927,5 +927,6 @@
"read_only_onload": 1,
"search_fields": "status,transaction_date,customer,lead,order_type",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation_list.html b/erpnext/selling/doctype/quotation/quotation_list.html
index 2126b52..716b77a 100644
--- a/erpnext/selling/doctype/quotation/quotation_list.html
+++ b/erpnext/selling/doctype/quotation/quotation_list.html
@@ -1,29 +1,14 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-10">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="{%= doc.quotation_to.toLowerCase() %},=,{%= doc[doc.quotation_to.toLowerCase()] %}">
- {%= doc.customer_name %}</span> ({%= doc.quotation_to %})
- </span>
- </span>
- <span style="margin-right: 8px; display: inline-block"
- title="{%= doc.order_type %}" class="filterable"
- data-filter="order_type,=,{%= doc.order_type %}">
- {% if(doc.order_type==="Service") { %}
- <i class="icon-wrench"></i>
- {% } else { %}
- <i class="icon-tag"></i>
- {% } %}
- </span>
- <span class="label {%= doc.status=="Draft" ? "label-danger" :
- (doc.status=="Ordered" ? "label-success": "label-info") %}
- filterable"
- data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
- </div>
+ <div class="col-xs-12 col-sm-8 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
</div>
- <div class="col-xs-2 text-right">
+ <div class="col-sm-2 hidden-xs">
+ <span class="indicator {%= doc.status=="Draft" ? "red" :
+ (doc.status=="Ordered" ? "green": "blue") %}
+ filterable"
+ data-filter="status,=,{%= doc.status %}">{%= __(doc.status) %}</span>
+ </div>
+ <div class="col-sm-2 hidden-xs text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %}
</div>
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7128042..3472044 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1021,7 +1021,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
- "modified": "2015-01-01 14:30:05.304190",
+ "modified": "2015-01-05 12:25:02.687860",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1111,5 +1111,6 @@
"read_only_onload": 1,
"search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.html b/erpnext/selling/doctype/sales_order/sales_order_list.html
index 75eddca..4833f3d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.html
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.html
@@ -1,47 +1,34 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-8">
+ <div class="col-xs-12 col-sm-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="customer,=,{%= doc.customer %}">
- {%= doc.customer_name %}</span></span>
- {% if(doc.per_delivered < 100 && doc.status!=="Stopped") { %}
- {% if(frappe.datetime.get_diff(doc.delivery_date) < 0) { %}
- <span class="label label-danger filterable"
- title="{%= doc.get_formatted("delivery_date")%}"
- data-filter="per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"
- >
- {%= __("Overdue") %}
- </span>
- {% } else { %}
- <span class="label label-warning filterable"
- data-filter="per_delivered,<,100|status,!=,Stopped"
- title="{%= __("Pending") %}">
- {%= doc.get_formatted("delivery_date") || "Pending" %}</span>
- {% } %}
- {% } %}
- {% if(doc.per_delivered == 100 && doc.status!=="Stopped") { %}
- <span class="filterable text-muted"
- data-filter="per_delivered,=,100|status,!=,Stopped">
- <i class="icon-ok-sign"></i></span>
- {% } %}
- {% if(doc.status==="Stopped") { %}
- <span class="label label-danger filterable"
- data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
- {% } %}
</div>
</div>
- <div class="col-xs-1 text-right">
- {% var completed = doc.per_delivered, title = __("Delivered") %}
- {% include "templates/form_grid/includes/progress.html" %}
- </div>
- <div class="col-xs-1 text-right">
- {% var completed = doc.per_billed, title = __("Billed") %}
- {% include "templates/form_grid/includes/progress.html" %}
- </div>
- <div class="col-xs-2 text-right">
- <div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
+ <div class="col-sm-2 hidden-xs text-ellipsis">
+ {% if(doc.per_delivered < 100 && doc.status!=="Stopped" &&
+ frappe.datetime.get_diff(doc.delivery_date) < 0) { %}
+ <span class="indicator red filterable"
+ title="{%= doc.get_formatted("delivery_date")%}"
+ data-filter="per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped">
+ {%= __("Overdue") %}
+ </span>
+ {% } else if(doc.per_delivered < 100 && doc.status!=="Stopped") { %}
+ <span class="indicator orange filterable"
+ data-filter="per_delivered,<,100|status,!=,Stopped"
+ title="{%= __("Pending") %}">
+ {%= doc.get_formatted("delivery_date") || "Pending" %}</span>
+ {% } else if(doc.per_delivered == 100 && doc.status!=="Stopped") { %}
+ <span class="filterable indicator green"
+ data-filter="per_delivered,=,100|status,!=,Stopped">
+ {%= __("Delivered") %}
+ </span>
+ {% } else if(doc.status==="Stopped") { %}
+ <span class="indicator red filterable"
+ data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
+ {% } %}
+ </div>
+ <div class="col-sm-2 hidden-xs text-ellipsis text-right">
+ <div title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %}
</div>
</div>
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index f78547b..39a1477 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -10,7 +10,7 @@
{
"fieldname": "brand",
"fieldtype": "Data",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Brand Name",
"oldfieldname": "brand",
"oldfieldtype": "Data",
@@ -33,7 +33,7 @@
"icon": "icon-certificate",
"idx": 1,
"in_dialog": 0,
- "modified": "2014-05-27 03:49:08.217867",
+ "modified": "2015-01-05 16:15:25.811253",
"modified_by": "Administrator",
"module": "Setup",
"name": "Brand",
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 3e7ef8c..52a44c5 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -12,13 +12,13 @@
"fieldname": "partner_name",
"fieldtype": "Data",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Sales Partner Name",
"oldfieldname": "partner_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1,
- "search_index": 1
+ "search_index": 0
},
{
"fieldname": "partner_type",
@@ -52,7 +52,7 @@
{
"fieldname": "commission_rate",
"fieldtype": "Float",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Commission Rate",
"oldfieldname": "commission_rate",
"oldfieldtype": "Currency",
@@ -200,7 +200,7 @@
"icon": "icon-user",
"idx": 1,
"in_create": 0,
- "modified": "2015-01-01 14:30:05.641746",
+ "modified": "2015-01-05 14:52:04.562481",
"modified_by": "Administrator",
"module": "Setup",
"name": "Sales Partner",
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index 2f5a289..e967df0 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -12,7 +12,7 @@
"fieldname": "title",
"fieldtype": "Data",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Title",
"oldfieldname": "title",
"oldfieldtype": "Data",
@@ -23,7 +23,7 @@
{
"fieldname": "terms",
"fieldtype": "Text Editor",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Terms and Conditions",
"oldfieldname": "terms",
"oldfieldtype": "Text Editor",
@@ -32,7 +32,7 @@
],
"icon": "icon-legal",
"idx": 1,
- "modified": "2014-05-27 03:49:20.923172",
+ "modified": "2015-01-05 14:58:21.277113",
"modified_by": "Administrator",
"module": "Setup",
"name": "Terms and Conditions",
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index 3f89ee8..7b07e63 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -9,7 +9,7 @@
{
"fieldname": "uom_name",
"fieldtype": "Data",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "UOM Name",
"oldfieldname": "uom_name",
"oldfieldtype": "Data",
@@ -20,14 +20,14 @@
"description": "Check this to disallow fractions. (for Nos)",
"fieldname": "must_be_whole_number",
"fieldtype": "Check",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Must be Whole Number",
"permlevel": 0
}
],
"icon": "icon-compass",
"idx": 1,
- "modified": "2014-05-27 03:49:22.050899",
+ "modified": "2015-01-05 16:14:43.862637",
"modified_by": "Administrator",
"module": "Setup",
"name": "UOM",
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index c586725..00d0e04 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -78,7 +78,7 @@
"icon": "icon-archive",
"idx": 1,
"max_attachments": 5,
- "modified": "2014-12-15 17:37:01.781726",
+ "modified": "2015-01-05 16:11:40.125703",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",
@@ -97,5 +97,6 @@
"submit": 0,
"write": 1
}
- ]
+ ],
+ "title_field": "item"
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/batch/batch_list.html b/erpnext/stock/doctype/batch/batch_list.html
index dc29905..cdccd8e 100644
--- a/erpnext/stock/doctype/batch/batch_list.html
+++ b/erpnext/stock/doctype/batch/batch_list.html
@@ -1,21 +1,18 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span class="filterable" style="margin-right: 8px;"
- data-filter="item,=,{%= doc.item %}">
- {%= doc.item %}</span>
- {% if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { %}
- <span class="label label-danger filterable"
- data-filter="expiry_date,>=,Today">
- {%= __("Expired") %}: {%= doc.get_formatted("expiry_date") %}
- </span>
- {% } else if(doc.expiry_date) { %}
- <span class="label label-default filterable"
- data-filter="expiry_date,=,{%= doc.expiry_date %}">
- {%= __("Expiry") %}: {%= doc.get_formatted("expiry_date") %}
- </span>
- {% } %}
- </div>
+ <div class="col-xs-12 col-sm-9 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
</div>
+ <div class="col-sm-3 hidden-xs text-ellipsis">
+ {% if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { %}
+ <span class="indicator red filterable"
+ data-filter="expiry_date,>=,Today">
+ {%= __("Expired") %}
+ </span>
+ {% } else if(doc.expiry_date) { %}
+ <span class="indicator darkgrey filterable"
+ data-filter="expiry_date,=,{%= doc.expiry_date %}" title="{%= __("Expiry Date") %}">
+ {%= doc.get_formatted("expiry_date") %}
+ </span>
+ {% } %}
+ </div>
</div>
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 45a4533..32682c9 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1013,7 +1013,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
- "modified": "2015-01-01 14:30:01.408528",
+ "modified": "2015-01-05 15:51:31.663904",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
@@ -1098,5 +1098,6 @@
"read_only_onload": 1,
"search_fields": "status,customer,customer_name, territory,grand_total",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.html b/erpnext/stock/doctype/delivery_note/delivery_note_list.html
index de0af97..66a49f8 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.html
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.html
@@ -1,29 +1,26 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-9">
+ <div class="col-xs-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block">
- <span class="filterable"
- data-filter="customer,=,{%= doc.customer %}">
- {%= doc.customer_name %}</span></span>
- {% if(doc.transporter_name) { %}
- <span style="margin-right: 8px;"
- title="{%= doc.transporter_name %}" class="filterable"
- data-filter="transporter_name,=,{%= doc.transporter_name %}">
- <i class="icon-truck text-muted"></i>
- </span>
- {% } %}
- {% if(doc.docstatus===0) { %}
- <span class="label label-danger filterable"
- data-filter="docstatus,=,0">{%= __("Draft") %}</span>
- {% } %}
+ {% if(doc.transporter_name) { %}
+ <span style="margin-right: 8px;"
+ title="{%= doc.transporter_name %}" class="filterable"
+ data-filter="transporter_name,=,{%= doc.transporter_name %}">
+ <i class="icon-truck text-muted"></i>
+ </span>
+ {% } %}
</div>
</div>
- <div class="col-xs-1 text-right">
- {% var completed = doc.per_installed, title=__("% Installed") %}
- {% include "templates/form_grid/includes/progress.html" %}
- </div>
- <div class="col-xs-2 text-right">
+ <div class="col-sm-2 hidden-xs">
+ {% if(doc.docstatus===0) { %}
+ <span class="indicator red filterable"
+ data-filter="docstatus,=,0">{%= __("Draft") %}</span>
+ {% } else if(doc.docstatus===1) { %}
+ <span class="indicator blue filterable"
+ data-filter="docstatus,=,1">{%= __("Delivered") %}</span>
+ {% } %}
+ </div>
+ <div class="col-sm-2 hidden-xs text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %}
</div>
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index c28067d..065f896 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -1,4 +1,4 @@
frappe.listview_settings['Delivery Note'] = {
add_fields: ["customer", "customer_name", "grand_total", "per_installed",
- "transporter_name"]
+ "transporter_name", "grand_total_export"]
};
diff --git a/erpnext/stock/doctype/item/item_list.html b/erpnext/stock/doctype/item/item_list.html
index abfc2c6..caac310 100644
--- a/erpnext/stock/doctype/item/item_list.html
+++ b/erpnext/stock/doctype/item/item_list.html
@@ -1,51 +1,18 @@
<div class="row">
- <div class="col-xs-11">
+ <div class="col-xs-11 col-sm-9">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
{% if(doc.item_name != doc.name) { %}
<span style="margin-right: 8px;">{%= doc.item_name %}</span>
{% } %}
- {% if(doc.is_stock_item==="Yes") { %}
- <span style="margin-right: 8px;"
- title="{%= __("Stock Item") %}" class="filterable"
- data-filter="is_stock_item,=,Yes">
- <i class="icon-inbox text-muted"></i>
- </span>
- {% } %}
- {% if(doc.is_sales_item==="Yes") { %}
- <span style="margin-right: 8px;"
- title="{%= __("Sales Item") %}" class="filterable"
- data-filter="is_sales_item,=,Yes">
- <i class="icon-tag text-muted"></i>
- </span>
- {% } %}
- {% if(doc.is_purchase_item==="Yes") { %}
- <span style="margin-right: 8px;"
- title="{%= __("Purchase Item") %}" class="filterable"
- data-filter="is_purchase_item,=,Yes">
- <i class="icon-shopping-cart text-muted"></i>
- </span>
- {% } %}
- {% if(doc.default_bom==="Yes") { %}
- <span style="margin-right: 8px;"
- title="{%= __("Manufactured Item") %}" class="filterable"
- data-filter="default_bom,=,{%= doc.default_bom %}">
- <i class="icon-site-map text-muted"></i>
- </span>
- {% } %}
- {% if(doc.show_in_website) { %}
- <span style="margin-right: 8px;"
- title="{%= __("Shown in Website") %}" class="filterable"
- data-filter="show_in_website,=,Yes">
- <i class="icon-globe text-muted"></i>
- </span>
- {% } %}
- <span class="label label-info filterable"
- data-filter="item_group,=,{%= doc.item_group %}">
- {%= doc.item_group %}</span>
</div>
</div>
- <div class="col-xs-1">
+ <div class="hidden-xs col-sm-2 text-ellipsis">
+ <span class="indicator darkgrey filterable"
+ data-filter="item_group,=,{%= doc.item_group %}">
+ {%= doc.item_group %}</span>
+ </div>
+ <div class="col-xs-1 col-sm-1">
{% if(doc.image) { %}
<img src="{%= doc.image %}" class="img-responsive" style="margin-bottom: 4px;">
{% } %}
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index f83c50f..dbbc6e5 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -22,10 +22,8 @@
cur_frm.dashboard.reset();
if(doc.docstatus===1) {
if(doc.status==="Stopped") {
- cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "icon-stop")
+ cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "octicon octicon-circle-slash")
}
- cur_frm.dashboard.add_progress(cint(doc.per_ordered) + "% "
- + __("Fulfilled"), cint(doc.per_ordered));
}
if(doc.docstatus==0) {
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index f7da8b0..a1ccb64 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -235,7 +235,7 @@
"icon": "icon-ticket",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-12-24 14:28:14.548275",
+ "modified": "2015-01-05 15:17:13.466750",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
@@ -303,5 +303,6 @@
"read_only_onload": 1,
"search_fields": "status,transaction_date",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "material_request_type"
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request_list.html b/erpnext/stock/doctype/material_request/material_request_list.html
index 750f650..2290a3a 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.html
+++ b/erpnext/stock/doctype/material_request/material_request_list.html
@@ -1,28 +1,20 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-10">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span style="margin-right: 8px; display: inline-block"
- title="{%= doc.material_request_type %}" class="filterable"
- data-filter="material_request_type,=,{%= doc.material_request_type %}">
- {% if(doc.material_request_type==="Purchase") { %}
- <i class="icon-shopping-cart"></i>
- {% } else { %}
- <i class="icon-truck"></i>
- {% } %}
- </span>
- {% if(doc.status=="Draft") { %}
- <span class="label label-danger"
- data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
- {% } %}
- {% if(doc.status=="Submitted" && doc.per_ordered < 100) { %}
- <span class="label label-warning filterable"
- data-filter="per_ordered,<,100">{%= __("Pending") %}</span>
- {% } %}
- </div>
+ <div class="col-sm-10 col-xs-12 text-ellipsis">
+ {%= list.get_avatar_and_id(doc) %}
</div>
- <div class="col-xs-2">
- {% var completed = doc.per_ordered, title = __("Ordered") %}
- {% include "templates/form_grid/includes/progress.html" %}
+ <div class="col-sm-2 hidden-xs">
+ {% if(doc.status=="Draft") { %}
+ <span class="indicator red filterable"
+ data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
+ {% } else if(doc.status=="Submitted" && doc.per_ordered < 100) { %}
+ <span class="indicator orange filterable"
+ data-filter="per_ordered,<,100">{%= __("Pending") %}</span>
+ {% } else if(doc.status=="Submitted" && doc.per_ordered == 100) { %}
+ <span class="indicator blue filterable"
+ data-filter="per_ordered,=,100">{%= __("Completed") %}</span>
+ {% } else if(doc.status=="Stopped") { %}
+ <span class="indicator red filterable"
+ data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
+ {% } %}
</div>
</div>
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 9a1c804..c66ec62 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -23,23 +23,6 @@
"read_only": 0
},
{
- "default": "Not Available",
- "description": "Only Serial Nos with status \"Available\" can be delivered.",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "Not Available\nAvailable\nDelivered\nPurchase Returned\nSales Returned",
- "permlevel": 0,
- "read_only": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
"fieldname": "serial_no",
"fieldtype": "Data",
"in_filter": 0,
@@ -67,6 +50,23 @@
"search_index": 0
},
{
+ "default": "Not Available",
+ "description": "Only Serial Nos with status \"Available\" can be delivered.",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "Not Available\nAvailable\nDelivered\nPurchase Returned\nSales Returned",
+ "permlevel": 0,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
"description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt",
"fieldname": "warehouse",
"fieldtype": "Link",
@@ -91,7 +91,7 @@
{
"fieldname": "item_name",
"fieldtype": "Data",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Item Name",
"permlevel": 0,
"read_only": 1
@@ -417,7 +417,7 @@
"icon": "icon-barcode",
"idx": 1,
"in_create": 0,
- "modified": "2015-01-01 14:30:05.865206",
+ "modified": "2015-01-05 16:03:49.825174",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
diff --git a/erpnext/stock/doctype/serial_no/serial_no_list.html b/erpnext/stock/doctype/serial_no/serial_no_list.html
deleted file mode 100644
index d53aab1..0000000
--- a/erpnext/stock/doctype/serial_no/serial_no_list.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span class="filterable" style="margin-right: 8px;"
- data-filter="item_code,=,{%= doc.item_code %}">
- {%= doc.item_code %}</span>
- {% var icon = {
- "Available": ["icon-ok", "label-success"],
- "Not Available": ["icon-remove", "label-danger"],
- "Delivered": ["icon-truck", "label-success"],
- "Purchase Returned": ["icon-retweet", "label-warning"],
- "Sales Returned": ["icon-retweet", "label-warning"],
- }[doc.status]; %}
- <span class="label {%= icon[1] %} filterable"
- data-filter="status,=,{%= doc.status %}"
- title="{%= doc.purpose %}">
- <i class="{%= icon[0] %}"></i> {%= doc.status %}
- </span>
- {% if(doc.warehouse) { %}
- <span class="label label-default filterable"
- data-filter="warehouse,=,{%= doc.warehouse %}">
- {%= doc.warehouse %}
- </span>
- {% } %}
- </div>
- </div>
-</div>
diff --git a/erpnext/stock/doctype/serial_no/serial_no_list.js b/erpnext/stock/doctype/serial_no/serial_no_list.js
deleted file mode 100644
index 9a65138..0000000
--- a/erpnext/stock/doctype/serial_no/serial_no_list.js
+++ /dev/null
@@ -1,3 +0,0 @@
-frappe.listview_settings['Serial No'] = {
- add_fields: ["status", "item_code", "warehouse"]
-};
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index af443ae..f09b178 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -587,7 +587,7 @@
"is_submittable": 1,
"issingle": 0,
"max_attachments": 0,
- "modified": "2014-12-24 16:43:51.886121",
+ "modified": "2015-01-05 15:28:49.649079",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -656,5 +656,6 @@
"read_only_onload": 0,
"search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "purpose"
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.html b/erpnext/stock/doctype/stock_entry/stock_entry_list.html
index e59b332..92bf2fa 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_list.html
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.html
@@ -1,51 +1,24 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
+ <div class="col-xs-12 col-sm-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- {% var icon = {
- "Material Issue": "icon-arrow-right",
- "Material Receipt": "icon-arrow-left",
- "Material Transfer": "icon-resize-horizontal",
- "Manufacture": "icon-wrench",
- "Repack": "icon-wrench",
- "Sales Return": "icon-warning-sign",
- "Purchase Return": "icon-warning-sign",
- "Subcontract": "icon-truck"
- }[doc.purpose]; %}
- <span class="label label-info filterable"
- data-filter="purpose,=,{%= doc.purpose %}"
- title="{%= doc.purpose %}">
- <i class="{%= icon %}"></i>
- </span>
- {% if(doc.from_warehouse) { %}
- <span class="label label-default filterable"
- data-filter="from_warehouse,=,{%= doc.from_warehouse %}">
- {%= doc.from_warehouse %}
- </span>
- {% } %}
- {% if(doc.from_warehouse || doc.to_warehouse) { %}
- <i class="icon-arrow-right text-muted"></i>
- {% } %}
- {% if(doc.to_warehouse) { %}
- <span class="label label-primary filterable"
- data-filter="to_warehouse,=,{%= doc.to_warehouse %}">
- {%= doc.to_warehouse %}
- </span>
- {% } %}
- {% if(doc.production_order) { %}
- <span class="label label-info filterable"
- data-filter="production_order,=,{%= doc.production_order %}"
- title="{%= doc.production_order %}">
- <i class="icon-wrench"></i>
- </span>
- {% } %}
- {% if(doc.bom_no) { %}
- <span class="label label-info filterable"
- data-filter="bom_no,=,{%= doc.bom_no %}"
- title="{%= doc.bom_no %}">
- <i class="icon-sitemap"></i>
- </span>
- {% } %}
</div>
</div>
+ <div class="col-sm-4 hidden-xs">
+ {% if(doc.from_warehouse) { %}
+ <span class="label label-default filterable"
+ data-filter="from_warehouse,=,{%= doc.from_warehouse %}">
+ {%= doc.from_warehouse %}
+ </span>
+ {% } %}
+ {% if(doc.from_warehouse || doc.to_warehouse) { %}
+ <i class="octicon octicon-arrow-right text-muted"></i>
+ {% } %}
+ {% if(doc.to_warehouse) { %}
+ <span class="label label-primary filterable"
+ data-filter="to_warehouse,=,{%= doc.to_warehouse %}">
+ {%= doc.to_warehouse %}
+ </span>
+ {% } %}
+ </div>
</div>
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 59951be..3503877 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -1,223 +1,224 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "creation": "2013-03-07 18:50:32",
- "description": "A logical Warehouse against which stock entries are made.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2013-03-07 18:50:32",
+ "description": "A logical Warehouse against which stock entries are made.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "warehouse_detail",
- "fieldtype": "Section Break",
- "label": "Warehouse Detail",
- "oldfieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "warehouse_detail",
+ "fieldtype": "Section Break",
+ "label": "Warehouse Detail",
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "warehouse_name",
- "fieldtype": "Data",
- "label": "Warehouse Name",
- "oldfieldname": "warehouse_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "warehouse_name",
+ "fieldtype": "Data",
+ "label": "Warehouse Name",
+ "oldfieldname": "warehouse_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "read_only": 0,
- "reqd": 1,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "read_only": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "depends_on": "eval:sys_defaults.auto_accounting_for_stock",
- "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.",
- "fieldname": "create_account_under",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Parent Account",
- "options": "Account",
+ "depends_on": "eval:sys_defaults.auto_accounting_for_stock",
+ "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.",
+ "fieldname": "create_account_under",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "Parent Account",
+ "options": "Account",
"permlevel": 0
- },
+ },
{
- "fieldname": "disabled",
- "fieldtype": "Check",
- "label": "Disabled",
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "label": "Disabled",
"permlevel": 0
- },
+ },
{
- "description": "For Reference Only.",
- "fieldname": "warehouse_contact_info",
- "fieldtype": "Section Break",
- "label": "Warehouse Contact Info",
- "permlevel": 0,
+ "description": "For Reference Only.",
+ "fieldname": "warehouse_contact_info",
+ "fieldtype": "Section Break",
+ "label": "Warehouse Contact Info",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "email_id",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Email Id",
- "oldfieldname": "email_id",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "email_id",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Email Id",
+ "oldfieldname": "email_id",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "phone_no",
- "fieldtype": "Data",
- "label": "Phone No",
- "oldfieldname": "phone_no",
- "oldfieldtype": "Int",
- "options": "Phone",
- "permlevel": 0,
+ "fieldname": "phone_no",
+ "fieldtype": "Data",
+ "label": "Phone No",
+ "oldfieldname": "phone_no",
+ "oldfieldtype": "Int",
+ "options": "Phone",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "mobile_no",
- "fieldtype": "Data",
- "label": "Mobile No",
- "oldfieldname": "mobile_no",
- "oldfieldtype": "Int",
- "options": "Phone",
- "permlevel": 0,
+ "fieldname": "mobile_no",
+ "fieldtype": "Data",
+ "label": "Mobile No",
+ "oldfieldname": "mobile_no",
+ "oldfieldtype": "Int",
+ "options": "Phone",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "address_line_1",
- "fieldtype": "Data",
- "label": "Address Line 1",
- "oldfieldname": "address_line_1",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "address_line_1",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Address Line 1",
+ "oldfieldname": "address_line_1",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "address_line_2",
- "fieldtype": "Data",
- "label": "Address Line 2",
- "oldfieldname": "address_line_2",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "address_line_2",
+ "fieldtype": "Data",
+ "label": "Address Line 2",
+ "oldfieldname": "address_line_2",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "city",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "City",
- "oldfieldname": "city",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "city",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "City",
+ "oldfieldname": "city",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "state",
- "fieldtype": "Data",
- "label": "State",
- "oldfieldname": "state",
- "oldfieldtype": "Select",
- "permlevel": 0,
+ "fieldname": "state",
+ "fieldtype": "Data",
+ "label": "State",
+ "oldfieldname": "state",
+ "oldfieldtype": "Select",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "pin",
- "fieldtype": "Int",
- "label": "PIN",
- "oldfieldname": "pin",
- "oldfieldtype": "Int",
- "permlevel": 0,
+ "fieldname": "pin",
+ "fieldtype": "Int",
+ "label": "PIN",
+ "oldfieldname": "pin",
+ "oldfieldtype": "Int",
+ "permlevel": 0,
"read_only": 0
}
- ],
- "icon": "icon-building",
- "idx": 1,
- "modified": "2014-09-15 02:55:16.750848",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Warehouse",
- "owner": "Administrator",
+ ],
+ "icon": "icon-building",
+ "idx": 1,
+ "modified": "2015-01-05 15:58:43.046509",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Warehouse",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material Master Manager",
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Material Master Manager",
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 1,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Material User",
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 1,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Material User",
+ "submit": 0,
"write": 0
- },
+ },
{
- "apply_user_permissions": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Sales User"
- },
+ },
{
- "apply_user_permissions": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Purchase User"
- },
+ },
{
- "apply_user_permissions": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
+ "apply_user_permissions": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Accounts User"
- },
+ },
{
- "apply_user_permissions": 1,
- "permlevel": 0,
- "read": 1,
+ "apply_user_permissions": 1,
+ "permlevel": 0,
+ "read": 1,
"role": "Manufacturing User"
}
]
-}
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/customer_issue/customer_issue.json b/erpnext/support/doctype/customer_issue/customer_issue.json
index e17e2b1..cc1a6e4 100644
--- a/erpnext/support/doctype/customer_issue/customer_issue.json
+++ b/erpnext/support/doctype/customer_issue/customer_issue.json
@@ -63,7 +63,7 @@
"fieldname": "customer",
"fieldtype": "Link",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Customer",
"oldfieldname": "customer",
"oldfieldtype": "Link",
@@ -162,7 +162,7 @@
"fieldtype": "Select",
"hidden": 0,
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Warranty / AMC Status",
"options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC",
"permlevel": 0
@@ -396,7 +396,7 @@
"icon": "icon-bug",
"idx": 1,
"is_submittable": 0,
- "modified": "2015-01-01 14:30:00.857711",
+ "modified": "2015-01-05 16:21:50.525893",
"modified_by": "Administrator",
"module": "Support",
"name": "Customer Issue",
@@ -419,5 +419,6 @@
],
"search_fields": "status,customer,customer_name,territory",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/support/doctype/customer_issue/customer_issue_list.html b/erpnext/support/doctype/customer_issue/customer_issue_list.html
deleted file mode 100644
index 6a39f9f..0000000
--- a/erpnext/support/doctype/customer_issue/customer_issue_list.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="row" style="max-height: 30px;">
- <div class="col-xs-12">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
-
- <span style="margin-right: 8px;" class="filterable"
- data-filter="customer,=,{%= doc.customer %}">
- {%= doc.customer %}</span>
-
- <span class="label
- label-{%= frappe.utils.guess_style(doc.status) %} filterable"
- data-filter="status,=,{%= doc.status %}">
- {%= doc.status %}
- </span>
-
- {% if(doc.item_code) { %}
- <span class="label label-default filterable"
- data-filter="item_code,=,{%= doc.item_code %}">
- {%= doc.item_code %}
- </span>
- {% } %}
- </div>
- </div>
-</div>
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index bb43bb3..c158b5e 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -27,7 +27,7 @@
"fieldname": "subject",
"fieldtype": "Data",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Subject",
"permlevel": 0,
"report_hide": 0,
@@ -217,7 +217,7 @@
],
"icon": "icon-ticket",
"idx": 1,
- "modified": "2014-11-28 12:11:31.275053",
+ "modified": "2015-01-05 16:16:58.927957",
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",
diff --git a/erpnext/support/doctype/issue/issue_list.html b/erpnext/support/doctype/issue/issue_list.html
deleted file mode 100644
index f2cf9b2..0000000
--- a/erpnext/support/doctype/issue/issue_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="row" style="max-height: 30px;">
- <div class="col-xs-10">
- <div class="text-ellipsis">
- {%= list.get_avatar_and_id(doc) %}
- <span class="label label-{%= frappe.utils.guess_style(doc.status) %} filterable"
- data-filter="status,=,{%= doc.status %}">
- {%= doc.status %}
- </span>
- </div>
- </div>
- <div class="col-xs-2">
- <div class="text-ellipsis">
- <span class="filterable text-muted small" style="margin-right: 8px;"
- data-filter="raised_by,=,{%= doc.raised_by %}">
- {%= doc.raised_by %}</span>
- </div>
- </div>
-</div>
diff --git a/erpnext/support/doctype/newsletter/newsletter_list.html b/erpnext/support/doctype/newsletter/newsletter_list.html
index 5bbe104..d9352c7 100644
--- a/erpnext/support/doctype/newsletter/newsletter_list.html
+++ b/erpnext/support/doctype/newsletter/newsletter_list.html
@@ -1,16 +1,15 @@
<div class="row" style="max-height: 30px;">
- <div class="col-xs-10">
+ <div class="col-xs-12 col-sm-9">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- <span class="label
- label-{%= cint(doc.email_sent) ? "success" : "warning" %} filterable"
- data-filter="email_sent,=,{%= cint(doc.email_sent) ? __("Yes") : __("No") %}">
- {%= cint(doc.email_sent) ? __("Sent") : __("Not Sent") %}
- </span>
- <span class="label label-info filterable"
- data-filter="send_to_type,=,{%= doc.send_to_type %}">
- {%= doc.send_to_type %}
- </span>
</div>
</div>
+ <div class="col-sm-3 hidden-xs">
+ {% if (!doc.email_sent) { %}
+ <span class="indicator orange filterable"
+ data-filter="email_sent,=,No">
+ {%= __("Not Sent") %}
+ </span>
+ {% } %}
+ </div>
</div>
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 9a7c322..9e5a26f 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -1,263 +1,264 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "creation": "2013-01-10 16:34:32",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2013-01-10 16:34:32",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "address_details",
- "fieldtype": "Section Break",
- "label": "Address Details",
- "options": "icon-map-marker",
+ "fieldname": "address_details",
+ "fieldtype": "Section Break",
+ "label": "Address Details",
+ "options": "icon-map-marker",
"permlevel": 0
- },
+ },
{
- "description": "Name of person or organization that this address belongs to.",
- "fieldname": "address_title",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Address Title",
- "permlevel": 0,
+ "description": "Name of person or organization that this address belongs to.",
+ "fieldname": "address_title",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Address Title",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "address_type",
- "fieldtype": "Select",
- "label": "Address Type",
- "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
- "permlevel": 0,
+ "fieldname": "address_type",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Address Type",
+ "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "address_line1",
- "fieldtype": "Data",
- "label": "Address Line 1",
- "permlevel": 0,
+ "fieldname": "address_line1",
+ "fieldtype": "Data",
+ "label": "Address Line 1",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "address_line2",
- "fieldtype": "Data",
- "label": "Address Line 2",
+ "fieldname": "address_line2",
+ "fieldtype": "Data",
+ "label": "Address Line 2",
"permlevel": 0
- },
+ },
{
- "fieldname": "city",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "City/Town",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "city",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "City/Town",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "state",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "State",
- "permlevel": 0,
+ "fieldname": "state",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "State",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "pincode",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Pincode",
- "permlevel": 0,
+ "fieldname": "pincode",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Pincode",
+ "permlevel": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "country",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Country",
- "options": "Country",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "country",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Country",
+ "options": "Country",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "email_id",
- "fieldtype": "Data",
- "label": "Email Id",
+ "fieldname": "email_id",
+ "fieldtype": "Data",
+ "label": "Email Id",
"permlevel": 0
- },
+ },
{
- "fieldname": "phone",
- "fieldtype": "Data",
- "label": "Phone",
- "permlevel": 0,
+ "fieldname": "phone",
+ "fieldtype": "Data",
+ "label": "Phone",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "fax",
- "fieldtype": "Data",
- "in_filter": 1,
- "label": "Fax",
+ "fieldname": "fax",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "label": "Fax",
"permlevel": 0
- },
+ },
{
- "default": "0",
- "description": "Check to make primary address",
- "fieldname": "is_primary_address",
- "fieldtype": "Check",
- "label": "Preferred Billing Address",
+ "default": "0",
+ "description": "Check to make primary address",
+ "fieldname": "is_primary_address",
+ "fieldtype": "Check",
+ "label": "Preferred Billing Address",
"permlevel": 0
- },
+ },
{
- "default": "0",
- "description": "Check to make Shipping Address",
- "fieldname": "is_shipping_address",
- "fieldtype": "Check",
- "in_list_view": 1,
- "label": "Preferred Shipping Address",
+ "default": "0",
+ "description": "Check to make Shipping Address",
+ "fieldname": "is_shipping_address",
+ "fieldtype": "Check",
+ "in_list_view": 0,
+ "label": "Preferred Shipping Address",
"permlevel": 0
- },
+ },
{
- "fieldname": "linked_with",
- "fieldtype": "Section Break",
- "label": "Reference",
- "options": "icon-pushpin",
+ "fieldname": "linked_with",
+ "fieldtype": "Section Break",
+ "label": "Reference",
+ "options": "icon-pushpin",
"permlevel": 0
- },
+ },
{
- "fieldname": "customer",
- "fieldtype": "Link",
- "label": "Customer",
- "options": "Customer",
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "label": "Customer",
+ "options": "Customer",
"permlevel": 0
- },
+ },
{
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Customer Name",
- "permlevel": 0,
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Customer Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "supplier",
- "fieldtype": "Link",
- "label": "Supplier",
- "options": "Supplier",
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "label": "Supplier",
+ "options": "Supplier",
"permlevel": 0
- },
+ },
{
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Supplier Name",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Supplier Name",
+ "permlevel": 0,
+ "read_only": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "sales_partner",
- "fieldtype": "Link",
- "label": "Sales Partner",
- "options": "Sales Partner",
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "label": "Sales Partner",
+ "options": "Sales Partner",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break_22",
- "fieldtype": "Column Break",
+ "fieldname": "column_break_22",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
- "fieldname": "lead",
- "fieldtype": "Link",
- "label": "Lead",
- "options": "Lead",
+ "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "fieldname": "lead",
+ "fieldtype": "Link",
+ "label": "Lead",
+ "options": "Lead",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
- "fieldname": "lead_name",
- "fieldtype": "Data",
- "label": "Lead Name",
- "permlevel": 0,
+ "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "fieldname": "lead_name",
+ "fieldtype": "Data",
+ "label": "Lead Name",
+ "permlevel": 0,
"read_only": 1
}
- ],
- "icon": "icon-map-marker",
- "idx": 1,
- "in_dialog": 0,
- "modified": "2014-09-15 03:49:07.273657",
- "modified_by": "Administrator",
- "module": "Utilities",
- "name": "Address",
- "owner": "Administrator",
+ ],
+ "icon": "icon-map-marker",
+ "idx": 1,
+ "in_dialog": 0,
+ "modified": "2015-01-05 12:10:31.519685",
+ "modified_by": "Administrator",
+ "module": "Utilities",
+ "name": "Address",
+ "owner": "Administrator",
"permissions": [
{
- "apply_user_permissions": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "submit": 0,
+ "apply_user_permissions": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "submit": 0,
+ "apply_user_permissions": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Maintenance User",
- "submit": 0,
+ "apply_user_permissions": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Maintenance User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "apply_user_permissions": 1,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "submit": 0,
+ "apply_user_permissions": 1,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "submit": 0,
"write": 1
}
- ],
- "search_fields": "customer, supplier, sales_partner, country, state",
- "sort_field": "modified",
+ ],
+ "search_fields": "customer, supplier, sales_partner, country, state",
+ "sort_field": "modified",
"sort_order": "DESC"
-}
+}
\ No newline at end of file