Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
[Fix] Fetch Serial No by default for Delivery Note Item
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ddaa155..85ac910 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.1.19'
+__version__ = '7.1.20'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index 2450a8a..4c04fc6 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -51,7 +51,7 @@
if (doc.is_group == 1) {
cur_frm.add_custom_button(__('Group to Non-Group'),
- function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
+ function() { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
} else if (cint(doc.is_group) == 0) {
cur_frm.add_custom_button(__('Ledger'), function() {
frappe.route_options = {
@@ -64,7 +64,7 @@
});
cur_frm.add_custom_button(__('Non-Group to Group'),
- function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
+ function() { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
}
}
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index c2dae29..1bdf355 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -529,7 +529,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 4cf9a67..fc6a1b4 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -30,7 +30,9 @@
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
- options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+ options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
+ 'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
+ 'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.")
},
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index c389b5c..7a4d40d 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -226,7 +226,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index 1a7b763..b83dc7c 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -234,7 +234,7 @@
],
"hide_heading": 1,
"hide_toolbar": 1,
- "icon": "icon-check",
+ "icon": "fa fa-check",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index fd093d3..a59fd18 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -400,7 +400,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index 83ecc9f..5d11005 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -50,11 +50,11 @@
cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
if (doc.is_group == 1) {
cur_frm.add_custom_button(__('Convert to Non-Group'),
- function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
+ function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
"btn-default")
} else if (doc.is_group == 0) {
cur_frm.add_custom_button(__('Convert to Group'),
- function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
+ function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
"btn-default")
}
}
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 2a62928..f590b5d 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -275,7 +275,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 1,
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index e7812c3..a516557 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -15,7 +15,7 @@
if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
this.frm.add_custom_button(__("Default"),
- this.frm.cscript.set_as_default, "icon-star");
+ this.frm.cscript.set_as_default, "fa fa-star");
this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
} else {
this.frm.set_intro("");
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index fcbd72c..f8284e6 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -131,7 +131,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 71008a6..04fd4be 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -596,7 +596,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-list",
+ "icon": "fa fa-list",
"idx": 1,
"in_create": 1,
"in_dialog": 0,
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index ced56d0..06ba5df 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -20,7 +20,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
if (frm.doc.__islocal) {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index ba5dd59..112112f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-flag",
+ "options": "fa fa-flag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -233,7 +233,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-table",
+ "options": "fa fa-table",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -663,7 +663,7 @@
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1148,7 +1148,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1283,7 +1283,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 176,
"image_view": 0,
"in_create": 0,
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 21a8ed2..923e87d 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -102,7 +102,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-credit-card",
+ "icon": "fa fa-credit-card",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 47c15e6..2340340 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -105,7 +105,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index ea1a2e3..1f6199e 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -156,7 +156,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
},
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index ef617b0..fc4edae 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -388,7 +388,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-resize-horizontal",
+ "icon": "fa fa-resize-horizontal",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index a092e56..c5ded6d 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -30,7 +30,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
}
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 50ba4fa..fb4ca2f 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -277,7 +277,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 3541202..b8404f0 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -1054,7 +1054,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 4c22b0d..5a3e651 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -4,7 +4,7 @@
frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
'<tr><td>',
- '<h4><i class="icon-hand-right"></i> ',
+ '<h4><i class="fa fa-hand-right"></i> ',
__('Notes'),
':</h4>',
'<ul>',
@@ -23,7 +23,7 @@
'</ul>',
'</td></tr>',
'<tr><td>',
- '<h4><i class="icon-question-sign"></i> ',
+ '<h4><i class="fa fa-question-sign"></i> ',
__('How Pricing Rule is applied?'),
'</h4>',
'<ol>',
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index af887df..fdf3db9 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1190,7 +1190,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-gift",
+ "icon": "fa fa-gift",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 11bf945..3476ddd 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -289,7 +289,7 @@
pricing_rules = filter(lambda x: x.for_price_list==args.price_list, pricing_rules) \
or pricing_rules
- if len(pricing_rules) > 1:
+ if len(pricing_rules) > 1 and not args.for_shopping_cart:
frappe.throw(_("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}")
.format("\n".join([d.name for d in pricing_rules])), MultiplePricingRuleConflict)
elif pricing_rules:
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 0c8d1ac..2791d6f 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -715,7 +715,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -942,7 +942,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1201,7 +1201,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1318,7 +1318,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2306,7 +2306,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2394,7 +2394,7 @@
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2711,7 +2711,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3006,7 +3006,7 @@
"label": "Recurring Invoice",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3399,7 +3399,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 204,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 9290ae1..50426df 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -213,7 +213,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index e0a8121..d6cf120 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -123,7 +123,7 @@
select
name, item_code, item_name, description, item_group, expense_account, has_batch_no,
has_serial_no, expense_account, selling_cost_center, stock_uom, image,
- default_warehouse, is_stock_item
+ default_warehouse, is_stock_item, barcode
from
tabItem
where
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 4cd66f5..5609fce 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -503,9 +503,23 @@
frappe.model.set_value(cdt, cdn, "billing_hours", data.billing_hours);
frappe.model.set_value(cdt, cdn, "billing_amount", data.billing_amount);
frappe.model.set_value(cdt, cdn, "timesheet_detail", data.timesheet_detail);
+ calculate_total_billing_amount(frm)
}
}
})
}
}
})
+
+var calculate_total_billing_amount = function(frm) {
+ var doc = frm.doc;
+
+ doc.total_billing_amount = 0.0
+ if(doc.timesheets) {
+ $.each(doc.timesheets, function(index, data){
+ doc.total_billing_amount += data.billing_amount
+ })
+ }
+
+ refresh_field('total_billing_amount')
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 602eabc..2a07389 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -28,7 +28,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1035,7 +1035,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1122,7 +1122,7 @@
"label": "Packing List",
"length": 0,
"no_copy": 0,
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1462,7 +1462,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1941,7 +1941,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2238,7 +2238,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2327,7 +2327,7 @@
"label": "Payments",
"length": 0,
"no_copy": 0,
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -3251,7 +3251,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3514,7 +3514,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3719,7 +3719,7 @@
"label": "Recurring",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -4172,7 +4172,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 181,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index 3a58aef..894d5ab 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -212,7 +212,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index 12cf8cb..a8788a1 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -378,7 +378,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 57ffcb1..70db094 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -246,6 +246,8 @@
var me = this;
this.items = this.item_data;
+ this.actual_qty_dict = {};
+
if(load_doc) {
this.frm.doc = JSON.parse(localStorage.getItem('doc'));
}
@@ -444,7 +446,7 @@
})
}
- key = this.search.$input.val().toLowerCase();
+ key = this.search.$input.val().toLowerCase().replace(/[&\/\\#,+()\[\]$~.'":*?<>{}]/g,'\\$&');
var re = new RegExp('%', 'g');
var reg = new RegExp(key.replace(re, '[\\w*\\s*[a-zA-Z0-9]*]*'))
search_status = true
@@ -680,7 +682,7 @@
item_code: d.item_code,
item_name: (d.item_name===d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
qty: d.qty,
- actual_qty: me.actual_qty,
+ actual_qty: me.actual_qty_dict[d.item_code] || 0,
projected_qty: d.projected_qty,
rate: format_number(d.rate, me.frm.doc.currency),
amount: format_currency(d.amount, me.frm.doc.currency)
@@ -731,7 +733,7 @@
me.update_paid_amount_status(true);
me.create_invoice();
me.make_payment();
- }, "octicon octicon-credit-card");
+ }, "octicon octfa fa-credit-card");
}else if(this.frm.doc.docstatus == 1) {
this.page.set_primary_action(__("Print"), function() {
html = frappe.render(me.print_template, me.frm.doc)
@@ -744,7 +746,7 @@
this.page.set_secondary_action(__("New"), function() {
me.save_previous_entry();
me.create_new();
- }, "octicon octicon-plus").addClass("btn-primary");
+ }, "octicon octfa fa-plus").addClass("btn-primary");
},
print_dialog: function(){
@@ -1083,9 +1085,11 @@
get_actual_qty: function(item) {
this.actual_qty = 0.0;
+
var warehouse = this.pos_profile_data['warehouse'] || item.default_warehouse;
if(warehouse && this.bin_data[item.item_code]) {
this.actual_qty = this.bin_data[item.item_code][warehouse] || 0;
+ this.actual_qty_dict[item.item_code] = this.actual_qty
}
return this.actual_qty
diff --git a/erpnext/accounts/page/pos/pos.json b/erpnext/accounts/page/pos/pos.json
index 31c043c..abd918a 100644
--- a/erpnext/accounts/page/pos/pos.json
+++ b/erpnext/accounts/page/pos/pos.json
@@ -3,7 +3,7 @@
"creation": "2014-08-08 02:45:55.931022",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-th",
+ "icon": "fa fa-th",
"modified": "2014-08-08 05:59:33.045012",
"modified_by": "Administrator",
"module": "Accounts",
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 97d2cdb..e66d20e 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -324,12 +324,17 @@
additional_conditions.append("posting_date >= %(from_date)s")
if filters:
- for key in ['cost_center', 'project']:
- if filters.get(key):
- additional_conditions.append("%s = '%s'"%(key, filters.get(key)))
+ if filters.get("project"):
+ additional_conditions.append("project = '%s'"%(frappe.db.escape(filters.get("project"))))
+ if filters.get("cost_center"):
+ additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
+def get_cost_center_cond(cost_center):
+ lft, rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
+ return (""" cost_center in (select name from `tabCost Center` where lft >=%s and rgt <=%s)"""%(lft, rgt))
+
def get_columns(periodicity, period_list, accumulated_values=1, company=None):
columns = [{
"fieldname": "account",
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index d6bbee5..1d417da 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -31,7 +31,7 @@
purchase_receipt = d.purchase_receipt
elif d.po_detail:
purchase_receipt = ", ".join(frappe.db.sql_list("""select distinct parent
- from `tabPurchase Receipt Item` where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail))
+ from `tabPurchase Receipt Item` where docstatus=1 and purchase_order_item=%s""", d.po_detail))
expense_account = d.expense_account or aii_account_map.get(d.company)
row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.supplier,
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 306799d..ac97255 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -186,7 +186,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index d155abb..c092695 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -858,7 +858,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1085,7 +1085,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1343,7 +1343,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1461,7 +1461,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2100,7 +2100,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2572,7 +2572,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2631,7 +2631,7 @@
"label": "Recurring",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -3053,7 +3053,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 105,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index 59b7808..fbdb0e4 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -238,7 +238,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -385,7 +385,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -566,7 +566,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -699,7 +699,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 57bf2c7..4b8f8c5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -30,7 +30,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -516,7 +516,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -786,7 +786,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 370,
"image_field": "image",
"image_view": 0,
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 05eaf56..519c37e 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -485,7 +485,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -716,7 +716,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -945,7 +945,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1063,7 +1063,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1674,7 +1674,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1878,7 +1878,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2035,7 +2035,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 29,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.json b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
index 407d888..ad13c7d 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.json
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:16.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:43:52.000000",
"modified_by": "Administrator",
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index 7a415f0..c35c1f2 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -56,6 +56,41 @@
]
},
{
+ "label": _("Attendance"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Student Attendance"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Leave Application"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Batch Attendance Tool"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Absent Student Report",
+ "doctype": "Attendance"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Batch-Wise Attendance",
+ "doctype": "Attendance"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Monthly Attendance Sheet",
+ "doctype": "Attendance"
+ }
+ ]
+ },
+ {
"label": _("Schedule"),
"items": [
{
@@ -65,15 +100,7 @@
},
{
"type": "doctype",
- "name": "Student Attendance"
- },
- {
- "type": "doctype",
"name": "Course Scheduling Tool"
- },
- {
- "type": "doctype",
- "name": "Student Batch Attendance Tool"
}
]
},
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 944c0b9..d4a02e6 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -500,7 +500,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -757,7 +757,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1004,7 +1004,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 5,
"image_field": "image",
"image_view": 0,
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index ff8f468..fa0ec81 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -28,7 +28,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -410,7 +410,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -471,7 +471,7 @@
"label": "Contact Info",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -760,7 +760,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1104,7 +1104,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-info-sign",
+ "icon": "fa fa-info-sign",
"idx": 195,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/docs/assets/img/crm/create-customer.gif b/erpnext/docs/assets/img/crm/create-customer.gif
new file mode 100644
index 0000000..a615f2a
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/create-customer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
new file mode 100644
index 0000000..70e536e
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
new file mode 100644
index 0000000..9d41027
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/requirement-gathering.png b/erpnext/docs/assets/img/crm/requirement-gathering.png
new file mode 100644
index 0000000..cd631d6
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/requirement-gathering.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
index b07a7cf..97ce265 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
index e8dea02..6191e13 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
index 5c20ff8..0cd0bd1 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
index dbdc303..c323628 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
new file mode 100644
index 0000000..07b5170
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations.png b/erpnext/docs/assets/img/manufacturing/PO-operations.png
index 6916891..4b091ce 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-operations.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-stop.png b/erpnext/docs/assets/img/manufacturing/PO-stop.png
index c486a68..0c82573 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-stop.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-stop.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
new file mode 100644
index 0000000..4701ad0
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/production-order.png b/erpnext/docs/assets/img/manufacturing/production-order.png
index d1e7966..fb552f3 100644
--- a/erpnext/docs/assets/img/manufacturing/production-order.png
+++ b/erpnext/docs/assets/img/manufacturing/production-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/selling-flow.png b/erpnext/docs/assets/img/selling/selling-flow.png
new file mode 100644
index 0000000..7f35f80
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/selling-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
new file mode 100644
index 0000000..c4d28f4
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-csv.png b/erpnext/docs/assets/img/setup/data-import/import-csv.png
new file mode 100644
index 0000000..3b9bc9f
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-csv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-file.png b/erpnext/docs/assets/img/setup/data-import/import-file.png
new file mode 100644
index 0000000..c99e015
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-file.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/__init__.py b/erpnext/docs/assets/img/setup/integration-service/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/__init__.py
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-1.png b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
new file mode 100644
index 0000000..d51434d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-2.png b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
new file mode 100644
index 0000000..f4dfa43
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-3.png b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
new file mode 100644
index 0000000..070fded
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
new file mode 100644
index 0000000..daa792c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-1.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-1.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
new file mode 100644
index 0000000..c0ecbc7
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
new file mode 100644
index 0000000..15fd387
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
new file mode 100644
index 0000000..e6f1665
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
new file mode 100644
index 0000000..e09e797
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
new file mode 100644
index 0000000..bf0ed19
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
new file mode 100644
index 0000000..f5f5e54
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
new file mode 100644
index 0000000..68cad28
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
new file mode 100644
index 0000000..042b422
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
new file mode 100644
index 0000000..21e8460
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
new file mode 100644
index 0000000..916679e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
new file mode 100644
index 0000000..932a62a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/taxes-and-charges.gif b/erpnext/docs/assets/img/taxes-and-charges.gif
new file mode 100644
index 0000000..8d0a2bc
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes-and-charges.gif
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-3.png b/erpnext/docs/assets/old_images/erpnext/import-3.png
deleted file mode 100644
index 9387dd5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-4.png b/erpnext/docs/assets/old_images/erpnext/import-4.png
deleted file mode 100644
index fce1f51..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
deleted file mode 100644
index ae9978a..0000000
--- a/erpnext/docs/current/models/stock/material_request_item.html
+++ /dev/null
@@ -1,426 +0,0 @@
-<!-- title: Material Request Item -->
-
-
-
-
-
-<div class="dev-header">
-
-<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
- Version 7.x.x</a>
-
-
- <a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/material_request_item"
- target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-
-</div>
-
-
-<span class="label label-info">Child Table</span>
-
-
- <p><b>Table Name:</b> <code>tabMaterial Request Item</code></p>
-
-
-
-
-<h3>Fields</h3>
-
-<table class="table table-bordered">
- <thead>
- <tr>
- <th style="width: 5%">Sr</th>
- <th style="width: 25%">Fieldname</th>
- <th style="width: 20%">Type</th>
- <th style="width: 25%">Label</th>
- <th style="width: 25%">Options</th>
- </tr>
- </thead>
- <tbody>
-
- <tr >
- <td>1</td>
- <td class="danger" title="Mandatory"><code>item_code</code></td>
- <td >
- Link</td>
- <td >
- Item Code
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>2</td>
- <td ><code>col_break1</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>3</td>
- <td ><code>item_name</code></td>
- <td >
- Data</td>
- <td >
- Item Name
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>4</td>
- <td ><code>section_break_4</code></td>
- <td >
- Section Break</td>
- <td >
- Description
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>5</td>
- <td class="danger" title="Mandatory"><code>description</code></td>
- <td >
- Text Editor</td>
- <td >
- Description
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>6</td>
- <td ><code>column_break_6</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>7</td>
- <td ><code>image</code></td>
- <td >
- Attach Image</td>
- <td >
- Image
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>8</td>
- <td ><code>quantity_and_warehouse</code></td>
- <td >
- Section Break</td>
- <td >
- Quantity and Warehouse
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>9</td>
- <td class="danger" title="Mandatory"><code>qty</code></td>
- <td >
- Float</td>
- <td >
- Quantity
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>10</td>
- <td class="danger" title="Mandatory"><code>uom</code></td>
- <td >
- Link</td>
- <td >
- Stock UOM
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>11</td>
- <td ><code>warehouse</code></td>
- <td >
- Link</td>
- <td >
- For Warehouse
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>12</td>
- <td ><code>col_break2</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>13</td>
- <td class="danger" title="Mandatory"><code>schedule_date</code></td>
- <td >
- Date</td>
- <td >
- Required Date
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>14</td>
- <td ><code>more_info</code></td>
- <td >
- Section Break</td>
- <td >
- More Information
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>15</td>
- <td ><code>item_group</code></td>
- <td >
- Link</td>
- <td >
- Item Group
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>16</td>
- <td ><code>brand</code></td>
- <td >
- Link</td>
- <td >
- Brand
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>17</td>
- <td ><code>lead_time_date</code></td>
- <td >
- Date</td>
- <td >
- Lead Time Date
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>18</td>
- <td ><code>sales_order</code></td>
- <td >
- Link</td>
- <td >
- Sales Order
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>19</td>
- <td ><code>project</code></td>
- <td >
- Link</td>
- <td >
- Project
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>20</td>
- <td ><code>col_break3</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>21</td>
- <td ><code>min_order_qty</code></td>
- <td >
- Float</td>
- <td >
- Min Order Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>22</td>
- <td ><code>projected_qty</code></td>
- <td >
- Float</td>
- <td >
- Projected Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>23</td>
- <td ><code>actual_qty</code></td>
- <td >
- Float</td>
- <td >
- Actual Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>24</td>
- <td ><code>ordered_qty</code></td>
- <td >
- Float</td>
- <td >
- Completed Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>25</td>
- <td ><code>page_break</code></td>
- <td >
- Check</td>
- <td >
- Page Break
-
- </td>
- <td></td>
- </tr>
-
- </tbody>
-</table>
-
-
-
-
- <h4>Child Table Of</h4>
- <ul>
-
- <li>
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
-
-</li>
-
- </ul>
-
-
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index 3ec4281..c730c68 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -7,9 +7,9 @@
> CRM > Dokumente > Kunde > Neu
-oder einen Upload über ein Datenimportwerkzeug durchführen.
+<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
-<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/customer.png">
+oder einen Upload über ein Datenimportwerkzeug durchführen.
> Anmerkung: Kunden werden von Kontakten und Adressen getrennt verwaltet. Ein Kunde kann mehrere verschiedene Kontakte und Adressen haben.
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 88f9e66..55755e6 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -9,9 +9,13 @@
> Selling > Customer
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
+
or upload it via the Data Import Tool.
-<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer.png">
+A Customer can avail the features (operations) in the selling process. The general flow can be summarazed as:
+
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer-to selling-flowchart.jpeg">
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
@@ -53,7 +57,7 @@
master. Classifying Customers
ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html)
-and also divide them into [Territories]({{docs_base_url}}/user/manual/en/CRM/setup/territory.html)
+and also divide them into [Territories]({{docs_base_url}}/user/manual/en/setting-up/territory.html)
Grouping will help you get better analysis of your data and
identify which Customers are profitable and which are not. Territories will
help you set sales targets for the respective territories.
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 9f44fdf..9248fb2 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -1,5 +1,5 @@
When you know a Lead is looking for some products or services to buy, you can
-track that as an Opportunity.
+track that as an Opportunity. Also opportunity document helps user to collect the requirement of a customer/lead.
You can create an Opportunity from:
@@ -17,11 +17,21 @@
<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
+#### Figure 3: Create Opportunity for Customer to Collect their Requirement
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/requirement-gathering.png">
+
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
Communication, you can also add the Items for which the Lead or Contact is
looking for.
+#### Make Supplier Quotation
+In some business, user collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. In ERPNext user get an option to make supplier quotation from the opportunity.
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/make-sq-from-opportunity.png">
+
> Best Practice: Leads and Opportunities are often referred as your “Sales
Pipeline” this is what you need to track if you want to be able to predict how
much business you are going to get in the future. Its always a good idea to be
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 1720db9..2f0fef3 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -1,3 +1,4 @@
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
Production Order (also called as Work Order) is a document that is given to
the manufacturing shop floor by the Production Planner as a signal to produce
a certain quantity of a certain Item. Production Order also helps to generate
@@ -45,7 +46,7 @@
* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
-* Click on 'Transfer Materials for Manufacturing'.
+* Click on 'Start'.
<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
@@ -63,18 +64,18 @@
### Making Time Logs
-* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html)
-* Time Logs are created against Production Order Operations.
-* Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
-* To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.
+* Progress in the Production Order can be tracked using [Timesheet]({{docs_base_url}}/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
+* Timesheet's time slots are created against Production Order Operations.
+* Drafts of Timesheet is created based on the scheduled operations when an Production Order is Submitted.
+* To create more Timesheet against an operation click 'Make Timesheet' button.
-<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
###Updating Finished Goods
* Once you are done with the Production Order you need to update the Finished Goods.
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
-* Click on 'Update Finished Goods'.
+* Click on 'Finish'.
<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 6f5cc5e..1f7b06c 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -1,9 +1,13 @@
During a sale, the customer may request for a written note about the products
or services you are planning to offer, along with the prices and other terms
of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
-Invoice”or a Quotation.
+Invoice”or a **Quotation**.
-To create a new Quotation go to:
+A typical Selling flow looks like:
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/selling-flow.png">
+
+To create a new Quotation navigate to:
> Selling > Quotation > New Quotation
@@ -13,23 +17,18 @@
<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
-Or You can create a new Quotation and pull details from an Opportunity.
-
-<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
-
A Quotation contains details about:
* The recipient of the Quotation
* The Items and quantities you are offering.
- * The rates at which they are offered. For details refer
+ * The rates at which they are offered.
* The taxes applicable.
* Other charges (like shipping, insurance) if applicable.
* The validity of contract.
* The time of delivery.
* Other conditions.
-> Tip: Images look great on Quotations. To add images to your Quotations,
-attach the corresponding image in the Item master.
+> Tip: Images look great on Quotations. Make sure your items have an image attached.
### Rates
@@ -41,11 +40,13 @@
### Taxes
-To add taxes to your Quotation, you can either select a tax template, Sales
-Taxes and Charges Template or add the taxes on your own. To understand taxes in
-detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
-You can add taxes in the same manner as the Sales Taxes and Charges Template.
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
### Terms and Conditions
@@ -71,19 +72,17 @@
Quotation is a “Submittable” transaction. Since you send this Quotation to
your Customer or Lead, you must freeze it so that changes are not made after
-you send the Quotation. See Document Stages.
+you send the Quotation.
> Tip: Quotations can also be titled as “Proforma Invoice” or “Proposal”.
-Select the right heading in the “Print Heading” field in the “More Info”
-section. To create new Print Headings go to Setup > Branding and Printing >
-Print Headings.
+You can do this by selecting a **Print Heading** in the **Print Settings**
+section. To create new Print Headings go to Setup > Printing >
+Print Heading.
### Discount
While making your sales transactions like a Quotation (or Sales Order) you
-would already have noticed that there is a “Discount” column. On the left is
-the “Price List Rate” on the right is the “Basic Rate”. You can add a
-“Discount” value to update the basic rate. To understand more about discount
-read [Discount.](http://erpnext.org/discount)
+can also give discounts to your customers. In the Discount section, add
+the discount in percentage or fixed amount. Read [Discount](https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount) for more explanation.
{next}
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 269473a..32e58a5 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -50,6 +50,16 @@
This “reserved” quantity will help you project what is the quantity you need
to purchase based on all your commitments.
+### Taxes
+
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
+
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+
### Sales Team
**Sales Partner:** If this Sale was booked via a Sales Partner, you can update the Sales Partner’s details with commission and other info that you can aggregate.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
index 6f99f89..e6a3b85 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -9,5 +9,4 @@
naming-series-current-value
overwriting-data-from-data-import-tool
rename-user
-setting-up-dropbox-backups
using-custom-domain-on-erpnext
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
deleted file mode 100644
index 68e4031..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
+++ /dev/null
@@ -1,74 +0,0 @@
-#Setting Up Dropbox Backups
-
-We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
-
-You can automate database backup download of your ERPNext account into your Dropbox account.
-
-####Step 1: Go to Setup
-
-`Explore > Setup > Integrations > Dropbox Backup`
-
-####Step 2: Activate
-
-In the Dropbox Backup, check "Send Backups to Dropbox" to active this feature. On checking this field, you will find field to set Frequency and notification Email.
-
-####Step 3: Set Frequency
-
-Set Frequency to download backup in your Dropbox account.
-
-<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/dropbox-1.png">
-
-####Step 4: Allow Dropbox Access
-
-After setting frequency and updating notification email, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
-
-####Step 5: Login to Dropbox
-
-Login to your Dropbox account by entering login credentials.
-
-<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/dropbox-2.png">
-
-####Step 6: Allow
-
-On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-
-<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/dropbox-3.png">
-
-With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
-
-##Open Source Users
-
-####Step 1: Go to
-
-<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
-
-####Step 2:Create a new app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-3.png">
-
-####Step 3: Fill in details for the app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-1.png">
-
--
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-2.png">
-
-####Step 4: Settings in Site Config
-
-After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
-
-<div>
- <pre>
- <code>{
- "db_name": "demo",
- "db_password": "DZ1Idd55xJ9qvkHvUH",
- "dropbox_access_key": "ACCESSKEY",
- "dropbox_secret_key": "SECRECTKEY"
-}
- </code>
- </pre>
-</div>
-
-####Step 5: Complete Backup
-
-Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index e59ed21..563568a 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -1,8 +1,6 @@
-The Data Import Tool is a great way to upload (or edit) bulk data, specially
-master data, into the system.
+The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system.
-To Open the data import tool, you either go to Setup or go to the Transaction
-you want to Import. If Data Import is allowed, you will see an Import Button:
+To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button:
<img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
@@ -20,22 +18,24 @@
implemented where there are multiple values for any property. For example an
Item can have multiple prices, An Invoice has multiple Items and so on.
-<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
-
- * Click on the table you want to download or "All Tables"
- * For bulk editing, you can click on "Download With Data"
+ * Select Doctype for which template should be downloaded.
+ * Check fields to be included in the template.
+ * Click on "Download Blank Template".
+ * For bulk editing, you can click on "Download With Data".
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-tool-template.gif">
### 2\. Fill in the Template
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-file.png">
Then export your template or save it as a **Comma Separated Values** (CSV)
file.
-
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
### 3\. Upload the .csv File
@@ -49,7 +49,7 @@
1. Make sure that if your application allows, use encoding as UTF-8.
1. Keep the ID column blank for new records.
-### 4\. Uploading All Tables (Main + Child)
+### 4. Uploading All Tables (Main + Child)
If you select all tables, you will get columns belonging to all the tables in
one row separated by `~` columns.
@@ -67,7 +67,7 @@
> To see how its done, enter a few records manually using forms and export
"All Tables" with "Download with Data"
-### 5\. Overwriting
+### 5. Overwriting
ERPNext also allows you to overwrite all / certain columns. If you want to
update certain columns, you can download the template with data. Remember to
@@ -76,7 +76,7 @@
> Note: For child records, if you select Overwrite, it will delete all the
child records of that parent.
-### 6\. Upload Limitations
+### 6. Upload Limitations
ERPNext restricts the amount of data you can upload in one file. Though the
number may vary based on the type of data. It is usually safe to upload around
@@ -107,4 +107,10 @@
clear way of saving as UTF-8. So save your file as a CSV, then open it in
Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
+####Help Video on Importing Data in ERPNext from Spreadsheet file
+
+
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Ta2Xx3QoK3E" frameborder="0" allowfullscreen></iframe>
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py b/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
new file mode 100644
index 0000000..7fc283b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
@@ -0,0 +1,81 @@
+#Setting Up Dropbox Backups
+
+We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
+
+You can automate database backup download of your ERPNext account into your Dropbox account.
+
+####Step 1: Create Dropbox service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Dropbox` as a service from dropdown then save the document.
+
+####Step 2: Activate
+
+After saving a document, click on `Dropbox Settings` button, to setup service.
+
+<img class="screenshot" alt="create dropbox service" src="{{docs_base_url}}/assets/img/setup/integration-service/create_service.png">
+
+####Step 3: Set Frequency
+
+Set Frequency to download backup in your Dropbox account.
+
+<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/integration-service/setup-backup-frequency.png">
+
+####Step 4: Allow Dropbox Access
+
+After setting frequency and updating other details, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
+
+####Step 5: Login to Dropbox
+
+Login to your Dropbox account by entering login credentials.
+
+<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-2.png">
+
+####Step 6: Allow
+
+On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
+
+<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-3.png">
+
+####Step 7: Enable Service
+After generating access token, go back to Dropbox Integration Service record and check `enable`. This will enable backup auto-download.
+
+With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
+
+##Open Source Users
+
+####Step 1: Go to
+
+<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
+
+####Step 2:Create a new app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-3.png">
+
+####Step 3: Fill in details for the app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-1.png">
+
+-
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-2.png">
+
+####Step 4: Settings in Site Config
+
+After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
+
+<div>
+ <pre>
+ <code>{
+ "db_name": "demo",
+ "db_password": "DZ1Idd55xJ9qvkHvUH",
+ "dropbox_access_key": "ACCESSKEY",
+ "dropbox_secret_key": "SECRECTKEY"
+}
+ </code>
+ </pre>
+</div>
+
+####Step 5: Complete Backup
+
+Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.md b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
new file mode 100644
index 0000000..e7b5a61
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
@@ -0,0 +1,5 @@
+
+Integration Services is platform to configure 3rd Party Services.
+
+###Services
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
new file mode 100644
index 0000000..fc5e8a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
@@ -0,0 +1,4 @@
+dropbox-backup
+paypal-integration
+razorpay-integration
+ldap-integration
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
new file mode 100644
index 0000000..34678a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
@@ -0,0 +1,24 @@
+#Setting up LDAP
+
+Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations.
+
+By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials.
+
+####Step 1: Create Razorpay service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `LDAP` as a service from dropdown then save the document.
+After saving a document, click on `LDAP Settings` button, to setup service.
+
+####Step 2: Setup ldap service
+
+To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, Base Distinguished Name (DN) and Password for Base DN
+
+<img class="screenshot" alt="LDAP Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/ldap_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on LDAP Settings, go back to LDAP Service record and enable it.
+While enabling, it will validate LDAP details and on successful validation, it will enables LDAP login option.
+
+<img class="screenshot" alt="LOGIN via LDAP" src="{{docs_base_url}}/assets/img/setup/integration-service/login_via_ldap.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
new file mode 100644
index 0000000..d1054ba
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
@@ -0,0 +1,58 @@
+#Setting up PayPal
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create PayPal service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `PayPal` as a service from dropdown then save the document.
+After saving a document, click on `PayPal Settings` button, to setup service.
+
+####Step 2: Setup payment service
+
+To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="PayPal Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_settings.png">
+
+You also can set test payment environment, by settings `Use Sandbox`
+
+####Step 3: Enable Service
+After setting up credentials on PayPal Settings, go back to PayPal Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="PayPal COA" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_paypal.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP, PLN, GBP, RUB, SGD, SEK, CHF, THB, TRY, USD
+
+##Get PayPal credentials
+
+#### Paypal Sanbox API Signature
+ - Login to paypal developer account, <a href="https://developer.paypal.com/">PayPal Developer Account</a>
+ - From **Accounts** tab. create a new business account.
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/setup-sanbox-1.png">
+
+ - From this account profile you will get your sandbox api credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/sanbox-credentials.png">
+
+
+---
+
+#### PayPal Account API Signature
+ - Login to PayPal Account and go to profile
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-1.png">
+
+ - From **My Selling Tools** go to **api Access**
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-2.png">
+
+ - On API Access Page, choose option 2 to generate API credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-3.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
new file mode 100644
index 0000000..ad43f63
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
@@ -0,0 +1,33 @@
+#Setting up Razorpay
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create Razorpay service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Razorpay` as a service from dropdown then save the document.
+After saving a document, click on `Razorpay Settings` button, to setup service.
+
+####Step 2: Setup payment service
+
+To enable Razorpay payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on Razorpay Settings, go back to Razorpay Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="Razorpay COA" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_razorpay.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+INR
diff --git a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
similarity index 98%
rename from erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
rename to erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
index a15834c..1dab1c1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -1,4 +1,4 @@
-#Multi-lngual Print Formats
+#Custom Translations
User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 80b5946..fa23652 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -5,4 +5,4 @@
address-template
terms-and-conditions
cheque-print-template
-multi-lingual-print-format
\ No newline at end of file
+custom-translations
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index 15dd117..f03bbd8 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,6 +1,6 @@
#Merging Documents
-For a document, of you have two records which are identical, and meant for common purpose, you can merge them into one record.
+For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record.
Following are step to merge documents. Let's assume we are merging two Accounts.
@@ -10,7 +10,7 @@
#### Step 2: Go to Account
-For an Account to be merge, click on "Rename" option.
+For an Account to be merged, click on the "Rename" option.
<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">
@@ -18,7 +18,7 @@
In the New Name field, enter another account name with which this account will be merged. Check "Merge with existing" option. Then press 'Rename' button to merge.
-Following is how merged account will appear in the Chart of Account master.
+Following is how the merged account will appear in the Chart of Accounts master.
<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">
@@ -28,4 +28,4 @@
<div class="well"> Note: Group Account cannot be merged into Child Account and vice versa.</div>
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
index a89040a..97c24d5 100644
--- a/erpnext/docs/user/manual/en/website/articles/index.txt
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt
@@ -1,3 +1,3 @@
managing-user-sign-up-via-website
website-security
-wesite-home-page
\ No newline at end of file
+website-home-page
diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
similarity index 97%
rename from erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
rename to erpnext/docs/user/manual/en/website/articles/website-home-page.md
index 0cf5fdc..9212643 100644
--- a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
@@ -1,4 +1,4 @@
-<h1>Wesite Home Page</h1>
+<h1>Website Home Page</h1>
It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
index f5a5d4d..26a4a01 100644
--- a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
+++ b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
@@ -26,7 +26,7 @@
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"precision": "",
"print_hide": 0,
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 9ee43a4..0906557 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -574,7 +574,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-thumbs-up",
+ "icon": "fa fa-thumbs-up",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 4ecd838..22ee3dd 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -93,7 +93,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index bf934a1..9a1b66e 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -308,7 +308,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ok",
+ "icon": "fa fa-ok",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index 1b8f2fd..609456c 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-code-fork",
+ "icon": "fa fa-code-fork",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index cd65d17..e19f175 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -66,7 +66,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 73f4446..1e70196 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -64,7 +64,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bookmark",
+ "icon": "fa fa-bookmark",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index e538377..5ded5a0 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -2234,7 +2234,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"image_view": 0,
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index 3493719..de8e17c 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -80,14 +80,14 @@
var row;
$.each(employee, function(i, m) {
- var attendance_icon = "icon-check";
+ var attendance_icon = "fa fa-check";
var color_class = "";
if(m.status == "Absent") {
- attendance_icon = "icon-check-empty"
+ attendance_icon = "fa fa-check-empty"
color_class = "text-muted";
}
else if(m.status == "Half Day") {
- attendance_icon = "icon-check-minus"
+ attendance_icon = "fa fa-check-minus"
}
if (i===0 || i % 4===0) {
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 3b9604d..6963be2 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index c587899..99b20fe 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -663,7 +663,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index 4749800..f59111a 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -97,7 +97,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index fa1fe5b..6b71ffc 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json
@@ -214,7 +214,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index d0f7c20..74c4273 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -217,7 +217,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 7f38045..05e3c46 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -237,7 +237,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index e278aae..7e28eef 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -156,7 +156,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bookmark",
+ "icon": "fa fa-bookmark",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 7994b60..e984bfc 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -465,7 +465,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ok",
+ "icon": "fa fa-ok",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 7e1b670..0238923 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -704,7 +704,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index d961bad..16dbda8 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
@@ -203,7 +203,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 17e667e..6e02ff5 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -311,7 +311,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index e218ecd..9153bbf 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -174,7 +174,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
index b773ce7..ae86c2d 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -709,7 +709,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index c2cdb0b..29d6015 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -185,7 +185,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index fb922a1..4d69b01 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -1383,7 +1383,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 9,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index c5df2e6..d3ab809 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -45,7 +45,7 @@
frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
frm.add_custom_button(__("Preview Salary Slip"),
- function() { frm.trigger('preview_salary_slip'); }, "icon-sitemap", "btn-default");
+ function() { frm.trigger('preview_salary_slip'); }, "fa fa-sitemap", "btn-default");
frm.add_custom_button(__("Add Employees"),function () {
frm.trigger('add_employees')
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index e239245..8a9068d 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -854,7 +854,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 4d7ef8e..5a3f72a 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -161,7 +161,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-upload-alt",
+ "icon": "fa fa-upload-alt",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index bdca950..60ddf63 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -28,7 +28,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -203,7 +203,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -262,7 +262,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -706,7 +706,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index 5cc6a89..6efd6fd 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -28,7 +28,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -365,7 +365,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -480,7 +480,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -539,7 +539,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -715,7 +715,7 @@
"label": "Contact Info",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -870,7 +870,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 193f920..c2c9b64 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -1262,7 +1262,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
index b7cf4a9..bf7e6fc 100644
--- a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
+++ b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
@@ -80,7 +80,7 @@
],
"hide_heading": 1,
"hide_toolbar": 1,
- "icon": "icon-magic",
+ "icon": "fa fa-magic",
"idx": 1,
"in_create": 1,
"in_dialog": 0,
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 5465705..9f12e45 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -331,7 +331,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 5858349..69eb449 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -99,7 +99,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index c5ee9ea..dd8bb5b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-gift",
+ "options": "fa fa-gift",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -357,7 +357,7 @@
"label": "Warehouses",
"length": 0,
"no_copy": 0,
- "options": "icon-building",
+ "options": "fa fa-building",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -528,7 +528,7 @@
"label": "Time",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -726,7 +726,7 @@
"label": "Operations",
"length": 0,
"no_copy": 0,
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -958,7 +958,7 @@
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1235,7 +1235,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cogs",
+ "icon": "fa fa-cogs",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index d9f3082..ffba219 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -807,7 +807,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 1,
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 93cc992..144635c 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -348,7 +348,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index b939803..5095784 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -60,9 +60,10 @@
workstation = frappe.get_doc("Workstation", workstation)
for working_hour in workstation.working_hours:
- slot_length = (to_timedelta(working_hour.end_time or "") - to_timedelta(working_hour.start_time or "")).total_seconds()
- if slot_length >= operation_length:
- return
+ if working_hour.start_time and working_hour.end_time:
+ slot_length = (to_timedelta(working_hour.end_time or "") - to_timedelta(working_hour.start_time or "")).total_seconds()
+ if slot_length >= operation_length:
+ return
frappe.throw(_("Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations").format(operation, workstation.name), NotInWorkingHoursError)
diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 628f993..fb6d1b2 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -112,7 +112,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 1915dfc..37ca968 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -320,7 +320,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -493,7 +493,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-flag",
+ "options": "fa fa-flag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -551,7 +551,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-list",
+ "options": "fa fa-list",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -749,7 +749,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1108,7 +1108,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-puzzle-piece",
+ "icon": "fa fa-puzzle-piece",
"idx": 29,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index c9023d8..9cd2aa8 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -934,7 +934,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-check",
+ "icon": "fa fa-check",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 7d0e71a..93f8b68 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -41,12 +41,12 @@
if(frm.doc.docstatus==1) {
if(frm.doc.per_billed < 100){
frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
- "icon-file-alt");
+ "fa fa-file-alt");
}
if(!frm.doc.salary_slip && frm.doc.employee){
frm.add_custom_button(__("Make Salary Slip"), function() { frm.trigger("make_salary_slip") },
- "icon-file-alt");
+ "fa fa-file-alt");
}
}
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index d06fbb5..8762a23 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -6,7 +6,7 @@
"beta": 0,
"creation": "2013-02-28 17:57:33",
"custom": 0,
- "description": "Batch Time Logs for Billing.",
+ "description": "",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
@@ -868,7 +868,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-time",
+ "icon": "fa fa-time",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -877,7 +877,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-22 01:42:54.204441",
+ "modified": "2016-11-23 17:35:51.194690",
"modified_by": "Administrator",
"module": "Projects",
"name": "Timesheet",
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index c21e1d5..a6ef2d6 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -2,18 +2,18 @@
<div class="col-xs-5"><h6>{%= item_code || "" %}{%= item_name || "" %}</h6></div>
<div class="col-xs-4">
<div class="row pos-qty-row">
- <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="icon-minus-sign text-muted"></i></div>
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="fa fa-minus-sign text-muted"></i></div>
<div class="col-xs-8">
<div>
<input type="text" value="{%= qty %}" class="form-control input-sm pos-item-qty text-right">
</div>
{% if(actual_qty != null) { %}
<div style="margin-top: 5px;" class="text-muted small text-right">
- <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
+ <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
</div>
{% } %}
</div>
- <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="icon-plus-sign text-muted"></i></div>
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="fa fa-plus-sign text-muted"></i></div>
</div>
</div>
<div class="col-xs-3 text-right">
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 0013fdb..30323ec 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -34,7 +34,7 @@
org: {
domains: ["all"],
title: __("The Organization"),
- icon: "icon-building",
+ icon: "fa fa-building",
fields: [
{fieldname:'company_name',
label: frappe.wiz.domain==='Education' ?
@@ -158,7 +158,7 @@
branding: {
domains: ["all"],
- icon: "icon-bookmark",
+ icon: "fa fa-bookmark",
title: __("The Brand"),
help: __('Upload your letter head and logo. (you can edit them later).'),
fields: [
@@ -180,7 +180,7 @@
users: {
domains: ["all"],
- icon: "icon-money",
+ icon: "fa fa-money",
title: __("Add Users"),
help: __("Add users to your organization, other than yourself"),
fields: [],
@@ -212,7 +212,7 @@
taxes: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-money",
+ icon: "fa fa-money",
title: __("Add Taxes"),
help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
"fields": [],
@@ -233,7 +233,7 @@
customers: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-group",
+ icon: "fa fa-group",
title: __("Your Customers"),
help: __("List a few of your customers. They could be organizations or individuals."),
fields: [],
@@ -256,7 +256,7 @@
suppliers: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-group",
+ icon: "fa fa-group",
title: __("Your Suppliers"),
help: __("List a few of your suppliers. They could be organizations or individuals."),
fields: [],
@@ -279,7 +279,7 @@
items: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-barcode",
+ icon: "fa fa-barcode",
title: __("Your Products or Services"),
help: __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
fields: [],
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 1617283..2a69deb 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -8,7 +8,7 @@
// update user
if(full_name) {
$('.navbar li[data-label="User"] a')
- .html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
+ .html('<i class="fa fa-fixed-width fa fa-user"></i> ' + full_name);
}
// update login
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 39e87f8..c80d418 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -143,8 +143,35 @@
if(!cur_frm.doc.items[0].item_code) {
cur_frm.doc.items = cur_frm.doc.items.splice(1);
}
+
+ // find the doctype of the items table
+ var items_doctype = frappe.meta.get_docfield(cur_frm.doctype, 'items').options;
+
+ // find the link fieldname from items table for the given
+ // source_doctype
+ var link_fieldname = null;
+ frappe.get_meta(items_doctype).fields.forEach(function(d) {
+ if(d.options===opts.source_doctype) link_fieldname = d.fieldname; });
+
+ // search in existing items if the source_name is already set
+ var already_set = false;
+
+ $.each(cur_frm.doc.items, function(i, d) {
+ if(d[link_fieldname]==opts.source_name) {
+ already_set = true;
+ return false;
+ }
+ });
+
+ if(already_set) {
+ frappe.msgprint(__("You have already selected items from {0} {1}",
+ [opts.source_doctype, opts.source_name]));
+ return;
+ }
+
}
+
return frappe.call({
// Sometimes we hit the limit for URL length of a GET request
// as we send the full target_doc. Hence this is a POST request.
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index dea8515..7cb02a3 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -54,13 +54,13 @@
"""
present = json.loads(students_present)
absent = json.loads(students_absent)
-
for d in present:
make_attendance_records(d["student"], d["student_name"], "Present", course_schedule, student_batch, date)
for d in absent:
make_attendance_records(d["student"], d["student_name"], "Absent", course_schedule, student_batch, date)
+ frappe.db.commit()
frappe.msgprint(_("Attendance has been marked successfully."))
def make_attendance_records(student, student_name, status, course_schedule=None, student_batch=None, date=None):
@@ -79,7 +79,6 @@
student_attendance.date = date
student_attendance.status = status
student_attendance.submit()
- frappe.db.commit()
@frappe.whitelist()
def get_student_batch_students(student_batch):
@@ -87,7 +86,7 @@
:param student_batch: Student Batch.
"""
- students = frappe.get_list("Student Batch Student", fields=["student", "student_name"] , filters={"parent": student_batch}, order_by= "idx")
+ students = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , filters={"parent": student_batch}, order_by= "idx")
return students
@frappe.whitelist()
diff --git a/erpnext/schools/doctype/assessment/assessment.js b/erpnext/schools/doctype/assessment/assessment.js
index efadbd6..e842f41 100644
--- a/erpnext/schools/doctype/assessment/assessment.js
+++ b/erpnext/schools/doctype/assessment/assessment.js
@@ -6,46 +6,46 @@
cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
cur_frm.add_fetch("student", "title", "student_name");
-frappe.ui.form.on("Assessment" ,{
- student_group : function(frm) {
- frm.set_value("results" ,"");
- if (frm.doc.student_group) {
- frappe.call({
- method: "erpnext.schools.api.get_student_group_students",
- args: {
- "student_group": frm.doc.student_group
- },
- callback: function(r) {
- if (r.message) {
- $.each(r.message, function(i, d) {
- var row = frappe.model.add_child(cur_frm.doc, "Assessment Result", "results");
- row.student = d.student;
- row.student_name = d.student_name;
- });
- }
- refresh_field("results");
- }
- });
- }
- }
+frappe.ui.form.on("Assessment", {
+ student_group: function(frm) {
+ frm.set_value("results", "");
+ if (frm.doc.student_group) {
+ frappe.call({
+ method: "erpnext.schools.api.get_student_group_students",
+ args: {
+ "student_group": frm.doc.student_group
+ },
+ callback: function(r) {
+ if (r.message) {
+ $.each(r.message, function(i, d) {
+ var row = frappe.model.add_child(cur_frm.doc, "Assessment Result", "results");
+ row.student = d.student;
+ row.student_name = d.student_name;
+ });
+ }
+ refresh_field("results");
+ }
+ });
+ }
+ }
});
-frappe.ui.form.on("Assessment Result" ,{
- result : function(frm, cdt, cdn) {
- if(frm.doc.grading_structure){
- var assessment_result = locals[cdt][cdn];
- frappe.call({
- method:"erpnext.schools.doctype.assessment.assessment.get_grade",
- args:{
- grading_structure: frm.doc.grading_structure,
- result: assessment_result.result
- },
- callback: function(r){
- if(r.message){
- frappe.model.set_value(cdt, cdn, 'grade', r.message);
- }
- }
- });
- }
- }
+frappe.ui.form.on("Assessment Result", {
+ result: function(frm, cdt, cdn) {
+ if (frm.doc.grading_structure) {
+ var assessment_result = locals[cdt][cdn];
+ frappe.call({
+ method: "erpnext.schools.doctype.assessment.assessment.get_grade",
+ args: {
+ grading_structure: frm.doc.grading_structure,
+ result: assessment_result.result
+ },
+ callback: function(r) {
+ if (r.message) {
+ frappe.model.set_value(cdt, cdn, 'grade', r.message);
+ }
+ }
+ });
+ }
+ }
});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/assessment.py b/erpnext/schools/doctype/assessment/assessment.py
index cb307cb..003b427 100644
--- a/erpnext/schools/doctype/assessment/assessment.py
+++ b/erpnext/schools/doctype/assessment/assessment.py
@@ -10,7 +10,7 @@
class Assessment(Document):
def validate(self):
self.validate_overlap()
-
+
def validate_overlap(self):
"""Validates overlap for Student Group/Student Batch, Instructor, Room"""
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
index ab34ae9..04a8cde 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.js
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.js
@@ -1,137 +1,134 @@
frappe.provide("schools")
-frappe.ui.form.on("Course Schedule" ,{
- onload: function(frm) {
- if (frm.doc.from_datetime && frm.doc.to_datetime) {
- var from_datetime = moment(frm.doc.from_datetime);
- var to_datetime = moment(frm.doc.to_datetime);
- frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
- frm.doc.from_time = from_datetime.format("HH:mm:ss");
- frm.doc.to_time = to_datetime.format("HH:mm:ss");
- }
- },
-
- refresh :function(frm) {
- if(!frm.doc.__islocal && frm.doc.student_group) {
- frappe.call({
- method: "erpnext.schools.api.check_attendance_records_exist",
- args: {
- "course_schedule": frm.doc.name
- },
- callback: function(r) {
- if(r.message) {
- hide_field('attendance');
- frm.events.view_attendance(frm)
- }
- else {
- frappe.call({
- method: "erpnext.schools.api.get_student_group_students",
- args: {
- "student_group": frm.doc.student_group
- },
- callback: function(r) {
- if (r.message) {
- frm.events.get_students(frm, r.message)
- }
- }
- });
- }
- }
- });
- }
- else {
- hide_field('attendance');
- }
- },
-
- view_attendance: function(frm) {
- hide_field('attendance');
- frm.add_custom_button(__("View attendance"), function() {
- frappe.route_options = {
- course_schedule: frm.doc.name
- }
- frappe.set_route("List", "Student Attendance");
- });
- },
-
- get_students: function(frm, students) {
- if(!frm.students_area) {
- frm.students_area = $('<div>')
- .appendTo(frm.fields_dict.students_html.wrapper);
- }
- frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
- }
+frappe.ui.form.on("Course Schedule", {
+ onload: function(frm) {
+ if (frm.doc.from_datetime && frm.doc.to_datetime) {
+ var from_datetime = moment(frm.doc.from_datetime);
+ var to_datetime = moment(frm.doc.to_datetime);
+ frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
+ frm.doc.from_time = from_datetime.format("HH:mm:ss");
+ frm.doc.to_time = to_datetime.format("HH:mm:ss");
+ }
+ },
+
+ refresh: function(frm) {
+ if (!frm.doc.__islocal && frm.doc.student_group) {
+ frappe.call({
+ method: "erpnext.schools.api.check_attendance_records_exist",
+ args: {
+ "course_schedule": frm.doc.name
+ },
+ callback: function(r) {
+ if (r.message) {
+ hide_field('attendance');
+ frm.events.view_attendance(frm)
+ } else {
+ frappe.call({
+ method: "erpnext.schools.api.get_student_group_students",
+ args: {
+ "student_group": frm.doc.student_group
+ },
+ callback: function(r) {
+ if (r.message) {
+ frm.events.get_students(frm, r.message)
+ }
+ }
+ });
+ }
+ }
+ });
+ } else {
+ hide_field('attendance');
+ }
+ },
+
+ view_attendance: function(frm) {
+ hide_field('attendance');
+ frm.add_custom_button(__("View attendance"), function() {
+ frappe.route_options = {
+ course_schedule: frm.doc.name
+ }
+ frappe.set_route("List", "Student Attendance");
+ });
+ },
+
+ get_students: function(frm, students) {
+ if (!frm.students_area) {
+ frm.students_area = $('<div>')
+ .appendTo(frm.fields_dict.students_html.wrapper);
+ }
+ frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
+ }
});
schools.StudentsEditor = Class.extend({
- init: function(frm, wrapper, students) {
- this.wrapper = wrapper;
- this.frm = frm;
- this.make(frm, students);
- },
- make: function(frm, students) {
- var me = this;
-
- $(this.wrapper).empty();
- var student_toolbar = $('<p>\
+ init: function(frm, wrapper, students) {
+ this.wrapper = wrapper;
+ this.frm = frm;
+ this.make(frm, students);
+ },
+ make: function(frm, students) {
+ var me = this;
+
+ $(this.wrapper).empty();
+ var student_toolbar = $('<p>\
<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
- student_toolbar.find(".btn-add")
- .html(__('Check all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if(!$(check).is(":checked")) {
- check.checked = true;
- }
- });
- });
+ student_toolbar.find(".btn-add")
+ .html(__('Check all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if (!$(check).is(":checked")) {
+ check.checked = true;
+ }
+ });
+ });
- student_toolbar.find(".btn-remove")
- .html(__('Uncheck all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- check.checked = false;
- }
- });
- });
-
- student_toolbar.find(".btn-mark-att")
- .html(__('Mark Attendence'))
- .on("click", function() {
- var students_present = [];
- var students_absent = [];
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- students_present.push(students[i]);
- }
- else {
- students_absent.push(students[i]);
- }
- });
- frappe.call({
- method: "erpnext.schools.api.mark_attendance",
- args: {
- "students_present": students_present,
- "students_absent": students_absent,
- "course_schedule": frm.doc.name
- },
- callback: function(r) {
- frm.events.view_attendance(frm)
- }
- });
- });
+ student_toolbar.find(".btn-remove")
+ .html(__('Uncheck all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if ($(check).is(":checked")) {
+ check.checked = false;
+ }
+ });
+ });
-
- $.each(students, function(i, m) {
- $(repl('<div class="col-sm-6">\
+ student_toolbar.find(".btn-mark-att")
+ .html(__('Mark Attendence'))
+ .on("click", function() {
+ var students_present = [];
+ var students_absent = [];
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if ($(check).is(":checked")) {
+ students_present.push(students[i]);
+ } else {
+ students_absent.push(students[i]);
+ }
+ });
+ frappe.call({
+ method: "erpnext.schools.api.mark_attendance",
+ args: {
+ "students_present": students_present,
+ "students_absent": students_absent,
+ "course_schedule": frm.doc.name
+ },
+ callback: function(r) {
+ frm.events.view_attendance(frm)
+ }
+ });
+ });
+
+
+ $.each(students, function(i, m) {
+ $(repl('<div class="col-sm-6">\
<div class="checkbox">\
<label><input type="checkbox" class="students-check" student="%(student)s">\
%(student)s</label>\
- </div></div>', {student: m.student_name})).appendTo(me.wrapper);
- });
- }
+ </div></div>', { student: m.student_name })).appendTo(me.wrapper);
+ });
+ }
})
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index 4a4b2d3..122285e 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -478,7 +478,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-16 16:38:00.454295",
+ "modified": "2016-12-01 12:59:25.086606",
"modified_by": "Administrator",
"module": "Schools",
"name": "Course Schedule",
@@ -490,6 +490,27 @@
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
"delete": 1,
"email": 1,
"export": 1,
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
index b8d4562..ea62b8f 100644
--- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
@@ -7,12 +7,15 @@
cur_frm.add_fetch("student_group", "academic_year", "academic_year");
cur_frm.add_fetch("student_group", "academic_term", "academic_term");
-frappe.ui.form.on("Course Scheduling Tool", "refresh", function(frm) {
- frm.disable_save();
- frm.page.set_primary_action(__("Schedule Course"), function() {
- frappe.call({
- method: "schedule_course",
- doc:frm.doc
- })
- });
+frappe.ui.form.on("Course Scheduling Tool", {
+
+ refresh: function(frm) {
+ frm.disable_save();
+ frm.page.set_primary_action(__("Schedule Course"), function() {
+ frappe.call({
+ method: "schedule_course",
+ doc: frm.doc
+ })
+ });
+ }
});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
index 4314aae..da8f7b1 100644
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -69,7 +69,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/fee_component/fee_component.json b/erpnext/schools/doctype/fee_component/fee_component.json
index c0f7bd6..ecf3314 100644
--- a/erpnext/schools/doctype/fee_component/fee_component.json
+++ b/erpnext/schools/doctype/fee_component/fee_component.json
@@ -95,7 +95,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index dd4507a..6e99032 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -274,7 +274,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index d188db3..6984d38 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "First Name",
"length": 0,
"no_copy": 0,
@@ -32,6 +33,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -50,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Middle Name",
"length": 0,
"no_copy": 0,
@@ -58,6 +61,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -76,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Last Name",
"length": 0,
"no_copy": 0,
@@ -84,6 +89,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -102,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -109,6 +116,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -127,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -136,6 +145,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -154,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Email ID",
"length": 0,
"no_copy": 0,
@@ -162,6 +173,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -180,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Mobile Number",
"length": 0,
"no_copy": 0,
@@ -189,6 +202,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -208,6 +222,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Joining Date",
"length": 0,
"no_copy": 0,
@@ -216,6 +231,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -234,6 +250,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -242,6 +259,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -262,6 +280,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Personal Details",
"length": 0,
"no_copy": 0,
@@ -270,6 +289,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -288,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Birth",
"length": 0,
"no_copy": 0,
@@ -296,6 +317,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -314,6 +336,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Blood Group",
"length": 0,
"no_copy": 0,
@@ -323,6 +346,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -341,6 +365,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -348,6 +373,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -366,6 +392,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gender",
"length": 0,
"no_copy": 0,
@@ -375,6 +402,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -393,6 +421,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Nationality",
"length": 0,
"no_copy": 0,
@@ -402,6 +431,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -420,6 +450,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Applicant",
"length": 0,
"no_copy": 0,
@@ -429,6 +460,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -447,6 +479,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Home Address",
"length": 0,
"no_copy": 0,
@@ -455,6 +488,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -473,6 +507,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 1",
"length": 0,
"no_copy": 0,
@@ -481,6 +516,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -499,6 +535,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 2",
"length": 0,
"no_copy": 0,
@@ -507,6 +544,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -525,6 +563,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pincode",
"length": 0,
"no_copy": 0,
@@ -533,6 +572,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -551,6 +591,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -558,6 +599,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -576,6 +618,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "City",
"length": 0,
"no_copy": 0,
@@ -584,6 +627,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -602,6 +646,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -610,6 +655,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -628,6 +674,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardian Details",
"length": 0,
"no_copy": 0,
@@ -636,6 +683,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -654,6 +702,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardians",
"length": 0,
"no_copy": 0,
@@ -663,6 +712,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -681,6 +731,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sibling Details",
"length": 0,
"no_copy": 0,
@@ -690,6 +741,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -708,6 +760,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Siblings",
"length": 0,
"no_copy": 0,
@@ -717,6 +770,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -736,6 +790,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -744,6 +799,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -763,7 +819,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-10-26 12:24:10.533118",
+ "modified": "2016-12-01 12:55:32.453131",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student",
@@ -774,6 +830,27 @@
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.js b/erpnext/schools/doctype/student_attendance/student_attendance.js
index 6e79d52..ec2a0cb 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.js
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.js
@@ -2,10 +2,4 @@
// For license information, please see license.txt
cur_frm.add_fetch("course_schedule", "schedule_date", "date");
-cur_frm.add_fetch("course_schedule", "student_batch", "student_batch");
-
-frappe.ui.form.on('Student Attendance', {
- refresh: function(frm) {
-
- }
-});
+cur_frm.add_fetch("course_schedule", "student_batch", "student_batch")
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/schools/doctype/student_attendance/student_attendance.json
index 70fcdf3..3ea47f37 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -252,7 +252,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-16 16:58:35.779867",
+ "modified": "2016-12-01 12:56:21.537215",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Attendance",
@@ -265,6 +265,27 @@
"cancel": 1,
"create": 1,
"delete": 1,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json
index 51dc541..f571d9d 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -75,6 +75,35 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "1",
+ "fieldname": "enabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Active",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -280,7 +309,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-21 19:08:05.775954",
+ "modified": "2016-12-01 13:18:12.024001",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Batch",
@@ -307,6 +336,27 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
}
],
"quick_entry": 1,
diff --git a/erpnext/schools/doctype/student_batch/student_batch.py b/erpnext/schools/doctype/student_batch/student_batch.py
index ec2dc79..1a0d799 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.py
+++ b/erpnext/schools/doctype/student_batch/student_batch.py
@@ -8,12 +8,11 @@
import frappe
class StudentBatch(Document):
- def autoname(self):
- prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
- if not prog_abb:
- prog_abb = self.program
- self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
-
- def validate(self):
- validate_duplicate_student(self.students)
-
\ No newline at end of file
+ def autoname(self):
+ prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
+ if not prog_abb:
+ prog_abb = self.program
+ self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
+
+ def validate(self):
+ validate_duplicate_student(self.students)
diff --git a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
index a6d035a..2dc6a85 100644
--- a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
+++ b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
@@ -3,126 +3,134 @@
frappe.provide("schools")
frappe.ui.form.on('Student Batch Attendance Tool', {
- refresh: function(frm) {
- frm.disable_save();
- hide_field('attendance');
- },
-
- student_batch :function(frm) {
- if(frm.doc.student_batch && frm.doc.date) {
- frappe.call({
- method: "erpnext.schools.api.check_attendance_records_exist",
- args: {
- "student_batch": frm.doc.student_batch,
- "date": frm.doc.date
- },
- callback: function(r) {
- if(r.message) {
- frappe.msgprint("Attendance already marked.");
- hide_field('attendance');
- }
- else {
- frappe.call({
- method: "erpnext.schools.api.get_student_batch_students",
- args: {
- "student_batch": frm.doc.student_batch
- },
- callback: function(r) {
- if (r.message) {
- unhide_field('attendance');
- frm.events.get_students(frm, r.message)
- }
- }
- });
- }
- }
- });
- }
- },
-
- date: function(frm) {
- frm.trigger("student_batch");
- },
-
- get_students: function(frm, students) {
- if(!frm.students_area) {
- frm.students_area = $('<div>')
- .appendTo(frm.fields_dict.students_html.wrapper);
- }
- frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
- }
+ refresh: function(frm) {
+ frm.disable_save();
+ hide_field('attendance');
+ },
+
+ student_batch: function(frm) {
+ if (frm.doc.student_batch && frm.doc.date) {
+ frappe.call({
+ method: "erpnext.schools.api.check_attendance_records_exist",
+ args: {
+ "student_batch": frm.doc.student_batch,
+ "date": frm.doc.date
+ },
+ callback: function(r) {
+ if (r.message) {
+ frappe.msgprint("Attendance already marked.");
+ hide_field('attendance');
+ } else {
+ frappe.call({
+ method: "erpnext.schools.api.get_student_batch_students",
+ args: {
+ "student_batch": frm.doc.student_batch
+ },
+ callback: function(r) {
+ if (r.message) {
+ unhide_field('attendance');
+ frm.events.get_students(frm, r.message)
+ }
+ }
+ });
+ }
+ }
+ });
+ }
+ },
+
+ date: function(frm) {
+ frm.trigger("student_batch");
+ },
+
+ get_students: function(frm, students) {
+ if (!frm.students_area) {
+ frm.students_area = $('<div>')
+ .appendTo(frm.fields_dict.students_html.wrapper);
+ }
+ frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
+ }
});
schools.StudentsEditor = Class.extend({
- init: function(frm, wrapper, students) {
- this.wrapper = wrapper;
- this.frm = frm;
- this.make(frm, students);
- },
- make: function(frm, students) {
- var me = this;
-
- $(this.wrapper).empty();
- var student_toolbar = $('<p>\
+ init: function(frm, wrapper, students) {
+ this.wrapper = wrapper;
+ this.frm = frm;
+ this.make(frm, students);
+ },
+ make: function(frm, students) {
+ var me = this;
+
+ $(this.wrapper).empty();
+ var student_toolbar = $('<p>\
<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
- student_toolbar.find(".btn-add")
- .html(__('Check all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if(!$(check).is(":checked")) {
- check.checked = true;
- }
- });
- });
+ student_toolbar.find(".btn-add")
+ .html(__('Check all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if (!$(check).is(":checked")) {
+ check.checked = true;
+ }
+ });
+ });
- student_toolbar.find(".btn-remove")
- .html(__('Uncheck all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- check.checked = false;
- }
- });
- });
-
- student_toolbar.find(".btn-mark-att")
- .html(__('Mark Attendence'))
- .on("click", function() {
- var students_present = [];
- var students_absent = [];
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- students_present.push(students[i]);
- }
- else {
- students_absent.push(students[i]);
- }
- });
- frappe.call({
- method: "erpnext.schools.api.mark_attendance",
- args: {
- "students_present": students_present,
- "students_absent": students_absent,
- "student_batch": frm.doc.student_batch,
- "date": frm.doc.date
- },
- callback: function(r) {
- hide_field('attendance');
- }
- });
- });
+ student_toolbar.find(".btn-remove")
+ .html(__('Uncheck all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if ($(check).is(":checked")) {
+ check.checked = false;
+ }
+ });
+ });
-
- $.each(students, function(i, m) {
- $(repl('<div class="col-sm-6">\
+ var get_student = function(idx) {
+ return students.filter(function(s) {
+ return s.idx === idx;
+ })[0]
+ }
+
+ student_toolbar.find(".btn-mark-att")
+ .html(__('Mark Attendence'))
+ .on("click", function() {
+ var students_present = [];
+ var students_absent = [];
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ var idx = $(check).data().idx;
+ if ($(check).is(":checked")) {
+ students_present.push(get_student(idx));
+ } else {
+ students_absent.push(get_student(idx));
+ }
+ });
+ frappe.call({
+ method: "erpnext.schools.api.mark_attendance",
+ args: {
+ "students_present": students_present,
+ "students_absent": students_absent,
+ "student_batch": frm.doc.student_batch,
+ "date": frm.doc.date
+ },
+ callback: function(r) {
+ hide_field('attendance');
+ }
+ });
+ });
+
+
+ $.each(students, function(i, m) {
+ $(repl('<div class="col-sm-6">\
<div class="checkbox">\
- <label><input type="checkbox" class="students-check" student="%(student)s">\
- %(student)s</label>\
- </div></div>', {student: m.student_name})).appendTo(me.wrapper);
- });
- }
-});
+ <label><input data-idx="%(idx)s" type="checkbox" class="students-check" data-student="%(name)s">\
+ %(idx)s - %(name)s</label>\
+ </div></div>', {
+ name: m.student_name,
+ idx: m.idx
+ })).appendTo(me.wrapper);
+ });
+ }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json
index 3361dcb..defc886 100644
--- a/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json
+++ b/erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.json
@@ -163,7 +163,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-16 17:16:43.835693",
+ "modified": "2016-12-01 12:58:31.822014",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Batch Attendance Tool",
@@ -176,6 +176,27 @@
"cancel": 0,
"create": 1,
"delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index 784f557..6f4084b 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -1,34 +1,36 @@
cur_frm.add_fetch("student", "title", "student_name");
-frappe.ui.form.on("Student Group", "refresh", function(frm) {
- if(!frm.doc.__islocal) {
- frm.add_custom_button(__("Course Schedule"), function() {
- frappe.route_options = {
- student_group: frm.doc.name
- }
- frappe.set_route("List", "Course Schedule");
- });
-
- frm.add_custom_button(__("Assessment"), function() {
- frappe.route_options = {
- student_group: frm.doc.name
- }
- frappe.set_route("List", "Assessment");
- });
- }
-});
+frappe.ui.form.on("Student Group", {
+ refresh: function(frm) {
+ if (!frm.doc.__islocal) {
+ frm.add_custom_button(__("Course Schedule"), function() {
+ frappe.route_options = {
+ student_group: frm.doc.name
+ }
+ frappe.set_route("List", "Course Schedule");
+ });
-frappe.ui.form.on("Student Group", "onload", function(frm){
- cur_frm.set_query("academic_term",function(){
- return{
- "filters":{
- "academic_year": (frm.doc.academic_year)
- }
- };
- });
+ frm.add_custom_button(__("Assessment"), function() {
+ frappe.route_options = {
+ student_group: frm.doc.name
+ }
+ frappe.set_route("List", "Assessment");
+ });
+ }
+ },
+
+ onload: function(frm) {
+ cur_frm.set_query("academic_term", function() {
+ return {
+ "filters": {
+ "academic_year": (frm.doc.academic_year)
+ }
+ };
+ });
+ }
});
//If Student Batch is entered, deduce program, academic_year and academic term from it
cur_frm.add_fetch("student_batch", "program", "program");
cur_frm.add_fetch("student_batch", "academic_term", "academic_term");
-cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
+cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
index adab0c7..9e44f51 100644
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -311,7 +311,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-07 05:26:38.673266",
+ "modified": "2016-12-01 12:57:17.125085",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Group",
@@ -322,6 +322,27 @@
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
diff --git a/erpnext/schools/doctype/student_leave_application/__init__.py b/erpnext/schools/doctype/student_leave_application/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/__init__.py
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.js b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
new file mode 100644
index 0000000..4746148
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Leave Application', {
+ refresh: function(frm) {
+
+ }
+});
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
new file mode 100644
index 0000000..238b134
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
@@ -0,0 +1,280 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "SLA.######",
+ "beta": 0,
+ "creation": "2016-11-28 15:38:54.793854",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "student.title",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "reason",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reason",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Student Leave Application",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-12-01 12:57:55.914656",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Leave Application",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Academics User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "student_name",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.py b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
new file mode 100644
index 0000000..4a36590
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentLeaveApplication(Document):
+ pass
diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
new file mode 100644
index 0000000..ddb30ac
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Leave Application')
+
+class TestStudentLeaveApplication(unittest.TestCase):
+ pass
diff --git a/erpnext/schools/report/absent_student_report/__init__.py b/erpnext/schools/report/absent_student_report/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/__init__.py
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/schools/report/absent_student_report/absent_student_report.js
new file mode 100644
index 0000000..7515f22
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Absent Student Report"] = {
+ "filters": [
+ {
+ "fieldname":"date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": get_today(),
+ "reqd": 1
+ }
+ ]
+}
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/schools/report/absent_student_report/absent_student_report.json
new file mode 100644
index 0000000..5f3ca71
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2013-05-13 14:04:03",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 14:28:27.184668",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Absent Student Report",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Absent Student Report",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/schools/report/absent_student_report/absent_student_report.py
new file mode 100644
index 0000000..82a20aa
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ msgprint(_("Please select date"), raise_exception=1)
+
+ columns = get_columns(filters)
+
+ absent_students = get_absent_students(filters.get("date"))
+ leave_applicants = get_leave_applications(filters.get("date"))
+
+ data = []
+ for student in absent_students:
+ if not student.student in leave_applicants:
+ row = [student.student, student.student_name, student.student_batch]
+ stud_details = frappe.db.get_value("Student", student.student, ['student_email_id', 'student_mobile_number'], as_dict=True)
+
+ if stud_details.student_email_id:
+ row+=[stud_details.student_email_id]
+ else:
+ row+= [""]
+
+ if stud_details.student_mobile_number:
+ row+=[stud_details.student_mobile_number]
+ else:
+ row+= [""]
+
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Student") + ":Link/Student:90",
+ _("Student Name") + "::150",
+ _("Student Batch") + "::180",
+ _("Student Email ID") + "::180",
+ _("Student Mobile No.") + "::150",
+ ]
+ return columns
+
+def get_absent_students(date):
+ absent_students = frappe.db.sql("""select student, student_name, student_batch from `tabStudent Attendance`
+ where docstatus = 1 and status="Absent" and date = %s order by student_batch, student_name""", date, as_dict=1)
+ return absent_students
+
+def get_leave_applications(date):
+ leave_applicants = []
+ for student in frappe.db.sql("""select student from `tabStudent Leave Application`
+ where docstatus = 1 and date = %s""", date):
+ leave_applicants.append(student[0])
+ return leave_applicants
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/__init__.py b/erpnext/schools/report/student_batch_wise_attendance/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/__init__.py
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
new file mode 100644
index 0000000..51f7346
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Student Batch-Wise Attendance"] = {
+ "filters": [{
+ "fieldname": "date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": get_today(),
+ "reqd": 1
+ }]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
new file mode 100644
index 0000000..8e5e483
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2016-11-28 22:07:03.859124",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 15:48:50.120579",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Batch-Wise Attendance",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Student Batch-Wise Attendance",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
new file mode 100644
index 0000000..c112b59
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
@@ -0,0 +1,64 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ msgprint(_("Please select date"), raise_exception=1)
+
+ columns = get_columns(filters)
+
+ active_student_batch = get_active_student_batch()
+
+ data = []
+ for student_batch in active_student_batch:
+ row = [student_batch.name]
+ present_students = 0
+ absent_students = 0
+ student_batch_strength = get_student_batch_strength(student_batch.name)
+ student_attendance = get_student_attendance(student_batch.name, filters.get("date"))
+ if student_attendance:
+ for attendance in student_attendance:
+ if attendance.status== "Present":
+ present_students = attendance.count
+ elif attendance.status== "Absent":
+ absent_students = attendance.count
+
+ unmarked_students = student_batch_strength - (present_students + absent_students)
+ row+= [student_batch_strength, present_students, absent_students, unmarked_students]
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Student batch") + ":Link/Student Batch:250",
+ _("Student batch Strength") + "::170",
+ _("Present") + "::90",
+ _("Absent") + "::90",
+ _("Not Marked") + "::90"
+ ]
+ return columns
+
+def get_active_student_batch():
+ active_student_batch = frappe.db.sql("""select name from `tabStudent Batch`
+ where enabled = 1 order by name""", as_dict=1)
+ return active_student_batch
+
+def get_student_batch_strength(student_batch):
+ student_batch_strength = frappe.db.sql("""select count(*) from `tabStudent Batch Student`
+ where parent = %s""", student_batch)[0][0]
+ return student_batch_strength
+
+def get_student_attendance(student_batch, date):
+ student_attendance = frappe.db.sql("""select count(*) as count, status from `tabStudent Attendance` where \
+ student_batch= %s and date= %s and docstatus=1 and\
+ (course_schedule is Null or course_schedule='') group by status""",
+ (student_batch, date), as_dict=1)
+ return student_attendance
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py b/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
new file mode 100644
index 0000000..32c0551
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Student Monthly Attendance Sheet"] = {
+ "filters": [
+ {
+ "fieldname":"month",
+ "label": __("Month"),
+ "fieldtype": "Select",
+ "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+ "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+ "Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+ },
+ {
+ "fieldname":"year",
+ "label": __("Year"),
+ "fieldtype": "Select",
+ "reqd": 1
+ },
+ {
+ "fieldname":"student_batch",
+ "label": __("Student Batch"),
+ "fieldtype": "Link",
+ "options": "Student Batch",
+ "reqd": 1
+ }
+ ],
+
+ "onload": function() {
+ return frappe.call({
+ method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
+ callback: function(r) {
+ var year_filter = frappe.query_report_filters_by_name.year;
+ year_filter.df.options = r.message;
+ year_filter.df.default = r.message.split("\n")[0];
+ year_filter.refresh();
+ year_filter.set_input(year_filter.df.default);
+ }
+ });
+ }
+}
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
new file mode 100644
index 0000000..1d8f4d0
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2013-05-13 14:04:03",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 14:29:53.547378",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Monthly Attendance Sheet",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Student Monthly Attendance Sheet",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
new file mode 100644
index 0000000..2f8ba52
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -0,0 +1,82 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+from calendar import monthrange
+from erpnext.schools.api import get_student_batch_students
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ conditions, filters = get_conditions(filters)
+ columns = get_columns(filters)
+ att_map = get_attendance_list(conditions, filters)
+ students = get_student_batch_students(filters.get("student_batch"))
+ data = []
+ for stud in students:
+ row = [stud.student, stud.student_name]
+
+ total_p = total_a = 0.0
+ for day in range(filters["total_days_in_month"]):
+ status="None"
+ if att_map.get(stud.student):
+ status = att_map.get(stud.student).get(day + 1, "None")
+ status_map = {"Present": "P", "Absent": "A", "None": ""}
+ row.append(status_map[status])
+
+ if status == "Present":
+ total_p += 1
+ elif status == "Absent":
+ total_a += 1
+
+ row += [total_p, total_a]
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
+
+ for day in range(filters["total_days_in_month"]):
+ columns.append(cstr(day+1) +"::20")
+
+ columns += [_("Total Present") + ":Int:95", _("Total Absent") + ":Int:90"]
+ return columns
+
+def get_attendance_list(conditions, filters):
+ attendance_list = frappe.db.sql("""select student, day(date) as day_of_month,
+ status from `tabStudent Attendance` where docstatus = 1 %s order by student, date""" %
+ conditions, filters, as_dict=1)
+
+ att_map = {}
+ for d in attendance_list:
+ att_map.setdefault(d.student, frappe._dict()).setdefault(d.day_of_month, "")
+ att_map[d.student][d.day_of_month] = d.status
+
+ return att_map
+
+def get_conditions(filters):
+ if not (filters.get("month") and filters.get("year")):
+ msgprint(_("Please select month and year"), raise_exception=1)
+
+ filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+ "Dec"].index(filters.month) + 1
+
+ filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
+
+ conditions = " and month(date) = %(month)s and year(date) = %(year)s"
+
+ if filters.get("student_batch"): conditions += " and student_batch = %(student_batch)s"
+
+ return conditions, filters
+
+@frappe.whitelist()
+def get_attendance_years():
+ year_list = frappe.db.sql_list("""select distinct YEAR(date) from `tabStudent Attendance` ORDER BY YEAR(date) DESC""")
+ if not year_list:
+ year_list = [getdate().year]
+
+ return "\n".join(str(year) for year in year_list)
diff --git a/erpnext/selling/doctype/campaign/campaign.js b/erpnext/selling/doctype/campaign/campaign.js
index 31a796f..72a90d0 100644
--- a/erpnext/selling/doctype/campaign/campaign.js
+++ b/erpnext/selling/doctype/campaign/campaign.js
@@ -10,6 +10,6 @@
cur_frm.add_custom_button(__("View Leads"), function() {
frappe.route_options = {"source": "Campaign","campaign_name": frm.doc.name}
frappe.set_route("List", "Lead");
- }, "icon-list", true);
+ }, "fa fa-list", true);
}
})
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 2c1d2b4..9487540 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -118,7 +118,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bullhorn",
+ "icon": "fa fa-bullhorn",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 13fb17b..77cc624 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -30,7 +30,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -520,7 +520,7 @@
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -835,7 +835,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -923,7 +923,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1056,7 +1056,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 363,
"image_field": "image",
"image_view": 0,
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 9d23215..027626c 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 5b99691..0334ae7 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -60,7 +60,7 @@
company: cur_frm.doc.company
}
})
- }, "icon-download", "btn-default"
+ }, "fa fa-download", "btn-default"
);
}
},
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 56c08e5..0254ec8 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -654,7 +654,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 7ec3df8..0edb8e6 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -108,7 +108,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 7964c8f..4fc536e 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -389,7 +389,7 @@
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -731,7 +731,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -965,7 +965,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1194,7 +1194,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1673,7 +1673,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1916,7 +1916,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2147,7 +2147,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2340,7 +2340,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 82,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index f49dbd2..f171007 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -28,7 +28,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -451,7 +451,7 @@
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -784,7 +784,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1018,7 +1018,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1272,7 +1272,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1754,7 +1754,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2026,7 +2026,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2086,7 +2086,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2175,7 +2175,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2732,7 +2732,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2937,7 +2937,7 @@
"label": "Recurring Order",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -3360,7 +3360,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 105,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index dd9bcd7..f1bfe95 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -352,7 +352,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index 56a3c03..3ea5b14 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -319,7 +319,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-mobile-phone",
+ "icon": "fa fa-mobile-phone",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.json b/erpnext/selling/page/sales_analytics/sales_analytics.json
index 12bc487..4a7761e 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.json
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:12.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:43:59.000000",
"modified_by": "Administrator",
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index a516342..67ba1c8 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -31,7 +31,7 @@
from_date: wrapper.page.add_date(__("From Date")),
to_date: wrapper.page.add_date(__("To Date")),
refresh_btn: wrapper.page.set_primary_action(__("Refresh"),
- function() { me.get_data(); }, "icon-refresh"),
+ function() { me.get_data(); }, "fa fa-refresh"),
};
this.elements.no_data = $('<div class="alert alert-warning">' + __("No Data") + '</div>')
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.json b/erpnext/selling/page/sales_funnel/sales_funnel.json
index 3a50968..e60b975 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.json
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.json
@@ -2,7 +2,7 @@
"creation": "2013-10-04 13:17:18.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-filter",
+ "icon": "fa fa-filter",
"idx": 1,
"modified": "2013-10-04 13:17:18.000000",
"modified_by": "Administrator",
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index e8c52d7..d696d3b 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -536,7 +536,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shield",
+ "icon": "fa fa-shield",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 8b04358..03433de 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-certificate",
+ "icon": "fa fa-certificate",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 338d10a..fabbd51 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1596,7 +1596,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-building",
+ "icon": "fa fa-building",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index 1400877..44cea20 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -99,7 +99,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-exchange",
+ "icon": "fa fa-exchange",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index a7ebb8a..dc595ac 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -350,7 +350,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
index b830d87..d822a75 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.js
+++ b/erpnext/setup/doctype/email_digest/email_digest.js
@@ -21,7 +21,7 @@
d.show();
}
});
- }, "icon-eye-open", "btn-default");
+ }, "fa fa-eye-open", "btn-default");
if(user==="Administrator") {
cur_frm.add_custom_button(__('Send Now'), function() {
@@ -39,7 +39,7 @@
} else {
msgprint(save_msg);
}
- }, "icon-envelope", "btn-default");
+ }, "fa fa-envelope", "btn-default");
}
}
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index 682ea22..a75a59a 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -1069,7 +1069,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-envelope",
+ "icon": "fa fa-envelope",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index a9397f2..ce3f2cf 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -222,7 +222,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 1,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 02b5268..45740bc 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -453,7 +453,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/naming_series/naming_series.json b/erpnext/setup/doctype/naming_series/naming_series.json
index 545db9d..0daf1a1 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.json
+++ b/erpnext/setup/doctype/naming_series/naming_series.json
@@ -227,7 +227,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-sort-by-order",
+ "icon": "fa fa-sort-by-order",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index 540aa13..fc3316e 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -523,7 +523,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-envelope",
+ "icon": "fa fa-envelope",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index be64db0..d992fcb 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-font",
+ "icon": "fa fa-font",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index c301698..b95a936 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 9c411d9..760954c 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -684,7 +684,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 53e7ec7..1665ba5 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -29,7 +29,7 @@
"label": "Name and Employee ID",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -290,7 +290,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-bullseye",
+ "options": "fa fa-bullseye",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -366,7 +366,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.json b/erpnext/setup/doctype/sms_settings/sms_settings.json
index ab2adeb..23d6fa2 100755
--- a/erpnext/setup/doctype/sms_settings/sms_settings.json
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.json
@@ -163,7 +163,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 8d34022..5e62099 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -159,7 +159,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
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 8af6321..ce057c2 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -92,7 +92,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-legal",
+ "icon": "fa fa-legal",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index e0f44de..e920c9d 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -309,7 +309,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index cea21de..609c6c0 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-compass",
+ "icon": "fa fa-compass",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index c4522f0..b04b427 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -338,7 +338,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/shopping_cart/product.py b/erpnext/shopping_cart/product.py
index 6a6cb69..24e4d42 100644
--- a/erpnext/shopping_cart/product.py
+++ b/erpnext/shopping_cart/product.py
@@ -4,9 +4,11 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, fmt_money
+from frappe.utils import cint, fmt_money, flt
from erpnext.shopping_cart.cart import _get_cart_quotation
-from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
+ import is_cart_enabled, get_shopping_cart_settings
+from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
@frappe.whitelist(allow_guest=True)
def get_product_info(item_code):
@@ -51,12 +53,14 @@
in_stock = in_stock[0][0] > 0 and 1 or 0
else:
- in_stock = -1
+ in_stock = 0
return in_stock
-def get_price(item_code, template_item_code, price_list):
+def get_price(item_code, template_item_code, price_list, qty=1):
if price_list:
+ cart_settings = get_shopping_cart_settings()
+
price = frappe.get_all("Item Price", fields=["price_list_rate", "currency"],
filters={"price_list": price_list, "item_code": item_code})
@@ -65,4 +69,22 @@
filters={"price_list": price_list, "item_code": template_item_code})
if price:
+ pricing_rule = get_pricing_rule_for_item(frappe._dict({
+ "item_code": item_code,
+ "qty": qty,
+ "transaction_type": "selling",
+ "price_list": price_list,
+ "customer_group": cart_settings.default_customer_group,
+ "company": cart_settings.company,
+ "conversion_rate": 1,
+ "for_shopping_cart": True
+ }))
+
+ if pricing_rule:
+ if pricing_rule.pricing_rule_for == "Discount Percentage":
+ price[0].price_list_rate = flt(price[0].price_list_rate * (1.0 - (pricing_rule.discount_percentage / 100.0)))
+
+ if pricing_rule.pricing_rule_for == "Price":
+ price[0].price_list_rate = pricing_rule.price_list_rate
+
return price[0]
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 2d79260..ef31cfd 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -187,7 +187,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-archive",
+ "icon": "fa fa-archive",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 9fd8a04..79ad4cd 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -434,7 +434,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-07 05:30:44.856343",
+ "modified": "2016-11-27 16:31:55.929378",
"modified_by": "Administrator",
"module": "Stock",
"name": "Bin",
@@ -467,6 +467,27 @@
"cancel": 0,
"create": 0,
"delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index def0e15..e1aa16d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -27,7 +27,7 @@
"label": "Delivery To",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -447,7 +447,7 @@
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -782,7 +782,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1012,7 +1012,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1072,7 +1072,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1328,7 +1328,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1810,7 +1810,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2059,7 +2059,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2147,7 +2147,7 @@
"label": "Transporter Info",
"length": 0,
"no_copy": 0,
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2300,7 +2300,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2916,7 +2916,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3110,7 +3110,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 146,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 6e103d4..bad8416 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,2869 +1,2869 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "beta": 0,
- "creation": "2013-05-03 10:45:46",
- "custom": 0,
- "default_print_format": "Standard",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:item_code",
+ "beta": 0,
+ "creation": "2013-05-03 10:45:46",
+ "custom": 0,
+ "default_print_format": "Standard",
+ "description": "A Product or a Service that is bought, sold or kept in stock.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "name_and_description_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-flag",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "name_and_description_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-flag",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 0,
- "options": "ITEM-",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "ITEM-",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_code",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Code",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "item_code",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_code",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "variant_of",
- "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
- "fieldname": "variant_of",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Variant Of",
- "length": 0,
- "no_copy": 0,
- "options": "Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "variant_of",
+ "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
+ "fieldname": "variant_of",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Variant Of",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Name",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "barcode",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Barcode",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Barcode",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_group",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Item Group",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_group",
- "oldfieldtype": "Link",
- "options": "Item Group",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item Group",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_group",
+ "oldfieldtype": "Link",
+ "options": "Item Group",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Unit of Measure",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Link",
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Unit of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Link",
+ "options": "UOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "disabled",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Disabled",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Disabled",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "description": "",
- "fieldname": "is_stock_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Maintain Stock",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_stock_item",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "description": "",
+ "fieldname": "is_stock_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Maintain Stock",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_stock_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
- "fieldname": "opening_stock",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Opening Stock",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
+ "fieldname": "opening_stock",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Opening Stock",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)",
- "fieldname": "valuation_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Valuation Rate",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)",
+ "fieldname": "valuation_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "standard_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Standard Selling Rate",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "standard_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Standard Selling Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_fixed_asset",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Fixed Asset",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_fixed_asset",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Fixed Asset",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_fixed_asset",
- "fieldname": "asset_category",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Asset Category",
- "length": 0,
- "no_copy": 0,
- "options": "Asset Category",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_fixed_asset",
+ "fieldname": "asset_category",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Asset Category",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Asset Category",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "image",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "image",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "image",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "image",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_11",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "brand",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Brand",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "brand",
- "oldfieldtype": "Link",
- "options": "Brand",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Brand",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "brand",
+ "oldfieldtype": "Link",
+ "options": "Brand",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "is_stock_item",
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "inventory",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inventory",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-truck",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "is_stock_item",
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "inventory",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inventory",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-truck",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "default_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Warehouse",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "default_warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "default_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "default_warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "2099-12-31",
- "depends_on": "is_stock_item",
- "fieldname": "end_of_life",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "End of Life",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "end_of_life",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "2099-12-31",
+ "depends_on": "is_stock_item",
+ "fieldname": "end_of_life",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "End of Life",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "end_of_life",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "has_batch_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Batch No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "has_batch_no",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Batch No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "has_batch_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
- "fieldname": "has_serial_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Serial No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "has_serial_no",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Serial No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "has_serial_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_serial_no",
- "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
- "fieldname": "serial_no_series",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Serial Number Series",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_serial_no",
+ "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+ "fieldname": "serial_no_series",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Serial Number Series",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Purchase",
- "fieldname": "default_material_request_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Material Request Type",
- "length": 0,
- "no_copy": 0,
- "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Purchase",
+ "fieldname": "default_material_request_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Material Request Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "tolerance",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Allow over delivery or receipt upto this percent",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "tolerance",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "tolerance",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Allow over delivery or receipt upto this percent",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "tolerance",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "valuation_method",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Valuation Method",
- "length": 0,
- "no_copy": 0,
- "options": "\nFIFO\nMoving Average",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "valuation_method",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Method",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nFIFO\nMoving Average",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "warranty_period",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Warranty Period (in days)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "warranty_period",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "warranty_period",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Warranty Period (in days)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "warranty_period",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "net_weight",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Net Weight",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "net_weight",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Net Weight",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "weight_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Weight UOM",
- "length": 0,
- "no_copy": 0,
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "weight_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weight UOM",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "reorder_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Auto re-order",
- "length": 0,
- "no_copy": 0,
- "options": "icon-rss",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "reorder_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Auto re-order",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-rss",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants unless overrridden",
- "fieldname": "reorder_levels",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Reorder level based on Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Item Reorder",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants unless overrridden",
+ "fieldname": "reorder_levels",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reorder level based on Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Reorder",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "attributes",
- "columns": 0,
- "depends_on": "",
- "fieldname": "variants_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Variants",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "attributes",
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "variants_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Variants",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "depends_on": "eval:!doc.variant_of",
- "description": "If this item has variants, then it cannot be selected in sales orders etc.",
- "fieldname": "has_variants",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Variants",
- "length": 0,
- "no_copy": 1,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "depends_on": "eval:!doc.variant_of",
+ "description": "If this item has variants, then it cannot be selected in sales orders etc.",
+ "fieldname": "has_variants",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Variants",
+ "length": 0,
+ "no_copy": 1,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "attributes",
- "fieldtype": "Table",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Attributes",
- "length": 0,
- "no_copy": 1,
- "options": "Item Variant Attribute",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "attributes",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Attributes",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Item Variant Attribute",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "purchase_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Purchase Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "purchase_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Purchase Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-shopping-cart",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_purchase_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Purchase Item",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_purchase_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Purchase Item",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0.00",
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "min_order_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Minimum Order Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "min_order_qty",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0.00",
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "min_order_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Minimum Order Qty",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "min_order_qty",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "safety_stock",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Safety Stock",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "safety_stock",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Safety Stock",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Average time taken by the supplier to deliver",
- "fieldname": "lead_time_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Lead Time in days",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "lead_time_days",
- "oldfieldtype": "Int",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Average time taken by the supplier to deliver",
+ "fieldname": "lead_time_days",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Lead Time in days",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "lead_time_days",
+ "oldfieldtype": "Int",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "buying_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Buying Cost Center",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "cost_center",
- "oldfieldtype": "Link",
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "buying_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Buying Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "cost_center",
+ "oldfieldtype": "Link",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Expense Account",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "purchase_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Expense Account",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "purchase_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "unit_of_measure_conversion",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Unit of Measure Conversion",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "unit_of_measure_conversion",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Unit of Measure Conversion",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants",
- "fieldname": "uoms",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "UOMs",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "uom_conversion_details",
- "oldfieldtype": "Table",
- "options": "UOM Conversion Detail",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants",
+ "fieldname": "uoms",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "UOMs",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "uom_conversion_details",
+ "oldfieldtype": "Table",
+ "options": "UOM Conversion Detail",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "last_purchase_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Last Purchase Rate",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "last_purchase_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "last_purchase_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Last Purchase Rate",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "last_purchase_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_supplier",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Supplier",
- "length": 0,
- "no_copy": 0,
- "options": "Supplier",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Supplier",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Supplier",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "delivered_by_supplier",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Delivered by Supplier (Drop Ship)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "delivered_by_supplier",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Delivered by Supplier (Drop Ship)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturer",
- "length": 0,
- "no_copy": 0,
- "options": "Manufacturer",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Manufacturer",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer_part_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturer Part Number",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer_part_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer Part Number",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Code for Suppliers",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code for Suppliers",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Supplier",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Supplier",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "sales_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-tag",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "sales_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-tag",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_sales_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Sales Item",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_sales_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Sales Item",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "description": "Publish Item to hub.erpnext.com",
- "fieldname": "publish_in_hub",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Publish in Hub",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "description": "Publish Item to hub.erpnext.com",
+ "fieldname": "publish_in_hub",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Publish in Hub",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fieldname": "synced_with_hub",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Synced With Hub",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "fieldname": "synced_with_hub",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Synced With Hub",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "income_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Income Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Income Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "selling_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Selling Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "selling_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Selling Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Item Codes",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Item Codes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "customer_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Customer Detail",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "customer_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Customer Detail",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "max_discount",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Max Discount (%)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "max_discount",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "max_discount",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Max Discount (%)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "max_discount",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "item_tax_section_break",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Tax",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "item_tax_section_break",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Tax",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Will also apply for variants",
- "fieldname": "taxes",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Taxes",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_tax",
- "oldfieldtype": "Table",
- "options": "Item Tax",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Will also apply for variants",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Taxes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_tax",
+ "oldfieldtype": "Table",
+ "options": "Item Tax",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "inspection_criteria",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Criteria",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-search",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "inspection_criteria",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Criteria",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-search",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "inspection_required_before_purchase",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Required before Purchase",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inspection_required",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "fieldname": "inspection_required_before_purchase",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "inspection_required",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "inspection_required_before_delivery",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Required before Delivery",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "inspection_required_before_delivery",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Delivery",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
- "description": "Will also apply to variants",
- "fieldname": "quality_parameters",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Quality Parameters",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_specification_details",
- "oldfieldtype": "Table",
- "options": "Item Quality Inspection Parameter",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
+ "description": "Will also apply to variants",
+ "fieldname": "quality_parameters",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Parameters",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_specification_details",
+ "oldfieldtype": "Table",
+ "options": "Item Quality Inspection Parameter",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "manufacturing",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturing",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-cogs",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "manufacturing",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturing",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-cogs",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_bom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default BOM",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "default_bom",
- "oldfieldtype": "Link",
- "options": "BOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_bom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default BOM",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "default_bom",
+ "oldfieldtype": "Link",
+ "options": "BOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "description": "If subcontracted to a vendor",
- "fieldname": "is_sub_contracted_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supply Raw Materials for Purchase",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_sub_contracted_item",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "description": "If subcontracted to a vendor",
+ "fieldname": "is_sub_contracted_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supply Raw Materials for Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_sub_contracted_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_74",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_74",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_code",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Code",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Code",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "website_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website",
- "length": 0,
- "no_copy": 0,
- "options": "icon-globe",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "website_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-globe",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "show_in_website",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Show in Website",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "show_in_website",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Show in Website",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "route",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Route",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "route",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Route",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Items with higher weightage will be shown higher",
- "fieldname": "weightage",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Weightage",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Items with higher weightage will be shown higher",
+ "fieldname": "weightage",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weightage",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Show a slideshow at the top of the page",
- "fieldname": "slideshow",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Slideshow",
- "length": 0,
- "no_copy": 0,
- "options": "Website Slideshow",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Show a slideshow at the top of the page",
+ "fieldname": "slideshow",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Slideshow",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Slideshow",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Item Image (if not slideshow)",
- "fieldname": "website_image",
- "fieldtype": "Attach",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Item Image (if not slideshow)",
+ "fieldname": "website_image",
+ "fieldtype": "Attach",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "thumbnail",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Thumbnail",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "thumbnail",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Thumbnail",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb72",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "cb72",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
- "fieldname": "website_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+ "fieldname": "website_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Warehouse",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "List this Item in multiple groups on the website.",
- "fieldname": "website_item_groups",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Item Groups",
- "length": 0,
- "no_copy": 0,
- "options": "Website Item Group",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "List this Item in multiple groups on the website.",
+ "fieldname": "website_item_groups",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Item Groups",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Item Group",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "website_specifications",
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "sb72",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Specifications",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "website_specifications",
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "sb72",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "copy_from_item_group",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Copy From Item Group",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "copy_from_item_group",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Copy From Item Group",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "website_specifications",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Specifications",
- "length": 0,
- "no_copy": 0,
- "options": "Item Website Specification",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "website_specifications",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Website Specification",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "web_long_description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "web_long_description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_projected_qty",
- "fieldtype": "Float",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Total Projected Qty",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "total_projected_qty",
+ "fieldtype": "Float",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Projected Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-tag",
- "idx": 2,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 1,
- "modified": "2016-11-18 02:19:54.507883",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-tag",
+ "idx": 2,
+ "image_field": "image",
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 1,
+ "modified": "2016-11-18 02:19:54.507883",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 1,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 1,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Maintenance User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Maintenance User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Accounts User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Manufacturing User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Manufacturing User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_name,description,item_group,customer_code",
- "sort_field": "idx desc, modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "item_name,description,item_group,customer_code",
+ "sort_field": "idx desc, modified desc",
+ "sort_order": "DESC",
+ "title_field": "item_name",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 338a0bc..8c02928 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -224,7 +224,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-edit",
+ "icon": "fa fa-edit",
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index aac9c1c..68edfc9 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -65,7 +65,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-edit",
+ "icon": "fa fa-edit",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 69a9078..6770c0f 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -29,7 +29,7 @@
"label": "Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tags",
+ "options": "fa fa-tags",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -139,7 +139,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -377,7 +377,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 15a5759..525853b 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -37,7 +37,7 @@
'<br><br>',
'<table class="table table-bordered" style="background-color: #f9f9f9;">',
'<tr><td>',
- '<h4><i class="icon-hand-right"></i> ',
+ '<h4><i class="fa fa-hand-right"></i> ',
__('Notes'),
':</h4>',
'<ul>',
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index 10dd035..227541f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -378,7 +378,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-usd",
+ "icon": "fa fa-usd",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index ea69ca0..0840e56 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -159,7 +159,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-certificate",
+ "icon": "fa fa-certificate",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 44b7dea..2b1fb7f 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -43,7 +43,7 @@
if(doc.docstatus==0) {
cur_frm.add_custom_button(__("Get Items from BOM"),
- cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default");
+ cur_frm.cscript.get_items_from_bom, "fa fa-sitemap", "btn-default");
}
if(doc.docstatus == 1 && doc.status != 'Stopped') {
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 416c61b..b5992c2 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -234,7 +234,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -293,7 +293,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -559,7 +559,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -633,7 +633,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ticket",
+ "icon": "fa fa-ticket",
"idx": 70,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index d8c7952..3359084 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -575,7 +575,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-suitcase",
+ "icon": "fa fa-suitcase",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/price_list/price_list.js b/erpnext/stock/doctype/price_list/price_list.js
index f109633..23ac6fd 100644
--- a/erpnext/stock/doctype/price_list/price_list.js
+++ b/erpnext/stock/doctype/price_list/price_list.js
@@ -8,6 +8,6 @@
"price_list": cur_frm.doc.name
};
frappe.set_route("Report", "Item Price");
- }, "icon-money");
+ }, "fa fa-money");
}
});
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index fb489ea..73674ee 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -236,7 +236,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-tags",
+ "icon": "fa fa-tags",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 948f5b2..b4bad54 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -666,7 +666,7 @@
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -898,7 +898,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1160,7 +1160,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1279,7 +1279,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1891,7 +1891,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1981,7 +1981,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-table",
+ "options": "fa fa-table",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2163,7 +2163,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2575,7 +2575,7 @@
"label": "Transporter Details",
"length": 0,
"no_copy": 0,
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2711,7 +2711,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 261,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
index 76e82f8..077c12d 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -681,7 +681,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-search",
+ "icon": "fa fa-search",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 7ff6cd6..c7ba178 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -1121,7 +1121,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-barcode",
+ "icon": "fa fa-barcode",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index f828b94..ccf28fd 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -1559,7 +1559,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.js b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
index 7f1a751..0e5aeb7 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_list.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
@@ -9,7 +9,7 @@
data-filter="from_warehouse,=,'+doc.from_warehouse+'">'+doc.from_warehouse+' </span>';
}
if(doc.from_warehouse || doc.to_warehouse) {
- html += '<i class="octicon octicon-arrow-right text-muted"></i> ';
+ html += '<i class="octicon octfa fa-arrow-right text-muted"></i> ';
}
if(doc.to_warehouse) {
html += '<span class="filterable h6"\
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 2e31ba4..ed1843e 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -31,6 +31,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -56,6 +57,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -76,7 +78,7 @@
"in_list_view": 1,
"label": "Source Warehouse",
"length": 0,
- "no_copy": 1,
+ "no_copy": 0,
"oldfieldname": "s_warehouse",
"oldfieldtype": "Link",
"options": "Warehouse",
@@ -84,6 +86,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -108,6 +111,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -128,7 +132,7 @@
"in_list_view": 1,
"label": "Target Warehouse",
"length": 0,
- "no_copy": 1,
+ "no_copy": 0,
"oldfieldname": "t_warehouse",
"oldfieldtype": "Link",
"options": "Warehouse",
@@ -136,6 +140,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -160,6 +165,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -188,6 +194,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -212,6 +219,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -237,6 +245,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -263,6 +272,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -291,6 +301,7 @@
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -317,6 +328,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -343,6 +355,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -370,6 +383,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -395,6 +409,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -422,6 +437,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -450,6 +466,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -477,6 +494,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -504,6 +522,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -532,6 +551,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -559,6 +579,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -583,6 +604,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -611,6 +633,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -638,6 +661,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -666,6 +690,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -693,6 +718,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -718,6 +744,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -745,6 +772,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -769,6 +797,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -797,6 +826,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -822,6 +852,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -849,6 +880,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -873,6 +905,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -901,6 +934,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -926,6 +960,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -953,6 +988,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -980,6 +1016,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1004,6 +1041,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1031,6 +1069,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1057,6 +1096,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1074,7 +1114,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-11-04 23:37:17.764323",
+ "modified": "2016-11-27 15:19:26.597414",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index 32beb1a..589c286 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -3,16 +3,20 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "SLE/.########",
+ "beta": 0,
"creation": "2013-01-29 19:25:42",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Other",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_code",
"fieldtype": "Link",
"hidden": 0,
@@ -31,6 +35,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -42,6 +47,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "serial_no",
"fieldtype": "Text",
"hidden": 0,
@@ -57,6 +63,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -68,6 +75,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "batch_no",
"fieldtype": "Data",
"hidden": 0,
@@ -84,6 +92,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -94,6 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
@@ -112,6 +122,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -123,6 +134,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "posting_date",
"fieldtype": "Date",
"hidden": 0,
@@ -140,6 +152,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -151,6 +164,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "posting_time",
"fieldtype": "Time",
"hidden": 0,
@@ -168,6 +182,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -179,6 +194,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "voucher_type",
"fieldtype": "Link",
"hidden": 0,
@@ -197,6 +213,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -208,6 +225,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "voucher_no",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -226,6 +244,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -237,6 +256,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "voucher_detail_no",
"fieldtype": "Data",
"hidden": 0,
@@ -254,6 +274,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -265,6 +286,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "actual_qty",
"fieldtype": "Float",
"hidden": 0,
@@ -282,6 +304,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -293,6 +316,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "incoming_rate",
"fieldtype": "Currency",
"hidden": 0,
@@ -310,6 +334,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -320,6 +345,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "outgoing_rate",
"fieldtype": "Currency",
"hidden": 0,
@@ -336,6 +362,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -346,6 +373,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_uom",
"fieldtype": "Link",
"hidden": 0,
@@ -364,6 +392,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -375,6 +404,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "qty_after_transaction",
"fieldtype": "Float",
"hidden": 0,
@@ -392,6 +422,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -403,6 +434,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "valuation_rate",
"fieldtype": "Currency",
"hidden": 0,
@@ -421,6 +453,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -432,6 +465,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_value",
"fieldtype": "Currency",
"hidden": 0,
@@ -449,6 +483,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -459,6 +494,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_value_difference",
"fieldtype": "Currency",
"hidden": 0,
@@ -474,6 +510,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -484,6 +521,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_queue",
"fieldtype": "Text",
"hidden": 1,
@@ -500,6 +538,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -510,6 +549,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "project",
"fieldtype": "Link",
"hidden": 0,
@@ -525,6 +565,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -535,6 +576,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@@ -553,6 +595,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -564,6 +607,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fiscal_year",
"fieldtype": "Data",
"hidden": 0,
@@ -581,6 +625,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -592,6 +637,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "is_cancelled",
"fieldtype": "Select",
"hidden": 1,
@@ -607,6 +653,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -616,15 +663,16 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-list",
+ "icon": "fa fa-list",
"idx": 1,
+ "image_view": 0,
"in_create": 1,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-03-29 13:26:08.241138",
+ "modified": "2016-11-27 16:31:36.294708",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@@ -640,6 +688,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -657,9 +706,31 @@
"create": 0,
"delete": 0,
"email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -671,6 +742,7 @@
"write": 0
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 72176bb..9d66d4d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -407,7 +407,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-upload-alt",
+ "icon": "fa fa-upload-alt",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 4a6e6e9..6501682 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -506,7 +506,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 8b1b679..8a9ecbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -12,7 +12,7 @@
if (cint(frm.doc.is_group) == 1) {
frm.add_custom_button(__('Group to Non-Group'),
- function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+ function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
} else if (cint(frm.doc.is_group) == 0) {
if(frm.doc.__onload && frm.doc.__onload.account) {
frm.add_custom_button(__("General Ledger"), function() {
@@ -25,7 +25,7 @@
}
frm.add_custom_button(__('Non-Group to Group'),
- function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+ function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
}
cur_frm.toggle_enable(['is_group', 'company'], false);
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index fb5f54d..a7556bd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -646,7 +646,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-building",
+ "icon": "fa fa-building",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.json b/erpnext/stock/page/stock_analytics/stock_analytics.json
index 3b8380a..90e9f2e 100644
--- a/erpnext/stock/page/stock_analytics/stock_analytics.json
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:14.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:44:10.000000",
"modified_by": "Administrator",
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 46db859..8994ef8 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -28,7 +28,7 @@
"label": "Subject",
"length": 0,
"no_copy": 0,
- "options": "icon-flag",
+ "options": "fa fa-flag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -399,7 +399,7 @@
"label": "Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -783,7 +783,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ticket",
+ "icon": "fa fa-ticket",
"idx": 7,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 45bd236..4e63bb6 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -262,7 +262,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-ticket",
+ "options": "fa fa-ticket",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -493,7 +493,7 @@
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-thumbs-up",
+ "options": "fa fa-thumbs-up",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -610,7 +610,7 @@
"label": "Customer Details",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -954,7 +954,7 @@
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1115,7 +1115,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bug",
+ "icon": "fa fa-bug",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 79a7fd6..01b7b48 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -27,11 +27,11 @@
},
filters: [
- {fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
+ {fieldname: "fiscal_year", fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
default_value: __("Select Fiscal Year") + "..."},
- {fieldtype:"Date", label: __("From Date")},
- {fieldtype:"Date", label: __("To Date")},
- {fieldtype:"Select", label: __("Range"),
+ {fieldname: "from_date", fieldtype:"Date", label: __("From Date")},
+ {fieldname: "to_date", fieldtype:"Date", label: __("To Date")},
+ {fieldname: "range", fieldtype:"Select", label: __("Range"),
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"], default_value: "Monthly"}
],
diff --git a/erpnext/support/page/support_analytics/support_analytics.json b/erpnext/support/page/support_analytics/support_analytics.json
index 3d8b486..93eb2d2 100644
--- a/erpnext/support/page/support_analytics/support_analytics.json
+++ b/erpnext/support/page/support_analytics/support_analytics.json
@@ -2,7 +2,7 @@
"creation": "2013-01-04 15:31:45.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:44:24.000000",
"modified_by": "Administrator",
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 674143d..7dac218 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -5,7 +5,7 @@
<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/me">My Account</a>
</li>
</ul>
diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html
index 6da6ad0..39138d3 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -18,7 +18,7 @@
target="_blank">{{ partner_website }}</a></p>{%- endif %}
{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
- {% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
+ {% if email -%}<p itemprop="email"><span class="fa fa-envelope"></span> {{ email }}</p>{%- endif %}
</address>
</div>
<div class="col-md-8">
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index f4d9027..4b23d5e 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -12,17 +12,17 @@
item_code: get_item_code()
},
callback: function(r) {
- $(".item-cart").toggleClass("hide", !!!r.message.price);
+ $(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.stock));
if(r.message && r.message.price) {
$(".item-price")
.html(r.message.price.formatted_price + " per " + r.message.uom);
if(r.message.stock==0) {
- $(".item-stock").html("<div class='help'>Not in stock</div>");
+ $(".item-stock").html("<div style='color: red'>Not in stock</div>");
}
else if(r.message.stock==1) {
$(".item-stock").html("<div style='color: green'>\
- <i class='icon-check'></i> Available (in stock)</div>");
+ <i class='fa fa-check'></i> Available (in stock)</div>");
}
if(r.message.qty) {
diff --git a/erpnext/templates/pages/task_info.html b/erpnext/templates/pages/task_info.html
index 1d6574b..7cc5594 100644
--- a/erpnext/templates/pages/task_info.html
+++ b/erpnext/templates/pages/task_info.html
@@ -4,7 +4,7 @@
<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
</li>
</ul>
diff --git a/erpnext/templates/pages/timelog_info.html b/erpnext/templates/pages/timelog_info.html
index 76dbc32..8b2fa6a 100644
--- a/erpnext/templates/pages/timelog_info.html
+++ b/erpnext/templates/pages/timelog_info.html
@@ -1,12 +1,12 @@
{% extends "templates/web.html" %}
{% block title %} {{ doc.name }} {% endblock %}
{% block breadcrumbs %}
-<div class="page-breadcrumbs" data-html-block="breadcrumbs">
+<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
- </li>
+ </li>
</ul>
</div>
{% endblock %}
@@ -18,28 +18,28 @@
<div class="page-content-block">
<div class="row">
- <div class="col-sm-12" style="max-width: 500px;">
+ <div class="col-sm-12" style="max-width: 500px;">
<label for="project" class="control-label text-muted small">Project</label>
- <input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
-
+ <input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
+
<label for="activity_type" class="control-label text-muted small">Activity Type</label>
- <input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">
+ <input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">
<label for="task" class="control-label text-muted small">Task</label>
- <input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">
+ <input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">
<label for="from_time" class="control-label text-muted small">From Time</label>
- <input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">
-
+ <input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">
+
<label for="to_time" class="control-label text-muted small">To Time</label>
- <input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">
-
+ <input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">
+
<label for="to_time" class="control-label text-muted small">Hours</label>
<input type="text" class="form-control" name="Hours" readonly value= "{{ doc.hours }}">
<label for="status" class="control-label text-muted small">Status</label>
- <input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">
-
+ <input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">
+
<label for="Note" class="control-label text-muted small">Note</label>
<textarea class="form-control" name="Hours" readonly> {{ doc.note }} </textarea>
</div>
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 27b54f8..8168b69 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -26,7 +26,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -467,7 +467,7 @@
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -741,7 +741,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 5,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
index 3f2ce47..6ff93d9 100644
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ b/erpnext/utilities/doctype/address_template/address_template.json
@@ -100,7 +100,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 9967806..a183779 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -27,7 +27,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -255,7 +255,7 @@
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -516,7 +516,7 @@
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -643,7 +643,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_field": "image",
"image_view": 0,
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index eff3e08..f9aac1c 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -75,7 +75,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-magic",
+ "icon": "fa fa-magic",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json
index 0df91f7..ffd9a7f 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.json
+++ b/erpnext/utilities/doctype/sms_log/sms_log.json
@@ -253,7 +253,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-mobile-phone",
+ "icon": "fa fa-mobile-phone",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
