Merge pull request #568 from akhileshdarjee/responsive
[Fix][Purchase Order]Warehouse in Item grid to call get_projected_qty
diff --git a/.gitignore b/.gitignore
index dec1746..2b5e3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,7 @@
*.pyc
*.py~
-*.comp.js
.DS_Store
-patch.log
-lib
conf.py
-version.num
locale
+latest_updates.json
.wnf-lang-status
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 11481d7..5e98cb0 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
- "modified": "2013-07-05 11:05:59",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"doctype": "DocField",
"fieldname": "voucher_id",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Voucher ID",
"oldfieldname": "voucher_id",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "against_account",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Against Account",
"oldfieldname": "against_account",
"oldfieldtype": "Data",
@@ -49,6 +51,7 @@
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Posting Date",
"oldfieldname": "posting_date",
"oldfieldtype": "Date",
@@ -58,6 +61,7 @@
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
@@ -66,6 +70,7 @@
"doctype": "DocField",
"fieldname": "cheque_number",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Cheque Number",
"oldfieldname": "cheque_number",
"oldfieldtype": "Data",
@@ -75,6 +80,7 @@
"doctype": "DocField",
"fieldname": "cheque_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Cheque Date",
"oldfieldname": "cheque_date",
"oldfieldtype": "Date",
diff --git a/accounts/doctype/budget_control/budget_control.txt b/accounts/doctype/budget_control/budget_control.txt
index e86fef8..13adf4b 100644
--- a/accounts/doctype/budget_control/budget_control.txt
+++ b/accounts/doctype/budget_control/budget_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:41",
"docstatus": 0,
- "modified": "2012-03-27 14:35:41",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "nabin@webnotestech.com"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Accounts",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 23
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index 3feb6f7..f16190d 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-02-22 01:27:37",
+ "creation": "2013-03-07 11:55:04",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Budget Detail",
"parentfield": "fields",
@@ -44,7 +45,7 @@
"label": "Budget Allocated",
"oldfieldname": "budget_allocated",
"oldfieldtype": "Currency",
- "options": "Company:company_name:default_currency",
+ "options": "Company:company:default_currency",
"reqd": 1
},
{
@@ -54,7 +55,7 @@
"label": "Actual",
"oldfieldname": "actual",
"oldfieldtype": "Currency",
- "options": "Company:company_name:default_currency",
+ "options": "Company:company:default_currency",
"read_only": 1
},
{
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index ff5d8fd..c8207bd 100644
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Budget Distribution Detail",
"parentfield": "fields",
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index ba247d3..487c982 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "C-Form Invoice Detail",
"parentfield": "fields",
diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js
index 2a98a96..4e2b8de 100644
--- a/accounts/doctype/cost_center/cost_center.js
+++ b/accounts/doctype/cost_center/cost_center.js
@@ -17,7 +17,7 @@
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
var intro_txt = '';
cur_frm.toggle_display('cost_center_name', doc.__islocal);
- cur_frm.toggle_enable(['group_or_ledger', 'company_name'], doc.__islocal);
+ cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal);
if(!doc.__islocal && doc.group_or_ledger=='Group') {
intro_txt += '<p><b>Note:</b> This Cost Center is a <i>Group</i>, \
@@ -36,16 +36,16 @@
//Account filtering for cost center
cur_frm.fields_dict['budget_details'].grid.get_field('account').get_query = function(doc) {
var mydoc = locals[this.doctype][this.docname];
- return 'SELECT DISTINCT `tabAccount`.`name`,`tabAccount`.debit_or_credit,`tabAccount`.group_or_ledger FROM `tabAccount` WHERE `tabAccount`.`company` = "' + doc.company_name + '" AND `tabAccount`.docstatus != 2 AND `tabAccount`.`is_pl_account` = "Yes" AND `tabAccount`.debit_or_credit = "Debit" AND `tabAccount`.`group_or_ledger` != "Group" AND `tabAccount`.`group_or_ledger` is not NULL AND `tabAccount`.`name` LIKE "%s" ORDER BY `tabAccount`.`name` LIMIT 50';
+ return 'SELECT DISTINCT `tabAccount`.`name`,`tabAccount`.debit_or_credit,`tabAccount`.group_or_ledger FROM `tabAccount` WHERE `tabAccount`.`company` = "' + doc.company + '" AND `tabAccount`.docstatus != 2 AND `tabAccount`.`is_pl_account` = "Yes" AND `tabAccount`.debit_or_credit = "Debit" AND `tabAccount`.`group_or_ledger` != "Group" AND `tabAccount`.`group_or_ledger` is not NULL AND `tabAccount`.`name` LIKE "%s" ORDER BY `tabAccount`.`name` LIMIT 50';
}
cur_frm.fields_dict['parent_cost_center'].get_query = function(doc){
- return 'SELECT DISTINCT `tabCost Center`.name FROM `tabCost Center` WHERE `tabCost Center`.group_or_ledger="Group" AND `tabCost Center`.docstatus != 2 AND `tabCost Center`.company_name="'+ doc.company_name+'" AND `tabCost Center`.company_name is not NULL AND `tabCost Center`.name LIKE "%s" ORDER BY `tabCost Center`.name LIMIT 50';
+ return 'SELECT DISTINCT `tabCost Center`.name FROM `tabCost Center` WHERE `tabCost Center`.group_or_ledger="Group" AND `tabCost Center`.docstatus != 2 AND `tabCost Center`.company="'+ doc.company+'" AND `tabCost Center`.company is not NULL AND `tabCost Center`.name LIKE "%s" ORDER BY `tabCost Center`.name LIMIT 50';
}
//parent cost center
cur_frm.cscript.parent_cost_center = function(doc,cdt,cdn){
- if(!doc.company_name){
+ if(!doc.company){
alert('Please enter company name first');
}
}
diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py
index 8be14c7..b2b4c90 100644
--- a/accounts/doctype/cost_center/cost_center.py
+++ b/accounts/doctype/cost_center/cost_center.py
@@ -28,16 +28,16 @@
def autoname(self):
company_abbr = webnotes.conn.sql("select abbr from tabCompany where name=%s",
- self.doc.company_name)[0][0]
+ self.doc.company)[0][0]
self.doc.name = self.doc.cost_center_name.strip() + ' - ' + company_abbr
def validate_mandatory(self):
if not self.doc.group_or_ledger:
msgprint("Please select Group or Ledger value", raise_exception=1)
- if self.doc.cost_center_name != self.doc.company_name and not self.doc.parent_cost_center:
+ if self.doc.cost_center_name != self.doc.company and not self.doc.parent_cost_center:
msgprint("Please enter parent cost center", raise_exception=1)
- elif self.doc.cost_center_name == self.doc.company_name and self.doc.parent_cost_center:
+ elif self.doc.cost_center_name == self.doc.company and self.doc.parent_cost_center:
msgprint(_("Root cannot have a parent cost center"), raise_exception=1)
def convert_group_to_ledger(self):
@@ -81,14 +81,14 @@
"""
Cost Center name must be unique
"""
- if (self.doc.fields.get("__islocal") or not self.doc.name) and webnotes.conn.sql("select name from `tabCost Center` where cost_center_name = %s and company_name=%s", (self.doc.cost_center_name, self.doc.company_name)):
+ if (self.doc.fields.get("__islocal") or not self.doc.name) and webnotes.conn.sql("select name from `tabCost Center` where cost_center_name = %s and company=%s", (self.doc.cost_center_name, self.doc.company)):
msgprint("Cost Center Name already exists, please rename", raise_exception=1)
self.validate_mandatory()
self.validate_budget_details()
def on_rename(self, new, old, merge=False):
- company_abbr = webnotes.conn.get_value("Company", self.doc.company_name, "abbr")
+ company_abbr = webnotes.conn.get_value("Company", self.doc.company, "abbr")
parts = new.split(" - ")
if parts[-1].lower() != company_abbr.lower():
diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt
index 7f5fe24..95c4f5a 100644
--- a/accounts/doctype/cost_center/cost_center.txt
+++ b/accounts/doctype/cost_center/cost_center.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-23 19:57:17",
"docstatus": 0,
- "modified": "2013-07-05 14:33:05",
+ "modified": "2013-07-09 14:43:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -81,7 +81,7 @@
},
{
"doctype": "DocField",
- "fieldname": "company_name",
+ "fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"oldfieldname": "company_name",
diff --git a/accounts/doctype/cost_center/test_cost_center.py b/accounts/doctype/cost_center/test_cost_center.py
index 8500bd3..94a87fe 100644
--- a/accounts/doctype/cost_center/test_cost_center.py
+++ b/accounts/doctype/cost_center/test_cost_center.py
@@ -3,7 +3,7 @@
"doctype": "Cost Center",
"cost_center_name": "_Test Cost Center",
"parent_cost_center": "_Test Company - _TC",
- "company_name": "_Test Company",
+ "company": "_Test Company",
"group_or_ledger": "Ledger"
}],
]
\ No newline at end of file
diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py
index d39155d..1d0ec8e 100644
--- a/accounts/doctype/gl_entry/gl_entry.py
+++ b/accounts/doctype/gl_entry/gl_entry.py
@@ -120,7 +120,7 @@
def _get_cost_center_company():
if not self.cost_center_company.get(self.doc.cost_center):
self.cost_center_company[self.doc.cost_center] = webnotes.conn.get_value("Cost Center",
- self.doc.cost_center, "company_name")
+ self.doc.cost_center, "company")
return self.cost_center_company[self.doc.cost_center]
diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js
index dbe6668..53c8764 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.js
+++ b/accounts/doctype/journal_voucher/journal_voucher.js
@@ -197,7 +197,7 @@
cur_frm.fields_dict["entries"].grid.get_field("cost_center").get_query = function(doc) {
return {
query: "accounts.utils.get_cost_center_list",
- filters: { company_name: doc.company}
+ filters: { company: doc.company}
}
}
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 9946bfb..750449b 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:39",
"docstatus": 0,
- "modified": "2013-07-01 13:53:33",
+ "modified": "2013-07-10 14:56:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "account",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Account",
"oldfieldname": "account",
"oldfieldtype": "Link",
@@ -40,29 +41,13 @@
"width": "250px"
},
{
- "doctype": "DocField",
- "fieldname": "debit",
- "fieldtype": "Currency",
- "label": "Debit",
- "oldfieldname": "debit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency"
- },
- {
- "doctype": "DocField",
- "fieldname": "credit",
- "fieldtype": "Currency",
- "label": "Credit",
- "oldfieldname": "credit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency"
- },
- {
"default": ":Company",
+ "description": "If Income or Expense",
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -73,8 +58,29 @@
},
{
"doctype": "DocField",
+ "fieldname": "debit",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Debit",
+ "oldfieldname": "debit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "credit",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Credit",
+ "oldfieldname": "credit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "balance",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Account Balance",
"no_copy": 1,
"oldfieldname": "balance",
@@ -87,6 +93,7 @@
"fieldname": "against_voucher",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Against Purchase Invoice",
"no_copy": 1,
"oldfieldname": "against_voucher",
diff --git a/accounts/doctype/mis_control/mis_control.txt b/accounts/doctype/mis_control/mis_control.txt
index 5d42bde..ed0bedb 100644
--- a/accounts/doctype/mis_control/mis_control.txt
+++ b/accounts/doctype/mis_control/mis_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:49",
"docstatus": 0,
- "modified": "2012-03-27 14:35:49",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Accounts",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 120
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
index 1908101..5259f74 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:39",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "voucher_no",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Voucher No",
"options": "Journal Voucher",
"print_width": "140px",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "amt_due",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Unmatched Amount",
"options": "Company:company:default_currency",
"read_only": 1
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "amt_to_be_reconciled",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated Amount",
"options": "Company:company:default_currency",
"reqd": 1
@@ -55,6 +58,7 @@
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Posting Date",
"read_only": 1
},
@@ -62,6 +66,7 @@
"doctype": "DocField",
"fieldname": "total_amt",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Total Amount",
"options": "Company:company:default_currency",
"read_only": 1
@@ -70,6 +75,7 @@
"doctype": "DocField",
"fieldname": "against_account",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Against Account",
"read_only": 1
},
diff --git a/accounts/doctype/pos_setting/pos_setting.js b/accounts/doctype/pos_setting/pos_setting.js
index 3ba60b4..1648bad 100755
--- a/accounts/doctype/pos_setting/pos_setting.js
+++ b/accounts/doctype/pos_setting/pos_setting.js
@@ -38,7 +38,7 @@
// Cost Center
// -----------------------------
cur_frm.fields_dict['cost_center'].get_query = function(doc,cdt,cdn) {
- return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company_name` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
+ return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
}
//get query select Territory
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js
index e57eb80..512e036 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -191,7 +191,7 @@
cur_frm.fields_dict["entries"].grid.get_field("cost_center").get_query = function(doc) {
return {
query: "accounts.utils.get_cost_center_list",
- filters: { company_name: doc.company}
+ filters: { company: doc.company}
}
}
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 779b056..64b9f5c 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-07-08 18:03:17",
+ "modified": "2013-07-09 12:51:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -172,7 +172,7 @@
"fieldname": "bill_no",
"fieldtype": "Data",
"in_filter": 1,
- "label": "Bill No",
+ "label": "Supplier Invoice No",
"oldfieldname": "bill_no",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -185,7 +185,7 @@
"fieldname": "bill_date",
"fieldtype": "Date",
"in_filter": 1,
- "label": "Bill Date",
+ "label": "Supplier Invoice Date",
"oldfieldname": "bill_date",
"oldfieldtype": "Date",
"print_hide": 1,
@@ -195,37 +195,34 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "entries",
- "fieldtype": "Table",
- "label": "Entries",
- "oldfieldname": "entries",
- "oldfieldtype": "Table",
- "options": "Purchase Invoice Item",
- "read_only": 0
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Purchase Invoice",
+ "print_hide": 1,
+ "read_only": 1
},
{
"doctype": "DocField",
- "fieldname": "recalculate",
- "fieldtype": "Button",
- "label": "Recalculate",
- "oldfieldtype": "Button",
- "read_only": 0
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "read_only": 0,
+ "search_index": 1
},
{
"doctype": "DocField",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
- "label": "Currency & Price List",
+ "label": "Currency and Price List",
"options": "icon-tag",
"read_only": 0
},
@@ -288,6 +285,59 @@
"read_only": 0
},
{
+ "doctype": "DocField",
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "read_only": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "entries",
+ "fieldtype": "Table",
+ "label": "Entries",
+ "oldfieldname": "entries",
+ "oldfieldtype": "Table",
+ "options": "Purchase Invoice Item",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_26",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total_import",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "Will be calculated automatically when you enter the details",
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
"description": "Add / Edit Taxes and Charges",
"doctype": "DocField",
"fieldname": "taxes",
@@ -310,16 +360,6 @@
},
{
"doctype": "DocField",
- "fieldname": "get_tax_detail",
- "fieldtype": "Button",
- "label": "Get Tax Detail",
- "oldfieldtype": "Button",
- "options": "get_purchase_tax_details",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "purchase_tax_details",
"fieldtype": "Table",
"label": "Purchase Taxes and Charges",
@@ -330,15 +370,6 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_tax",
- "fieldtype": "Button",
- "label": "Calculate Tax",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "tax_calculation",
"fieldtype": "HTML",
"label": "Tax Calculation",
@@ -348,50 +379,6 @@
},
{
"doctype": "DocField",
- "fieldname": "total_tax",
- "fieldtype": "Currency",
- "label": "Total Tax",
- "oldfieldname": "total_tax",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "depends_on": "supplier",
- "doctype": "DocField",
- "fieldname": "contact_section",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "options": "icon-bullhorn",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "label": "Supplier Address",
- "options": "Address",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break23",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "label": "Contact Person",
- "options": "Contact",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
@@ -401,20 +388,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total_import",
- "fieldtype": "Currency",
- "label": "Net Total (Import)",
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added (Import)",
+ "label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -425,7 +401,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Import)",
+ "label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -437,7 +413,7 @@
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"in_list_view": 1,
- "label": "Grand Total (Import)",
+ "label": "Grand Total",
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -448,7 +424,7 @@
"doctype": "DocField",
"fieldname": "in_words_import",
"fieldtype": "Data",
- "label": "In Words (Import)",
+ "label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -504,12 +480,11 @@
"width": "50%"
},
{
- "description": "Will be calculated automatically when you enter the details",
"doctype": "DocField",
- "fieldname": "net_total",
+ "fieldname": "total_tax",
"fieldtype": "Currency",
- "label": "Net Total",
- "oldfieldname": "net_total",
+ "label": "Total Tax (Company Currency)",
+ "oldfieldname": "total_tax",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1,
@@ -519,7 +494,7 @@
"doctype": "DocField",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added",
+ "label": "Taxes and Charges Added (Company Currency)",
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -530,7 +505,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
+ "label": "Taxes and Charges Deducted (Company Currency)",
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -541,7 +516,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -553,7 +528,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -658,6 +633,39 @@
"label": "Terms and Conditions1"
},
{
+ "depends_on": "supplier",
+ "doctype": "DocField",
+ "fieldname": "contact_section",
+ "fieldtype": "Section Break",
+ "label": "Contact Info",
+ "options": "icon-bullhorn",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "label": "Supplier Address",
+ "options": "Address",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break23",
+ "fieldtype": "Column Break",
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "label": "Contact Person",
+ "options": "Contact",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -695,18 +703,6 @@
"search_index": 0
},
{
- "doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Purchase Invoice",
- "print_hide": 1,
- "read_only": 1
- },
- {
"allow_on_submit": 1,
"doctype": "DocField",
"fieldname": "select_print_heading",
@@ -751,19 +747,6 @@
},
{
"doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "read_only": 0,
- "search_index": 1
- },
- {
- "doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
index 6b31684..49aa688 100644
--- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-08 15:36:46",
"docstatus": 0,
- "modified": "2013-03-20 16:52:12",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "journal_voucher",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Journal Voucher",
"oldfieldname": "journal_voucher",
"oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"fieldname": "jv_detail_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Journal Voucher Detail No",
"oldfieldname": "jv_detail_no",
"oldfieldtype": "Date",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "advance_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Advance Amount",
"oldfieldname": "advance_amount",
"oldfieldtype": "Currency",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated Amount",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Remarks",
"oldfieldname": "remarks",
"oldfieldtype": "Small Text",
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 8df4306..d7fb8e5 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-04-19 11:00:07",
+ "creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-05-22 12:01:56",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -55,6 +57,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -64,8 +67,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -77,6 +88,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"options": "UOM",
"print_hide": 1,
@@ -86,7 +98,8 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate ",
+ "in_list_view": 0,
+ "label": "Price List Rate",
"options": "currency",
"print_hide": 1,
"read_only": 0
@@ -95,6 +108,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -103,6 +117,7 @@
"doctype": "DocField",
"fieldname": "import_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -115,6 +130,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -126,7 +142,8 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 0
@@ -135,7 +152,8 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Currency",
- "label": "Rate*",
+ "in_list_view": 0,
+ "label": "Rate (Company Currency)",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -147,7 +165,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -157,8 +176,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "accounting",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Accounting"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "expense_head",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Expense Head",
"oldfieldname": "expense_head",
"oldfieldtype": "Link",
@@ -174,6 +201,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -185,9 +213,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -198,6 +234,7 @@
"fieldname": "brand",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Data",
@@ -210,6 +247,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -223,7 +261,8 @@
"fieldname": "purchase_order",
"fieldtype": "Link",
"in_filter": 1,
- "label": "Pur Order",
+ "in_list_view": 0,
+ "label": "Purchase Order",
"no_copy": 1,
"oldfieldname": "purchase_order",
"oldfieldtype": "Link",
@@ -238,6 +277,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Purchase Order Item",
"no_copy": 1,
"oldfieldname": "po_detail",
@@ -251,7 +291,8 @@
"fieldname": "purchase_receipt",
"fieldtype": "Link",
"in_filter": 1,
- "label": "Pur Receipt",
+ "in_list_view": 0,
+ "label": "Purchase Receipt",
"no_copy": 1,
"oldfieldname": "purchase_receipt",
"oldfieldtype": "Link",
@@ -266,6 +307,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "PR Detail",
"no_copy": 1,
"oldfieldname": "pr_detail",
@@ -280,6 +322,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -292,6 +335,7 @@
"fieldname": "item_tax_amount",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Amount",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -306,6 +350,7 @@
"fieldname": "valuation_rate",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Valuation Rate",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -316,6 +361,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Conversion Factor",
"print_hide": 1,
"read_only": 0
@@ -325,6 +371,7 @@
"fieldname": "rm_supp_cost",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Raw Materials Supplied Cost",
"no_copy": 1,
"options": "Company:company:default_currency",
@@ -336,6 +383,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"print_hide": 1,
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
index d6d2a92..5ea7fc0 100644
--- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:04",
"docstatus": 0,
- "modified": "2013-05-28 12:02:02",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"doctype": "DocField",
"fieldname": "category",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Consider Tax or Charge for",
"oldfieldname": "category",
"oldfieldtype": "Select",
@@ -42,6 +43,7 @@
"doctype": "DocField",
"fieldname": "charge_type",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Type",
"oldfieldname": "charge_type",
"oldfieldtype": "Select",
@@ -53,6 +55,7 @@
"doctype": "DocField",
"fieldname": "account_head",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Account Head",
"oldfieldname": "account_head",
"oldfieldtype": "Link",
@@ -65,6 +68,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -75,6 +79,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -87,6 +92,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
index f04f895..a147ac1 100644
--- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
+++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
@@ -135,7 +135,7 @@
cur_frm.fields_dict['purchase_tax_details'].grid.get_field("cost_center").get_query = function(doc) {
- return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company_name` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
+ return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
}
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 0d2bf66..c7d7d25 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -263,7 +263,7 @@
// Write off cost center
//-----------------------
cur_frm.fields_dict.write_off_cost_center.get_query = function(doc) {
- return 'SELECT `tabCost Center`.name FROM `tabCost Center` WHERE `tabCost Center`.group_or_ledger="Ledger" AND `tabCost Center`.docstatus!=2 AND `tabCost Center`.company_name="'+doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s"'
+ return 'SELECT `tabCost Center`.name FROM `tabCost Center` WHERE `tabCost Center`.group_or_ledger="Ledger" AND `tabCost Center`.docstatus!=2 AND `tabCost Center`.company="'+doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s"'
}
//project name
@@ -315,7 +315,7 @@
cur_frm.fields_dict["entries"].grid.get_field("cost_center").get_query = function(doc) {
return {
query: "accounts.utils.get_cost_center_list",
- filters: { company_name: doc.company}
+ filters: { company: doc.company}
}
}
diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py
index 35f9002..e0147b1 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/accounts/doctype/sales_invoice/sales_invoice.py
@@ -150,7 +150,7 @@
self.make_cancel_gl_entries()
def update_status_updater_args(self):
- if cint(self.doc.is_pos) and cint(self.doc.update_stock):
+ if cint(self.doc.update_stock):
self.status_updater.append({
'source_dt':'Sales Invoice Item',
'target_dt':'Sales Order Item',
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index c935789..e3c60a0 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-07-09 11:18:43",
+ "modified": "2013-07-09 12:48:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -223,7 +223,7 @@
"doctype": "DocField",
"fieldname": "currency_section",
"fieldtype": "Section Break",
- "label": "Price List and Currency",
+ "label": "Currency and Price List",
"options": "icon-tag",
"read_only": 0
},
@@ -352,18 +352,28 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_30",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total_export",
"fieldtype": "Currency",
- "label": "Net Total (Export)",
+ "label": "Net Total",
"options": "currency",
"print_hide": 0,
"read_only": 1
},
{
"doctype": "DocField",
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total",
"fieldtype": "Currency",
- "label": "Net Total*",
+ "label": "Net Total (Company Currency)",
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -373,15 +383,6 @@
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes and Charges",
@@ -449,19 +450,8 @@
"doctype": "DocField",
"fieldname": "other_charges_total_export",
"fieldtype": "Currency",
- "label": "Total Taxes and Charges (Export)",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "other_charges_total",
- "fieldtype": "Currency",
"label": "Total Taxes and Charges",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "options": "currency",
"print_hide": 1,
"read_only": 1
},
@@ -472,12 +462,14 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_total",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"print_hide": 1,
- "read_only": 0
+ "read_only": 1
},
{
"doctype": "DocField",
@@ -494,7 +486,7 @@
"fieldname": "grand_total_export",
"fieldtype": "Currency",
"in_list_view": 1,
- "label": "Grand Total (Export)",
+ "label": "Grand Total",
"oldfieldname": "grand_total_export",
"oldfieldtype": "Currency",
"options": "currency",
@@ -506,7 +498,7 @@
"doctype": "DocField",
"fieldname": "rounded_total_export",
"fieldtype": "Currency",
- "label": "Rounded Total (Export)",
+ "label": "Rounded Total",
"oldfieldname": "rounded_total_export",
"oldfieldtype": "Currency",
"options": "currency",
@@ -517,7 +509,7 @@
"doctype": "DocField",
"fieldname": "in_words_export",
"fieldtype": "Data",
- "label": "In Words (Export)",
+ "label": "In Words",
"oldfieldname": "in_words_export",
"oldfieldtype": "Data",
"print_hide": 0,
@@ -558,7 +550,7 @@
"fieldname": "grand_total",
"fieldtype": "Currency",
"in_filter": 1,
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -571,7 +563,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -583,7 +575,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index 32ef4c5..b82f4ac 100644
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:41",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "journal_voucher",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Journal Voucher",
"oldfieldname": "journal_voucher",
"oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"fieldname": "jv_detail_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Journal Voucher Detail No",
"oldfieldname": "jv_detail_no",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "advance_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Advance amount",
"oldfieldname": "advance_amount",
"oldfieldtype": "Currency",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Allocated amount",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Remarks",
"oldfieldname": "remarks",
"oldfieldtype": "Small Text",
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 1a9cd48..03b9f8b 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-06-26 14:34:00",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "barcode",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Barcode",
"print_hide": 1,
"read_only": 0
@@ -38,6 +39,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -52,6 +54,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -61,6 +64,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -73,6 +77,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -83,9 +88,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
- "label": "Qty",
+ "in_list_view": 1,
+ "label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"read_only": 0,
@@ -95,6 +108,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"read_only": 1
},
@@ -102,6 +116,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -114,6 +129,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -124,6 +140,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Basic Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -135,6 +152,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -146,7 +164,8 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
- "label": "Price List Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -158,7 +177,8 @@
"fieldname": "basic_rate",
"fieldtype": "Currency",
"in_filter": 0,
- "label": "Basic Rate*",
+ "in_list_view": 0,
+ "label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -171,7 +191,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -181,21 +202,17 @@
},
{
"doctype": "DocField",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 1,
- "read_only": 0
+ "fieldname": "accounting",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Accounting"
},
{
"doctype": "DocField",
"fieldname": "income_account",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Income Account",
"oldfieldname": "income_account",
"oldfieldtype": "Link",
@@ -212,6 +229,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Expense Account",
"options": "Account",
"print_hide": 1,
@@ -224,6 +242,7 @@
"fieldname": "cost_center",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
@@ -236,9 +255,30 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text",
@@ -320,7 +360,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
- "label": "SO Detail ",
+ "label": "Sales Order Item",
"no_copy": 1,
"oldfieldname": "so_detail",
"oldfieldtype": "Data",
@@ -348,7 +388,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
- "label": "DN Detail",
+ "label": "Delivery Note Item",
"no_copy": 1,
"oldfieldname": "dn_detail",
"oldfieldtype": "Data",
@@ -377,18 +417,6 @@
},
{
"doctype": "DocField",
- "fieldname": "clear_pending",
- "fieldtype": "Check",
- "hidden": 1,
- "label": "Clear Pending",
- "no_copy": 1,
- "oldfieldname": "clear_pending",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "buying_amount",
"fieldtype": "Currency",
"hidden": 1,
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
index ba9f907..fbba643 100644
--- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-24 11:39:32",
"docstatus": 0,
- "modified": "2013-05-28 11:59:02",
+ "modified": "2013-07-10 14:54:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"doctype": "DocField",
"fieldname": "charge_type",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Type",
"oldfieldname": "charge_type",
"oldfieldtype": "Select",
@@ -40,6 +41,7 @@
"doctype": "DocField",
"fieldname": "account_head",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Account Head",
"oldfieldname": "account_head",
"oldfieldtype": "Link",
@@ -52,6 +54,7 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Cost Center",
"oldfieldname": "cost_center_other_charges",
"oldfieldtype": "Link",
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -72,6 +76,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
@@ -81,6 +86,7 @@
"doctype": "DocField",
"fieldname": "tax_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "tax_amount",
"oldfieldtype": "Currency",
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
index 5787427..9f4cb08 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
+++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
@@ -141,7 +141,7 @@
}
cur_frm.fields_dict['other_charges'].grid.get_field("cost_center").get_query = function(doc) {
- return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company_name` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
+ return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.`docstatus`!= 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50';
}
diff --git a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
index 2fe43db..3784ecb 100644
--- a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
+++ b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 11:54:50",
"docstatus": 0,
- "modified": "2013-06-25 11:58:04",
+ "modified": "2013-07-10 14:54:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Shipping Rule Condition",
"parentfield": "fields",
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js
index 0b69fb9..904b4cd 100644
--- a/accounts/page/accounts_browser/accounts_browser.js
+++ b/accounts/page/accounts_browser/accounts_browser.js
@@ -310,7 +310,7 @@
var node = me.selected_node();
v.parent_cost_center = node.data('label');
- v.company_name = me.company;
+ v.company = me.company;
wn.call({
args: v,
diff --git a/accounts/page/accounts_browser/accounts_browser.py b/accounts/page/accounts_browser/accounts_browser.py
index febe22d..4c4162d 100644
--- a/accounts/page/accounts_browser/accounts_browser.py
+++ b/accounts/page/accounts_browser/accounts_browser.py
@@ -28,16 +28,14 @@
args = webnotes.form_dict
ctype, company = args['ctype'], args['comp']
- company_field = ctype=='Account' and 'company' or 'company_name'
-
# root
if args['parent'] in ("Accounts", "Cost Centers"):
acc = webnotes.conn.sql(""" select
name as value, if(group_or_ledger='Group', 1, 0) as expandable
from `tab%s`
where ifnull(parent_%s,'') = ''
- and %s = %s and docstatus<2
- order by name""" % (ctype, ctype.lower().replace(' ','_'), company_field, '%s'),
+ and `company` = %s and docstatus<2
+ order by name""" % (ctype, ctype.lower().replace(' ','_'), '%s'),
company, as_dict=1)
else:
# other
diff --git a/accounts/report/budget_variance_report/budget_variance_report.py b/accounts/report/budget_variance_report/budget_variance_report.py
index 42bc663..835475f 100644
--- a/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/accounts/report/budget_variance_report/budget_variance_report.py
@@ -79,7 +79,7 @@
cc.parent_cost_center, bd.account, bd.budget_allocated
from `tabCost Center` cc, `tabBudget Detail` bd
where bd.parent=cc.name and bd.fiscal_year=%s and
- cc.company_name=%s and ifnull(cc.distribution_id, '')!=''
+ cc.company=%s and ifnull(cc.distribution_id, '')!=''
order by cc.name""" % ('%s', '%s'),
(filters.get("fiscal_year"), filters.get("company")), as_dict=1)
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 284c238..8f8893f 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -221,6 +221,21 @@
}
},
+ purchase_other_charges: function() {
+ var me = this;
+ if(this.frm.doc.purchase_other_charges) {
+ this.frm.call({
+ doc: this.frm.doc,
+ method: "get_purchase_tax_details",
+ callback: function(r) {
+ if(!r.exc) {
+ me.calculate_taxes_and_totals();
+ }
+ }
+ });
+ }
+ },
+
calculate_taxes_and_totals: function() {
this._super();
this.calculate_total_advance("Purchase Invoice", "advance_allocation_details");
diff --git a/buying/doctype/purchase_common/purchase_common.txt b/buying/doctype/purchase_common/purchase_common.txt
index 15ef574..40f5756 100644
--- a/buying/doctype/purchase_common/purchase_common.txt
+++ b/buying/doctype/purchase_common/purchase_common.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:35:51",
"docstatus": 0,
- "modified": "2012-03-27 14:35:51",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Buying",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 187
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index f9e8375..1699c56 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-07-08 17:49:29",
+ "modified": "2013-07-09 12:50:00",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -139,55 +139,37 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart"
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1,
+ "report_hide": 0
},
{
- "allow_on_submit": 1,
+ "description": "Select the relevant company name if you have multiple companies",
"doctype": "DocField",
- "fieldname": "po_details",
- "fieldtype": "Table",
- "label": "Purchase Order Items",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
"no_copy": 0,
- "oldfieldname": "po_details",
- "oldfieldtype": "Table",
- "options": "Purchase Order Item"
- },
- {
- "doctype": "DocField",
- "fieldname": "sb_last_purchase",
- "fieldtype": "Section Break"
- },
- {
- "doctype": "DocField",
- "fieldname": "get_last_purchase_rate",
- "fieldtype": "Button",
- "label": "Get Last Purchase Rate",
- "oldfieldtype": "Button",
- "print_hide": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "print_width": "50%",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button"
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
},
{
"doctype": "DocField",
"fieldname": "price_list_and_currency",
"fieldtype": "Section Break",
- "label": "Currency & Price List",
+ "label": "Currency and Price List",
"options": "icon-tag"
},
{
@@ -255,6 +237,68 @@
},
{
"doctype": "DocField",
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart"
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "po_details",
+ "fieldtype": "Table",
+ "label": "Purchase Order Items",
+ "no_copy": 0,
+ "oldfieldname": "po_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Order Item"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sb_last_purchase",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total_import",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "no_copy": 0,
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "get_last_purchase_rate",
+ "fieldtype": "Button",
+ "label": "Get Last Purchase Rate",
+ "oldfieldtype": "Button",
+ "print_hide": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -276,15 +320,6 @@
},
{
"doctype": "DocField",
- "fieldname": "get_tax_detail",
- "fieldtype": "Button",
- "label": "Get Tax Detail",
- "oldfieldtype": "Button",
- "options": "get_purchase_tax_details",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "purchase_tax_details",
"fieldtype": "Table",
"label": "Purchase Taxes and Charges",
@@ -295,14 +330,6 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_tax",
- "fieldtype": "Button",
- "label": "Calculate Tax",
- "oldfieldtype": "Button",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "tax_calculation",
"fieldtype": "HTML",
"label": "Tax Calculation",
@@ -320,21 +347,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total_import",
- "fieldtype": "Currency",
- "label": "Net Total (Import)",
- "no_copy": 0,
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added (Import)",
+ "label": "Taxes and Charges Added",
"no_copy": 0,
"oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency",
@@ -347,7 +362,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Import)",
+ "label": "Taxes and Charges Deducted",
"no_copy": 0,
"oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency",
@@ -361,7 +376,7 @@
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"in_list_view": 1,
- "label": "Grand Total (Import)",
+ "label": "Grand Total",
"no_copy": 0,
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
@@ -374,7 +389,7 @@
"doctype": "DocField",
"fieldname": "in_words_import",
"fieldtype": "Data",
- "label": "In Words(Import)",
+ "label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -389,22 +404,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total*",
- "no_copy": 1,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added",
+ "label": "Taxes and Charges Added (Company Currency)",
"no_copy": 0,
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
@@ -416,7 +418,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
+ "label": "Taxes and Charges Deducted (Company Currency)",
"no_copy": 0,
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
@@ -428,7 +430,7 @@
"doctype": "DocField",
"fieldname": "total_tax",
"fieldtype": "Currency",
- "label": "Total Tax*",
+ "label": "Total Tax (Company Currency)",
"no_copy": 1,
"oldfieldname": "total_tax",
"oldfieldtype": "Currency",
@@ -440,7 +442,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"no_copy": 1,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
@@ -452,7 +454,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -464,7 +466,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -583,34 +585,6 @@
},
{
"doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1,
- "report_hide": 0
- },
- {
- "description": "Select the relevant company name if you have multiple companies",
- "doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index d73f115..c7233d0 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
- "modified": "2013-07-09 11:37:24",
+ "modified": "2013-07-10 14:54:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldtype": "Date",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Reqd By Date",
"no_copy": 0,
"oldfieldname": "schedule_date",
@@ -60,6 +62,7 @@
"fieldname": "supplier_part_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Supplier Part Number",
"print_hide": 1,
"read_only": 1
@@ -70,6 +73,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -80,8 +84,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -95,6 +107,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -107,6 +120,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -121,6 +135,7 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"options": "currency",
"print_hide": 1,
@@ -130,6 +145,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -139,6 +155,7 @@
"fieldname": "import_rate",
"fieldtype": "Currency",
"hidden": 0,
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -150,6 +167,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -160,7 +178,8 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 0
@@ -170,7 +189,8 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
- "label": "Rate*",
+ "in_list_view": 0,
+ "label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -185,7 +205,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -195,9 +216,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -211,6 +240,7 @@
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -222,6 +252,7 @@
"fieldname": "conversion_factor",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 0,
"label": "UOM Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Currency",
@@ -236,6 +267,7 @@
"fieldname": "stock_uom",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -250,6 +282,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Prevdoc DocType",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -263,6 +296,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -280,6 +314,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Date",
"no_copy": 1,
"oldfieldname": "prevdoc_date",
@@ -294,6 +329,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -308,6 +344,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Supplier Quotation",
"no_copy": 1,
"options": "Supplier Quotation",
@@ -319,6 +356,7 @@
"fieldname": "supplier_quotation_item",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 1,
"label": "Supplier Quotation Item",
"no_copy": 1,
"options": "Supplier Quotation Item",
@@ -329,6 +367,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 1,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -342,6 +381,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -355,6 +395,7 @@
"fieldname": "stock_qty",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Stock Qty",
"no_copy": 1,
"oldfieldname": "stock_qty",
@@ -369,6 +410,7 @@
"fieldname": "received_qty",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Received Qty",
"no_copy": 1,
"oldfieldname": "received_qty",
@@ -380,6 +422,7 @@
"doctype": "DocField",
"fieldname": "billed_amt",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Billed Amt",
"no_copy": 1,
"options": "currency",
@@ -392,6 +435,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 1,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -405,6 +449,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 1,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
index d08963b..1d91aa3 100644
--- a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
+++ b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:42",
"docstatus": 0,
- "modified": "2013-03-07 07:03:28",
+ "modified": "2013-07-10 14:54:15",
"modified_by": "Administrator",
"owner": "dhanalekshmi@webnotestech.com"
},
@@ -31,6 +31,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reference Name",
"oldfieldname": "reference_name",
"oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_detail_no",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "BOM Detail No",
"oldfieldname": "bom_detail_no",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "main_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "main_item_code",
"oldfieldtype": "Data",
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rm_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Raw Material Item Code",
"oldfieldname": "rm_item_code",
"oldfieldtype": "Data",
@@ -68,6 +72,7 @@
"doctype": "DocField",
"fieldname": "required_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Required Qty",
"oldfieldname": "required_qty",
"oldfieldtype": "Currency",
@@ -77,6 +82,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency",
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
index 4c0ce0d..0ee20a5 100644
--- a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
+++ b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:42",
"docstatus": 0,
- "modified": "2013-03-07 07:03:28",
+ "modified": "2013-07-10 14:54:17",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -31,6 +31,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reference Name",
"oldfieldname": "reference_name",
"oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_detail_no",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "BOM Detail No",
"oldfieldname": "bom_detail_no",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "main_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "main_item_code",
"oldfieldtype": "Data",
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rm_item_code",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Raw Material Item Code",
"oldfieldname": "rm_item_code",
"oldfieldtype": "Data"
@@ -67,6 +71,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -78,6 +83,7 @@
"doctype": "DocField",
"fieldname": "required_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Required Qty",
"oldfieldname": "required_qty",
"oldfieldtype": "Currency",
diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
index 066185e..0c68cc7 100644
--- a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
+++ b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:43",
"docstatus": 0,
- "modified": "2013-03-07 07:03:29",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "specification",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Parameter",
"oldfieldname": "specification",
"oldfieldtype": "Data",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "value",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Acceptance Criteria",
"oldfieldname": "value",
"oldfieldtype": "Data"
@@ -46,6 +48,7 @@
"doctype": "DocField",
"fieldname": "reading_1",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 1",
"oldfieldname": "reading_1",
"oldfieldtype": "Data"
@@ -54,6 +57,7 @@
"doctype": "DocField",
"fieldname": "reading_2",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 2",
"oldfieldname": "reading_2",
"oldfieldtype": "Data"
@@ -62,6 +66,7 @@
"doctype": "DocField",
"fieldname": "reading_3",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 3",
"oldfieldname": "reading_3",
"oldfieldtype": "Data"
@@ -70,6 +75,7 @@
"doctype": "DocField",
"fieldname": "reading_4",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading 4",
"oldfieldname": "reading_4",
"oldfieldtype": "Data"
diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py
index d63d336..d1552f94 100644
--- a/buying/doctype/supplier/supplier.py
+++ b/buying/doctype/supplier/supplier.py
@@ -196,7 +196,7 @@
@webnotes.whitelist()
def get_dashboard_info(supplier):
- if not webnotes.has_permission("Supplier", supplier):
+ if not webnotes.has_permission("Supplier", "read", supplier):
webnotes.msgprint("No Permission", raise_exception=True)
out = {}
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index 0984ac7..3cb5046 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
- "modified": "2013-07-08 15:14:48",
+ "modified": "2013-07-09 12:49:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -139,40 +139,37 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart"
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1,
+ "report_hide": 0
},
{
- "allow_on_submit": 1,
+ "description": "Select the relevant company name if you have multiple companies",
"doctype": "DocField",
- "fieldname": "quotation_items",
- "fieldtype": "Table",
- "label": "Quotation Items",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
"no_copy": 0,
- "oldfieldname": "po_details",
- "oldfieldtype": "Table",
- "options": "Supplier Quotation Item"
- },
- {
- "doctype": "DocField",
- "fieldname": "section_break0",
- "fieldtype": "Section Break"
- },
- {
- "doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button"
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
},
{
"doctype": "DocField",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
- "label": "Currency & Price List",
+ "label": "Currency and Price List",
"options": "icon-tag"
},
{
@@ -237,6 +234,60 @@
},
{
"doctype": "DocField",
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart"
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "quotation_items",
+ "fieldtype": "Table",
+ "label": "Quotation Items",
+ "no_copy": 0,
+ "oldfieldname": "po_details",
+ "oldfieldtype": "Table",
+ "options": "Supplier Quotation Item"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total_import",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "no_copy": 0,
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break_24",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "no_copy": 1,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -257,15 +308,6 @@
},
{
"doctype": "DocField",
- "fieldname": "get_tax_detail",
- "fieldtype": "Button",
- "label": "Get Tax Detail",
- "oldfieldtype": "Button",
- "options": "get_purchase_tax_details",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "purchase_tax_details",
"fieldtype": "Table",
"label": "Purchase Taxes and Charges",
@@ -276,14 +318,6 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_tax",
- "fieldtype": "Button",
- "label": "Calculate Tax",
- "oldfieldtype": "Button",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "tax_calculation",
"fieldtype": "HTML",
"label": "Tax Calculation",
@@ -301,21 +335,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total_import",
- "fieldtype": "Currency",
- "label": "Net Total (Import)",
- "no_copy": 0,
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added (Import)",
+ "label": "Taxes and Charges Added",
"no_copy": 0,
"oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency",
@@ -328,7 +350,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Import)",
+ "label": "Taxes and Charges Deducted",
"no_copy": 0,
"oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency",
@@ -342,7 +364,7 @@
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"in_list_view": 1,
- "label": "Grand Total (Import)",
+ "label": "Grand Total",
"no_copy": 0,
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
@@ -355,7 +377,7 @@
"doctype": "DocField",
"fieldname": "in_words_import",
"fieldtype": "Data",
- "label": "In Words(Import)",
+ "label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -370,22 +392,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total*",
- "no_copy": 1,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added",
+ "label": "Taxes and Charges Added (Company Currency)",
"no_copy": 0,
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
@@ -397,7 +406,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
+ "label": "Taxes and Charges Deducted (Company Currency)",
"no_copy": 0,
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
@@ -409,7 +418,7 @@
"doctype": "DocField",
"fieldname": "total_tax",
"fieldtype": "Currency",
- "label": "Total Tax*",
+ "label": "Total Tax (Company Currency)",
"no_copy": 1,
"oldfieldname": "total_tax",
"oldfieldtype": "Currency",
@@ -421,7 +430,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"no_copy": 1,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
@@ -433,7 +442,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -445,7 +454,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -555,38 +564,10 @@
},
{
"doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1,
- "report_hide": 0
- },
- {
- "doctype": "DocField",
"fieldname": "column_break_57",
"fieldtype": "Column Break"
},
{
- "description": "Select the relevant company name if you have multiple companies",
- "doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 6b24d2f..3ac6200 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-03-07 11:42:56",
+ "creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-05-22 12:02:28",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "supplier_part_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Supplier Part Number",
"print_hide": 1,
"read_only": 1
@@ -55,6 +57,7 @@
"fieldtype": "Data",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -67,6 +70,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -76,10 +80,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -92,6 +104,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -106,7 +119,8 @@
"doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate ",
+ "in_list_view": 0,
+ "label": "Price List Rate",
"options": "currency",
"print_hide": 1,
"read_only": 0
@@ -115,6 +129,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 0,
"read_only": 0
@@ -124,6 +139,7 @@
"fieldname": "import_rate",
"fieldtype": "Currency",
"hidden": 0,
+ "in_list_view": 1,
"label": "Rate ",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -135,6 +151,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -145,7 +162,8 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 0
@@ -155,7 +173,8 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
- "label": "Rate*",
+ "in_list_view": 0,
+ "label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -170,7 +189,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -180,9 +200,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -196,6 +224,7 @@
"fieldname": "project_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Project Name",
"options": "Project",
"print_hide": 1,
@@ -207,6 +236,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Prevdoc DocType",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -220,6 +250,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -237,6 +268,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Date",
"no_copy": 1,
"oldfieldname": "prevdoc_date",
@@ -251,6 +283,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Material Request Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -264,6 +297,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -277,6 +311,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -291,6 +326,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -304,6 +340,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 910c1b1..0d4165b 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,292 +1,3 @@
-erpnext.updates = [
- ["17th May", ["Patch: Set Conversion Factor for purchase invoice item in all old records. And repost JV to book Stock Received But Not Billed account, if Auto Inventory Integration enabed."
- ]],
- ["2nd May", ["Buying: Warehouse must belong to same company as transaction",
- "Price List: Added Currency Field. One price list can have only one currency",
- "Item: Naming can now be by series or item code",
- "Naming Series: Set number of digits in series (optionally)",
- "Login: Disable Signup link in the login page"]],
- ["30th April", ["Price List: Valid for all countries or only valid for specific countries"]],
- ["18th April", ["Cost Center: Set a default Cost Center for a Company"]],
- ["12th April", ["Employee: List of Leave Approvers who can approve the Employee's Leave Applications"]],
- ["10th April", ["Redesigned File Uploads and added File Manager in Setup"]],
- ["3rd April", ["Update Manager: Open source users can update their ERPNext instance from Setup > Update Manager"]],
- ["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
- ["26th March", ["Added project to Stock Ledger and Balance",
- "Added Default Cash Account in Company."]],
- ["19th March", ["Sales and Purchase Return Tool deprecated. Use Stock Entry instead."]],
- ["12th March", ["Updates to website module. Added more options in Style Settings and Website Settings."]],
- ["5th March", ["Refactored Upload Attendance Tool"]],
- ["4th March", ["Lead organization added in Quotation classic/spartan/modern print format"]],
- ["1st March", [
- "Time Log, Time Log Batch: Created feature to batch Time Logs so that they can be tracked for billing.",
- "Sub-contracting code refactored for PO",
- ]],
- ["28th February", [
- "Datatype validation in Voucher Import Tool",
- "Fixes for conversion factor in old invoices",
- "Fixed asynchronus issue in purchase cycle"
- ]],
- ["27th February", [
- "Time Log: Created Time Log System, with Calendar View."
- ]],
- ["26th February", [
- "Gross Profit: The report has been rewritten and now it is under Accounts module"
- ]],
- ["25th February", [
- "Employee Leave Balance: New Report",
- "Scripted Reports: Ability to create reports via Script",
- ]],
- ["21st February, 2013", [
- "Item: Warehouse-wise Re-order Level and Quantity",
- "Buying: Purchase Request renamed to Material Request",
- "Website: Dynamic (mobile friendly) layouts using Bootstrap Responsive layouts"
- ]],
- ["20th February, 2013", [
- "Disable Rounded Total: If disable in 'Global Defaults', Rounding related fields \
- in sales cycle transactions and in corresponding print formats will not be visible"
- ]],
- ["15th February, 2013", [
- "Calendar: Added new FullCalendar, and Calendar Views",
- "Leave Application: Added email notifications on Leave Application",
- ]],
- ["13th February, 2013", [
- "Employee: If Employee is linked to a Profile, copy Full Name, Date of Birth, \
- Image and Gender to Profile",
- "Leave Application: Select Leave Approver by their Full Name",
- "Fixes in C-Form",
- ]],
- ["12th February, 2013", ["Fixes in Payment Reconciliation "]],
- ["6th February, 2013", [
- "Bookmarks: Add bookmarks via toolbar by clicking on the <i class='icon-star'></i> sign.",
- "Fixes in Voucher Import Tool",
- ]],
- ["5th February, 2013", [
- "Block Negative Account Balance: If enabled, system will not allow to post entry \
- if balance goes into negative",
- "Leave Block List: Block users from taking leave on certain days.",
- "Added project column in 'To Be Delivered/Billed' report ",
- ]],
- ["4th February, 2013", [
- "Make gl entry only if amount is there",
- "Fixes in Stock Ledger Report"
- ]],
- ["2nd February, 2013", [
- "Warehouse: Added table Warehouse User to restrict Warehouse Entry per user.",
- "Fixes in Gl Entry for Purchase Invoice",
- ]],
- ["1st February, 2013", [
- "Removed sales order pending items report",
- "Fixes in Salary Register Report, Sales Invoice and Budget Control",
- ]],
- ["31st January, 2013", [
- "New Report: Purchase order items pending to be received",
- "GL Mapper deprecated",
- ]],
- ["28st January, 2013", [
- "List Views are now configurable: To set list views, check 'In List View' in Setup > Customize Form View in the fields table.",
- "Fixes in Financial Statements and Features Setup",
- ]],
- ["25th January, 2013", [
- "Fixes for currency in all Modern/Classic/Spartan print formats",
- "Stock Ageing Report: Added show zero values option"
- ]],
- ["24th January, 2013", [
- "Sales Analytics based on Sales Order/Delivery Note/Sales Invoice",
- "Integrated Languages in Profile and via browser settings. To set your language, click on your name in the toolbar then 'My Settings...'",
- "Fixes in Recurring Invoice",
- "Fixes for Territory link to Sales Browser ",
- "Check item/item group with same name while creating item group/item",
- ]],
- ["22nd January, 2013", [
- "Valuation Rate mandatory for opening Stock Reconciliation",
- "Show analytics value based on valuation method defined in item master",
- ]],
- ["21st January, 2013", [
- "Number Formatting: Added Number Format to Global Defaults & Currency",
- ]],
- ["20th January, 2013", [
- "In payment matching tool only show outstanding invoices"
- ]],
- ["18th January, 2013", [
- "Buying: Added Price List to purchase cycle",
- "C-Form now submittable",
- ]],
- ["16th January, 2013", [
- "Incoming rate for sales return as per delivery note outgoing rate",
- "Job Applicant: Track Job Applicants and extract them from a mailbox like 'jobs@example.com'. See <a href='#Form/Jobs Email Settings'>Jobs Email Settings</a>.",
- "Extract leads: Extract Leads from a mailbox like 'sales@example.com'. See <a href='#Form/Sales Email Settings'>Sales Email Settings</a>.",
- ]],
- ["14th January, 2013", [
- "Stock Reconciliation: Ability to update Valuation Rate",
- "Time Field: Added Datetime and new Time Picker",
- "Task, Support Ticket, Customer Issue: Added script to update resolution times"
- ]],
- ["10th January 2013", [
- "Modules: New module pages with open item count and multi-lingual.",
- "Permissions: Added new 'Report' permission. Only users with report permissions will be allowed.",
- ]],
- ["7th January 2013", [
- "Language (backend): Integrated language libraries."]],
- ["4th January 2013", [
- "Support Analytics: Simple Tool to Plot Number Tickets and time to Closing",
- "Workflow: Added Workflow Help",
- ]],
- ["2nd January 2013", [
- "Permission Manager: New Design with better help and better advanced permission selection.",
- "User Properties: Better way to set User Properties (defaults).",
- ]],
- ["1st January 2013", [
- "Trial Balance: Added an option to see the report <b>without period closing entry</b>\
- You will find this checkbox at the bottom of the report.",
- "General Ledger: Now, on filter of any account group, you will have an option to see \
- the report <b>grouped by ledgers</b> under that group and with opening \
- and closing balance for each of them."
- ]],
- ["28th December 2012", [
- "Workflow: Added System for Multi-level approval before Submission. \
- <br>See video at <a href='https://www.youtube.com/watch?v=zuGv59_wJKw' \
- target='_blank'>https://www.youtube.com/watch?v=zuGv59_wJKw</a>.",
- "Stock Level Report: New report to see available and estimated qty of stock",
- ]],
- ["27th December 2012", [
- "Website: Added auto-generated Contact Us and About Us Pages",
- "Website: Added option to create slideshows and add them to Pages, Products and Product Groups",
- ]],
- ["25th December 2012", [
- "Stock Balance Report: Inflow, outflow and balance of stock within a defined period",
- "Stock Reports: Added Brand filter on some of the reports"
- ]],
- ["21st December 2012", [
- "Manufacturing: For Material Transfer against Production Order, \
- fetch quantity pending to be transferred for each item.",
- "Desktop: New Icons and now sortable by dragging."
- ]],
- ["20th December 2012", [
- "Website: Create Product Search Page, Product Group Page on the website.",
- "Manufacturing: \
- <a href=\"https://github.com/webnotes/erpnext/wiki/Changes-in-Manufacturing-Module\" \
- target=\"_blank\">Refactored code, improved usability.</a>"
- ]],
- ["14th December 2012", [
- "Website Module: Major Refactor - removed framework code from website."
- ]],
- ["12th December 2012", [
- "Attachments: Attachments can be set as URLs or File Uploads. This will help if people want to share documents from Google Docs, Dropbox and other such services (esp for the Product listings on websites).",
- "Global Defaults: Session Expiry can now be set in Global Defaults.",
- ]],
- ["6th December 2012", [
- "Rename: Cost Center, Item Group, Customer Group, Supplier Type, Territory, Sales Person can now be renamed.",
- "Newsletter: Send newsletter to a list of email addresses.",
- ]],
- ["5th December 2012", [
- "Leave Application: Now can set approver.",
- "New Roles Added: Leave Approver and Expense Approver.",
- "Production Order: Now linked with Sales Order.",
- "Production Planning Tool: The field 'Allow SA items as raw material' has been renamed to 'Use multi-level BOM', 'Include in plan' column from SO table has been deleted",
- "Batch Numbers: Batch nos are now filtered with Item and available qty at time of selection in transactions.",
- "BOM: 'Update Costing' button has been deleted, once submitted cost are fixed.",
- "[For indian customer only] Deprecated TDS related documents and fields. Old TDS amount added into tax table in Purchase Invoice and entries table in case of JV",
- ]],
- ["4th December 2012", [
- "POS / Mode of Payment: Select default bank / cash account in Mode of Payment and it will be automatically selected in POS Invoice.",
- "Email: Add contact name as 'Dear so-and-so' in Email.",
- "Report Builder: Remember last column setup for users",
- "Report Builder: Autoset column width (remember)",
- ]],
- ["3rd December 2012", [
- "Linked With: Added new Linked with in all Forms.",
- "Rename Tool: Documents that can be renamed will have a 'Rename' option in the sidebar (wherever applicable).",
- "Chart of Accounts: Ability to rename / delete from Chart of Accounts.",
- "Delivery and Billing status now updated in sales order, if POS made against that sales order"
- ]],
- ["30th November 2012", [
- "Auto Notifications: System will prompt user with pre-set message for auto-notification.",
- "Employee: Users with role Employee will only be able to see their Employee Records.",
- "Leave Application: Users with role Employee can now apply for leaves. HR User will be able to set Approval or Rejection.",
- ]],
- ["29th November 2012", [
- "EMail: Form Emails are now via Communication (with Rich Text Etc.).",
- ]],
- ["28th November 2012", [
- "Profile: Profile Settings (My Settings...) is now the Profile Form.",
- "Financial Analytics: Show Net Profit/Loss",
- ]],
- ["27th November 2012", [
- "Communication: Made common communication thread and added it in Lead, Contact.",
- ]],
- ["26th November 2012", [
- "Email: Added User Signature",
- "Support Ticket: Added link to Lead / Contact. If incoming ticket is not from an existing Lead / Contact, create a new Lead",
- ]],
- ["24ht November 2012", [
- "Support Ticket: Support Ticket Response is now Communication",
- ]],
- ["23rd November 2012", [
- "General Ledger: Auto-suggest Accounts for filtering",
- "Calendar: User Interface Fixes, small text for events",
- "Email Settings: Setup outgoing email without a login id \
- (applicable for a local email server)",
- "Delivered Items To Be Billed: New report in 'Accounts'",
- ]],
- ["22nd November 2012", [
- "Support Ticket: Compose a reply using Markdown",
- "Supplier Link Field: Search by Supplier Name instead of ID",
- "Supplier Link Field: Show only ID in auto-suggest \
- if ID created using Supplier Name (as defined in Global Defaults)",
- ]],
- ["21st November 2012", [
- "Tree Report: Added missing expand / collapse buttons.",
- "List View: Do not show restricted records, as defined in Permission Manager.",
- "Customer Link Field: Search by Customer Name instead of ID",
- "Customer Link Field: Show only ID in auto-suggest \
- if ID created using Customer Name (as defined in Global Defaults)",
- "Letter Head: Fixed bug causing cursor position to reset in Content",
- ]],
- ["20th November 2012", [
- "Auto-suggest: Show main label in bold",
- "Data Import Tool: Fixed #Name error faced by MS Excel users in import template",
- ]],
- ["19th November 2012", [
- "Sales Order: Bugfix - Shipping Address should be a Link field.",
- "Link Fields: Search Profile, Employee and Lead using Full Names instead of ID.",
- "Knowledge Base: Always open links, embedded in an answer, in a new tab."
- ]],
- ["16th November 2012", [
- "Appraisal: Cleaned up form and logic. Removed complex and unnecessary approval logic, \
- the appraiser can select the template and role and make an appraisal. \
- Normal user can see self created Appraisals. HR Manager can see all Appraisals.",
- "Project: Bugfix in Gantt Chart (caused due to jquery conflict)",
- "Serial No: Ability to rename.",
- "Rename Tool: Added Serial No to rename tool.",
- ]],
- ["15th November 2012", [
- "Customer Issue: Moved all allocations to 'Assigned' so that there is avoid duplication fo features.",
- "Letter Head: Show preview, make upload button more visible.",
- "Price List: Removed import, now import from Data Import Tool.",
- "Data Import Tool: More help in template.",
- ]],
- ["14th November 2012", [
- "Employee: If User ID is set, Employee Name will be updated in defaults and will appear automatically in all relevant forms.",
- "Backups: Link to download both database and files.",
- ]],
- ["13th November 2012", [
- "Customize Form View: Validate correct 'Options' for Link and Table fields.",
- "Report Builder (new): Added formatters for Date, Currency, Links etc.",
- "Trial Balance (new): Feature to export Ledgers or Groups selectively. Indent Groups with spaces.",
- "General Ledger (new): Will show entries with 'Is Opening' as Opening.",
- "General Ledger (new): Show against account entries if filtered by account.",
- ]],
- ["12th November 2012", [
- "Document Lists: Automatically Refresh lists when opened (again).",
- "Messages: Popups will not be shown (annoying).",
- "Email Digest: New option to get ten latest Open Support Tickets.",
- "Journal Voucher: 'Against JV' will now be filtered by the Account selected.",
- "Query Report: Allow user to rename and save reports.",
- "Employee Leave Balance Report: Bugfix"
- ]]
-];
-
wn.pages['latest-updates'].onload = function(wrapper) {
wn.ui.make_app_page({
parent: wrapper,
@@ -295,16 +6,40 @@
});
var parent = $(wrapper).find(".layout-main");
+ parent.html('<div class="progress progress-striped active">\
+ <div class="progress-bar" style="width: 100%;"></div></div>')
- $("<p class='help'>Report issues by sending a mail to <a href='mailto:support@erpnext.com'>support@erpnext.com</a> or \
- via <a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p><hr>").appendTo(parent);
-
-
- $.each(erpnext.updates, function(i, day) {
- $("<h4>" + day[0] + "</h4>").appendTo(parent);
- $.each(day[1], function(j, item) {
- $("<p>").html(item).appendTo(parent);
- });
- $("<hr>").appendTo(parent);
- });
+ wn.call({
+ method:"home.page.latest_updates.latest_updates.get",
+ callback: function(r) {
+ parent.empty();
+ $("<p class='help'>Report issues at\
+ <a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p>\
+ <hr><h3>Commit Log</h3>")
+ .appendTo(parent);
+
+ var $tbody = $('<table class="table table-bordered"><tbody></tbody></table>')
+ .appendTo(parent).find("tbody");
+ $.each(r.message, function(i, log) {
+ if(log.message.indexOf("[")!==-1) {
+ log.message = log.message.replace(/(\[[^\]]*\])/g,
+ function(match, p1, offset, string) {
+ match = match.toLowerCase();
+ var color_class = "";
+ $.each(["bug", "fix"], function(i, v) {
+ if(!color_class && match.indexOf(v)!==-1)
+ color_class = "label-danger";
+ });
+ return '<span class="label ' + color_class +'">' + p1.slice(1,-1) + '</span> '
+ });
+ log.repo = log.repo==="lib" ? "wnframework" : "erpnext";
+ $(repl('<tr>\
+ <td><b><a href="https://github.com/webnotes/%(repo)s/commit/%(commit)s" \
+ target="_blank">%(message)s</b>\
+ <br><span class="text-muted">By %(author)s on %(date)s</span></td></tr>', log)).appendTo($tbody);
+ }
+
+ })
+ }
+ })
};
\ No newline at end of file
diff --git a/home/page/latest_updates/latest_updates.py b/home/page/latest_updates/latest_updates.py
new file mode 100644
index 0000000..4cd25b2
--- /dev/null
+++ b/home/page/latest_updates/latest_updates.py
@@ -0,0 +1,59 @@
+from __future__ import unicode_literals
+import webnotes, os, subprocess, tempfile, json, datetime
+
+@webnotes.whitelist()
+def get():
+ with open("../app/home/page/latest_updates/latest_updates.json", "r") as lufile:
+ return json.loads(lufile.read())
+
+def make():
+ def add_to_logs(out, repo):
+ out.seek(0)
+ last_commit = None
+ for l in out.readlines():
+ if last_commit is not None:
+ if l.startswith("Date:"):
+ last_commit["date"] = l[8:-1]
+ last_commit["datetime"] = datetime.datetime.strptime(last_commit["date"][:-6], "%a %b %d %H:%M:%S %Y")
+ if l.startswith("Author:"):
+ last_commit["author"] = l[8:-1]
+ if l.startswith(" "):
+ last_commit["message"] = l[4:-1]
+
+ if l.startswith("commit"):
+ last_commit = {
+ "repo": repo,
+ "commit": l.split(" ")[1][:-1]
+ }
+ logs.append(last_commit)
+
+ os.chdir("lib")
+ logs = []
+ out_lib = tempfile.TemporaryFile()
+ subprocess.call("git --no-pager log -n 200 --no-color", shell=True, stdout=out_lib)
+ add_to_logs(out_lib, "lib")
+
+ os.chdir("../app")
+ out_app = tempfile.TemporaryFile()
+ subprocess.call("git --no-pager log -n 200 --no-color", shell=True, stdout=out_app)
+ add_to_logs(out_app, "app")
+
+ logs.sort(key=lambda a: a["datetime"], reverse=True)
+ for a in logs:
+ del a["datetime"]
+
+ for i in xrange(len(logs)):
+ if i and logs[i]["message"]==logs[i-1]["message"]:
+ logs[i]["delete"] = True
+
+ if logs[i]["message"].startswith("Merge branch") or "[" not in logs[i]["message"]:
+ logs[i]["delete"] = True
+
+ logs = filter(lambda a: a if not a.get("delete") else None, logs)
+
+ os.chdir("..")
+ with open("app/home/page/latest_updates/latest_updates.json", "w") as lufile:
+ lufile.write(json.dumps(logs, indent=1, sort_keys=True))
+
+if __name__=="__main__":
+ make()
\ No newline at end of file
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.txt b/hr/doctype/appraisal_goal/appraisal_goal.txt
index ed71e69..794a879 100644
--- a/hr/doctype/appraisal_goal/appraisal_goal.txt
+++ b/hr/doctype/appraisal_goal/appraisal_goal.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:44",
"docstatus": 0,
- "modified": "2013-03-07 07:03:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Appraisal Goal",
"parentfield": "fields",
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
index da9fde0..074c247 100644
--- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
+++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:44",
"docstatus": 0,
- "modified": "2013-03-07 07:03:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Appraisal Template Goal",
"parentfield": "fields",
diff --git a/hr/doctype/employee/employee.js b/hr/doctype/employee/employee.js
index 5a2dbab..4ef66a0 100644
--- a/hr/doctype/employee/employee.js
+++ b/hr/doctype/employee/employee.js
@@ -30,13 +30,9 @@
refresh: function() {
var me = this;
erpnext.hide_naming_series();
- if(!this.frm.doc.__islocal) {
- cur_frm.add_custom_button('View Active Salary Structure', function() {
- me.view_active_salary_structure(this); });
-
+ if(!this.frm.doc.__islocal) {
cur_frm.add_custom_button('Make Salary Structure', function() {
me.make_salary_structure(this); });
-
}
},
@@ -45,7 +41,8 @@
this.frm.call({
method:"hr.utils.get_leave_approver_list",
callback: function(r) {
- me.frm.fields_dict.employee_leave_approvers.grid.get_field("leave_approver").df.options =
+ me.frm.fields_dict.employee_leave_approvers.grid
+ .get_field("leave_approver").df.options =
$.map(r.message, function(profile) {
return {value: profile, label: wn.user_info(profile).fullname};
});
@@ -75,9 +72,9 @@
if(r.message) {
msgprint(wn._("Employee") + ' "' + me.frm.doc.name + '": '
+ wn._("An active Salary Structure already exists. \
- If you want to create new one, please ensure that no active Salary Structure \
- exists for this Employee. Go to the active Salary Structure and set \
- \"Is Active\" = \"No\""));
+ If you want to create new one, please ensure that no active \
+ Salary Structure exists for this Employee. \
+ Go to the active Salary Structure and set \"Is Active\" = \"No\""));
} else if(!r.exc) {
wn.model.map({
source: wn.model.get_doclist(me.frm.doc.doctype, me.frm.doc.name),
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index 9d6dfae..44e1bb2 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
- "modified": "2013-07-05 14:36:19",
+ "modified": "2013-07-10 12:52:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,7 +31,9 @@
"parent": "Employee",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
+ "report": 1,
"submit": 0
},
{
@@ -55,7 +57,7 @@
"doctype": "DocField",
"fieldname": "image_view",
"fieldtype": "Image",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Image View",
"options": "image"
},
@@ -564,6 +566,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break6",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "marital_status",
"fieldtype": "Select",
"label": "Marital Status",
@@ -577,12 +585,6 @@
"options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-"
},
{
- "doctype": "DocField",
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
"description": "Here you can maintain family details like name and occupation of parent, spouse and children",
"doctype": "DocField",
"fieldname": "family_background",
@@ -748,17 +750,6 @@
"create": 0,
"doctype": "DocPerm",
"match": "employee",
- "permlevel": 0,
- "report": 1,
- "role": "Employee",
- "write": 0
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
"role": "Employee",
"write": 0
},
@@ -767,8 +758,6 @@
"create": 1,
"doctype": "DocPerm",
"match": "company",
- "permlevel": 0,
- "report": 1,
"role": "HR User",
"write": 1
},
@@ -776,27 +765,7 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "report": 1,
"role": "HR Manager",
"write": 1
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "HR User",
- "write": 0
- },
- {
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "report": 0,
- "role": "HR Manager",
- "write": 0
}
]
\ No newline at end of file
diff --git a/hr/doctype/employee_education/employee_education.txt b/hr/doctype/employee_education/employee_education.txt
index 46b6f00..69bbbde 100644
--- a/hr/doctype/employee_education/employee_education.txt
+++ b/hr/doctype/employee_education/employee_education.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee Education",
"parentfield": "fields",
diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.txt b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
index 05fc5c0..2d54729 100644
--- a/hr/doctype/employee_external_work_history/employee_external_work_history.txt
+++ b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee External Work History",
"parentfield": "fields",
diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
index d813e7c..9cd03ce 100644
--- a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
+++ b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:45",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Employee Internal Work History",
"parentfield": "fields",
diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
index 31e3e09..f175bbd 100644
--- a/hr/doctype/employee_leave_approver/employee_leave_approver.txt
+++ b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-12 06:56:15",
"docstatus": 0,
- "modified": "2013-04-12 07:53:33",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,6 +19,7 @@
"doctype": "DocField",
"fieldname": "leave_approver",
"fieldtype": "Select",
+ "in_list_view": 0,
"label": "Leave Approver",
"name": "__common__",
"parent": "Employee Leave Approver",
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.txt b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
index d2b5cf3..e9c5a99 100644
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:46",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Expense Claim Detail",
"parentfield": "fields",
diff --git a/hr/doctype/holiday/holiday.txt b/hr/doctype/holiday/holiday.txt
index 94f7936..3b87bb0 100644
--- a/hr/doctype/holiday/holiday.txt
+++ b/hr/doctype/holiday/holiday.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:46",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Holiday",
"parentfield": "fields",
diff --git a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt b/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
index 8e362f3..1e8c86b 100644
--- a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
+++ b/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:47",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "allow_user",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Allow User",
"name": "__common__",
"options": "Profile",
diff --git a/hr/doctype/leave_block_list_date/leave_block_list_date.txt b/hr/doctype/leave_block_list_date/leave_block_list_date.txt
index d0b9fbf..c13e2d5 100644
--- a/hr/doctype/leave_block_list_date/leave_block_list_date.txt
+++ b/hr/doctype/leave_block_list_date/leave_block_list_date.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:47",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Leave Block List Date",
"parentfield": "fields",
diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py
index e3e43e4..1af71d5 100644
--- a/hr/doctype/salary_slip/salary_slip.py
+++ b/hr/doctype/salary_slip/salary_slip.py
@@ -21,7 +21,7 @@
from webnotes.model.doc import make_autoname
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
-from webnotes import msgprint
+from webnotes import msgprint, _
from setup.utils import get_company_currency
sql = webnotes.conn.sql
@@ -65,12 +65,6 @@
from hr.doctype.salary_structure.salary_structure import make_salary_slip
make_salary_slip(struct, self.doclist)
- basic_info = sql("select bank_name, bank_ac_no, esic_card_no, pf_number from `tabEmployee` where name ='%s'" % self.doc.employee)
- self.doc.bank_name = basic_info[0][0]
- self.doc.bank_account_no = basic_info[0][1]
- self.doc.esic_no = basic_info[0][2]
- self.doc.pf_no = basic_info[0][3]
-
def get_leave_details(self, lwp=None):
m = get_obj('Salary Manager').get_month_details(self.doc.fiscal_year, self.doc.month)
@@ -92,7 +86,9 @@
if getdate(emp['relieving_date']) > m['month_start_date'] and getdate(emp['relieving_date']) < m['month_end_date']:
payment_days = getdate(emp['relieving_date']).day
elif getdate(emp['relieving_date']) < m['month_start_date']:
- payment_days = 0
+ webnotes.msgprint(_("Relieving Date of employee is ") + cstr(emp['relieving_date']
+ + _(". Please set status of the employee as 'Left'")), raise_exception=1)
+
if emp['date_of_joining']:
if getdate(emp['date_of_joining']) > m['month_start_date'] and getdate(emp['date_of_joining']) < m['month_end_date']:
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
index 86acef0..7fa4051 100644
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Slip Deduction",
"parentfield": "fields",
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
index 64f4dc6..4ac3f39 100644
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Slip Earning",
"parentfield": "fields",
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
index 53dbf69..81e9a46 100644
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Structure Deduction",
"parentfield": "fields",
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.txt b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
index 29c3f52..b2a8e30 100644
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:48",
"docstatus": 0,
- "modified": "2013-03-07 07:03:30",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Salary Structure Earning",
"parentfield": "fields",
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
index 3808cdf..abc74cd 100644
--- a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
+++ b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-06-04 13:13:28",
+ "modified": "2013-07-10 14:54:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -32,6 +32,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -51,6 +53,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency"
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "standard_rate",
"oldfieldtype": "Currency"
@@ -67,6 +71,7 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "amount_as_per_sr",
"oldfieldtype": "Currency"
@@ -75,6 +80,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Link",
@@ -85,6 +91,7 @@
"fieldname": "qty_consumed_per_unit",
"fieldtype": "Float",
"hidden": 0,
+ "in_list_view": 1,
"label": "Qty Consumed Per Unit",
"no_copy": 0
}
diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/manufacturing/doctype/bom_item/bom_item.txt
index 2554adf..85fbcf6 100644
--- a/manufacturing/doctype/bom_item/bom_item.txt
+++ b/manufacturing/doctype/bom_item/bom_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-06-27 11:30:07",
+ "modified": "2013-07-10 14:54:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,6 +41,7 @@
"doctype": "DocField",
"fieldname": "operation_no",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Operation No",
"oldfieldname": "operation_no",
"oldfieldtype": "Data",
@@ -51,6 +52,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -63,6 +65,7 @@
"fieldname": "bom_no",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "BOM No",
"oldfieldname": "bom_no",
"oldfieldtype": "Link",
@@ -76,6 +79,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -85,6 +89,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -96,12 +101,14 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate"
},
{
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "amount_as_per_mar",
"oldfieldtype": "Currency",
diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/manufacturing/doctype/bom_operation/bom_operation.txt
index 56805b5..86dffe9 100644
--- a/manufacturing/doctype/bom_operation/bom_operation.txt
+++ b/manufacturing/doctype/bom_operation/bom_operation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "BOM Operation",
"parentfield": "fields",
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.txt b/manufacturing/doctype/production_plan_item/production_plan_item.txt
index 3af1bea..37f56c9 100644
--- a/manufacturing/doctype/production_plan_item/production_plan_item.txt
+++ b/manufacturing/doctype/production_plan_item/production_plan_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "bom_no",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "BOM No",
"oldfieldname": "bom_no",
"oldfieldtype": "Link",
@@ -54,6 +56,7 @@
"doctype": "DocField",
"fieldname": "planned_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Planned Qty",
"oldfieldname": "planned_qty",
"oldfieldtype": "Currency",
@@ -65,6 +68,7 @@
"doctype": "DocField",
"fieldname": "sales_order",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Sales Order",
"oldfieldname": "source_docname",
"oldfieldtype": "Data",
@@ -76,6 +80,7 @@
"doctype": "DocField",
"fieldname": "so_pending_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "SO Pending Qty",
"oldfieldname": "prevdoc_reqd_qty",
"oldfieldtype": "Currency",
@@ -88,6 +93,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -100,6 +106,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index dc5b88d..e74f3bb 100644
--- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:49",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Production Plan Sales Order",
"parentfield": "fields",
diff --git a/patches/july_2013/p03_cost_center_company.py b/patches/july_2013/p03_cost_center_company.py
new file mode 100644
index 0000000..22072ae
--- /dev/null
+++ b/patches/july_2013/p03_cost_center_company.py
@@ -0,0 +1,6 @@
+import webnotes
+
+def execute():
+ webnotes.reload_doc("accounts", "doctype", "cost_center")
+ webnotes.conn.sql("""update `tabCost Center` set company=company_name""")
+ webnotes.conn.sql_ddl("""alter table `tabCost Center` drop column company_name""")
\ No newline at end of file
diff --git a/patches/march_2013/p08_create_aii_accounts.py b/patches/march_2013/p08_create_aii_accounts.py
index 00230d8..0156a17 100644
--- a/patches/march_2013/p08_create_aii_accounts.py
+++ b/patches/march_2013/p08_create_aii_accounts.py
@@ -79,9 +79,9 @@
def add_aii_cost_center():
for company, abbr in webnotes.conn.sql("""select name, abbr from `tabCompany`"""):
if not webnotes.conn.sql("""select name from `tabCost Center` where cost_center_name =
- 'Auto Inventory Accounting' and company_name = %s""", company):
+ 'Auto Inventory Accounting' and company = %s""", company):
parent_cost_center = webnotes.conn.get_value("Cost Center",
- {"parent_cost_center['']": '', "company_name": company})
+ {"parent_cost_center['']": '', "company": company})
if not parent_cost_center:
webnotes.errprint("Company " + company + "does not have a root cost center")
@@ -92,7 +92,7 @@
"cost_center_name": "Auto Inventory Accounting",
"parent_cost_center": parent_cost_center,
"group_or_ledger": "Ledger",
- "company_name": company
+ "company": company
})
cc.insert()
diff --git a/patches/patch_list.py b/patches/patch_list.py
index eee00fe..48e521d 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -249,4 +249,5 @@
"execute:webnotes.delete_doc('Report', 'Delivered Items To Be Billed')",
"execute:webnotes.delete_doc('Report', 'Received Items To Be Billed')",
"patches.july_2013.p02_copy_shipping_address",
+ "patches.july_2013.p03_cost_center_company",
]
\ No newline at end of file
diff --git a/projects/doctype/project_milestone/project_milestone.txt b/projects/doctype/project_milestone/project_milestone.txt
index 11c5d20..31722d6 100644
--- a/projects/doctype/project_milestone/project_milestone.txt
+++ b/projects/doctype/project_milestone/project_milestone.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:50",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Project Milestone",
"parentfield": "fields",
diff --git a/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt b/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
index 8bd554f..98eca10 100644
--- a/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
+++ b/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-05 09:11:06",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Time Log Batch Detail",
"parentfield": "fields",
diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js
index 9d85979..cdc8662 100644
--- a/public/js/complete_setup.js
+++ b/public/js/complete_setup.js
@@ -48,7 +48,7 @@
{fieldname:'update', label:'Setup',fieldtype:'Button'},
],
});
-
+
if(user != 'Administrator'){
$(d.appframe.$titlebar).find('.close').toggle(false); // Hide close image
$('header').toggle(false); // hide toolbar
@@ -87,7 +87,6 @@
} else {
$(this).done_working();
}
-
});
};
@@ -125,7 +124,7 @@
}
}
- return d;
+ return d;
},
fy_start_list: ['', '1st Jan', '1st Apr', '1st Jul', '1st Oct'],
diff --git a/public/js/queries.js b/public/js/queries.js
index 24ddc13..a7e137e 100644
--- a/public/js/queries.js
+++ b/public/js/queries.js
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// searches for enabled profiles
+wn.provide("erpnext.utils");
erpnext.utils.profile_query = function() {
return "select name, concat_ws(' ', first_name, middle_name, last_name) \
from `tabProfile` where ifnull(enabled, 0)=1 and docstatus < 2 and \
diff --git a/public/js/startup.js b/public/js/startup.js
index 26e5219..eadfa1b 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -15,23 +15,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
var current_module;
-var is_system_manager = 0;
wn.provide('erpnext.startup');
-erpnext.startup.set_globals = function() {
- if(inList(user_roles,'System Manager')) is_system_manager = 1;
-}
-
erpnext.startup.start = function() {
console.log('Starting up...');
$('#startup_div').html('Starting up...').toggle(true);
- erpnext.startup.set_globals();
-
if(user != 'Guest'){
- erpnext.setup_mousetrap();
-
// setup toolbar
erpnext.toolbar.setup();
@@ -66,33 +57,9 @@
}
}
erpnext.set_about();
- if(wn.control_panel.custom_startup_code)
- eval(wn.control_panel.custom_startup_code);
}
}
-erpnext.hide_naming_series = function() {
- if(cur_frm.fields_dict.naming_series) {
- cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
- }
-}
-
-erpnext.setup_mousetrap = function() {
- $(document).keydown("meta+g ctrl+g", function(e) {
- wn.ui.toolbar.search.show();
- return false;
- });
-
- $(document).keydown("meta+s ctrl+s", function(e) {
- if(cur_frm) {
- cur_frm.save_or_update();
- }
- else if(wn.container.page.save_action)
- wn.container.page.save_action();
- return false;
- })
-}
-
// start
$(document).bind('startup', function() {
erpnext.startup.start();
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index 4becb23..91427b3 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -31,6 +31,8 @@
'+wn._('Live Chat')+'</a></li>')
erpnext.toolbar.set_new_comments();
+
+ $("#toolbar-tools").append('<li><a href="#latest-updates">Latest Updates</li>');
}
erpnext.toolbar.set_new_comments = function(new_comments) {
diff --git a/public/js/transaction.js b/public/js/transaction.js
index 79e7a56..50de3d5 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -45,6 +45,7 @@
refresh: function() {
this.frm.clear_custom_buttons();
erpnext.hide_naming_series();
+ erpnext.hide_company();
this.show_item_wise_taxes();
this.frm.fields_dict.currency ? this.currency() : this.set_dynamic_labels();
},
diff --git a/public/js/utils.js b/public/js/utils.js
index 0284670..b44a875 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -13,13 +13,31 @@
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-wn.provide("erpnext.utils");
+wn.provide("erpnext");
-erpnext.get_currency = function(company) {
- if(!company && cur_frm)
- company = cur_frm.doc.company;
- if(company)
- return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
- else
- return wn.boot.sysdefaults.currency;
-}
+$.extend(erpnext, {
+ get_currency: function(company) {
+ if(!company && cur_frm)
+ company = cur_frm.doc.company;
+ if(company)
+ return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
+ else
+ return wn.boot.sysdefaults.currency;
+ },
+
+ hide_naming_series: function() {
+ if(cur_frm.fields_dict.naming_series) {
+ cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
+ }
+ },
+
+ hide_company: function() {
+ if(cur_frm.fields_dict.company) {
+ var companies = Object.keys(locals[":Company"]);
+ if(companies.length === 1) {
+ if(!cur_frm.doc.company) cur_frm.set_value("company", companies[0]);
+ cur_frm.toggle_display("company", false);
+ }
+ }
+ }
+});
\ No newline at end of file
diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py
index 83c10a5..2820fb3 100644
--- a/selling/doctype/customer/customer.py
+++ b/selling/doctype/customer/customer.py
@@ -177,7 +177,7 @@
@webnotes.whitelist()
def get_dashboard_info(customer):
- if not webnotes.has_permission("Customer", customer):
+ if not webnotes.has_permission("Customer", "read", customer):
webnotes.msgprint("No Permission", raise_exception=True)
out = {}
diff --git a/selling/doctype/installation_note_item/installation_note_item.txt b/selling/doctype/installation_note_item/installation_note_item.txt
index a2ccdc4..02871ad 100644
--- a/selling/doctype/installation_note_item/installation_note_item.txt
+++ b/selling/doctype/installation_note_item/installation_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-03-07 07:03:21",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -51,6 +53,7 @@
"fieldname": "prevdoc_date",
"fieldtype": "Date",
"hidden": 0,
+ "in_list_view": 1,
"label": "Delivery Date",
"oldfieldname": "prevdoc_date",
"oldfieldtype": "Date",
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text",
@@ -72,6 +76,7 @@
"fieldname": "prevdoc_detail_docname",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Against Document Detail No",
"no_copy": 1,
"oldfieldname": "prevdoc_detail_docname",
@@ -87,6 +92,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Against Document No",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -103,6 +109,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Document Type",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -117,6 +124,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Installed Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index ba7870e..fb1501c 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-03-07 07:03:26",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -59,6 +62,7 @@
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -71,6 +75,7 @@
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -80,9 +85,26 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Qty",
+ "oldfieldname": "qty",
+ "oldfieldtype": "Currency"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
"hidden": 1,
+ "in_list_view": 0,
"label": "Basic Rate",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
@@ -91,16 +113,9 @@
},
{
"doctype": "DocField",
- "fieldname": "qty",
- "fieldtype": "Float",
- "label": "Qty",
- "oldfieldname": "qty",
- "oldfieldtype": "Currency"
- },
- {
- "doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 243963c..19eefa3 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-07-08 15:51:41",
+ "modified": "2013-07-09 12:48:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -236,7 +236,7 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
- "label": "Price List and Currency",
+ "label": "Currency and Price List",
"options": "icon-tag",
"read_only": 0
},
@@ -348,15 +348,20 @@
"doctype": "DocField",
"fieldname": "net_total_export",
"fieldtype": "Currency",
- "label": "Net Total (Export)",
+ "label": "Net Total",
"options": "currency",
"read_only": 1
},
{
"doctype": "DocField",
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total",
"fieldtype": "Currency",
- "label": "Net Total*",
+ "label": "Net Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
@@ -368,15 +373,6 @@
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -445,19 +441,8 @@
"doctype": "DocField",
"fieldname": "other_charges_total_export",
"fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "other_charges_total",
- "fieldtype": "Currency",
"label": "Taxes and Charges Total",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "options": "currency",
"print_hide": 1,
"read_only": 1
},
@@ -468,12 +453,14 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_total",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"print_hide": 1,
- "read_only": 0
+ "read_only": 1
},
{
"doctype": "DocField",
@@ -539,7 +526,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total*",
+ "label": "Grand Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
@@ -553,7 +540,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
@@ -567,7 +554,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"no_copy": 0,
"oldfieldname": "in_words",
"oldfieldtype": "Data",
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index 11ac1ba..32b8421 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-05-22 12:10:32",
+ "modified": "2013-07-10 14:54:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -31,6 +31,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -47,6 +48,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -56,6 +58,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -70,6 +73,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -80,11 +84,19 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -99,6 +111,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -113,6 +126,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -128,6 +142,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -142,6 +157,7 @@
"fieldname": "export_rate",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -159,6 +175,7 @@
"fieldname": "export_amount",
"fieldtype": "Currency",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -174,7 +191,8 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
- "label": "Price List Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -189,7 +207,8 @@
"fieldname": "basic_rate",
"fieldtype": "Currency",
"in_filter": 0,
- "label": "Basic Rate*",
+ "in_list_view": 0,
+ "label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -206,7 +225,8 @@
"fieldname": "amount",
"fieldtype": "Currency",
"in_filter": 0,
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -219,10 +239,18 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -237,6 +265,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Brand",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -252,6 +281,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -263,6 +293,7 @@
"doctype": "DocField",
"fieldname": "prevdoc_docname",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Against Docname",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
@@ -278,6 +309,7 @@
"fieldname": "prevdoc_doctype",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Against Doctype",
"no_copy": 1,
"oldfieldname": "prevdoc_doctype",
@@ -294,6 +326,7 @@
"fieldname": "page_break",
"fieldtype": "Check",
"hidden": 0,
+ "in_list_view": 0,
"label": "Page Break",
"no_copy": 1,
"oldfieldname": "page_break",
diff --git a/selling/doctype/sales_bom_item/sales_bom_item.txt b/selling/doctype/sales_bom_item/sales_bom_item.txt
index f7906b7..1bd456b 100644
--- a/selling/doctype/sales_bom_item/sales_bom_item.txt
+++ b/selling/doctype/sales_bom_item/sales_bom_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-23 16:55:51",
"docstatus": 0,
- "modified": "2013-06-26 13:45:41",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -47,6 +49,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -57,6 +60,7 @@
"doctype": "DocField",
"fieldname": "rate",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency"
@@ -65,6 +69,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
diff --git a/selling/doctype/sales_common/sales_common.txt b/selling/doctype/sales_common/sales_common.txt
index 4d00b51..a407493 100644
--- a/selling/doctype/sales_common/sales_common.txt
+++ b/selling/doctype/sales_common/sales_common.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:14",
"docstatus": 0,
- "modified": "2012-03-27 14:36:14",
+ "modified": "2013-07-10 14:54:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,10 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Selling",
- "name": "__common__",
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 290
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 572164a..37c9e21 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
- "modified": "2013-07-08 15:54:25",
+ "modified": "2013-07-09 12:47:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -210,7 +210,7 @@
"fieldname": "po_no",
"fieldtype": "Data",
"hidden": 0,
- "label": "P.O. No",
+ "label": "Customer's Purchase Order No",
"oldfieldname": "po_no",
"oldfieldtype": "Data",
"print_hide": 0,
@@ -223,7 +223,7 @@
"fieldname": "po_date",
"fieldtype": "Date",
"hidden": 0,
- "label": "P.O. Date",
+ "label": "Customer's Purchase Order Date",
"oldfieldname": "po_date",
"oldfieldtype": "Date",
"print_hide": 0,
@@ -255,7 +255,7 @@
"doctype": "DocField",
"fieldname": "sec_break45",
"fieldtype": "Section Break",
- "label": "Price List and Currency",
+ "label": "Currency and Price List",
"options": "icon-tag"
},
{
@@ -366,17 +366,27 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_31",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total_export",
"fieldtype": "Currency",
- "label": "Net Total (Export)",
+ "label": "Net Total",
"options": "currency",
"read_only": 1
},
{
"doctype": "DocField",
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total",
"fieldtype": "Currency",
- "label": "Net Total*",
+ "label": "Net Total (Company Currency)",
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -387,15 +397,6 @@
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "search_index": 0
- },
- {
- "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -458,35 +459,27 @@
"doctype": "DocField",
"fieldname": "other_charges_total_export",
"fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
+ "label": "Taxes and Charges Total",
"options": "currency",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Total",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
"fieldname": "column_break_46",
"fieldtype": "Column Break"
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
- "print_hide": 0
+ "fieldname": "other_charges_total",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1,
+ "width": "150px"
},
{
"doctype": "DocField",
@@ -501,7 +494,7 @@
"doctype": "DocField",
"fieldname": "grand_total_export",
"fieldtype": "Currency",
- "label": "Grand Total (Export)",
+ "label": "Grand Total",
"oldfieldname": "grand_total_export",
"oldfieldtype": "Currency",
"options": "currency",
@@ -514,7 +507,7 @@
"doctype": "DocField",
"fieldname": "rounded_total_export",
"fieldtype": "Currency",
- "label": "Rounded Total (Export)",
+ "label": "Rounded Total",
"oldfieldname": "rounded_total_export",
"oldfieldtype": "Currency",
"options": "currency",
@@ -526,7 +519,7 @@
"doctype": "DocField",
"fieldname": "in_words_export",
"fieldtype": "Data",
- "label": "In Words (Export)",
+ "label": "In Words",
"oldfieldname": "in_words_export",
"oldfieldtype": "Data",
"print_hide": 0,
@@ -545,7 +538,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total*",
+ "label": "Grand Total (Company Currency)",
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -558,7 +551,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -571,7 +564,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 7276fc3..84e44b0 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-05-22 12:10:03",
+ "modified": "2013-07-10 14:54:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -53,6 +55,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -67,6 +70,7 @@
"fieldname": "description",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -77,10 +81,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -94,6 +106,7 @@
"fieldname": "stock_uom",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -107,6 +120,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"oldfieldname": "ref_rate",
"oldfieldtype": "Currency",
@@ -122,6 +136,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount(%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -135,6 +150,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -149,6 +165,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"no_copy": 0,
"oldfieldname": "export_amount",
@@ -163,7 +180,8 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
- "label": "Price List Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -177,7 +195,8 @@
"doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
- "label": "Basic Rate*",
+ "in_list_view": 0,
+ "label": "Basic Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -192,7 +211,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"no_copy": 0,
"oldfieldname": "amount",
"oldfieldtype": "Currency",
@@ -205,8 +225,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "reserved_warehouse",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Reserved Warehouse",
"no_copy": 1,
"oldfieldname": "reserved_warehouse",
@@ -224,6 +252,7 @@
"fieldname": "projected_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Projected Qty",
"no_copy": 1,
"oldfieldname": "projected_qty",
@@ -238,6 +267,7 @@
"doctype": "DocField",
"fieldname": "actual_qty",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Actual Qty",
"no_copy": 1,
"print_hide": 1,
@@ -252,6 +282,7 @@
"fieldtype": "Float",
"hidden": 0,
"in_filter": 0,
+ "in_list_view": 0,
"label": "Delivered Qty",
"no_copy": 1,
"oldfieldname": "delivered_qty",
@@ -266,6 +297,7 @@
"doctype": "DocField",
"fieldname": "billed_amt",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Billed Amt",
"no_copy": 1,
"options": "currency",
@@ -278,6 +310,7 @@
"fieldname": "planned_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Planned Quantity",
"no_copy": 1,
"oldfieldname": "planned_qty",
@@ -294,6 +327,7 @@
"fieldname": "produced_qty",
"fieldtype": "Float",
"hidden": 1,
+ "in_list_view": 0,
"label": "Produced Quantity",
"oldfieldname": "produced_qty",
"oldfieldtype": "Currency",
@@ -309,6 +343,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Brand Name",
"oldfieldname": "brand",
"oldfieldtype": "Link",
@@ -323,6 +358,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@@ -337,7 +373,8 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
- "label": "Quotation No.",
+ "in_list_view": 0,
+ "label": "Quotation",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link",
@@ -351,6 +388,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 0,
"label": "Page Break",
"oldfieldname": "page_break",
"oldfieldtype": "Check",
@@ -363,6 +401,7 @@
"fieldname": "item_tax_rate",
"fieldtype": "Small Text",
"hidden": 1,
+ "in_list_view": 0,
"label": "Item Tax Rate",
"oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text",
@@ -377,6 +416,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 0,
+ "in_list_view": 0,
"label": "Sales Order Date",
"oldfieldname": "transaction_date",
"oldfieldtype": "Date",
diff --git a/selling/doctype/sales_team/sales_team.txt b/selling/doctype/sales_team/sales_team.txt
index 29a951e..ae50814b 100644
--- a/selling/doctype/sales_team/sales_team.txt
+++ b/selling/doctype/sales_team/sales_team.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-19 13:30:51",
"docstatus": 0,
- "modified": "2013-05-21 17:04:45",
+ "modified": "2013-07-10 14:54:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"fieldname": "sales_person",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Sales Person",
"oldfieldname": "sales_person",
"oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"fieldname": "sales_designation",
"fieldtype": "Data",
"hidden": 0,
+ "in_list_view": 1,
"label": "Designation",
"oldfieldname": "sales_designation",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"fieldname": "contact_no",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 1,
"label": "Contact No.",
"oldfieldname": "contact_no",
"oldfieldtype": "Data",
@@ -64,6 +67,7 @@
"doctype": "DocField",
"fieldname": "allocated_percentage",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Contribution (%)",
"oldfieldname": "allocated_percentage",
"oldfieldtype": "Currency",
@@ -75,6 +79,7 @@
"doctype": "DocField",
"fieldname": "allocated_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Contribution to Net Total",
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
@@ -90,6 +95,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
+ "in_list_view": 0,
"label": "Parenttype",
"oldfieldname": "parenttype",
"oldfieldtype": "Data",
@@ -100,6 +106,7 @@
"doctype": "DocField",
"fieldname": "incentives",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Incentives",
"oldfieldname": "incentives",
"oldfieldtype": "Currency",
diff --git a/setup/doctype/authorization_control/authorization_control.txt b/setup/doctype/authorization_control/authorization_control.txt
index 601381e..897994b 100644
--- a/setup/doctype/authorization_control/authorization_control.txt
+++ b/setup/doctype/authorization_control/authorization_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:18",
"docstatus": 0,
- "modified": "2012-03-27 14:36:18",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,9 +10,7 @@
"doctype": "DocType",
"issingle": 1,
"module": "Setup",
- "name": "__common__",
- "section_style": "Tabbed",
- "version": 216
+ "name": "__common__"
},
{
"doctype": "DocType",
diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py
index 0ea7f40..55a17f7 100644
--- a/setup/doctype/company/company.py
+++ b/setup/doctype/company/company.py
@@ -215,13 +215,13 @@
cc_list = [
{
'cost_center_name': self.doc.name,
- 'company_name':self.doc.name,
+ 'company':self.doc.name,
'group_or_ledger':'Group',
'parent_cost_center':''
},
{
'cost_center_name':'Main',
- 'company_name':self.doc.name,
+ 'company':self.doc.name,
'group_or_ledger':'Ledger',
'parent_cost_center':self.doc.name + ' - ' + self.doc.abbr
},
@@ -266,9 +266,9 @@
webnotes.conn.sql("delete from `tabAccount` where company = %s order by lft desc, rgt desc", self.doc.name)
#delete cost center child table - budget detail
- webnotes.conn.sql("delete bd.* from `tabBudget Detail` bd, `tabCost Center` cc where bd.parent = cc.name and cc.company_name = %s", self.doc.name)
+ webnotes.conn.sql("delete bd.* from `tabBudget Detail` bd, `tabCost Center` cc where bd.parent = cc.name and cc.company = %s", self.doc.name)
#delete cost center
- webnotes.conn.sql("delete from `tabCost Center` WHERE company_name = %s order by lft desc, rgt desc", self.doc.name)
+ webnotes.conn.sql("delete from `tabCost Center` WHERE company = %s order by lft desc, rgt desc", self.doc.name)
webnotes.defaults.clear_default("company", value=self.doc.name)
diff --git a/setup/doctype/contact_control/contact_control.txt b/setup/doctype/contact_control/contact_control.txt
index 9fab367..80caeae 100644
--- a/setup/doctype/contact_control/contact_control.txt
+++ b/setup/doctype/contact_control/contact_control.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-03-27 14:36:19",
"docstatus": 0,
- "modified": "2012-03-27 14:36:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -12,14 +12,12 @@
"issingle": 1,
"module": "Setup",
"name": "__common__",
- "read_only": 1,
- "section_style": "Simple",
- "show_in_menu": 0,
- "version": 25
+ "read_only": 1
},
{
"doctype": "DocField",
"fieldtype": "Text",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Contact Control",
"parentfield": "fields",
@@ -43,9 +41,6 @@
"name": "Contact Control"
},
{
- "doctype": "DocPerm"
- },
- {
"doctype": "DocField",
"fieldname": "header",
"label": "Header"
@@ -59,5 +54,8 @@
"doctype": "DocField",
"fieldname": "supplier_intro",
"label": "Supplier Intro"
+ },
+ {
+ "doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/setup/doctype/for_territory/for_territory.txt b/setup/doctype/for_territory/for_territory.txt
index 658a11c..be454ec 100644
--- a/setup/doctype/for_territory/for_territory.txt
+++ b/setup/doctype/for_territory/for_territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 12:48:38",
"docstatus": 0,
- "modified": "2013-06-20 12:48:38",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Territory",
"name": "__common__",
"options": "Territory",
diff --git a/setup/doctype/notification_control/notification_control.txt b/setup/doctype/notification_control/notification_control.txt
index be86a96..c1f559b 100644
--- a/setup/doctype/notification_control/notification_control.txt
+++ b/setup/doctype/notification_control/notification_control.txt
@@ -1,208 +1,217 @@
[
{
- "owner": "Administrator",
- "docstatus": 0,
"creation": "2012-07-12 23:29:45",
+ "docstatus": 0,
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
- "modified": "2013-01-10 12:22:45"
+ "owner": "Administrator"
},
{
+ "allow_copy": 1,
"allow_email": 1,
- "issingle": 1,
- "description": "Send automatic emails to Contacts on Submitting transactions.",
- "name": "__common__",
"allow_print": 1,
+ "description": "Send automatic emails to Contacts on Submitting transactions.",
"doctype": "DocType",
+ "issingle": 1,
"module": "Setup",
- "allow_copy": 1
+ "name": "__common__"
},
{
- "name": "__common__",
- "parent": "Notification Control",
"doctype": "DocField",
- "parenttype": "DocType",
- "permlevel": 0,
- "parentfield": "fields"
- },
- {
"name": "__common__",
"parent": "Notification Control",
- "read": 1,
- "doctype": "DocPerm",
+ "parentfield": "fields",
"parenttype": "DocType",
- "permlevel": 0,
- "parentfield": "permissions"
+ "permlevel": 0
},
{
- "name": "Notification Control",
- "doctype": "DocType"
+ "doctype": "DocPerm",
+ "name": "__common__",
+ "parent": "Notification Control",
+ "parentfield": "permissions",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "read": 1
+ },
+ {
+ "doctype": "DocType",
+ "name": "Notification Control"
},
{
"description": "When any of the checked transactions are \"Submitted\", an email pop-up automatically opened to send an email to the associated \"Contact\" in that transaction, with the transaction as an attachment. The user may or may not send the email.",
"doctype": "DocField",
- "label": "Prompt for Email on Submission of",
"fieldname": "send_autonotification_for",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Prompt for Email on Submission of"
},
{
- "print_width": "50%",
"doctype": "DocField",
- "label": "Sales",
- "width": "50%",
"fieldname": "sales",
- "fieldtype": "Column Break"
- },
- {
- "doctype": "DocField",
- "label": "Quotation",
- "fieldname": "quotation",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Sales Order",
- "fieldname": "sales_order",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Delivery Note",
- "fieldname": "delivery_note",
- "fieldtype": "Check"
- },
- {
- "doctype": "DocField",
- "label": "Sales Invoice",
- "fieldname": "sales_invoice",
- "fieldtype": "Check"
- },
- {
+ "fieldtype": "Column Break",
+ "in_list_view": 0,
+ "label": "Sales",
"print_width": "50%",
+ "width": "50%"
+ },
+ {
"doctype": "DocField",
- "label": "Purchase",
- "width": "50%",
+ "fieldname": "quotation",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Quotation"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sales_order",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Sales Order"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "delivery_note",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Delivery Note"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sales_invoice",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Sales Invoice"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "purchase",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "in_list_view": 0,
+ "label": "Purchase",
+ "print_width": "50%",
+ "width": "50%"
},
{
"doctype": "DocField",
- "label": "Purchase Order",
"fieldname": "purchase_order",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Purchase Order"
},
{
"doctype": "DocField",
- "label": "Purchase Receipt",
"fieldname": "purchase_receipt",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Purchase Receipt"
},
{
"doctype": "DocField",
- "label": "Expense Claim",
"fieldname": "expense_claim",
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "label": "Expense Claim"
},
{
"description": "Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.",
"doctype": "DocField",
- "label": "Customize the Notification",
"fieldname": "customize_the_notification",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "label": "Customize the Notification"
},
{
"doctype": "DocField",
- "label": "Select Transaction",
"fieldname": "select_transaction",
"fieldtype": "Select",
+ "label": "Select Transaction",
"options": "\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected"
},
{
"doctype": "DocField",
- "label": "Custom Message",
"fieldname": "custom_message",
- "fieldtype": "Text Editor"
+ "fieldtype": "Text Editor",
+ "label": "Custom Message"
},
{
"doctype": "DocField",
- "label": "Update",
"fieldname": "update",
"fieldtype": "Button",
+ "label": "Update",
"options": "set_message"
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Quotation Message",
"fieldname": "quotation_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Quotation Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Sales Order Message",
"fieldname": "sales_order_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Sales Order Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Delivery Note Message",
"fieldname": "delivery_note_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Delivery Note Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Sales Invoice Message",
"fieldname": "sales_invoice_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Sales Invoice Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Purchase Order Message",
"fieldname": "purchase_order_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Purchase Order Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Purchase Receipt Message",
"fieldname": "purchase_receipt_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Purchase Receipt Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Expense Claim Approved Message",
"fieldname": "expense_claim_approved_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Expense Claim Approved Message",
+ "print_hide": 1
},
{
- "print_hide": 1,
"doctype": "DocField",
- "label": "Expense Claim Rejected Message",
"fieldname": "expense_claim_rejected_message",
"fieldtype": "Text",
- "hidden": 1
+ "hidden": 1,
+ "label": "Expense Claim Rejected Message",
+ "print_hide": 1
},
{
"create": 0,
"doctype": "DocPerm",
- "write": 0,
- "role": "Guest"
+ "role": "Guest",
+ "write": 0
},
{
"create": 1,
"doctype": "DocPerm",
- "write": 1,
- "role": "System Manager"
+ "role": "System Manager",
+ "write": 1
}
]
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.py b/setup/doctype/sales_person/sales_person.py
index ea21cd0..2fe08fa 100644
--- a/setup/doctype/sales_person/sales_person.py
+++ b/setup/doctype/sales_person/sales_person.py
@@ -32,4 +32,13 @@
for d in getlist(self.doclist, 'target_details'):
if not flt(d.target_qty) and not flt(d.target_amount):
webnotes.msgprint("Either target qty or target amount is mandatory.")
- raise Exception
\ No newline at end of file
+ raise Exception
+
+ def get_email_id(self):
+ profile = webnotes.conn.get_value("Employee", self.doc.employee, "user_id")
+ if not profile:
+ webnotes.msgprint("User ID (Profile) no set for Employee %s" % self.doc.employee,
+ raise_exception=True)
+ else:
+ return webnotes.conn.get_value("Profile", profile, "email") or profile
+
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt
index 44a246d..56c6397 100644
--- a/setup/doctype/sales_person/sales_person.txt
+++ b/setup/doctype/sales_person/sales_person.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
- "modified": "2013-07-05 14:54:33",
+ "modified": "2013-07-10 12:51:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,12 +44,10 @@
},
{
"doctype": "DocField",
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "read_only": 1
+ "fieldname": "name_and_employee_id",
+ "fieldtype": "Section Break",
+ "label": "Name and Employee ID",
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -93,7 +91,8 @@
"fieldname": "employee",
"fieldtype": "Link",
"label": "Employee",
- "options": "Employee"
+ "options": "Employee",
+ "reqd": 1
},
{
"doctype": "DocField",
@@ -138,7 +137,8 @@
"fieldname": "target_details_section_break",
"fieldtype": "Section Break",
"label": "Sales Person Targets",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-bullseye"
},
{
"doctype": "DocField",
diff --git a/setup/doctype/sales_person/test_sales_person.py b/setup/doctype/sales_person/test_sales_person.py
index 2dea3e5..f4283de 100644
--- a/setup/doctype/sales_person/test_sales_person.py
+++ b/setup/doctype/sales_person/test_sales_person.py
@@ -1,21 +1,25 @@
+test_dependencies = ["Employee"]
test_records = [
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0001",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 1",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0002",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 2",
"parent_sales_person": "All Sales Persons",
- "is_group": "No"
+ "is_group": "No",
+ "employee": "_T-Employee-0003",
}]
diff --git a/setup/doctype/sms_parameter/sms_parameter.txt b/setup/doctype/sms_parameter/sms_parameter.txt
index cc7a002..38cca31 100755
--- a/setup/doctype/sms_parameter/sms_parameter.txt
+++ b/setup/doctype/sms_parameter/sms_parameter.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-03-07 07:03:32",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
{
"doctype": "DocField",
"fieldtype": "Data",
+ "in_list_view": 1,
"name": "__common__",
"parent": "SMS Parameter",
"parentfield": "fields",
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index b3e2886..5d22d88 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-03-07 07:03:33",
+ "modified": "2013-07-10 14:54:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Target Detail",
"parentfield": "fields",
diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt
index cf3fbb1..34681a8 100644
--- a/stock/doctype/bin/bin.txt
+++ b/stock/doctype/bin/bin.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:25",
"docstatus": 0,
- "modified": "2013-01-23 16:53:15",
+ "modified": "2013-07-10 14:54:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -45,6 +45,7 @@
"fieldname": "warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -55,6 +56,7 @@
"doctype": "DocField",
"fieldname": "warehouse_type",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Warehouse Type",
"oldfieldname": "warehouse_type",
"oldfieldtype": "Data"
@@ -64,6 +66,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -76,6 +79,7 @@
"fieldname": "reserved_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Reserved Quantity",
"oldfieldname": "reserved_qty",
"oldfieldtype": "Currency",
@@ -87,6 +91,7 @@
"fieldname": "actual_qty",
"fieldtype": "Float",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Actual Quantity",
"oldfieldname": "actual_qty",
"oldfieldtype": "Currency",
@@ -98,6 +103,7 @@
"fieldname": "ordered_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Ordered Quantity",
"oldfieldname": "ordered_qty",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index 936ca9e..bbc22b9 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -247,7 +247,7 @@
cur_frm.fields_dict.delivery_note_details.grid.get_field("cost_center").get_query = function(doc) {
return {
query: "accounts.utils.get_cost_center_list",
- filters: { company_name: doc.company}
+ filters: { company: doc.company}
}
}
}
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 5cdae86..cfdd8cd 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
- "modified": "2013-07-08 17:46:45",
+ "modified": "2013-07-09 12:48:27",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -214,32 +214,10 @@
},
{
"doctype": "DocField",
- "fieldname": "challan_no",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Challan No",
- "oldfieldname": "challan_no",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "challan_date",
- "fieldtype": "Date",
- "hidden": 1,
- "label": "Challan Date",
- "oldfieldname": "challan_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "po_no",
"fieldtype": "Data",
"hidden": 1,
- "label": "P.O. No",
+ "label": "Customer's Purchase Order No",
"no_copy": 0,
"oldfieldname": "po_no",
"oldfieldtype": "Data",
@@ -254,7 +232,7 @@
"fieldname": "po_date",
"fieldtype": "Data",
"hidden": 1,
- "label": "P.O. Date",
+ "label": "Customer's Purchase Order Date",
"no_copy": 0,
"oldfieldname": "po_date",
"oldfieldtype": "Data",
@@ -267,7 +245,7 @@
"doctype": "DocField",
"fieldname": "sec_break25",
"fieldtype": "Section Break",
- "label": "Price List and Currency",
+ "label": "Currency and Price List",
"options": "icon-tag",
"read_only": 0
},
@@ -392,17 +370,27 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_31",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total_export",
"fieldtype": "Currency",
- "label": "Net Total (Export)",
+ "label": "Net Total",
"options": "currency",
"read_only": 1
},
{
"doctype": "DocField",
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "net_total",
"fieldtype": "Currency",
- "label": "Net Total*",
+ "label": "Net Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "net_total",
"oldfieldtype": "Currency",
@@ -415,14 +403,6 @@
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -490,37 +470,28 @@
"doctype": "DocField",
"fieldname": "other_charges_total_export",
"fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
+ "label": "Taxes and Charges Total",
"options": "company",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Total",
- "oldfieldname": "other_charges_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
"fieldname": "column_break_47",
"fieldtype": "Column Break"
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_total",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Company Currency)",
+ "oldfieldname": "other_charges_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"print_hide": 1,
- "read_only": 0
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
},
{
"doctype": "DocField",
@@ -536,7 +507,7 @@
"doctype": "DocField",
"fieldname": "grand_total_export",
"fieldtype": "Currency",
- "label": "Grand Total (Export)",
+ "label": "Grand Total",
"no_copy": 0,
"oldfieldname": "grand_total_export",
"oldfieldtype": "Currency",
@@ -551,7 +522,7 @@
"doctype": "DocField",
"fieldname": "rounded_total_export",
"fieldtype": "Currency",
- "label": "Rounded Total (Export)",
+ "label": "Rounded Total",
"no_copy": 0,
"oldfieldname": "rounded_total_export",
"oldfieldtype": "Currency",
@@ -566,7 +537,7 @@
"doctype": "DocField",
"fieldname": "in_words_export",
"fieldtype": "Data",
- "label": "In Words (Export)",
+ "label": "In Words",
"no_copy": 0,
"oldfieldname": "in_words_export",
"oldfieldtype": "Data",
@@ -586,7 +557,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
@@ -601,7 +572,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"no_copy": 0,
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
@@ -616,7 +587,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"no_copy": 0,
"oldfieldname": "in_words",
"oldfieldtype": "Data",
@@ -690,7 +661,7 @@
"doctype": "DocField",
"fieldname": "lr_no",
"fieldtype": "Data",
- "label": "LR No",
+ "label": "Vehicle No",
"no_copy": 0,
"oldfieldname": "lr_no",
"oldfieldtype": "Data",
@@ -706,7 +677,7 @@
"doctype": "DocField",
"fieldname": "lr_date",
"fieldtype": "Date",
- "label": "LR Date",
+ "label": "Vehicle Dispatch Date",
"no_copy": 0,
"oldfieldname": "lr_date",
"oldfieldtype": "Date",
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index 69b5bc4..346673f 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-07-08 17:46:21",
+ "modified": "2013-07-10 14:54:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "barcode",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Barcode",
"print_hide": 1,
"read_only": 0
@@ -38,6 +39,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -53,6 +55,7 @@
"fieldname": "customer_item_code",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Customer's Item Code",
"print_hide": 1,
"read_only": 1
@@ -61,6 +64,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -74,6 +78,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -83,10 +88,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "quantity_and_rate",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Rate"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -99,6 +112,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -113,6 +127,7 @@
"doctype": "DocField",
"fieldname": "ref_rate",
"fieldtype": "Currency",
+ "in_list_view": 0,
"label": "Price List Rate",
"no_copy": 0,
"oldfieldname": "ref_rate",
@@ -129,6 +144,7 @@
"doctype": "DocField",
"fieldname": "adj_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount (%)",
"oldfieldname": "adj_rate",
"oldfieldtype": "Float",
@@ -141,6 +157,7 @@
"doctype": "DocField",
"fieldname": "export_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
@@ -155,6 +172,7 @@
"doctype": "DocField",
"fieldname": "export_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "export_amount",
"oldfieldtype": "Currency",
@@ -169,7 +187,8 @@
"doctype": "DocField",
"fieldname": "base_ref_rate",
"fieldtype": "Currency",
- "label": "Price List Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -183,7 +202,8 @@
"doctype": "DocField",
"fieldname": "basic_rate",
"fieldtype": "Currency",
- "label": "Rate*",
+ "in_list_view": 0,
+ "label": "Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -197,7 +217,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -209,8 +230,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -225,6 +254,7 @@
"fieldname": "serial_no",
"fieldtype": "Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
diff --git a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
index defd39d..441b13a 100644
--- a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
+++ b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:00",
"docstatus": 0,
- "modified": "2013-03-07 07:03:20",
+ "modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"doctype": "DocField",
"fieldname": "parent_item",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Parent Item",
"oldfieldname": "parent_item",
"oldfieldtype": "Link",
@@ -39,6 +40,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -50,6 +52,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -60,6 +63,7 @@
"fieldname": "parent_detail_docname",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 0,
"label": "Parent Detail docname",
"no_copy": 1,
"oldfieldname": "parent_detail_docname",
@@ -71,6 +75,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -82,6 +87,7 @@
"doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -91,6 +97,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/item_customer_detail/item_customer_detail.txt b/stock/doctype/item_customer_detail/item_customer_detail.txt
index 3b916a2..def1dff 100644
--- a/stock/doctype/item_customer_detail/item_customer_detail.txt
+++ b/stock/doctype/item_customer_detail/item_customer_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-08 15:37:16",
"docstatus": 0,
- "modified": "2013-03-21 17:29:45",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,6 +19,7 @@
{
"doctype": "DocField",
"in_filter": 1,
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Customer Detail",
"parentfield": "fields",
diff --git a/stock/doctype/item_price/item_price.txt b/stock/doctype/item_price/item_price.txt
index e4926cb..8062b57 100644
--- a/stock/doctype/item_price/item_price.txt
+++ b/stock/doctype/item_price/item_price.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-02 16:29:48",
"docstatus": 0,
- "modified": "2013-06-11 18:27:55",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -17,6 +17,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Price",
"parentfield": "fields",
diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
index 8233ede..df8c817 100644
--- a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
+++ b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
{
"doctype": "DocField",
"fieldtype": "Data",
+ "in_list_view": 1,
"name": "__common__",
"oldfieldtype": "Data",
"parent": "Item Quality Inspection Parameter",
diff --git a/stock/doctype/item_reorder/item_reorder.txt b/stock/doctype/item_reorder/item_reorder.txt
index b6933c7..ae9de1e 100644
--- a/stock/doctype/item_reorder/item_reorder.txt
+++ b/stock/doctype/item_reorder/item_reorder.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:59",
"docstatus": 0,
- "modified": "2013-03-19 12:22:44",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Reorder",
"parentfield": "fields",
diff --git a/stock/doctype/item_supplier/item_supplier.txt b/stock/doctype/item_supplier/item_supplier.txt
index 3129504..e0e0e6d 100644
--- a/stock/doctype/item_supplier/item_supplier.txt
+++ b/stock/doctype/item_supplier/item_supplier.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Supplier",
"parentfield": "fields",
diff --git a/stock/doctype/item_tax/item_tax.txt b/stock/doctype/item_tax/item_tax.txt
index 343f965..cbc112e 100644
--- a/stock/doctype/item_tax/item_tax.txt
+++ b/stock/doctype/item_tax/item_tax.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Tax",
"parentfield": "fields",
diff --git a/stock/doctype/item_website_specification/item_website_specification.txt b/stock/doctype/item_website_specification/item_website_specification.txt
index 1b371c7..c3c1d34 100644
--- a/stock/doctype/item_website_specification/item_website_specification.txt
+++ b/stock/doctype/item_website_specification/item_website_specification.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:01",
"docstatus": 0,
- "modified": "2013-03-07 07:03:22",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Item Website Specification",
"parentfield": "fields",
diff --git a/stock/doctype/landed_cost_item/landed_cost_item.txt b/stock/doctype/landed_cost_item/landed_cost_item.txt
index 1563fac..3e14ce8 100644
--- a/stock/doctype/landed_cost_item/landed_cost_item.txt
+++ b/stock/doctype/landed_cost_item/landed_cost_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Landed Cost Item",
"parentfield": "fields",
diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
index 8b80559..e47dd27 100644
--- a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
+++ b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Landed Cost Purchase Receipt",
"parentfield": "fields",
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index 649210e..92bca0a 100644
--- a/stock/doctype/material_request/material_request.txt
+++ b/stock/doctype/material_request/material_request.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 14:48:38",
"docstatus": 0,
- "modified": "2013-07-08 16:18:00",
+ "modified": "2013-07-09 11:39:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -81,6 +81,35 @@
},
{
"doctype": "DocField",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "description": "Select the relevant company name if you have multiple companies",
+ "doctype": "DocField",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "print_width": "150px",
+ "reqd": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "items",
"fieldtype": "Section Break",
"label": "Items",
@@ -131,22 +160,6 @@
"width": "100px"
},
{
- "description": "Select the relevant company name if you have multiple companies",
- "doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "print_width": "150px",
- "reqd": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
@@ -226,19 +239,6 @@
},
{
"doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
"fieldname": "remark",
"fieldtype": "Small Text",
"in_list_view": 0,
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 992b4cf..86cc168 100644
--- a/stock/doctype/material_request_item/material_request_item.txt
+++ b/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-07-09 11:37:12",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"doctype": "DocField",
"fieldname": "schedule_date",
"fieldtype": "Date",
+ "in_list_view": 1,
"label": "Required Date",
"no_copy": 1,
"oldfieldname": "schedule_date",
@@ -57,6 +59,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -66,8 +69,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "quantity_and_warehouse",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Quantity and Warehouse"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -82,6 +93,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"no_copy": 0,
"oldfieldname": "qty",
@@ -94,6 +106,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Stock UOM",
"no_copy": 0,
"oldfieldname": "uom",
@@ -108,6 +121,7 @@
"doctype": "DocField",
"fieldname": "lead_time_date",
"fieldtype": "Date",
+ "in_list_view": 0,
"label": "Lead Time Date",
"no_copy": 1,
"oldfieldname": "lead_time_date",
@@ -120,6 +134,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
diff --git a/stock/doctype/packing_slip_item/packing_slip_item.txt b/stock/doctype/packing_slip_item/packing_slip_item.txt
index b186f40..8dea877 100644
--- a/stock/doctype/packing_slip_item/packing_slip_item.txt
+++ b/stock/doctype/packing_slip_item/packing_slip_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-08 13:10:16",
"docstatus": 0,
- "modified": "2013-04-11 15:06:05",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"options": "Item",
"print_width": "100px",
@@ -40,6 +41,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"print_width": "200px",
"read_only": 1,
@@ -49,6 +51,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Quantity",
"print_width": "100px",
"read_only": 0,
@@ -59,6 +62,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "UOM",
"print_width": "100px",
"read_only": 1,
@@ -68,6 +72,7 @@
"doctype": "DocField",
"fieldname": "net_weight",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Net Weight",
"print_width": "100px",
"read_only": 0,
@@ -77,6 +82,7 @@
"doctype": "DocField",
"fieldname": "weight_uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "Weight UOM",
"options": "UOM",
"print_width": "100px",
@@ -87,6 +93,7 @@
"doctype": "DocField",
"fieldname": "page_break",
"fieldtype": "Check",
+ "in_list_view": 1,
"label": "Page Break",
"read_only": 0
},
@@ -95,6 +102,7 @@
"fieldname": "dn_detail",
"fieldtype": "Data",
"hidden": 1,
+ "in_list_view": 1,
"label": "DN Detail",
"read_only": 0
}
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 3b6d876..94136ae 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-07-08 17:46:13",
+ "modified": "2013-07-09 12:50:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -172,7 +172,7 @@
"fieldname": "challan_no",
"fieldtype": "Data",
"hidden": 1,
- "label": "Challan No",
+ "label": "Supplier Shipment No",
"no_copy": 1,
"oldfieldname": "challan_no",
"oldfieldtype": "Data",
@@ -186,7 +186,7 @@
"fieldname": "challan_date",
"fieldtype": "Date",
"hidden": 1,
- "label": "Challan Date",
+ "label": "Supplier Shipment Date",
"no_copy": 1,
"oldfieldname": "challan_date",
"oldfieldtype": "Date",
@@ -197,56 +197,9 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart"
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "purchase_receipt_details",
- "fieldtype": "Table",
- "label": "Purchase Receipt Items",
- "oldfieldname": "purchase_receipt_details",
- "oldfieldtype": "Table",
- "options": "Purchase Receipt Item",
- "print_hide": 0,
- "reqd": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break"
- },
- {
- "doctype": "DocField",
- "fieldname": "get_current_stock",
- "fieldtype": "Button",
- "label": "Get Current Stock",
- "oldfieldtype": "Button",
- "options": "get_current_stock",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break_18",
- "fieldtype": "Column Break"
- },
- {
- "doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button"
- },
- {
- "doctype": "DocField",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
- "label": "Currency & Price List",
+ "label": "Currency and Price List",
"options": "icon-tag"
},
{
@@ -309,6 +262,71 @@
"print_hide": 1
},
{
+ "doctype": "DocField",
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart"
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "purchase_receipt_details",
+ "fieldtype": "Table",
+ "label": "Purchase Receipt Items",
+ "oldfieldname": "purchase_receipt_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Receipt Item",
+ "print_hide": 0,
+ "reqd": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total_import",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "get_current_stock",
+ "fieldtype": "Button",
+ "label": "Get Current Stock",
+ "oldfieldtype": "Button",
+ "options": "get_current_stock",
+ "print_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break_27",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 1,
+ "width": "150px"
+ },
+ {
"description": "Add / Edit Taxes and Charges",
"doctype": "DocField",
"fieldname": "taxes",
@@ -330,15 +348,6 @@
},
{
"doctype": "DocField",
- "fieldname": "get_tax_detail",
- "fieldtype": "Button",
- "label": "Get Tax Detail",
- "oldfieldtype": "Button",
- "options": "get_purchase_tax_details",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "purchase_tax_details",
"fieldtype": "Table",
"label": "Purchase Taxes and Charges",
@@ -348,14 +357,6 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_tax",
- "fieldtype": "Button",
- "label": "Calculate Tax",
- "oldfieldtype": "Button",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "tax_calculation",
"fieldtype": "HTML",
"label": "Tax Calculation",
@@ -373,20 +374,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total_import",
- "fieldtype": "Currency",
- "label": "Net Total (Import)",
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added (Import)",
+ "label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -397,7 +387,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Import)",
+ "label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -408,7 +398,7 @@
"doctype": "DocField",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
- "label": "Grand Total (Import)",
+ "label": "Grand Total",
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
"options": "currency",
@@ -419,7 +409,7 @@
"doctype": "DocField",
"fieldname": "in_words_import",
"fieldtype": "Data",
- "label": "In Words (Import)",
+ "label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -434,23 +424,9 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
- "label": "Taxes and Charges Added",
+ "label": "Taxes and Charges Added (Company Currency)",
"oldfieldname": "other_charges_added",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -461,7 +437,7 @@
"doctype": "DocField",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
+ "label": "Taxes and Charges Deducted (Company Currency)",
"oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -472,7 +448,7 @@
"doctype": "DocField",
"fieldname": "total_tax",
"fieldtype": "Currency",
- "label": "Total Tax",
+ "label": "Total Tax (Company Currency)",
"oldfieldname": "total_tax",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -483,7 +459,7 @@
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
- "label": "Grand Total",
+ "label": "Grand Total (Company Currency)",
"oldfieldname": "grand_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -494,7 +470,7 @@
"doctype": "DocField",
"fieldname": "rounded_total",
"fieldtype": "Currency",
- "label": "Rounded Total",
+ "label": "Rounded Total (Company Currency)",
"oldfieldname": "rounded_total",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -506,7 +482,7 @@
"doctype": "DocField",
"fieldname": "in_words",
"fieldtype": "Data",
- "label": "In Words",
+ "label": "In Words (Company Currency)",
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 0f6e9b5..60b1b56 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2013-07-08 17:46:17",
+ "modified": "2013-07-10 14:54:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -57,6 +59,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -66,10 +69,18 @@
"width": "300px"
},
{
+ "doctype": "DocField",
+ "fieldname": "received_and_accepted",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Received and Accepted"
+ },
+ {
"default": "0.00",
"doctype": "DocField",
"fieldname": "received_qty",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Recd Quantity",
"oldfieldname": "received_qty",
"oldfieldtype": "Currency",
@@ -84,6 +95,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Accepted Quantity",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -97,6 +109,7 @@
"fieldname": "rejected_qty",
"fieldtype": "Float",
"in_filter": 0,
+ "in_list_view": 0,
"label": "Rejected Quantity",
"oldfieldname": "rejected_qty",
"oldfieldtype": "Currency",
@@ -110,6 +123,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -122,9 +136,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "rate_and_amount",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Rate and Amount"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "import_ref_rate",
"fieldtype": "Currency",
- "label": "Ref Rate ",
+ "in_list_view": 0,
+ "label": "Price List Rate",
"options": "currency",
"print_hide": 1,
"read_only": 0
@@ -133,6 +155,7 @@
"doctype": "DocField",
"fieldname": "discount_rate",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Discount %",
"print_hide": 1,
"read_only": 0
@@ -142,6 +165,7 @@
"doctype": "DocField",
"fieldname": "import_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
@@ -155,6 +179,7 @@
"doctype": "DocField",
"fieldname": "import_amount",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Amount",
"oldfieldname": "import_amount",
"oldfieldtype": "Currency",
@@ -165,7 +190,8 @@
"doctype": "DocField",
"fieldname": "purchase_ref_rate",
"fieldtype": "Currency",
- "label": "Price List Rate*",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
"options": "Company:company:default_currency",
"print_hide": 1,
"read_only": 0
@@ -175,7 +201,8 @@
"doctype": "DocField",
"fieldname": "purchase_rate",
"fieldtype": "Currency",
- "label": "Rate*",
+ "in_list_view": 0,
+ "label": "Rate (Company Currency)",
"oldfieldname": "purchase_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -190,7 +217,8 @@
"doctype": "DocField",
"fieldname": "amount",
"fieldtype": "Currency",
- "label": "Amount*",
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
"oldfieldname": "amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -202,9 +230,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Warehouse and Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
+ "in_list_view": 0,
"label": "Accepted Warehouse",
"oldfieldname": "warehouse",
"oldfieldtype": "Link",
@@ -218,6 +254,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 0,
"label": "Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Currency",
@@ -231,6 +268,7 @@
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
+ "in_list_view": 0,
"label": "Stock UOM",
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
@@ -245,6 +283,7 @@
"fieldname": "serial_no",
"fieldtype": "Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
@@ -314,7 +353,7 @@
"doctype": "DocField",
"fieldname": "qa_no",
"fieldtype": "Link",
- "label": "QA No",
+ "label": "Quality Inspection",
"no_copy": 1,
"oldfieldname": "qa_no",
"oldfieldtype": "Link",
@@ -378,7 +417,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
- "label": "PO No",
+ "label": "Purchase Order",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link",
@@ -396,7 +435,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
- "label": "PO Date",
+ "label": "Purchase Order Date",
"no_copy": 1,
"oldfieldname": "prevdoc_date",
"oldfieldtype": "Date",
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index 8426ddca..f47e192 100644
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-29 18:22:12",
"docstatus": 0,
- "modified": "2013-03-29 19:43:04",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "s_warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Source Warehouse",
"no_copy": 1,
"oldfieldname": "s_warehouse",
@@ -42,6 +43,7 @@
"fieldname": "t_warehouse",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Target Warehouse",
"no_copy": 1,
"oldfieldname": "t_warehouse",
@@ -54,6 +56,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -66,6 +69,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -77,6 +81,7 @@
"doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
@@ -87,6 +92,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -98,6 +104,7 @@
"doctype": "DocField",
"fieldname": "incoming_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Valuation Rate",
"oldfieldname": "incoming_rate",
"oldfieldtype": "Currency",
diff --git a/stock/doctype/stock_ledger/stock_ledger.txt b/stock/doctype/stock_ledger/stock_ledger.txt
index 1da37c6..afdaa4d 100644
--- a/stock/doctype/stock_ledger/stock_ledger.txt
+++ b/stock/doctype/stock_ledger/stock_ledger.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-01-22 14:57:24",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
index 381c7f7..8b35f64 100644
--- a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
+++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:04",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -29,6 +29,7 @@
"doctype": "DocField",
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
@@ -38,6 +39,7 @@
"doctype": "DocField",
"fieldname": "conversion_factor",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Conversion Factor",
"oldfieldname": "conversion_factor",
"oldfieldtype": "Float"
diff --git a/stock/doctype/warehouse_user/warehouse_user.txt b/stock/doctype/warehouse_user/warehouse_user.txt
index 6912e30..fee6221 100644
--- a/stock/doctype/warehouse_user/warehouse_user.txt
+++ b/stock/doctype/warehouse_user/warehouse_user.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -17,6 +17,7 @@
"doctype": "DocField",
"fieldname": "user",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "User",
"name": "__common__",
"options": "Profile",
diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js
index 558ef32..9957c8e 100644
--- a/support/doctype/customer_issue/customer_issue.js
+++ b/support/doctype/customer_issue/customer_issue.js
@@ -18,10 +18,9 @@
// TODO commonify this code
erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
refresh: function() {
- if(cur_frm.doc.docstatus==1 && (cur_frm.doc.status=='Open' ||
- cur_frm.doc.status == 'Work In Progress')) {
- cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
- }
+ if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
+ cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
+ }
},
customer: function() {
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index 1850f57..5f89ade 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-05 14:34:37",
+ "modified": "2013-07-10 13:13:27",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -10,7 +10,7 @@
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-bug",
- "is_submittable": 1,
+ "is_submittable": 0,
"module": "Support",
"name": "__common__",
"search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory"
@@ -24,6 +24,8 @@
"permlevel": 0
},
{
+ "amend": 0,
+ "cancel": 1,
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
@@ -33,6 +35,8 @@
"permlevel": 0,
"read": 1,
"report": 1,
+ "role": "Maintenance User",
+ "submit": 0,
"write": 1
},
{
@@ -412,28 +416,6 @@
"width": "150px"
},
{
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "System Manager",
- "submit": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "Maintenance Manager",
- "submit": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "doctype": "DocPerm",
- "role": "Maintenance User",
- "submit": 1
- },
- {
- "doctype": "DocPerm",
- "role": "Guest"
+ "doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js
index ec75289..6e43cb1 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -17,6 +17,30 @@
wn.provide("erpnext.support");
// TODO commonify this code
erpnext.support.MaintenanceSchedule = wn.ui.form.Controller.extend({
+ refresh: function() {
+ if (this.frm.doc.docstatus===0) {
+ cur_frm.add_custom_button(wn._('From Sales Order'),
+ function() {
+ wn.model.map_current_doc({
+ method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
+ source_doctype: "Sales Order",
+ get_query_filters: {
+ docstatus: 1,
+ order_type: cur_frm.doc.order_type,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ } else if (this.frm.doc.docstatus===1) {
+ cur_frm.add_custom_button(wn._("Make Maintenance Visit"), function() {
+ wn.model.open_mapped_doc({
+ method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ source_name: cur_frm.doc.name
+ })
+ })
+ }
+ },
customer: function() {
var me = this;
if(this.frm.doc.customer) {
@@ -27,23 +51,8 @@
if(!r.exc) me.frm.refresh_fields();
}
});
-
- // TODO shift this to depends_on
- unhide_field(['customer_address', 'contact_person', 'customer_name',
- 'address_display', 'contact_display', 'contact_mobile', 'contact_email',
- 'territory', 'customer_group']);
-
- }
+ }
},
-
- get_items: function() {
- wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
- source_name: cur_frm.doc.quotation_no,
- });
- unhide_field(['customer_address', 'contact_person', 'customer_name', 'address_display',
- 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']);
- }
});
$.extend(cur_frm.cscript, new erpnext.support.MaintenanceSchedule({frm: cur_frm}));
@@ -82,15 +91,6 @@
}
}
-cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
- }
- return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Item`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Item`.parent = `tabSales Order`.name AND `tabSales Order Item`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
-}
-
cur_frm.cscript.periodicity = function(doc, cdt, cdn){
var d = locals[cdt][cdn];
if(d.start_date && d.end_date){
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py
index ee7f45a..0e2d1f9 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -77,8 +77,8 @@
self.update_amc_date(d.serial_no, d.end_date)
if d.incharge_name not in email_map:
- e = sql("select email_id, name from `tabSales Person` where name='%s' " %(d.incharge_name),as_dict=1)[0]
- email_map[d.incharge_name] = (e['email_id'])
+ email_map[d.incharge_name] = webnotes.bean("Sales Person",
+ d.incharge_name).run_method("get_email_id")
scheduled_date =sql("select scheduled_date from `tabMaintenance Schedule Detail` \
where incharge_name='%s' and item_code='%s' and parent='%s' " %(d.incharge_name, \
@@ -312,6 +312,9 @@
def make_maintenance_visit(source_name, target_doclist=None):
from webnotes.model.mapper import get_mapped_doclist
+ def update_status(source, target, parent):
+ target.maintenance_type = "Scheduled"
+
doclist = get_mapped_doclist("Maintenance Schedule", source_name, {
"Maintenance Schedule": {
"doctype": "Maintenance Visit",
@@ -320,13 +323,15 @@
},
"validation": {
"docstatus": ["=", 1]
- }
+ },
+ "postprocess": update_status
},
"Maintenance Schedule Item": {
"doctype": "Maintenance Visit Purpose",
"field_map": {
"parent": "prevdoc_docname",
- "parenttype": "prevdoc_doctype"
+ "parenttype": "prevdoc_doctype",
+ "incharge_name": "service_person"
}
}
}, target_doclist)
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index fc95ec6..0491946 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-07 12:18:51",
+ "modified": "2013-07-10 12:18:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,13 +24,19 @@
"permlevel": 0
},
{
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Maintenance Schedule",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
- "report": 1
+ "report": 1,
+ "submit": 1,
+ "write": 1
},
{
"doctype": "DocType",
@@ -42,7 +48,7 @@
"fieldtype": "Section Break",
"label": "Customer Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -97,6 +103,7 @@
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
+ "hidden": 1,
"label": "Address",
"read_only": 1
},
@@ -104,20 +111,23 @@
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
+ "hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "contact_mobile",
- "fieldtype": "Text",
+ "fieldtype": "Data",
+ "hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "contact_email",
- "fieldtype": "Text",
+ "fieldtype": "Data",
+ "hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -202,26 +212,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
- "options": "Simple"
- },
- {
- "doctype": "DocField",
- "fieldname": "sales_order_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Order No",
- "oldfieldname": "sales_order_no",
- "oldfieldtype": "Link",
- "options": "Sales Order",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "get_items",
- "fieldtype": "Button",
- "label": "Get Items",
- "oldfieldtype": "Button",
- "report_hide": 1
+ "options": "icon-shopping-cart"
},
{
"doctype": "DocField",
@@ -238,7 +229,7 @@
"fieldtype": "Section Break",
"label": "Schedule",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-time"
},
{
"doctype": "DocField",
@@ -258,41 +249,11 @@
"read_only": 1
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "System Manager",
- "submit": 1,
- "write": 1
+ "role": "System Manager"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "role": "System Manager",
- "submit": 0
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance Manager",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance Manager",
- "submit": 0
+ "role": "Maintenance Manager"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
index 0aa4d0d..e55a69c 100644
--- a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:23",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 0,
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -54,6 +56,7 @@
"fieldname": "scheduled_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Scheduled Date",
"oldfieldname": "scheduled_date",
"oldfieldtype": "Date",
@@ -65,6 +68,7 @@
"fieldname": "actual_date",
"fieldtype": "Date",
"hidden": 1,
+ "in_list_view": 0,
"label": "Actual Date",
"no_copy": 1,
"oldfieldname": "actual_date",
@@ -78,6 +82,7 @@
"fieldname": "incharge_name",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Incharge Name",
"oldfieldname": "incharge_name",
"oldfieldtype": "Link",
@@ -90,6 +95,7 @@
"fieldname": "serial_no",
"fieldtype": "Small Text",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Serial No",
"no_copy": 0,
"oldfieldname": "serial_no",
diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
index 3a95b2c..648a328 100644
--- a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
+++ b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:05",
"docstatus": 0,
- "modified": "2013-03-07 07:03:24",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,6 +30,7 @@
"fieldname": "item_code",
"fieldtype": "Link",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -50,6 +52,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Data",
@@ -59,9 +62,17 @@
},
{
"doctype": "DocField",
+ "fieldname": "schedule_details",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Schedule Details"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "start_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "Start Date",
"oldfieldname": "start_date",
"oldfieldtype": "Date",
@@ -73,6 +84,7 @@
"fieldname": "end_date",
"fieldtype": "Date",
"in_filter": 1,
+ "in_list_view": 1,
"label": "End Date",
"oldfieldname": "end_date",
"oldfieldtype": "Date",
@@ -83,6 +95,7 @@
"doctype": "DocField",
"fieldname": "periodicity",
"fieldtype": "Select",
+ "in_list_view": 1,
"label": "Periodicity",
"oldfieldname": "periodicity",
"oldfieldtype": "Select",
@@ -102,7 +115,7 @@
"fieldname": "incharge_name",
"fieldtype": "Link",
"in_filter": 1,
- "label": "Incharge Name",
+ "label": "Sales Person Incharge",
"oldfieldname": "incharge_name",
"oldfieldtype": "Link",
"options": "Sales Person",
@@ -111,6 +124,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "reference",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
"label": "Serial No",
diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js
index 6c282c0..8de80af 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/support/doctype/maintenance_visit/maintenance_visit.js
@@ -17,6 +17,48 @@
wn.provide("erpnext.support");
// TODO commonify this code
erpnext.support.MaintenanceVisit = wn.ui.form.Controller.extend({
+ refresh: function() {
+ if (this.frm.doc.docstatus===0) {
+ cur_frm.add_custom_button(wn._('From Maintenance Schedule'),
+ function() {
+ wn.model.map_current_doc({
+ method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ source_doctype: "Maintenance Schedule",
+ get_query_filters: {
+ docstatus: 1,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ cur_frm.add_custom_button(wn._('From Customer Issue'),
+ function() {
+ wn.model.map_current_doc({
+ method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
+ source_doctype: "Customer Issue",
+ get_query_filters: {
+ status: ["in", "Open, Work in Progress"],
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ cur_frm.add_custom_button(wn._('From Sales Order'),
+ function() {
+ wn.model.map_current_doc({
+ method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
+ source_doctype: "Sales Order",
+ get_query_filters: {
+ docstatus: 1,
+ order_type: cur_frm.doc.order_type,
+ customer: cur_frm.doc.customer || undefined,
+ company: cur_frm.doc.company
+ }
+ })
+ });
+ }
+ cur_frm.cscript.hide_contact_info();
+ },
customer: function() {
var me = this;
if(this.frm.doc.customer) {
@@ -29,29 +71,9 @@
});
// TODO shift this to depends_on
- hide_contact_info(this.frm.doc);
+ cur_frm.cscript.hide_contact_info();
}
},
-
- get_items: function() {
- if(cur_frm.doc.sales_order_no) {
- wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- } else if (cur_frm.doc.customer_issue_no) {
- wn.model.map_current_doc({
- method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- } else if (cur_frm.doc.maintenance_schedule) {
- wn.model.map_current_doc({
- method: "support.doctype.maintenance_schedule.maintenance_schedule\
- .make_maintenance_visit",
- source_name: cur_frm.doc.quotation_no,
- });
- }
- }
});
$.extend(cur_frm.cscript, new erpnext.support.MaintenanceVisit({frm: cur_frm}));
@@ -59,17 +81,11 @@
cur_frm.cscript.onload = function(doc, dt, dn) {
if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
if(doc.__islocal) set_multiple(dt,dn,{mntc_date:get_today()});
- hide_contact_info(doc);
+ cur_frm.cscript.hide_contact_info();
}
-var hide_contact_info = function(doc) {
- if(doc.customer) $(cur_frm.fields_dict.contact_info_section.row.wrapper).toggle(true);
- else $(cur_frm.fields_dict.contact_info_section.row.wrapper).toggle(false);
-
-}
-
-cur_frm.cscript.refresh = function(doc) {
- hide_contact_info(doc);
+cur_frm.cscript.hide_contact_info = function() {
+ cur_frm.toggle_display("contact_info_section", cur_frm.doc.customer ? true : false);
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
@@ -84,14 +100,6 @@
return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE customer = "'+ doc.customer +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50';
}
-cur_frm.cscript.get_items = function(doc, dt, dn) {
- var callback = function(r,rt) {
- hide_contact_info(doc);
- cur_frm.refresh();
- }
- get_server_fields('fetch_items','','',doc, dt, dn,1,callback);
-}
-
cur_frm.fields_dict['maintenance_visit_details'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
return 'SELECT tabItem.name,tabItem.item_name,tabItem.description FROM tabItem WHERE tabItem.is_service_item="Yes" AND tabItem.docstatus != 2 AND tabItem.%(key)s LIKE "%s" LIMIT 50';
}
@@ -104,36 +112,4 @@
}
}
-cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
- }
- return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Item`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Item`.parent = `tabSales Order`.name AND `tabSales Order Item`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
-}
-
-cur_frm.fields_dict['customer_issue_no'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabCustomer Issue`.customer = "'+doc.customer+'" AND';
- }
- return repl('SELECT `tabCustomer Issue`.name FROM `tabCustomer Issue` WHERE `tabCustomer Issue`.company = "%(company)s" AND %(cond)s `tabCustomer Issue`.docstatus = 1 AND (`tabCustomer Issue`.status = "Open" OR `tabCustomer Issue`.status = "Work In Progress") AND `tabCustomer Issue`.name LIKE "%s" ORDER BY `tabCustomer Issue`.name DESC LIMIT 50', {company:doc.company, cond:cond});
-}
-
-cur_frm.fields_dict['maintenance_schedule'].get_query = function(doc) {
- doc = locals[this.doctype][this.docname];
- var cond = '';
- if(doc.customer) {
- cond = '`tabMaintenance Schedule`.customer = "'+doc.customer+'" AND';
- }
- return repl('SELECT `tabMaintenance Schedule`.name FROM `tabMaintenance Schedule` WHERE `tabMaintenance Schedule`.company = "%(company)s" AND %(cond)s `tabMaintenance Schedule`.docstatus = 1 AND `tabMaintenance Schedule`.name LIKE "%s" ORDER BY `tabMaintenance Schedule`.name DESC LIMIT 50', {company:doc.company, cond:cond});
-}
-
-//get query select Territory
-cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
- return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
-}
-
cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index c57787e..478d9ac 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:31",
"docstatus": 0,
- "modified": "2013-07-07 12:08:12",
+ "modified": "2013-07-10 12:26:15",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -24,13 +24,19 @@
"permlevel": 0
},
{
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Maintenance Visit",
"parentfield": "permissions",
"parenttype": "DocType",
+ "permlevel": 0,
"read": 1,
- "report": 1
+ "report": 1,
+ "submit": 1,
+ "write": 1
},
{
"doctype": "DocType",
@@ -42,7 +48,7 @@
"fieldtype": "Section Break",
"label": "Customer Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-user"
},
{
"doctype": "DocField",
@@ -137,7 +143,7 @@
"fieldtype": "Section Break",
"label": "Maintenance Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-wrench"
},
{
"doctype": "DocField",
@@ -151,6 +157,11 @@
"reqd": 1
},
{
+ "doctype": "DocField",
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break"
+ },
+ {
"default": "Unscheduled",
"doctype": "DocField",
"fieldname": "maintenance_type",
@@ -166,56 +177,10 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "sales_order_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Sales Order No",
- "oldfieldname": "sales_order_no",
- "oldfieldtype": "Link",
- "options": "Sales Order",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "customer_issue_no",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Issue No",
- "oldfieldname": "customer_issue_no",
- "oldfieldtype": "Link",
- "options": "Customer Issue",
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "maintenance_schedule",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Maintenance Schedule",
- "options": "Maintenance Schedule"
- },
- {
- "doctype": "DocField",
- "fieldname": "get_items",
- "fieldtype": "Button",
- "label": "Get Items",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "report_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-wrench"
},
{
"doctype": "DocField",
@@ -231,7 +196,8 @@
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-file-text"
},
{
"doctype": "DocField",
@@ -301,7 +267,8 @@
"doctype": "DocField",
"fieldname": "contact_info_section",
"fieldtype": "Section Break",
- "label": "Contact Info"
+ "label": "Contact Info",
+ "options": "icon-bullhorn"
},
{
"doctype": "DocField",
@@ -341,60 +308,15 @@
"print_hide": 1
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "System Manager",
- "submit": 1,
- "write": 1
+ "role": "System Manager"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
"doctype": "DocPerm",
- "permlevel": 1,
- "role": "System Manager",
- "submit": 0
+ "role": "Maintenance Manager"
},
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
"doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance Manager",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance Manager",
- "submit": 0
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
- "role": "Maintenance User",
- "submit": 1,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
- "permlevel": 1,
- "role": "Maintenance User",
- "submit": 0
+ "role": "Maintenance User"
}
]
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
index 694f871..53fa0a2 100644
--- a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
+++ b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:06",
"docstatus": 0,
- "modified": "2013-03-07 07:03:24",
+ "modified": "2013-07-10 14:54:10",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -27,38 +27,9 @@
},
{
"doctype": "DocField",
- "fieldname": "description",
- "fieldtype": "Small Text",
- "label": "Description",
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "print_width": "300px",
- "reqd": 1,
- "width": "300px"
- },
- {
- "doctype": "DocField",
- "fieldname": "service_person",
- "fieldtype": "Link",
- "label": "Service Person",
- "oldfieldname": "service_person",
- "oldfieldtype": "Link",
- "options": "Sales Person",
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "work_done",
- "fieldtype": "Small Text",
- "label": "Work Done",
- "oldfieldname": "work_done",
- "oldfieldtype": "Small Text",
- "reqd": 1
- },
- {
- "doctype": "DocField",
"fieldname": "item_code",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Code",
"oldfieldname": "item_code",
"oldfieldtype": "Link",
@@ -68,6 +39,7 @@
"doctype": "DocField",
"fieldname": "item_name",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
@@ -77,12 +49,53 @@
"doctype": "DocField",
"fieldname": "serial_no",
"fieldtype": "Small Text",
+ "in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text"
},
{
"doctype": "DocField",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Small Text",
+ "print_width": "300px",
+ "reqd": 1,
+ "width": "300px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "work_details",
+ "fieldtype": "Section Break",
+ "in_list_view": 0,
+ "label": "Work Details"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "service_person",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sales Person",
+ "oldfieldname": "service_person",
+ "oldfieldtype": "Link",
+ "options": "Sales Person",
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "work_done",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Work Done",
+ "oldfieldname": "work_done",
+ "oldfieldtype": "Small Text",
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "prevdoc_docname",
"fieldtype": "Data",
"hidden": 0,
diff --git a/utilities/doctype/note_user/note_user.txt b/utilities/doctype/note_user/note_user.txt
index 2d82bb0..fcc1d11 100644
--- a/utilities/doctype/note_user/note_user.txt
+++ b/utilities/doctype/note_user/note_user.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 14:24:48",
"docstatus": 0,
- "modified": "2013-05-24 14:24:48",
+ "modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Note User",
"parentfield": "fields",
diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py
index 30a40da..74a75e6 100644
--- a/utilities/transaction_base.py
+++ b/utilities/transaction_base.py
@@ -301,23 +301,28 @@
def validate_with_previous_doc(self, source_dt, ref):
for key, val in ref.items():
+ is_child = val.get("is_child_table")
ref_doc = {}
for d in self.doclist.get({"doctype": source_dt}):
- if d.fields.get(val["ref_dn_field"]):
- ref_doc.setdefault(key, d.fields[val["ref_dn_field"]])
-
- if val.get("is_child_table"):
- self.compare_values(ref_doc, val["compare_fields"], d)
- else:
+ ref_dn = d.fields.get(val["ref_dn_field"])
+ if ref_dn:
+ if is_child:
+ self.compare_values({key: [ref_dn]}, val["compare_fields"], d)
+ elif ref_dn:
+ ref_doc.setdefault(key, [])
+ if ref_dn not in ref_doc[key]:
+ ref_doc[key].append(ref_dn)
+ if ref_doc:
self.compare_values(ref_doc, val["compare_fields"])
def compare_values(self, ref_doc, fields, doc=None):
- for ref_doctype, ref_docname in ref_doc.items():
- prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname,
- [d[0] for d in fields], as_dict=1)
-
- for field, condition in fields:
- self.validate_value(field, condition, prevdoc_values[field], doc)
+ for ref_doctype, ref_dn_list in ref_doc.items():
+ for ref_docname in ref_dn_list:
+ prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname,
+ [d[0] for d in fields], as_dict=1)
+
+ for field, condition in fields:
+ self.validate_value(field, condition, prevdoc_values[field], doc)
def get_default_address_and_contact(party_field, party_name, fetch_shipping_address=False):
out = {}
diff --git a/website/doctype/about_us_team_member/about_us_team_member.txt b/website/doctype/about_us_team_member/about_us_team_member.txt
index b1bf6b3..c5e6d16 100644
--- a/website/doctype/about_us_team_member/about_us_team_member.txt
+++ b/website/doctype/about_us_team_member/about_us_team_member.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:11",
"docstatus": 0,
- "modified": "2013-03-12 13:51:02",
+ "modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "About Us Team Member",
"parentfield": "fields",
diff --git a/website/doctype/company_history/company_history.txt b/website/doctype/company_history/company_history.txt
index 544845d..c0f230c 100644
--- a/website/doctype/company_history/company_history.txt
+++ b/website/doctype/company_history/company_history.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
- "modified": "2013-03-07 07:03:19",
+ "modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Company History",
"parentfield": "fields",
diff --git a/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt b/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
index 57ddc21..cdda874 100644
--- a/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
+++ b/website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:00:18",
"docstatus": 0,
- "modified": "2013-06-20 16:01:34",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "price_list",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Price List",
"name": "__common__",
"options": "Price List",
diff --git a/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt b/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
index caeba3d..302b0ae 100644
--- a/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
+++ b/website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-07-03 13:15:34",
"docstatus": 0,
- "modified": "2013-07-03 13:19:02",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Shipping Rule",
"name": "__common__",
"options": "Shipping Rule",
diff --git a/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt b/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
index 6cd9f38..f00a23d 100644
--- a/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
+++ b/website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:57:03",
"docstatus": 0,
- "modified": "2013-06-20 16:57:03",
+ "modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "sales_taxes_and_charges_master",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Tax Master",
"name": "__common__",
"options": "Sales Taxes and Charges Master",
diff --git a/website/doctype/top_bar_item/top_bar_item.txt b/website/doctype/top_bar_item/top_bar_item.txt
index 0076f7f..58d101e 100644
--- a/website/doctype/top_bar_item/top_bar_item.txt
+++ b/website/doctype/top_bar_item/top_bar_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Top Bar Item",
"parentfield": "fields",
diff --git a/website/doctype/website_item_group/website_item_group.txt b/website/doctype/website_item_group/website_item_group.txt
index 0b64306..3d26e85 100644
--- a/website/doctype/website_item_group/website_item_group.txt
+++ b/website/doctype/website_item_group/website_item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:09",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -18,6 +18,7 @@
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "Item Group",
"name": "__common__",
"options": "Item Group",
diff --git a/website/doctype/website_slideshow_item/website_slideshow_item.txt b/website/doctype/website_slideshow_item/website_slideshow_item.txt
index 53aa628..c6fd78c 100644
--- a/website/doctype/website_slideshow_item/website_slideshow_item.txt
+++ b/website/doctype/website_slideshow_item/website_slideshow_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 12:26:33",
"docstatus": 0,
- "modified": "2013-03-07 07:03:34",
+ "modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
+ "in_list_view": 1,
"name": "__common__",
"parent": "Website Slideshow Item",
"parentfield": "fields",