Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py
index e57b6a3..a767245 100644
--- a/accounts/doctype/cost_center/cost_center.py
+++ b/accounts/doctype/cost_center/cost_center.py
@@ -81,7 +81,7 @@
"""
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 64d84b0..429cc10 100644
--- a/accounts/doctype/gl_entry/gl_entry.py
+++ b/accounts/doctype/gl_entry/gl_entry.py
@@ -108,8 +108,8 @@
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 @@
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/test_purchase_invoice.py b/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 621604b..a70c932 100644
--- a/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -72,7 +72,38 @@
["Stock Received But Not Billed - _TC", 750.0, 0],
["_Test Account Shipping Charges - _TC", 100.0, 0],
["_Test Account VAT - _TC", 120.0, 0],
- ["Expenses Included In Valuation - _TC", 0, 250.0]
+ ["Expenses Included In Valuation - _TC", 0, 250.0],
+ ])
+
+ for i, gle in enumerate(gl_entries):
+ self.assertEquals(expected_values[i][0], gle.account)
+ self.assertEquals(expected_values[i][1], gle.debit)
+ self.assertEquals(expected_values[i][2], gle.credit)
+
+ webnotes.defaults.set_global_default("auto_inventory_accounting", 0)
+
+ def test_gl_entries_with_aia_for_non_stock_items(self):
+ webnotes.defaults.set_global_default("auto_inventory_accounting", 1)
+ self.assertEqual(cint(webnotes.defaults.get_global_default("auto_inventory_accounting")), 1)
+
+ pi = webnotes.bean(copy=test_records[1])
+ pi.doclist[1].item_code = "_Test Non Stock Item"
+ pi.doclist[1].expense_head = "_Test Account Cost for Goods Sold - _TC"
+ pi.doclist.pop(2)
+ pi.doclist.pop(3)
+ pi.run_method("calculate_taxes_and_totals")
+ pi.insert()
+ pi.submit()
+
+ gl_entries = webnotes.conn.sql("""select account, debit, credit
+ from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
+ order by account asc""", pi.doc.name, as_dict=1)
+ self.assertTrue(gl_entries)
+
+ expected_values = sorted([
+ ["_Test Supplier - _TC", 0, 620],
+ ["_Test Account Cost for Goods Sold - _TC", 500.0, 0],
+ ["_Test Account VAT - _TC", 120.0, 0],
])
for i, gle in enumerate(gl_entries):
@@ -106,7 +137,6 @@
self.assertEqual(tax.account_head, expected_values[i][0])
self.assertEqual(tax.tax_amount, expected_values[i][1])
self.assertEqual(tax.total, expected_values[i][2])
- # print tax.account_head, tax.tax_amount, tax.item_wise_tax_detail
expected_values = [
["_Test Item Home Desktop 100", 90, 59],
@@ -142,7 +172,6 @@
self.assertEqual(tax.account_head, expected_values[i][0])
self.assertEqual(tax.tax_amount, expected_values[i][1])
self.assertEqual(tax.total, expected_values[i][2])
- # print tax.account_head, tax.tax_amount, tax.item_wise_tax_detail
expected_values = [
["_Test FG Item", 90, 7059],
diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js
index 3e9ea92..6a9f91a 100644
--- a/accounts/page/accounts_home/accounts_home.js
+++ b/accounts/page/accounts_home/accounts_home.js
@@ -149,6 +149,16 @@
route: "query-report/Accounts Payable",
doctype: "Purchase Invoice"
},
+ {
+ "label":wn._("Sales Register"),
+ 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 21be3a0..a462b70 100644
--- a/accounts/page/general_ledger/general_ledger.js
+++ b/accounts/page/general_ledger/general_ledger.js
@@ -186,7 +186,6 @@
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 @@
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 34c8ccd..a10dc7e 100644
--- a/accounts/report/accounts_payable/accounts_payable.py
+++ b/accounts/report/accounts_payable/accounts_payable.py
@@ -19,7 +19,6 @@
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 @@
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 @@
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 8920a0b..6de97f6 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 d385b36..a8c6d23 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/accounts/report/accounts_receivable/accounts_receivable.py
@@ -18,7 +18,6 @@
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 @@
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 28f7e4f..7eb344f 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 0000000..e69de29
--- /dev/null
+++ b/accounts/report/purchase_register/__init__.py
diff --git a/accounts/report/purchase_register/purchase_register.js b/accounts/report/purchase_register/purchase_register.js
new file mode 100644
index 0000000..21e0547
--- /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 0000000..01dc937
--- /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 <http://www.gnu.org/licenses/>.
+
+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 0000000..847f5f3
--- /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/__init__.py b/accounts/report/sales_register/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/accounts/report/sales_register/__init__.py
diff --git a/accounts/report/sales_register/sales_register.js b/accounts/report/sales_register/sales_register.js
new file mode 100644
index 0000000..8224619
--- /dev/null
+++ b/accounts/report/sales_register/sales_register.js
@@ -0,0 +1,42 @@
+wn.query_reports["Sales 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": "Debit",
+ "company": company,
+ "master_type": "Customer"
+ }
+ }
+ }
+ },
+ {
+ "fieldname":"company",
+ "label": "Company",
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": sys_defaults.company
+ }
+ ]
+}
\ No newline at end of file
diff --git a/accounts/report/sales_register/sales_register.py b/accounts/report/sales_register/sales_register.py
new file mode 100644
index 0000000..a0020c4
--- /dev/null
+++ b/accounts/report/sales_register/sales_register.py
@@ -0,0 +1,161 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import flt
+
+def execute(filters=None):
+ if not filters: filters = {}
+ columns, income_accounts, tax_accounts = get_columns()
+
+ invoice_list = get_invoices(filters)
+ invoice_income_map = get_invoice_income_map(invoice_list)
+ invoice_tax_map = get_invoice_tax_map(invoice_list)
+
+ invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
+ customer_map = get_customer_deatils(invoice_list)
+ account_map = get_account_details(invoice_list)
+
+ data = []
+ for inv in invoice_list:
+ # invoice details
+ sales_order = ", ".join(invoice_so_dn_map.get(inv.name, {}).get("sales_order", []))
+ delivery_note = ", ".join(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", []))
+ # webnotes.errprint(customer_map.get(inv.customer, []))
+ row = [inv.name, inv.posting_date, inv.customer, inv.debit_to,
+ account_map.get(inv.debit_to), customer_map.get(inv.customer), inv.project_name,
+ inv.remarks, sales_order, delivery_note]
+
+ # map income values
+ for income_acc in income_accounts:
+ row.append(invoice_income_map.get(inv.name, {}).get(income_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.other_charges_total, inv.grand_total]
+
+ data.append(row)
+
+ return columns, data
+
+
+def get_columns():
+ """return columns based on filters"""
+ columns = [
+ "Invoice:Link/Sales Invoice:120", "Posting Date:Date:80", "Customer:Link/Customer:120",
+ "Customer Account:Link/Account:120", "Account Group:LInk/Account:120",
+ "Territory:Link/Territory:80", "Project:Link/Project:80",
+ "Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100"
+ ]
+
+ income_accounts = webnotes.conn.sql_list("""select distinct income_account
+ from `tabSales Invoice Item` where docstatus = 1 order by income_account""")
+
+ tax_accounts = webnotes.conn.sql_list("""select distinct account_head
+ from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
+ and docstatus = 1 order by account_head""")
+
+ columns = columns + [(account + ":Currency:120") for account in income_accounts] + \
+ ["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \
+ ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"]
+
+ return columns, income_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, 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)
+
+def get_invoice_income_map(invoice_list):
+ income_details = webnotes.conn.sql("""select parent, income_account, sum(amount) as amount
+ from `tabSales Invoice Item` where parent in (%s) group by parent, income_account""" %
+ ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
+
+ invoice_income_map = {}
+ for d in income_details:
+ invoice_income_map.setdefault(d.parent, webnotes._dict()).setdefault(d.income_account, [])
+ invoice_income_map[d.parent][d.income_account] = flt(d.amount)
+
+ return invoice_income_map
+
+def get_invoice_tax_map(invoice_list):
+ tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount
+ from `tabSales 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_so_dn_map(invoice_list):
+ si_items = webnotes.conn.sql("""select parent, sales_order, delivery_note
+ from `tabSales Invoice Item` where parent in (%s)
+ and (ifnull(sales_order, '') != '' or ifnull(delivery_note, '') != '')""" %
+ ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
+
+ invoice_so_dn_map = {}
+ for d in si_items:
+ if d.sales_order:
+ invoice_so_dn_map.setdefault(d.parent, webnotes._dict()).setdefault(
+ "sales_order", []).append(d.sales_order)
+ if d.delivery_note:
+ invoice_so_dn_map.setdefault(d.parent, webnotes._dict()).setdefault(
+ "delivery_note", []).append(d.delivery_note)
+
+ return invoice_so_dn_map
+
+def get_customer_deatils(invoice_list):
+ customer_map = {}
+ customers = list(set([inv.customer for inv in invoice_list]))
+ for cust in webnotes.conn.sql("""select name, territory from `tabCustomer`
+ where name in (%s)""" % ", ".join(["%s"]*len(customers)), tuple(customers), as_dict=1):
+ customer_map.setdefault(cust.name, "")
+ customer_map[cust.name] = cust.territory
+
+ return customer_map
+
+def get_account_details(invoice_list):
+ account_map = {}
+ accounts = list(set([inv.debit_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/sales_register/sales_register.txt b/accounts/report/sales_register/sales_register.txt
new file mode 100644
index 0000000..dbf41af
--- /dev/null
+++ b/accounts/report/sales_register/sales_register.txt
@@ -0,0 +1,22 @@
+[
+ {
+ "creation": "2013-04-23 18:15:29",
+ "docstatus": 0,
+ "modified": "2013-04-30 17:53:10",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "add_total_row": 1,
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Sales Invoice",
+ "report_name": "Sales Register",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Sales Register"
+ }
+]
\ No newline at end of file
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 0038438..8aa94bf 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/accounts/search_criteria/sales_register/sales_register.js b/accounts/search_criteria/sales_register/sales_register.js
index 5a09713..872e198 100644
--- a/accounts/search_criteria/sales_register/sales_register.js
+++ b/accounts/search_criteria/sales_register/sales_register.js
@@ -28,5 +28,5 @@
this.filter_fields_dict['Sales Invoice'+FILTER_SEP +'Grand Total <='].df.filter_hide = 1;
this.filter_fields_dict['Sales Invoice'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 1;
this.filter_fields_dict['Sales Invoice'+FILTER_SEP +'Sales Partner'].df.filter_hide = 1;
- this.filter_fields_dict['Sales Invoice'+FILTER_SEP +'Is Opening'].df.filter_hide = 1;
+ this.filter_fields_dict['Sales Invoice'+FILTER_SEP +'Is Opening Entry'].df.filter_hide = 1;
}
diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py
index 429737e..e167dc5 100644
--- a/controllers/buying_controller.py
+++ b/controllers/buying_controller.py
@@ -29,6 +29,7 @@
class BuyingController(StockController):
def validate(self):
super(BuyingController, self).validate()
+ self.validate_stock_or_nonstock_items()
if self.meta.get_field("currency"):
self.company_currency = get_company_currency(self.doc.company)
self.validate_conversion_rate("currency", "conversion_rate")
@@ -41,7 +42,25 @@
# set total in words
self.set_total_in_words()
-
+
+ def validate_stock_or_nonstock_items(self):
+ items = [d.item_code for d in self.doclist.get({"parentfield": self.fname})]
+ if self.stock_items:
+ nonstock_items = list(set(items) - set(self.stock_items))
+ 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
+ self.doclist.get({"parentfield": "purchase_tax_details"})
+ if d.category in ["Valuation", "Valuation and Total"]]
+ if tax_for_valuation:
+ webnotes.msgprint(_("""Tax Category can not be 'Valuation' or 'Valuation and Total'
+ as all items are non-stock items"""), raise_exception=1)
+
def update_item_details(self):
for item in self.doclist.get({"parentfield": self.fname}):
ret = get_item_details({
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 1e35a92..b768f1a 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,6 +1,8 @@
erpnext.updates = [
- ["10th April", ["Redesigned File Uploads and added File Manager in Setup"]],
+ ["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/manufacturing/doctype/bom/bom.js b/manufacturing/doctype/bom/bom.js
index 4e8fbc9..f0c15fa 100644
--- a/manufacturing/doctype/bom/bom.js
+++ b/manufacturing/doctype/bom/bom.js
@@ -59,27 +59,22 @@
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 @@
$.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 @@
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 @@
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;i<op.length;i++) {
@@ -151,7 +146,7 @@
refresh_field('operating_cost');
}
-var calculate_rm_cost = function(doc, dt, dn) {
+var calculate_rm_cost = function(doc) {
var rm = getchildren('BOM Item', doc.name, 'bom_materials');
total_rm_cost = 0;
for(var i=0;i<rm.length;i++) {
@@ -201,7 +196,7 @@
}
cur_frm.cscript.validate = function(doc, dt, dn) {
- calculate_op_cost(doc, dt, dn);
- calculate_rm_cost(doc, dt, dn);
+ calculate_op_cost(doc);
+ calculate_rm_cost(doc);
calculate_total(doc);
}
diff --git a/manufacturing/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py
index 75bf305..5f42f4d 100644
--- a/manufacturing/doctype/bom/bom.py
+++ b/manufacturing/doctype/bom/bom.py
@@ -32,7 +32,7 @@
def autoname(self):
last_name = sql("""select max(name) from `tabBOM`
- where name like 'BOM/%s/%%'""" % self.doc.item)
+ where name like "BOM/%s/%%" """ % cstr(self.doc.item).replace('"', '\\"'))
if last_name:
idx = cint(cstr(last_name[0][0]).split('/')[-1]) + 1
else:
@@ -44,10 +44,11 @@
self.validate_main_item()
self.validate_operations()
self.validate_materials()
+ self.set_bom_material_details()
+ self.calculate_cost()
def on_update(self):
self.check_recursion()
- self.calculate_cost()
self.update_exploded_items()
self.doc.save()
@@ -67,21 +68,13 @@
self.manage_default_bom()
def get_item_det(self, item_code):
- item = sql("""select name, is_asset_item, is_purchase_item, docstatus, description,
- is_sub_contracted_item, stock_uom, default_bom,
+ item = webnotes.conn.sql("""select name, is_asset_item, is_purchase_item,
+ docstatus, description, is_sub_contracted_item, stock_uom, default_bom,
last_purchase_rate, standard_rate, is_manufactured_item
- from `tabItem` where item_code = %s""", item_code, as_dict = 1)
+ from `tabItem` where name=%s""", item_code, as_dict = 1)
return item
-
- def get_item_details(self, item_code):
- res = sql("""select description, stock_uom as uom
- from `tabItem` where item_code = %s""", item_code, as_dict = 1)
- return res and res[0] or {}
-
- def get_workstation_details(self,workstation):
- return {'hour_rate': webnotes.conn.get_value("Workstation", workstation, "hour_rate")}
-
+
def validate_rm_item(self, item):
if item[0]['name'] == self.doc.item:
msgprint("Item_code: %s in materials tab cannot be same as FG Item",
@@ -89,32 +82,42 @@
if not item or item[0]['docstatus'] == 2:
msgprint("Item %s does not exist in system" % item[0]['item_code'], raise_exception = 1)
-
- def get_bom_material_detail(self):
+
+ def set_bom_material_details(self):
+ for item in self.doclist.get({"parentfield": "bom_materials"}):
+ ret = self.get_bom_material_detail({ "item_code": item.item_code, "bom_no": item.bom_no,
+ "qty": item.qty })
+
+ for r in ret:
+ if not item.fields.get(r):
+ item.fields[r] = ret[r]
+
+ def get_bom_material_detail(self, args=None):
""" Get raw material details like uom, desc and rate"""
- arg = webnotes.form_dict.get('args')
- import json
- arg = json.loads(arg)
-
- item = self.get_item_det(arg['item_code'])
+ if not args:
+ args = webnotes.form_dict.get('args')
+ import json
+ args = json.loads(args)
+
+ item = self.get_item_det(args['item_code'])
self.validate_rm_item(item)
- arg['bom_no'] = arg['bom_no'] or item and cstr(item[0]['default_bom']) or ''
- arg.update(item[0])
+ args['bom_no'] = args['bom_no'] or item and cstr(item[0]['default_bom']) or ''
+ args.update(item[0])
- rate = self.get_rm_rate(arg)
+ rate = self.get_rm_rate(args)
ret_item = {
- 'description' : item and arg['description'] or '',
- 'stock_uom' : item and arg['stock_uom'] or '',
- 'bom_no' : arg['bom_no'],
+ 'description' : item and args['description'] or '',
+ 'stock_uom' : item and args['stock_uom'] or '',
+ 'bom_no' : args['bom_no'],
'rate' : rate
}
return ret_item
def get_rm_rate(self, arg):
""" Get raw material rate as per selected method, if bom exists takes bom cost """
-
+ rate = 0
if arg['bom_no']:
rate = self.get_bom_unitcost(arg['bom_no'])
elif arg and (arg['is_purchase_item'] == 'Yes' or arg['is_sub_contracted_item'] == 'Yes'):
@@ -183,11 +186,14 @@
if not item:
msgprint("Item %s does not exists in the system or expired." %
self.doc.item, raise_exception = 1)
-
elif item[0]['is_manufactured_item'] != 'Yes' \
and item[0]['is_sub_contracted_item'] != 'Yes':
msgprint("""As Item: %s is not a manufactured / sub-contracted item, \
you can not make BOM for it""" % self.doc.item, raise_exception = 1)
+ else:
+ ret = webnotes.conn.get_value("Item", self.doc.item, ["description", "stock_uom"])
+ self.doc.description = ret[0]
+ self.doc.uom = ret[1]
def validate_operations(self):
""" Check duplicate operation no"""
@@ -209,7 +215,7 @@
msgprint("""Operation no: %s against item: %s at row no: %s \
is not present at Operations table""" %
(m.operation_no, m.item_code, m.idx), raise_exception = 1)
-
+
item = self.get_item_det(m.item_code)
if item[0]['is_manufactured_item'] == 'Yes':
if not m.bom_no:
@@ -293,9 +299,10 @@
"""Update workstation rate and calculates totals"""
total_op_cost = 0
for d in getlist(self.doclist, 'bom_operations'):
+ if d.workstation and not d.hour_rate:
+ d.hour_rate = webnotes.conn.get_value("Workstation", d.workstation, "hour_rate")
if d.hour_rate and d.time_in_mins:
d.operating_cost = flt(d.hour_rate) * flt(d.time_in_mins) / 60.0
- d.save()
total_op_cost += flt(d.operating_cost)
self.doc.operating_cost = total_op_cost
@@ -307,7 +314,6 @@
d.rate = self.get_bom_unitcost(d.bom_no)
d.amount = flt(d.rate) * flt(d.qty)
d.qty_consumed_per_unit = flt(d.qty) / flt(self.doc.quantity)
- d.save()
total_rm_cost += d.amount
self.doc.raw_material_cost = total_rm_cost
diff --git a/master.sql.gz b/master.sql.gz
index f331784..030ee05 100644
--- a/master.sql.gz
+++ b/master.sql.gz
Binary files differ
diff --git a/patches/april_2013/p05_update_file_data.py b/patches/april_2013/p05_update_file_data.py
index 8811858..fc1b614 100644
--- a/patches/april_2013/p05_update_file_data.py
+++ b/patches/april_2013/p05_update_file_data.py
@@ -4,27 +4,37 @@
webnotes.reload_doc("core", "doctype", "file_data")
webnotes.reset_perms("File Data")
- singles = webnotes.conn.sql_list("""select name from tabDocType
- where ifnull(issingle,0)=1""")
+ singles = get_single_doctypes()
+
for doctype in webnotes.conn.sql_list("""select parent from tabDocField where
- fieldname='file_list' and fieldtype='Text'"""):
- if doctype in singles:
- doc = webnotes.doc(doctype, doctype)
- if doc.file_list:
- update_for_doc(doctype, doc)
- webnotes.conn.set_value(doctype, None, "file_list", None)
- else:
- try:
- for doc in webnotes.conn.sql("""select name, file_list from `tab%s` where
- ifnull(file_list, '')!=''""" % doctype, as_dict=True):
- update_for_doc(doctype, doc)
- webnotes.conn.commit()
- webnotes.conn.sql("""alter table `tab%s` drop column file_list""" % doctype)
- except Exception, e:
- if e.args[0]!=1054: raise e
+ fieldname='file_list'"""):
+ update_file_list(doctype, singles)
webnotes.conn.sql("""delete from tabDocField where fieldname='file_list'
and parent=%s""", doctype)
+ # export_to_files([["DocType", doctype]])
+
+def get_single_doctypes():
+ return webnotes.conn.sql_list("""select name from tabDocType
+ where ifnull(issingle,0)=1""")
+
+def update_file_list(doctype, singles):
+ if doctype in singles:
+ doc = webnotes.doc(doctype, doctype)
+ if doc.file_list:
+ update_for_doc(doctype, doc)
+ webnotes.conn.set_value(doctype, None, "file_list", None)
+ else:
+ try:
+ for doc in webnotes.conn.sql("""select name, file_list from `tab%s` where
+ ifnull(file_list, '')!=''""" % doctype, as_dict=True):
+ update_for_doc(doctype, doc)
+ webnotes.conn.commit()
+ webnotes.conn.sql("""alter table `tab%s` drop column `file_list`""" % doctype)
+ except Exception, e:
+ print webnotes.getTraceback()
+ if (e.args and e.args[0]!=1054) or not e.args:
+ raise e
def update_for_doc(doctype, doc):
for filedata in doc.file_list.split("\n"):
@@ -43,10 +53,21 @@
exists = False
if exists:
- webnotes.conn.sql("""update `tabFile Data`
- set attached_to_doctype=%s, attached_to_name=%s
- where name=%s""", (doctype, doc.name, fileid))
-
+ if webnotes.conn.exists("File Data", fileid):
+ try:
+ fd = webnotes.bean("File Data", fileid)
+ if not (fd.doc.attached_to_doctype and fd.doc.attached_to_name):
+ fd.doc.attached_to_doctype = doctype
+ fd.doc.attached_to_name = doc.name
+ fd.save()
+ else:
+ fd = webnotes.bean("File Data", copy=fd.doclist)
+ fd.doc.attached_to_doctype = doctype
+ fd.doc.attached_to_name = doc.name
+ fd.doc.name = None
+ fd.insert()
+ except webnotes.DuplicateEntryError:
+ pass
else:
webnotes.conn.sql("""delete from `tabFile Data` where name=%s""",
- fileid)
\ No newline at end of file
+ fileid)
diff --git a/patches/april_2013/p07_update_file_data_2.py b/patches/april_2013/p07_update_file_data_2.py
new file mode 100644
index 0000000..2405e80
--- /dev/null
+++ b/patches/april_2013/p07_update_file_data_2.py
@@ -0,0 +1,18 @@
+import webnotes
+def execute():
+ from patches.april_2013.p05_update_file_data import update_file_list, get_single_doctypes
+
+ singles = get_single_doctypes()
+ for doctype in webnotes.conn.sql_list("""select table_name from `information_schema`.`columns`
+ where table_schema=%s and column_name='file_list'""", webnotes.conn.cur_db_name):
+ doctype = doctype[3:]
+
+ if not webnotes.conn.exists("DocType", doctype): continue
+
+ update_file_list(doctype, singles)
+
+ webnotes.conn.sql("""delete from `tabCustom Field` where fieldname='file_list'
+ and parent=%s""", doctype)
+ webnotes.conn.sql("""delete from `tabDocField` where fieldname='file_list'
+ and parent=%s""", doctype)
+
\ No newline at end of file
diff --git a/patches/april_2013/rebuild_sales_browser.py b/patches/april_2013/rebuild_sales_browser.py
new file mode 100644
index 0000000..917ae68
--- /dev/null
+++ b/patches/april_2013/rebuild_sales_browser.py
@@ -0,0 +1,4 @@
+import webnotes
+def execute():
+ from patches.january_2013 import rebuild_tree
+ rebuild_tree.execute()
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 2cde56d..c2630de 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -246,4 +246,7 @@
"execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')",
"patches.april_2013.p07_rename_cost_center_other_charges",
"patches.april_2013.p06_default_cost_center",
+ "execute:webnotes.reset_perms('File Data')",
+ "patches.april_2013.p07_update_file_data_2",
+ "patches.april_2013.rebuild_sales_browser",
]
\ No newline at end of file
diff --git a/projects/utils.py b/projects/utils.py
index a7a016a..7a45b08 100644
--- a/projects/utils.py
+++ b/projects/utils.py
@@ -5,4 +5,4 @@
@webnotes.whitelist()
def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
- return webnotes.conn.get_values("Time Log", filters, ["name", "activity_type", "owner"], debug=True)
\ No newline at end of file
+ return webnotes.conn.get_values("Time Log", filters, ["name", "activity_type", "owner"])
\ No newline at end of file
diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/setup/doctype/backup_manager/backup_dropbox.py
index ac07824..054d2b2 100644
--- a/setup/doctype/backup_manager/backup_dropbox.py
+++ b/setup/doctype/backup_manager/backup_dropbox.py
@@ -85,6 +85,7 @@
os.path.basename(backup.backup_path_db))
upload_file_to_dropbox(filename, "/database", dropbox_client)
+ webnotes.conn.close()
response = dropbox_client.metadata("/files")
# upload files to files folder
@@ -108,6 +109,7 @@
did_not_upload.append(filename)
error_log.append(cstr(e))
+ webnotes.connect()
return did_not_upload, list(set(error_log))
def get_dropbox_session():
diff --git a/setup/doctype/backup_manager/backup_googledrive.py b/setup/doctype/backup_manager/backup_googledrive.py
index 7d980de..a705f0e 100644
--- a/setup/doctype/backup_manager/backup_googledrive.py
+++ b/setup/doctype/backup_manager/backup_googledrive.py
@@ -34,7 +34,6 @@
"authorize_url": authorize_url,
}
-@webnotes.whitelist()
def upload_files(name, mimetype, service, folder_id):
if not webnotes.conn:
webnotes.connect()
@@ -78,6 +77,9 @@
did_not_upload = []
error_log = []
+ files_folder_id = webnotes.conn.get_value("Backup Manager", None, "files_folder_id")
+
+ webnotes.conn.close()
path = os.path.join(get_base_path(), "public", "files")
for filename in os.listdir(path):
found = False
@@ -91,9 +93,7 @@
#Compare Local File with Server File
param = {}
- children = drive_service.children().list(
- folderId=webnotes.conn.get_value("Backup Manager", None, "files_folder_id"),
- **param).execute()
+ children = drive_service.children().list(folderId=files_folder_id, **param).execute()
for child in children.get('items', []):
file = drive_service.files().get(fileId=child['id']).execute()
if filename == file['title'] and size == int(file['fileSize']):
@@ -101,12 +101,12 @@
break
if not found:
try:
- upload_files(filepath, mimetype, drive_service,
- webnotes.conn.get_value("Backup Manager", None, "files_folder_id"))
+ upload_files(filepath, mimetype, drive_service, files_folder_id)
except Exception, e:
did_not_upload.append(filename)
error_log.append(cstr(e))
+ webnotes.connect()
return did_not_upload, list(set(error_log))
def get_gdrive_flow():
diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
index 5991181..7b804f8 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/setup/doctype/naming_series/naming_series.py
@@ -29,12 +29,12 @@
def get_transactions(self, arg=None):
return {
- "transactions": "\n".join([''] + [i[0] for i in
- sql("""select `tabDocField`.`parent`
- FROM `tabDocField`, `tabDocType`
- WHERE `tabDocField`.`fieldname` = 'naming_series'
- and `tabDocType`.name=`tabDocField`.parent
- order by `tabDocField`.parent""")]),
+ "transactions": "\n".join([''] + sorted(list(set(
+ webnotes.conn.sql_list("""select parent
+ from `tabDocField` where fieldname='naming_series'""")
+ + webnotes.conn.sql_list("""select dt from `tabCustom Field`
+ where fieldname='naming_series'""")
+ )))),
"prefixes": "\n".join([''] + [i[0] for i in
sql("""select name from tabSeries""")])
}
@@ -89,7 +89,6 @@
'property': prop,
'value': prop_dict[prop],
'property_type': 'Select',
- 'select_doctype': doctype
})
ps.save(1)
@@ -101,11 +100,18 @@
from core.doctype.doctype.doctype import DocType
dt = DocType()
- parent = sql("""select dt.name from `tabDocField` df, `tabDocType` dt
- where dt.name = df.parent and df.fieldname='naming_series' and dt.name != %s""",
- self.doc.select_doc_for_series)
- sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]]
- for p in parent)
+ parent = list(set(
+ webnotes.conn.sql_list("""select dt.name
+ from `tabDocField` df, `tabDocType` dt
+ where dt.name = df.parent and df.fieldname='naming_series' and dt.name != %s""",
+ self.doc.select_doc_for_series)
+ + webnotes.conn.sql_list("""select dt.name
+ from `tabCustom Field` df, `tabDocType` dt
+ where dt.name = df.dt and df.fieldname='naming_series' and dt.name != %s""",
+ self.doc.select_doc_for_series)
+ ))
+ sr = [[webnotes.model.doctype.get_property(p, 'options', 'naming_series'), p]
+ for p in parent]
options = self.scrub_options_list(self.doc.set_options.split("\n"))
for series in options:
dt.validate_series(series, self.doc.select_doc_for_series)
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index 8d09cbd..0a31dfe 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -326,6 +326,17 @@
}
// 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/item/item.py b/stock/doctype/item/item.py
index 4767742..6b6dfb3 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -55,12 +55,13 @@
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 @@
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/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js
index edad9a7..456f5f1 100644
--- a/stock/page/stock_ageing/stock_ageing.js
+++ b/stock/page/stock_ageing/stock_ageing.js
@@ -95,6 +95,8 @@
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 3da81d9..4ee4c1d 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -29,17 +29,13 @@
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 5625f11..8a705f4 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/support/doctype/support_ticket/support_ticket.py
@@ -45,6 +45,10 @@
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/utilities/doctype/rename_tool/rename_tool.py b/utilities/doctype/rename_tool/rename_tool.py
index 2e368ce..5accf3c 100644
--- a/utilities/doctype/rename_tool/rename_tool.py
+++ b/utilities/doctype/rename_tool/rename_tool.py
@@ -34,7 +34,8 @@
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 @@
rename_log.append("<span style='color: RED'>" + \
_("Failed: ") + row[0] + " -> " + row[1] + "</span>")
rename_log.append("<span style='margin-left: 20px;'>" + repr(e) + "</span>")
-
+
return rename_log
\ No newline at end of file