diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt index 3a956e9aec8..9243d362cd3 100644 --- a/accounts/doctype/c_form/c_form.txt +++ b/accounts/doctype/c_form/c_form.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-30 12:49:46", + "creation": "2013-03-07 14:48:29", "docstatus": 0, "modified": "2013-02-13 11:29:18", "modified_by": "Administrator", @@ -24,17 +24,13 @@ "permlevel": 0 }, { - "create": 1, "doctype": "DocPerm", "name": "__common__", "parent": "C-Form", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, - "report": 1, - "submit": 0, - "write": 1 + "submit": 0 }, { "doctype": "DocType", @@ -156,15 +152,6 @@ "print_hide": 0, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "amended_from", @@ -176,11 +163,28 @@ "read_only": 1 }, { + "create": 1, "doctype": "DocPerm", - "role": "Accounts User" + "permlevel": 0, + "report": 1, + "role": "Accounts User", + "write": 1 }, { + "create": 1, "doctype": "DocPerm", - "role": "Accounts Manager" + "permlevel": 0, + "report": 1, + "role": "Accounts Manager", + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "role": "All" } ] \ No newline at end of file diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py index e57b6a37582..a7672452aad 100644 --- a/accounts/doctype/cost_center/cost_center.py +++ b/accounts/doctype/cost_center/cost_center.py @@ -81,7 +81,7 @@ class DocType(DocTypeNestedSet): """ Cost Center name must be unique """ - if (self.doc.__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_name=%s", (self.doc.cost_center_name, self.doc.company_name)): msgprint("Cost Center Name already exists, please rename", raise_exception=1) self.validate_mandatory() diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py index 64d84b04594..429cc104a7b 100644 --- a/accounts/doctype/gl_entry/gl_entry.py +++ b/accounts/doctype/gl_entry/gl_entry.py @@ -108,8 +108,8 @@ class DocType: and not 'Accounts Manager' in webnotes.user.get_roles(): msgprint(_("Account") + ": " + self.doc.account + _(" has been freezed. \ Only Accounts Manager can do transaction against this account"), raise_exception=1) - - if ret and ret[0]["company"] != self.doc.company: + + if self.doc.is_cancelled in ("No", None) and ret and ret[0]["company"] != self.doc.company: msgprint(_("Account") + ": " + self.doc.account + _(" does not belong to the company") \ + ": " + self.doc.company, raise_exception=1) @@ -124,9 +124,10 @@ class DocType: return self.cost_center_company[self.doc.cost_center] - if self.doc.cost_center and _get_cost_center_company() != self.doc.company: - msgprint(_("Cost Center") + ": " + self.doc.cost_center \ - + _(" does not belong to the company") + ": " + self.doc.company, raise_exception=True) + if self.doc.is_cancelled in ("No", None) and \ + self.doc.cost_center and _get_cost_center_company() != self.doc.company: + msgprint(_("Cost Center") + ": " + self.doc.cost_center \ + + _(" does not belong to the company") + ": " + self.doc.company, raise_exception=True) def check_freezing_date(self, adv_adj): """ diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index 4228264f68e..43d2c790fc5 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-03-07 13:16:13", + "creation": "2013-04-09 10:18:10", "docstatus": 0, "modified": "2013-03-22 18:17:14", "modified_by": "Administrator", @@ -30,9 +30,7 @@ "parent": "Purchase Invoice", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -758,19 +756,69 @@ "reqd": 0 }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Accounts Manager", + "submit": 0, + "write": 0 }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Accounts Manager", + "submit": 1, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Accounts User", + "submit": 0, + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "role": "Purchase User", + "submit": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 1, + "doctype": "DocPerm", + "match": "", + "permlevel": 0, + "report": 1, + "role": "Purchase User", + "submit": 0, + "write": 1 + }, + { + "amend": 1, + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Accounts User", "submit": 1, "write": 1 @@ -778,6 +826,8 @@ { "doctype": "DocPerm", "match": "supplier", + "permlevel": 0, + "report": 1, "role": "Supplier" } ] \ No newline at end of file diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 2464cb6333d..a2c422f38a2 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -30,9 +30,7 @@ "parent": "Sales Invoice", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -1285,21 +1283,13 @@ "read_only": 0, "report_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1, - "read_only": 0 - }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Accounts User", "submit": 1, "write": 1 @@ -1307,6 +1297,8 @@ { "doctype": "DocPerm", "match": "customer", + "permlevel": 0, + "report": 1, "role": "Customer" - } + }, ] \ No newline at end of file diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index 2703d27f698..6a9f91a7194 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -154,6 +154,11 @@ wn.module_page["Accounts"] = [ route: "query-report/Sales Register", doctype: "Sales Invoice" }, + { + "label":wn._("Purchase Register"), + route: "query-report/Purchase Register", + doctype: "Purchase Invoice" + }, ] }, { diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 21be3a05dd7..a462b70e93e 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -186,7 +186,6 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ var totals = this.make_summary_row("Totals", this.account); var grouped_ledgers = {}; - $.each(data, function(i, item) { if((me.is_default("company") ? true : me.apply_filter(item, "company")) && (me.account ? me.is_child_account(me.account, item.account) @@ -217,8 +216,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ grouped_ledgers[item.account].totals.debit += item.debit; grouped_ledgers[item.account].totals.credit += item.credit; } - - if(me.account) { + if(item.account) { item.against_account = me.voucher_accounts[item.voucher_type + ":" + item.voucher_no][(item.debit > 0 ? "credits" : "debits")].join(", "); } diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py index 34c8ccd2be2..a10dc7e7e7d 100644 --- a/accounts/report/accounts_payable/accounts_payable.py +++ b/accounts/report/accounts_payable/accounts_payable.py @@ -19,7 +19,6 @@ def execute(filters=None): and nowdate() or filters.get("report_date") data = [] - total_invoiced_amount = total_paid = total_outstanding = 0 for gle in entries: if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \ or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date: @@ -36,7 +35,7 @@ def execute(filters=None): paid_amount = get_paid_amount(gle, filters.get("report_date") or nowdate(), entries_after_report_date) outstanding_amount = invoiced_amount - paid_amount - + if abs(flt(outstanding_amount)) > 0.01: row = [gle.posting_date, gle.account, gle.voucher_type, gle.voucher_no, gle.remarks, account_supplier_type_map.get(gle.account), due_date, bill_no, @@ -47,16 +46,9 @@ def execute(filters=None): ageing_based_on_date = due_date else: ageing_based_on_date = gle.posting_date + row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount) - - # Add to total - total_invoiced_amount += flt(invoiced_amount) - total_paid += flt(paid_amount) - total_outstanding += flt(outstanding_amount) data.append(row) - if data: - data.append(["", "", "", "", "", "", "", "Total", "", total_invoiced_amount, total_paid, - total_outstanding, "", "", "", ""]) return columns, data diff --git a/accounts/report/accounts_payable/accounts_payable.txt b/accounts/report/accounts_payable/accounts_payable.txt index 8920a0bf2ee..6de97f64e6e 100644 --- a/accounts/report/accounts_payable/accounts_payable.txt +++ b/accounts/report/accounts_payable/accounts_payable.txt @@ -2,11 +2,12 @@ { "creation": "2013-04-22 16:16:03", "docstatus": 0, - "modified": "2013-04-23 14:54:27", + "modified": "2013-04-30 17:55:54", "modified_by": "Administrator", "owner": "Administrator" }, { + "add_total_row": 1, "doctype": "Report", "is_standard": "Yes", "name": "__common__", diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py index d385b36b902..a8c6d2311eb 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.py +++ b/accounts/report/accounts_receivable/accounts_receivable.py @@ -18,7 +18,6 @@ def execute(filters=None): and nowdate() or filters.get("report_date") data = [] - total_invoiced_amount = total_payment = total_outstanding = 0 for gle in entries: if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \ or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date: @@ -41,17 +40,9 @@ def execute(filters=None): else: ageing_based_on_date = gle.posting_date row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount) - - # Add to total - total_invoiced_amount += flt(invoiced_amount) - total_payment += flt(payment_amount) - total_outstanding += flt(outstanding_amount) - + data.append(row) - if data: - data.append(["", "", "", "", "", "", "Total", total_invoiced_amount, total_payment, - total_outstanding, "", "", "", ""]) - + return columns, data def get_columns(): diff --git a/accounts/report/accounts_receivable/accounts_receivable.txt b/accounts/report/accounts_receivable/accounts_receivable.txt index 28f7e4f44dd..7eb344fc087 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.txt +++ b/accounts/report/accounts_receivable/accounts_receivable.txt @@ -2,11 +2,12 @@ { "creation": "2013-04-16 11:31:13", "docstatus": 0, - "modified": "2013-04-16 11:31:13", + "modified": "2013-04-30 17:54:47", "modified_by": "Administrator", "owner": "Administrator" }, { + "add_total_row": 1, "doctype": "Report", "is_standard": "Yes", "name": "__common__", diff --git a/accounts/report/purchase_register/__init__.py b/accounts/report/purchase_register/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/report/purchase_register/purchase_register.js b/accounts/report/purchase_register/purchase_register.js new file mode 100644 index 00000000000..21e0547f4a5 --- /dev/null +++ b/accounts/report/purchase_register/purchase_register.js @@ -0,0 +1,42 @@ +wn.query_reports["Purchase Register"] = { + "filters": [ + { + "fieldname":"from_date", + "label": "From Date", + "fieldtype": "Date", + "default": wn.defaults.get_user_default("year_start_date"), + "width": "80" + }, + { + "fieldname":"to_date", + "label": "To Date", + "fieldtype": "Date", + "default": get_today() + }, + { + "fieldname":"account", + "label": "Account", + "fieldtype": "Link", + "options": "Account", + "get_query": function() { + var company = wn.query_report.filters_by_name.company.get_value(); + return { + "query": "accounts.utils.get_account_list", + "filters": { + "is_pl_account": "No", + "debit_or_credit": "Credit", + "company": company, + "master_type": "Supplier" + } + } + } + }, + { + "fieldname":"company", + "label": "Company", + "fieldtype": "Link", + "options": "Company", + "default": sys_defaults.company + } + ] +} \ No newline at end of file diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py new file mode 100644 index 00000000000..01dc93700b2 --- /dev/null +++ b/accounts/report/purchase_register/purchase_register.py @@ -0,0 +1,147 @@ +# ERPNext - web based ERP (http://erpnext.com) +# Copyright (C) 2012 Web Notes Technologies Pvt Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from __future__ import unicode_literals +import webnotes +from webnotes.utils import flt + +def execute(filters=None): + if not filters: filters = {} + columns, expense_accounts, tax_accounts = get_columns() + + invoice_list = get_invoices(filters) + invoice_expense_map = get_invoice_expense_map(invoice_list) + invoice_tax_map = get_invoice_tax_map(invoice_list) + invoice_po_pr_map = get_invoice_po_pr_map(invoice_list) + account_map = get_account_details(invoice_list) + + data = [] + for inv in invoice_list: + # invoice details + purchase_order = ", ".join(invoice_po_pr_map.get(inv.name, {}).get("purchase_order", [])) + purchase_receipt = ", ".join(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])) + row = [inv.name, inv.posting_date, inv.supplier, inv.credit_to, + account_map.get(inv.credit_to), inv.project_name, inv.bill_no, inv.bill_date, + inv.remarks, purchase_order, purchase_receipt] + + # map expense values + for expense_acc in expense_accounts: + row.append(invoice_expense_map.get(inv.name, {}).get(expense_acc)) + + # net total + row.append(inv.net_total) + + # tax account + for tax_acc in tax_accounts: + row.append(invoice_tax_map.get(inv.name, {}).get(tax_acc)) + + # total tax, grand total + row += [inv.total_tax, inv.grand_total] + data.append(row) + + return columns, data + + +def get_columns(): + """return columns based on filters""" + columns = [ + "Invoice:Link/Purchase Invoice:120", "Posting Date:Date:80", "Supplier:Link/Supplier:120", + "Supplier Account:Link/Account:120", "Account Group:LInk/Account:120", + "Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150", + "Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100" + ] + + expense_accounts = webnotes.conn.sql_list("""select distinct expense_head + from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_head, '') != '' + order by expense_head""") + tax_accounts = webnotes.conn.sql_list("""select distinct account_head + from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' + and docstatus = 1 and ifnull(account_head, '') != '' order by account_head""") + + columns = columns + [(account + ":Currency:120") for account in expense_accounts] + \ + ["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \ + ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + + return columns, expense_accounts, tax_accounts + +def get_conditions(filters): + conditions = "" + + if filters.get("company"): conditions += " and company=%(company)s" + if filters.get("account"): conditions += " and account = %(account)s" + + if filters.get("from_date"): conditions += " and posting_date>=%(from_date)s" + if filters.get("to_date"): conditions += " and posting_date<=%(to_date)s" + + return conditions + +def get_invoices(filters): + conditions = get_conditions(filters) + return webnotes.conn.sql("""select name, posting_date, credit_to, project_name, supplier, + bill_no, bill_date, remarks, net_total, total_tax, grand_total + from `tabPurchase Invoice` where docstatus = 1 %s + order by posting_date desc, name desc""" % conditions, filters, as_dict=1) + +def get_invoice_expense_map(invoice_list): + expense_details = webnotes.conn.sql("""select parent, expense_head, sum(amount) as amount + from `tabPurchase Invoice Item` where parent in (%s) group by parent, expense_head""" % + ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) + + invoice_expense_map = {} + for d in expense_details: + invoice_expense_map.setdefault(d.parent, webnotes._dict()).setdefault(d.expense_head, []) + invoice_expense_map[d.parent][d.expense_head] = flt(d.amount) + + return invoice_expense_map + +def get_invoice_tax_map(invoice_list): + tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount + from `tabPurchase Taxes and Charges` where parent in (%s) group by parent, account_head""" % + ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) + + invoice_tax_map = {} + for d in tax_details: + invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(d.account_head, []) + invoice_tax_map[d.parent][d.account_head] = flt(d.tax_amount) + + return invoice_tax_map + +def get_invoice_po_pr_map(invoice_list): + pi_items = webnotes.conn.sql("""select parent, purchase_order, purchase_receipt + from `tabPurchase Invoice Item` where parent in (%s) + and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" % + ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) + + invoice_po_pr_map = {} + for d in pi_items: + if d.purchase_order: + invoice_po_pr_map.setdefault(d.parent, webnotes._dict()).setdefault( + "purchase_order", []).append(d.purchase_order) + if d.purchase_receipt: + invoice_po_pr_map.setdefault(d.parent, webnotes._dict()).setdefault( + "purchase_receipt", []).append(d.purchase_receipt) + + return invoice_po_pr_map + +def get_account_details(invoice_list): + account_map = {} + accounts = list(set([inv.credit_to for inv in invoice_list])) + for acc in webnotes.conn.sql("""select name, parent_account from tabAccount + where name in (%s)""" % ", ".join(["%s"]*len(accounts)), tuple(accounts), as_dict=1): + account_map.setdefault(acc.name, "") + account_map[acc.name] = acc.parent_account + + return account_map \ No newline at end of file diff --git a/accounts/report/purchase_register/purchase_register.txt b/accounts/report/purchase_register/purchase_register.txt new file mode 100644 index 00000000000..847f5f3b6cb --- /dev/null +++ b/accounts/report/purchase_register/purchase_register.txt @@ -0,0 +1,22 @@ +[ + { + "creation": "2013-04-29 16:13:11", + "docstatus": 0, + "modified": "2013-04-30 17:51:19", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "add_total_row": 1, + "doctype": "Report", + "is_standard": "Yes", + "name": "__common__", + "ref_doctype": "Purchase Invoice", + "report_name": "Purchase Register", + "report_type": "Script Report" + }, + { + "doctype": "Report", + "name": "Purchase Register" + } +] \ No newline at end of file diff --git a/accounts/report/sales_register/sales_register.py b/accounts/report/sales_register/sales_register.py index 07772cb4e2c..a0020c45a06 100644 --- a/accounts/report/sales_register/sales_register.py +++ b/accounts/report/sales_register/sales_register.py @@ -94,8 +94,8 @@ def get_conditions(filters): def get_invoices(filters): conditions = get_conditions(filters) - return webnotes.conn.sql("""select name, posting_date, territory, debit_to, territory, - project_name, customer, remarks, net_total, other_charges_total, grand_total + return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer, + remarks, net_total, other_charges_total, grand_total from `tabSales Invoice` where docstatus = 1 %s order by posting_date desc, name desc""" % conditions, filters, as_dict=1) diff --git a/accounts/report/sales_register/sales_register.txt b/accounts/report/sales_register/sales_register.txt index 5aef8145968..dbf41af0d0d 100644 --- a/accounts/report/sales_register/sales_register.txt +++ b/accounts/report/sales_register/sales_register.txt @@ -2,11 +2,12 @@ { "creation": "2013-04-23 18:15:29", "docstatus": 0, - "modified": "2013-04-23 18:15:29", + "modified": "2013-04-30 17:53:10", "modified_by": "Administrator", "owner": "Administrator" }, { + "add_total_row": 1, "doctype": "Report", "is_standard": "Yes", "name": "__common__", diff --git a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt index 00384386f52..8aa94bf50a0 100644 --- a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt +++ b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt @@ -1,29 +1,32 @@ [ { - "owner": "Administrator", + "creation": "2012-05-14 18:05:41", "docstatus": 0, - "creation": "2012-04-03 12:49:50", + "modified": "2013-04-30 14:49:06", "modified_by": "Administrator", - "modified": "2012-04-03 12:49:50" + "owner": "Administrator" }, { - "description": "Bank Clearance report", - "parent_doc_type": "Journal Voucher", - "module": "Accounts", - "standard": "Yes", - "sort_order": "DESC", - "filters": "{'Journal Voucher\u0001Submitted':1,'Journal Voucher\u0001Voucher Type':'','Journal Voucher\u0001Is Opening':'','Journal Voucher\u0001Fiscal Year':'','Journal Voucher\u0001Company':'','Journal Voucher\u0001TDS Applicable':'','Journal Voucher\u0001TDS Category':''}", - "dis_filters": "fiscal_year", - "doc_type": "Journal Voucher Detail", - "name": "__common__", - "doctype": "Search Criteria", - "sort_by": "ID", - "page_len": 50, + "columns": "Journal Voucher\u0001ID,Journal Voucher Detail\u0001Account,Journal Voucher Detail\u0001Debit,Journal Voucher Detail\u0001Credit,Journal Voucher\u0001Clearance Date,Journal Voucher\u0001Cheque No,Journal Voucher\u0001Cheque Date,Journal Voucher\u0001Voucher Date,Journal Voucher\u0001Posting Date,Journal Voucher Detail\u0001Against Payable,Journal Voucher Detail\u0001Against Receivable", "criteria_name": "Bank Clearance report", - "columns": "Journal Voucher\u0001ID,Journal Voucher Detail\u0001Account,Journal Voucher Detail\u0001Debit,Journal Voucher Detail\u0001Credit,Journal Voucher\u0001Clearance Date,Journal Voucher\u0001Cheque No,Journal Voucher\u0001Cheque Date,Journal Voucher\u0001Voucher Date,Journal Voucher\u0001Posting Date,Journal Voucher Detail\u0001Against Payable,Journal Voucher Detail\u0001Against Receivable" + "custom_query": "", + "description": "Bank Clearance report", + "dis_filters": "fiscal_year", + "disabled": 0, + "doc_type": "Journal Voucher Detail", + "doctype": "Search Criteria", + "filters": "{'Journal Voucher\u0001Submitted':1,'Journal Voucher\u0001Voucher Type':'','Journal Voucher\u0001Is Opening':'','Journal Voucher\u0001Fiscal Year':'','Journal Voucher\u0001Company':'','Journal Voucher\u0001TDS Applicable':'','Journal Voucher\u0001TDS Category':''}", + "module": "Accounts", + "name": "__common__", + "page_len": 50, + "parent_doc_type": "Journal Voucher", + "report_script": null, + "sort_by": "ID", + "sort_order": "DESC", + "standard": "Yes" }, { - "name": "bank_clearance_report", - "doctype": "Search Criteria" + "doctype": "Search Criteria", + "name": "bank_clearance_report" } ] \ No newline at end of file diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 101b0a93e57..8a56f26e9c0 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-29 19:25:50", + "creation": "2013-03-25 16:01:24", "docstatus": 0, "modified": "2013-02-18 13:37:11", "modified_by": "Administrator", @@ -803,20 +803,12 @@ "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "report": 0, "role": "Material User", @@ -839,6 +831,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "report": 0, "role": "Purchase Manager", @@ -861,6 +854,7 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "match": "", "permlevel": 0, "report": 1, "role": "Purchase User", @@ -872,6 +866,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "role": "All", "submit": 0 diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index d180651b196..dace56a43f5 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-29 19:25:54", + "creation": "2013-03-25 16:01:25", "docstatus": 0, "modified": "2013-02-18 13:40:17", "modified_by": "Administrator", @@ -663,15 +663,6 @@ "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "amend": 1, "cancel": 1, @@ -732,6 +723,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "report": 0, "role": "All", diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py index 85d8b9d9ea4..e167dc57b77 100644 --- a/controllers/buying_controller.py +++ b/controllers/buying_controller.py @@ -45,12 +45,13 @@ class BuyingController(StockController): def validate_stock_or_nonstock_items(self): items = [d.item_code for d in self.doclist.get({"parentfield": self.fname})] - if self.stock_items and len(items) > len(self.stock_items): + if self.stock_items: nonstock_items = list(set(items) - set(self.stock_items)) - webnotes.msgprint(_("Stock and non-stock items can not be entered at the same ") + - self.doc.doctype + _(""". You should make separate documents for them. - Stock Items: """) + ", ".join(self.stock_items) + _(""" - Non-stock Items: """) + ", ".join(nonstock_items), raise_exception=1) + if nonstock_items: + webnotes.msgprint(_("Stock and non-stock items can not be entered in the same ") + + self.doc.doctype + _(""". You should make separate documents for them. + Stock Items: """) + ", ".join(self.stock_items) + _(""" + Non-stock Items: """) + ", ".join(nonstock_items), raise_exception=1) elif items and not self.stock_items: tax_for_valuation = [d.account_head for d in diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 949849d8f18..b768f1aa1e8 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,5 +1,8 @@ erpnext.updates = [ + ["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."]], diff --git a/hr/doctype/employee/employee.py b/hr/doctype/employee/employee.py index 59c8380ee64..87fe9a45e9d 100644 --- a/hr/doctype/employee/employee.py +++ b/hr/doctype/employee/employee.py @@ -101,18 +101,19 @@ class DocType: if self.doc.gender: profile_wrapper.doc.gender = self.doc.gender - if self.doc.image and self.doc.file_list: - # add to file list and user_image - for file_args in self.doc.file_list.split("\n"): - fname, fid = file_args.split(",") - if self.doc.image == fname: - new_file_args = fname + "," + fid - file_list = cstr(profile_wrapper.doc.file_list).split("\n") - if new_file_args not in file_list: - file_list += [new_file_args] - profile_wrapper.doc.file_list = "\n".join(file_list) - profile_wrapper.doc.user_image = fname - break + if self.doc.image: + if not profile_wrapper.doc.user_image == self.doc.image: + profile_wrapper.doc.user_image = self.doc.image + try: + webnotes.doc({ + "doctype": "File Data", + "file_name": self.doc.image, + "attached_to_doctype": "Profile", + "attached_to_name": self.doc.user_id + }).insert() + except webnotes.DuplicateEntryError, e: + # already exists + pass profile_wrapper.save() diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index 997a1efb51b..705eaa72730 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -30,9 +30,7 @@ "parent": "Employee", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, - "report": 1, "submit": 0 }, { @@ -741,14 +739,6 @@ "oldfieldname": "feedback", "oldfieldtype": "Text" }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "trash_reason", @@ -763,6 +753,18 @@ "create": 0, "doctype": "DocPerm", "match": "employee", + "permlevel": 0, + "report": 1, + "role": "Employee", + "write": 0 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, "role": "Employee", "write": 0 }, @@ -771,6 +773,8 @@ "create": 1, "doctype": "DocPerm", "match": "company", + "permlevel": 0, + "report": 1, "role": "HR User", "write": 1 }, @@ -778,7 +782,29 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "HR Manager", "write": 1 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "HR User", + "write": 0 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "HR Manager", + "write": 0 } ] \ No newline at end of file diff --git a/hr/doctype/job_applicant/job_applicant.txt b/hr/doctype/job_applicant/job_applicant.txt index 4500d9b64a7..d2a2d77ca76 100644 --- a/hr/doctype/job_applicant/job_applicant.txt +++ b/hr/doctype/job_applicant/job_applicant.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-15 16:32:13", + "creation": "2013-01-29 19:25:37", "docstatus": 0, "modified": "2013-01-29 17:44:52", "modified_by": "Administrator", @@ -88,16 +88,6 @@ "fieldtype": "HTML", "label": "Thread HTML" }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "in_list_view": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "doctype": "DocPerm" } diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index f0f15604e6c..0710a5c6562 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-02-18 18:37:56", + "creation": "2013-02-20 11:18:11", "docstatus": 0, "modified": "2013-02-19 16:30:05", "modified_by": "Administrator", @@ -8,7 +8,6 @@ }, { "allow_attach": 1, - "allow_import": 1, "autoname": "LAP/.#####", "description": "Apply / Approve Leaves", "doctype": "DocType", @@ -227,16 +226,6 @@ "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1 - }, { "create": 1, "doctype": "DocPerm", @@ -251,6 +240,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "role": "All", "submit": 0 @@ -260,7 +250,6 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "match": "company", "permlevel": 0, "report": 1, "role": "HR User", @@ -269,8 +258,8 @@ }, { "amend": 1, - "cancel": 1, - "create": 1, + "cancel": 0, + "create": 0, "doctype": "DocPerm", "match": "leave_approver:user", "permlevel": 0, @@ -284,6 +273,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "report": 1, "role": "HR User", @@ -295,6 +285,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "match": "", "permlevel": 1, "report": 1, "role": "Leave Approver", diff --git a/manufacturing/doctype/bom/bom.js b/manufacturing/doctype/bom/bom.js index 4e8fbc95d16..f0c15fa2a9d 100644 --- a/manufacturing/doctype/bom/bom.js +++ b/manufacturing/doctype/bom/bom.js @@ -59,27 +59,22 @@ cur_frm.fields_dict["bom_operations"].grid.on_row_delete = function(cdt, cdn){ set_operation_no(doc); } -cur_frm.cscript.item = function(doc, dt, dn) { - if (doc.item) { - get_server_fields('get_item_details', doc.item, '', doc, dt, dn, 1); - } -} +cur_frm.add_fetch("item", "description", "description"); +cur_frm.add_fetch("item", "stock_uom", "uom"); cur_frm.cscript.workstation = function(doc,dt,dn) { var d = locals[dt][dn]; - if (d.workstation) { - var callback = function(r, rt) { - calculate_op_cost(doc, dt, dn); - calculate_total(doc); - } - get_server_fields('get_workstation_details', d.workstation, - 'bom_operations', doc, dt, dn, 1, callback); - } + wn.model.with_doc("Workstation", d.workstation, function(i, v) { + d.hour_rate = v.hour_rate; + refresh_field("hour_rate"); + calculate_op_cost(doc); + calculate_total(doc); + }); } cur_frm.cscript.hour_rate = function(doc, dt, dn) { - calculate_op_cost(doc, dt, dn); + calculate_op_cost(doc); calculate_total(doc); } @@ -114,7 +109,7 @@ var get_bom_material_detail= function(doc, cdt, cdn) { $.extend(d, r.message); refresh_field("bom_materials"); doc = locals[doc.doctype][doc.name]; - calculate_rm_cost(doc, cdt, cdn); + calculate_rm_cost(doc); calculate_total(doc); }, freeze: true @@ -124,7 +119,7 @@ var get_bom_material_detail= function(doc, cdt, cdn) { cur_frm.cscript.qty = function(doc, cdt, cdn) { - calculate_rm_cost(doc, cdt, cdn); + calculate_rm_cost(doc); calculate_total(doc); } @@ -134,12 +129,12 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { msgprint("You can not change rate if BOM mentioned agianst any item"); get_bom_material_detail(doc, cdt, cdn); } else { - calculate_rm_cost(doc, cdt, cdn); + calculate_rm_cost(doc); calculate_total(doc); } } -var calculate_op_cost = function(doc, dt, dn) { +var calculate_op_cost = function(doc) { var op = getchildren('BOM Operation', doc.name, 'bom_operations'); total_op_cost = 0; for(var i=0;iUse the Data Import Tool to upload, update Item Prices in bulk:\n
    \n
  1. Go to Data Import Tool.\n
  2. Select \"Item\"\n
  3. Check on \"With Data\"\n
  4. Download \"Item Price\" from Child Tables.\n
  5. Update the prices required and add new rows if required.\n
  6. Check on \"Overwrite\"\n
  7. Upload the modified sheet.\n\n" }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List" - }, { "cancel": 0, "create": 0, @@ -85,6 +78,7 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "match": "", "role": "Sales Master Manager", "write": 1 } diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index 4ab7578850a..b47f6f28d11 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -82,6 +82,12 @@ wn.module_page["Setup"] = [ label: wn._("Rename Tool"), "description":wn._("Rename multiple items in one go") }, + { + "route":"List/File Data", + doctype: "File Data", + label: wn._("File Manager"), + "description":wn._("List, delete uploaded files.") + }, ] }, { diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt index 6a6de8b2476..4722996c0f8 100644 --- a/stock/doctype/batch/batch.txt +++ b/stock/doctype/batch/batch.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-03-01 08:21:54", + "creation": "2013-03-01 19:09:43", "docstatus": 0, "modified": "2013-03-01 08:22:16", "modified_by": "Administrator", @@ -24,19 +24,14 @@ "permlevel": 0 }, { - "cancel": 1, - "create": 1, "doctype": "DocPerm", "name": "__common__", "parent": "Batch", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, - "report": 1, "role": "Material Master Manager", - "submit": 0, - "write": 1 + "submit": 0 }, { "doctype": "DocType", @@ -108,15 +103,19 @@ "read_only": 1 }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "write": 1 }, { - "doctype": "DocPerm" + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1 } ] \ No newline at end of file diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 8d09cbd6761..0a31dfe80e4 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -326,6 +326,17 @@ if (sys_defaults.auto_inventory_accounting) { } // cost center + cur_frm.cscript.cost_center = function(doc, cdt, cdn){ + var d = locals[cdt][cdn]; + if(d.cost_center) { + var cl = getchildren('Delivery Note Item', doc.name, cur_frm.cscript.fname, doc.doctype); + for(var i = 0; i < cl.length; i++){ + if(!cl[i].cost_center) cl[i].cost_center = d.cost_center; + } + } + refresh_field(cur_frm.cscript.fname); + } + cur_frm.fields_dict.delivery_note_details.grid.get_field("cost_center").get_query = function(doc) { return { query: "accounts.utils.get_cost_center_list", diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 618d172d074..36c2789bfa7 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-29 17:54:12", + "creation": "2013-04-02 10:50:50", "docstatus": 0, "modified": "2013-02-02 19:18:38", "modified_by": "Administrator", @@ -32,9 +32,7 @@ "parent": "Delivery Note", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -1123,20 +1121,25 @@ "read_only": 0 }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1, - "read_only": 0 + "amend": 1, + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material User", + "submit": 1, + "write": 1 }, { + "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", - "role": "Accounts User", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material User", "submit": 0, "write": 0 }, @@ -1145,31 +1148,73 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "role": "Sales User", - "submit": 1, - "write": 1 - }, - { - "doctype": "DocPerm", - "match": "customer_name", - "role": "Customer" - }, - { - "amend": 1, - "cancel": 1, - "create": 1, - "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material Manager", "submit": 1, "write": 1 }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material Manager", + "submit": 0, + "write": 0 + }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", - "role": "Material User", + "match": "", + "permlevel": 0, + "report": 1, + "role": "Sales User", "submit": 1, "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Sales User", + "submit": 0, + "write": 0 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Accounts User", + "submit": 0, + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "role": "Accounts User", + "submit": 0 + }, + { + "doctype": "DocPerm", + "match": "customer_name", + "permlevel": 0, + "report": 1, + "role": "Customer" } ] \ No newline at end of file diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 4767742e3ef..6b6dfb37005 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -55,12 +55,13 @@ class DocType(DocListController): ch.conversion_factor = 1 def check_stock_uom_with_bin(self): - bin = webnotes.conn.sql("select stock_uom from `tabBin` where item_code = %s", - self.doc.item_code) - if self.doc.stock_uom and bin and cstr(bin[0][0]) \ - and cstr(bin[0][0]) != cstr(self.doc.stock_uom): - msgprint(_("Please Update Stock UOM with the help of Stock UOM Replace Utility."), - raise_exception=1) + if not self.doc.fields.get("__islocal"): + bin = webnotes.conn.sql("select stock_uom from `tabBin` where item_code = %s", + self.doc.name) + if self.doc.stock_uom and bin and cstr(bin[0][0]) \ + and cstr(bin[0][0]) != cstr(self.doc.stock_uom): + msgprint(_("Please Update Stock UOM with the help of Stock UOM Replace Utility."), + raise_exception=1) def validate_conversion_factor(self): check_list = [] @@ -154,13 +155,14 @@ class DocType(DocListController): def validate_barcode(self): if self.doc.barcode: - duplicate = webnotes.conn.sql("select name from tabItem where barcode = %s and name != %s", (self.doc.barcode, self.doc.name)) + duplicate = webnotes.conn.sql("""select name from tabItem where barcode = %s + and name != %s""", (self.doc.barcode, self.doc.name)) if duplicate: msgprint("Barcode: %s already used in item: %s" % (self.doc.barcode, cstr(duplicate[0][0])), raise_exception = 1) def check_non_asset_warehouse(self): - if self.doc.is_asset_item == "Yes": + if not self.doc.__islocal and self.doc.is_asset_item == "Yes": existing_qty = webnotes.conn.sql("select t1.warehouse, t1.actual_qty from tabBin t1, tabWarehouse t2 where t1.item_code=%s and (t2.warehouse_type!='Fixed Asset' or t2.warehouse_type is null) and t1.warehouse=t2.name and t1.actual_qty > 0", self.doc.name) for e in existing_qty: msgprint("%s Units exist in Warehouse %s, which is not an Asset Warehouse." % diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 38b8bcc7acd..3497402076e 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -28,6 +28,7 @@ "permlevel": 0 }, { + "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Item", @@ -35,7 +36,6 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, - "report": 1, "submit": 0 }, { @@ -746,16 +746,6 @@ "read_only": 0, "reqd": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "customer_code", @@ -895,7 +885,6 @@ "write": 1 }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", @@ -903,7 +892,6 @@ "write": 0 }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index f2e6b3573a1..eb788e41edf 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-02-21 14:15:25", + "creation": "2013-03-07 14:48:38", "docstatus": 0, "modified": "2013-02-25 15:38:02", "modified_by": "Administrator", @@ -331,15 +331,6 @@ "options": "Print Heading", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "amend": 0, "cancel": 0, diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 3ecbb039473..350777d95c1 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-22 15:24:18", + "creation": "2013-03-25 16:01:29", "docstatus": 0, "modified": "2013-02-02 19:09:37", "modified_by": "Administrator", @@ -31,9 +31,7 @@ "parent": "Purchase Receipt", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -886,44 +884,78 @@ "read_only": 1 }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, - { - "amend": 1, - "cancel": 1, - "create": 1, - "doctype": "DocPerm", - "role": "Purchase User", - "submit": 1, - "write": 1 - }, - { - "doctype": "DocPerm", - "match": "supplier", - "role": "Supplier" + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material Manager", + "submit": 0, + "write": 0 }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material Manager", "submit": 1, "write": 1 }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material User", + "submit": 0, + "write": 0 + }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material User", "submit": 1, "write": 1 + }, + { + "amend": 1, + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "match": "", + "permlevel": 0, + "report": 1, + "role": "Purchase User", + "submit": 1, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "role": "Purchase User", + "submit": 0 + }, + { + "doctype": "DocPerm", + "match": "supplier", + "permlevel": 0, + "report": 1, + "role": "Supplier" } ] \ No newline at end of file diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index 086575f5936..8e891b81724 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-10 16:34:29", + "creation": "2013-01-29 19:25:41", "docstatus": 0, "modified": "2013-01-29 16:27:57", "modified_by": "Administrator", @@ -31,8 +31,8 @@ "parent": "Serial No", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1 + "read": 1, + "submit": 0 }, { "doctype": "DocType", @@ -476,15 +476,6 @@ "oldfieldtype": "Small Text", "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "sle_exists", @@ -496,25 +487,82 @@ "read_only": 1, "report_hide": 1 }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material Manager", + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material Manager", + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 0, + "role": "Material User", + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material User", + "write": 0 + }, { "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, "report": 1, - "role": "Material User", - "submit": 0, + "role": "System Manager", "write": 1 }, { + "cancel": 1, + "create": 1, "doctype": "DocPerm", - "role": "Sales User" + "permlevel": 0, + "report": 1, + "role": "Material Master Manager", + "write": 1 }, { + "amend": 0, + "cancel": 0, + "create": 0, "doctype": "DocPerm", - "role": "Purchase User" + "match": "", + "permlevel": 1, + "role": "System Manager" }, { + "amend": 0, + "cancel": 0, + "create": 0, "doctype": "DocPerm", - "role": "Accounts User" + "match": "", + "permlevel": 1, + "role": "Sales Master Manager" } ] \ No newline at end of file diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 760620bb734..9b5b2a128a2 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-03-26 06:51:17", + "creation": "2013-03-28 10:35:31", "docstatus": 0, - "modified": "2013-03-26 08:32:03", + "modified": "2013-04-10 13:44:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -52,6 +52,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 0, + "in_list_view": 1, "label": "Posting Date", "oldfieldname": "reconciliation_date", "oldfieldtype": "Date", @@ -63,6 +64,7 @@ "fieldname": "posting_time", "fieldtype": "Time", "in_filter": 0, + "in_list_view": 1, "label": "Posting Time", "oldfieldname": "reconciliation_time", "oldfieldtype": "Time", @@ -148,6 +150,7 @@ "fieldname": "stock_value_difference", "fieldtype": "Currency", "hidden": 1, + "in_list_view": 1, "label": "Stock Value Difference", "print_hide": 1 }, diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index edad9a76a18..456f5f13670 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -95,6 +95,8 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ this.data = [].concat(this._data); + this.serialized_buying_rates = this.get_serialized_buying_rates(); + $.each(this.data, function(i, d) { me.reset_item_values(d); }); diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 3da81d9efbe..4ee4c1d9684 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -29,17 +29,13 @@ $.extend(cur_frm.cscript, { erpnext.hide_naming_series(); cur_frm.cscript.make_listing(doc); if(!doc.__islocal) { - if(in_list(user_roles,'System Manager')) { - if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']); - if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']); - }else if(doc.allocated_to) { - cur_frm.set_df_property('status','read_only', 1); - if(user==doc.allocated_to && doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']); + if(user_roles.indexOf("Support Manager")!==-1) { + if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']); + if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']); } - cur_frm.set_df_property('subject','read_only', 1); - cur_frm.set_df_property('description','hidden', 1); - cur_frm.set_df_property('raised_by','read_only', 1); + cur_frm.toggle_enable(["subject", "raised_by"], false); + cur_frm.toggle_display("description", false); } refresh_field('status'); }, diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 5625f1179cd..8a705f41c72 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -45,6 +45,10 @@ class DocType(TransactionBase): def validate(self): self.update_status() + if self.doc.status == "Closed": + from webnotes.widgets.form.assign_to import clear + clear(self.doc.doctype, self.doc.name) + def on_communication_sent(self, comm): webnotes.conn.set(self.doc, 'status', 'Waiting for Customer') if comm.lead and not self.doc.lead: diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index f058a9e1562..769bb9d7017 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-01-10 16:34:31", + "creation": "2013-01-31 22:22:27", "docstatus": 0, "modified": "2013-01-31 22:17:24", "modified_by": "Administrator", @@ -23,18 +23,13 @@ "permlevel": 0 }, { - "amend": 0, - "create": 1, "doctype": "DocPerm", "name": "__common__", "parent": "Support Ticket", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, - "report": 1, - "submit": 0, - "write": 1 + "submit": 0 }, { "doctype": "DocType", @@ -242,27 +237,51 @@ "label": "Content Type" }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 + "amend": 0, + "cancel": 0, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Guest", + "write": 1 }, { - "cancel": 0, + "create": 1, "doctype": "DocPerm", - "role": "Guest" - }, - { - "cancel": 0, - "doctype": "DocPerm", - "role": "Customer" + "match": "customer", + "permlevel": 0, + "report": 1, + "role": "Customer", + "write": 1 }, { "cancel": 1, + "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Support Team", + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 1, + "report": 1, + "role": "Support Team", + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "match": "", + "permlevel": 2, "role": "Support Team" } ] \ No newline at end of file diff --git a/utilities/doctype/question/question.txt b/utilities/doctype/question/question.txt index b064e331054..fbd7b75341b 100644 --- a/utilities/doctype/question/question.txt +++ b/utilities/doctype/question/question.txt @@ -1,75 +1,76 @@ [ { - "owner": "Administrator", + "creation": "2013-01-02 17:08:46", "docstatus": 0, - "creation": "2012-07-03 13:30:42", + "modified": "2013-01-01 18:58:55", "modified_by": "Administrator", - "modified": "2013-01-01 18:58:55" + "owner": "Administrator" }, { - "read_only": 1, - "in_create": 1, + "allow_attach": 0, "autoname": "QUES.#######", - "name": "__common__", - "module": "Utilities", "doctype": "DocType", - "allow_attach": 0 + "in_create": 1, + "module": "Utilities", + "name": "__common__", + "read_only": 1 }, { - "name": "__common__", - "parent": "Question", "doctype": "DocField", + "name": "__common__", + "parent": "Question", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Question", - "read": 1, - "report": 1, "cancel": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Question", + "parentfield": "permissions", "parenttype": "DocType", - "role": "All", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "All", + "submit": 0, + "write": 1 }, { - "name": "Question", - "doctype": "DocType" + "doctype": "DocType", + "name": "Question" }, { - "oldfieldtype": "Text", "doctype": "DocField", + "fieldname": "question", + "fieldtype": "Text", "label": "Question", "oldfieldname": "question", - "fieldname": "question", - "fieldtype": "Text" + "oldfieldtype": "Text" }, { "doctype": "DocField", - "label": "Points", "fieldname": "points", "fieldtype": "Int", - "hidden": 1 + "hidden": 1, + "label": "Points" }, { - "oldfieldtype": "Text Editor", "doctype": "DocField", + "fieldname": "answer", + "fieldtype": "Text Editor", "label": "Answer", "oldfieldname": "answer", - "fieldname": "answer", - "fieldtype": "Text Editor" + "oldfieldtype": "Text Editor" }, { "doctype": "DocField", - "label": "User Tags", "fieldname": "_user_tags", "fieldtype": "Data", - "hidden": 1 + "hidden": 1, + "label": "User Tags" }, { "doctype": "DocField", @@ -77,15 +78,6 @@ "fieldtype": "Text", "label": "Users Voted" }, - { - "oldfieldtype": "Text", - "doctype": "DocField", - "label": "File List", - "oldfieldname": "file_list", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1 - }, { "doctype": "DocPerm" } diff --git a/utilities/doctype/rename_tool/rename_tool.py b/utilities/doctype/rename_tool/rename_tool.py index 2e368ced709..5accf3c6b77 100644 --- a/utilities/doctype/rename_tool/rename_tool.py +++ b/utilities/doctype/rename_tool/rename_tool.py @@ -34,7 +34,8 @@ def upload(select_doctype=None, rows=None): rename_log = [] for row in rows: - if len(row) > 2: + # if row has some content + if len(row) > 1 and row[0] and row[1]: try: if rename_doc(select_doctype, row[0], row[1]): rename_log.append(_("Successful: ") + row[0] + " -> " + row[1]) @@ -45,5 +46,5 @@ def upload(select_doctype=None, rows=None): rename_log.append("" + \ _("Failed: ") + row[0] + " -> " + row[1] + "") rename_log.append("" + repr(e) + "") - + return rename_log \ No newline at end of file diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt index b846d2bc6c2..ef6122ec61a 100644 --- a/website/doctype/about_us_settings/about_us_settings.txt +++ b/website/doctype/about_us_settings/about_us_settings.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-03-07 15:53:15", + "creation": "2013-03-26 12:48:00", "docstatus": 0, "modified": "2013-03-12 14:48:34", "modified_by": "Administrator", @@ -102,15 +102,6 @@ "fieldtype": "Text Editor", "label": "Footer" }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "doctype": "DocPerm" } diff --git a/website/doctype/blog_post/blog_post.txt b/website/doctype/blog_post/blog_post.txt index 4144e401343..07c53926a91 100644 --- a/website/doctype/blog_post/blog_post.txt +++ b/website/doctype/blog_post/blog_post.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-03-08 11:36:50", + "creation": "2013-03-28 10:35:30", "docstatus": 0, "modified": "2013-03-18 13:55:53", "modified_by": "Administrator", @@ -114,15 +114,6 @@ "hidden": 1, "label": "Email Sent" }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "create": 1, "doctype": "DocPerm", diff --git a/website/doctype/blogger/blogger.txt b/website/doctype/blogger/blogger.txt index f56df1f2b38..da065c52f6b 100644 --- a/website/doctype/blogger/blogger.txt +++ b/website/doctype/blogger/blogger.txt @@ -82,15 +82,6 @@ "label": "Posts", "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "create": 1, "doctype": "DocPerm", diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt index df266a5992c..e31713aa5ff 100644 --- a/website/doctype/style_settings/style_settings.txt +++ b/website/doctype/style_settings/style_settings.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-03-08 11:36:53", + "creation": "2013-03-25 16:01:33", "docstatus": 0, "modified": "2013-03-14 11:57:20", "modified_by": "Administrator", @@ -184,15 +184,6 @@ "label": "Custom CSS", "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "create": 1, "doctype": "DocPerm", diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt index eed7d2b63b4..effe06433d9 100644 --- a/website/doctype/web_page/web_page.txt +++ b/website/doctype/web_page/web_page.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-02-12 13:19:11", + "creation": "2013-03-28 10:35:30", "docstatus": 0, "modified": "2013-03-11 17:41:11", "modified_by": "Administrator", @@ -24,14 +24,12 @@ "permlevel": 0 }, { - "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Web Page", "parentfield": "permissions", "parenttype": "DocType", "read": 1, - "report": 1, "role": "Website Manager", "submit": 0 }, @@ -139,26 +137,18 @@ "options": "CSS" }, { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, - { - "cancel": 1, "create": 1, "doctype": "DocPerm", "permlevel": 0, + "report": 1, "write": 1 }, { + "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 1, - "write": 0 + "match": "", + "permlevel": 1 } ] \ No newline at end of file diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt index 0ebc75b2eb7..615c0a5b1b0 100644 --- a/website/doctype/website_settings/website_settings.txt +++ b/website/doctype/website_settings/website_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-26 06:51:18", "docstatus": 0, - "modified": "2013-04-17 11:51:24", + "modified": "2013-04-17 11:51:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -227,15 +227,6 @@ "label": "Domain List", "reqd": 0 }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 - }, { "create": 1, "doctype": "DocPerm", diff --git a/website/doctype/website_slideshow/website_slideshow.txt b/website/doctype/website_slideshow/website_slideshow.txt index 4caa617f311..2887d4b464c 100644 --- a/website/doctype/website_slideshow/website_slideshow.txt +++ b/website/doctype/website_slideshow/website_slideshow.txt @@ -1,84 +1,78 @@ [ { - "owner": "Administrator", + "creation": "2013-03-07 14:48:40", "docstatus": 0, - "creation": "2012-12-25 16:47:53", + "modified": "2012-12-25 16:56:34", "modified_by": "Administrator", - "modified": "2012-12-25 16:56:34" + "owner": "Administrator" }, { "allow_attach": 1, "autoname": "field:slideshow_name", - "name": "__common__", - "module": "Website", + "description": "Slideshow like display for the website", "doctype": "DocType", - "max_attachments": 10, "document_type": "Transaction", - "description": "Slideshow like display for the website" + "max_attachments": 10, + "module": "Website", + "name": "__common__" }, { - "name": "__common__", - "parent": "Website Slideshow", "doctype": "DocField", + "name": "__common__", + "parent": "Website Slideshow", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Website Slideshow", - "read": 1, - "report": 1, "cancel": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Website Slideshow", + "parentfield": "permissions", "parenttype": "DocType", - "role": "Website Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "Website Manager", + "submit": 0, + "write": 1 }, { - "name": "Website Slideshow", - "doctype": "DocType" + "doctype": "DocType", + "name": "Website Slideshow" }, { - "read_only": 0, "doctype": "DocField", - "label": "Slideshow Name", "fieldname": "slideshow_name", "fieldtype": "Data", + "label": "Slideshow Name", + "read_only": 0, "reqd": 1 }, { "depends_on": "eval:!doc.__islocal", "doctype": "DocField", - "label": "Slideshow Items", "fieldname": "sb0", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Slideshow Items" }, { "depends_on": "eval:!doc.__islocal", "doctype": "DocField", - "label": "Slideshow Items", "fieldname": "slideshow_items", "fieldtype": "Table", + "label": "Slideshow Items", "options": "Website Slideshow Item" }, { - "description": "This goes above the slideshow.", "depends_on": "eval:!doc.__islocal", + "description": "This goes above the slideshow.", "doctype": "DocField", - "label": "Header", "fieldname": "header", - "fieldtype": "Text Editor" - }, - { - "doctype": "DocField", - "label": "File List", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1 + "fieldtype": "Text Editor", + "label": "Header" }, { "doctype": "DocPerm" diff --git a/website/doctype/website_slideshow_item/website_slideshow_item.txt b/website/doctype/website_slideshow_item/website_slideshow_item.txt index aa98745451f..53aa628bde6 100644 --- a/website/doctype/website_slideshow_item/website_slideshow_item.txt +++ b/website/doctype/website_slideshow_item/website_slideshow_item.txt @@ -1,6 +1,6 @@ [ { - "creation": "2013-02-22 01:28:09", + "creation": "2013-03-07 12:26:33", "docstatus": 0, "modified": "2013-03-07 07:03:34", "modified_by": "Administrator", @@ -48,14 +48,5 @@ "label": "Description", "print_width": "200px", "width": "200px" - }, - { - "doctype": "DocField", - "fieldname": "file_list", - "fieldtype": "Text", - "hidden": 1, - "label": "File List", - "no_copy": 1, - "print_hide": 1 } ] \ No newline at end of file