From 2eba53f7639369ceb14db99143a7198eabb8fec8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 11:55:31 +0530 Subject: [PATCH 01/15] test case fixes --- erpnext/hr/doctype/salary_slip/test_salary_slip.py | 8 +++++++- erpnext/selling/doctype/customer/test_customer.py | 1 - erpnext/stock/doctype/item/test_item.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py index 9f7c5df238..2bb7f52f63 100644 --- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py @@ -12,6 +12,9 @@ class TestSalarySlip(unittest.TestCase): def setUp(self): frappe.db.sql("""delete from `tabLeave Application`""") frappe.db.sql("""delete from `tabSalary Slip`""") + + frappe.db.set_value("Holiday List", "_Test Holiday List", "is_default", 1) + from erpnext.hr.doctype.leave_application.test_leave_application import _test_records as leave_applications la = frappe.copy_doc(leave_applications[2]) la.insert() @@ -26,6 +29,7 @@ class TestSalarySlip(unittest.TestCase): frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1) ss = frappe.copy_doc(test_records[0]) ss.insert() + self.assertEquals(ss.total_days_in_month, 31) self.assertEquals(ss.payment_days, 30) self.assertEquals(ss.earnings[0].e_modified_amount, 14516.13) @@ -36,8 +40,10 @@ class TestSalarySlip(unittest.TestCase): self.assertEquals(ss.net_pay, 14867.74) def test_salary_slip_with_holidays_excluded(self): + frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0) ss = frappe.copy_doc(test_records[0]) ss.insert() + self.assertEquals(ss.total_days_in_month, 30) self.assertEquals(ss.payment_days, 29) self.assertEquals(ss.earnings[0].e_modified_amount, 14500) @@ -102,6 +108,6 @@ class TestSalarySlip(unittest.TestCase): return salary_slip -test_dependencies = ["Leave Application"] +test_dependencies = ["Leave Application", "Holiday List"] test_records = frappe.get_test_records('Salary Slip') diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py index 479c5b552c..1644f29ffc 100644 --- a/erpnext/selling/doctype/customer/test_customer.py +++ b/erpnext/selling/doctype/customer/test_customer.py @@ -34,7 +34,6 @@ class TestCustomer(unittest.TestCase): make_test_records("Address") make_test_records("Contact") - details = get_party_details("_Test Customer") for key, value in to_check.iteritems(): diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index a8f3583f98..33778c9799 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -34,6 +34,8 @@ class TestItem(unittest.TestCase): se = make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, incoming_rate=1) item.has_variants = 1 + item.append("variants", {"item_attribute": "Test Size", "item_attribute_value": "Small"}) + self.assertRaises(ItemTemplateCannotHaveStock, item.save) def test_variant_item_codes(self): From fd4bcd855b6f02022622b827b0e554232c98090c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 16:55:40 +0530 Subject: [PATCH 02/15] test case fixes --- erpnext/controllers/buying_controller.py | 2 +- erpnext/crm/doctype/newsletter/newsletter.py | 2 +- .../crm/doctype/newsletter/test_newsletter.py | 13 ++++++++++--- .../newsletter_list/test_newsletter_list.py | 10 ++++------ .../doctype/newsletter_list/test_records.json | 15 --------------- .../newsletter_list_subscriber.py | 2 +- .../production_order/test_production_order.py | 3 +-- .../selling/doctype/customer/test_customer.py | 3 +++ .../doctype/delivery_note/test_delivery_note.py | 4 ++-- .../doctype/stock_entry/test_stock_entry.py | 16 ++++++++++------ .../stock_reconciliation/stock_reconciliation.py | 2 +- .../test_stock_reconciliation.py | 3 ++- erpnext/stock/reorder_item.py | 5 +---- 13 files changed, 37 insertions(+), 43 deletions(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index d4e69cf46e..9867973258 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -279,7 +279,7 @@ class BuyingController(StockController): def set_qty_as_per_stock_uom(self): for d in self.get("items"): - if d.meta.get_field("stock_qty") and not d.stock_qty: + if d.meta.get_field("stock_qty"): if not d.conversion_factor: frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx)) d.stock_qty = flt(d.qty) * flt(d.conversion_factor) diff --git a/erpnext/crm/doctype/newsletter/newsletter.py b/erpnext/crm/doctype/newsletter/newsletter.py index 6b1633f7e7..0bafda6881 100644 --- a/erpnext/crm/doctype/newsletter/newsletter.py +++ b/erpnext/crm/doctype/newsletter/newsletter.py @@ -92,7 +92,7 @@ def unsubscribe(email, name): return subs_id = frappe.db.get_value("Newsletter List Subscriber", {"email": email, "newsletter_list": name}) - if name: + if subs_id: subscriber = frappe.get_doc("Newsletter List Subscriber", subs_id) subscriber.unsubscribed = 1 subscriber.save(ignore_permissions=True) diff --git a/erpnext/crm/doctype/newsletter/test_newsletter.py b/erpnext/crm/doctype/newsletter/test_newsletter.py index ce1d2d1a54..580982ad50 100644 --- a/erpnext/crm/doctype/newsletter/test_newsletter.py +++ b/erpnext/crm/doctype/newsletter/test_newsletter.py @@ -9,7 +9,16 @@ from urllib import unquote class TestNewsletter(unittest.TestCase): def setUp(self): - frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0") + if not frappe.get_all("Newsletter List Subscriber"): + for email in ["test_subscriber1@example.com", "test_subscriber2@example.com", + "test_subscriber3@example.com"]: + frappe.get_doc({ + "doctype": "Newsletter List Subscriber", + "email": email, + "newsletter_list": "_Test Newsletter List" + }).insert() + else: + frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0") def test_send(self): self.send_newsletter() @@ -39,6 +48,4 @@ class TestNewsletter(unittest.TestCase): newsletter.send_emails() - - test_dependencies = ["Newsletter List"] diff --git a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py index c715d8557c..ebc094e159 100644 --- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py +++ b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py @@ -6,8 +6,6 @@ from __future__ import unicode_literals import frappe import unittest -# test_records = frappe.get_test_records('Newletter List') - class TestNewletterList(unittest.TestCase): def test_import(self): new_list = frappe.get_doc({ @@ -15,13 +13,13 @@ class TestNewletterList(unittest.TestCase): "title": "_Test Newsletter List 1" }).insert() - n_leads = frappe.db.count("Lead") - + n_leads = frappe.db.sql("select count(distinct email_id) from `tabLead`")[0][0] + added = new_list.import_from("Lead") - self.assertEquals(added, n_leads) - frappe.delete_doc("Newsletter List", new_list.name) + def tearDown(self): + frappe.delete_doc("Newsletter List", "_Test Newsletter List 1") test_dependencies = ["Lead"] diff --git a/erpnext/crm/doctype/newsletter_list/test_records.json b/erpnext/crm/doctype/newsletter_list/test_records.json index 5afc9df1cc..ed2f89e355 100644 --- a/erpnext/crm/doctype/newsletter_list/test_records.json +++ b/erpnext/crm/doctype/newsletter_list/test_records.json @@ -2,20 +2,5 @@ { "doctype": "Newsletter List", "title": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber1@example.com", - "newsletter_list": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber2@example.com", - "newsletter_list": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber3@example.com", - "newsletter_list": "_Test Newsletter List" } ] diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py index 1539553576..c036adcf8e 100644 --- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py +++ b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py @@ -10,4 +10,4 @@ class NewsletterListSubscriber(Document): pass def after_doctype_insert(): - frappe.db.add_unique("Newsletter List Subscriber", ("name", "email")) + frappe.db.add_unique("Newsletter List Subscriber", ("newsletter_list", "email")) diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py index 7b6425e995..34d584a94a 100644 --- a/erpnext/manufacturing/doctype/production_order/test_production_order.py +++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py @@ -130,10 +130,9 @@ class TestProductionOrder(unittest.TestCase): prod_order = make_prod_order_test_record(item="_Test FG Item 2", planned_start_date="2014-11-25 00:00:00", qty=1, do_not_save=True) prod_order.set_production_order_operations() - prod_order.save() cost = prod_order.planned_operating_cost prod_order.qty = 2 - prod_order.save() + prod_order.set_production_order_operations() self.assertEqual(prod_order.planned_operating_cost, cost*2) def make_prod_order_test_record(**args): diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py index 1644f29ffc..1db6c6a24a 100644 --- a/erpnext/selling/doctype/customer/test_customer.py +++ b/erpnext/selling/doctype/customer/test_customer.py @@ -34,6 +34,9 @@ class TestCustomer(unittest.TestCase): make_test_records("Address") make_test_records("Contact") + frappe.db.set_value("Contact", "_Test Contact For _Test Customer-_Test Customer", + "is_primary_contact", 1) + details = get_party_details("_Test Customer") for key, value in to_check.iteritems(): diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 59b453161c..4d397e77ea 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -7,7 +7,7 @@ import unittest import frappe import json import frappe.defaults -from frappe.utils import cint, nowdate, nowtime, cstr, add_days +from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt from erpnext.stock.stock_ledger import get_previous_sle from erpnext.accounts.utils import get_balance_on from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \ @@ -136,7 +136,7 @@ class TestDeliveryNote(unittest.TestCase): # check stock in hand balance bal = get_balance_on(stock_in_hand_account) - self.assertEquals(bal, prev_bal - stock_value_diff) + self.assertEquals(flt(bal, 2), flt(prev_bal - stock_value_diff, 2)) dn.cancel() self.assertFalse(get_gl_entries("Delivery Note", dn.name)) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 399589d671..432627b3cb 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -81,17 +81,21 @@ class TestStockEntry(unittest.TestCase): template = frappe.get_doc("Item", item.variant_of) else: template = item + + projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code, + "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or 0 # stock entry reqd for auto-reorder create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC", - qty=10, rate=100) - - frappe.db.set_value("Stock Settings", None, "auto_indent", 1) - projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, + qty = actual_qty + abs(projected_qty) + 10, rate=100) + + projected_qty = projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0 - + + frappe.db.set_value("Stock Settings", None, "auto_indent", 1) + # update re-level qty so that it is more than projected_qty - if projected_qty > template.reorder_levels[0].warehouse_reorder_level: + if projected_qty >= template.reorder_levels[0].warehouse_reorder_level: template.reorder_levels[0].warehouse_reorder_level += projected_qty template.save() diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 5614ee23d3..413f820043 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -227,7 +227,7 @@ class StockReconciliation(StockController): msgprint(_("Please enter Expense Account"), raise_exception=1) elif not frappe.db.sql("""select name from `tabStock Ledger Entry` limit 1"""): if frappe.db.get_value("Account", self.expense_account, "report_type") == "Profit and Loss": - frappe.throw(_("Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError) + frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError) def get_items_for(self, warehouse): self.items = [] diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 0d3288c363..eaa82dd23f 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -97,7 +97,8 @@ def create_stock_reconciliation(**args): sr.posting_time = args.posting_time or nowtime() sr.company = args.company or "_Test Company" sr.fiscal_year = get_fiscal_year(sr.posting_date)[0] - sr.expense_account = args.expense_account or "Stock Adjustment - _TC" + sr.expense_account = args.expense_account or \ + ("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC") sr.cost_center = args.cost_center or "_Test Cost Center - _TC" sr.append("items", { "item_code": args.item_code or "_Test Item", diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 61abe3b49f..30fe755bd4 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -11,10 +11,7 @@ def reorder_item(): if not frappe.db.sql("select name from `tabFiscal Year` limit 1"): return - if getattr(frappe.local, "auto_indent", None) is None: - frappe.local.auto_indent = cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')) - - if frappe.local.auto_indent: + if cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')): return _reorder_item() def _reorder_item(): From e2968e989332083a9055bd53e76c7f2df9bb1e36 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 17:25:55 +0530 Subject: [PATCH 03/15] minor fixes in test cases --- erpnext/buying/doctype/purchase_order/test_purchase_order.py | 2 ++ erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index f68f814ce3..66d50ba89d 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -80,6 +80,8 @@ def create_purchase_order(**args): po.company = args.company or "_Test Company" po.supplier = args.customer or "_Test Supplier" po.is_subcontracted = args.is_subcontracted or "No" + po.currency = args.currency or frappe.db.get_value("Company", po.company, "default_currency") + po.conversion_factor = args.conversion_factor or 1 po.append("items", { "item_code": args.item or args.item_code or "_Test Item", diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 432627b3cb..ff0b272fd5 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -83,13 +83,13 @@ class TestStockEntry(unittest.TestCase): template = item projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code, - "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or 0 + "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or [0, 0] # stock entry reqd for auto-reorder create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC", qty = actual_qty + abs(projected_qty) + 10, rate=100) - projected_qty = projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, + projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0 frappe.db.set_value("Stock Settings", None, "auto_indent", 1) From fe8d107731d924ee1f8e2a00be09afa714a1f0ce Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 18:04:35 +0530 Subject: [PATCH 04/15] stock entry: get item details --- erpnext/stock/doctype/stock_entry/stock_entry.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index c7810fd039..1135bc708f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -445,10 +445,11 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) { args: args, callback: function(r) { if(r.message) { + var d = locals[cdt][cdn]; $.each(r.message, function(k, v) { d[k] = v; }); - refresh_field('items'); + refresh_field("items"); } } }); From c4d38e2183722c2027f23c684cf615a2c969fca8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 May 2015 11:29:37 +0530 Subject: [PATCH 05/15] [minor] setup wizard language fix and no submit messages for gl/sl entry --- erpnext/accounts/doctype/gl_entry/gl_entry.py | 2 +- erpnext/setup/page/setup_wizard/setup_wizard.py | 2 +- erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index ae4dae0616..4e7928d081 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -10,8 +10,8 @@ from frappe import _ from frappe.model.document import Document class GLEntry(Document): - def validate(self): + self.flags.ignore_submit_comment = True self.check_mandatory() self.pl_must_have_cost_center() self.validate_posting_date() diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py index b80d55e7da..819e244d48 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.py +++ b/erpnext/setup/page/setup_wizard/setup_wizard.py @@ -28,7 +28,7 @@ def setup_account(args=None): args = frappe._dict(args) - if args.language != "english": + if args.language and args.language != "english": set_default_language(args.language) install_fixtures.install(args.get("country")) diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index 97e7c20b34..de6b3a6950 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -14,6 +14,7 @@ class StockFreezeError(frappe.ValidationError): pass class StockLedgerEntry(Document): def validate(self): + self.flags.ignore_submit_comment = True from erpnext.stock.utils import validate_warehouse_company self.validate_mandatory() self.validate_item() From adc830b712c17a313f8a01ed4f5dd1c3f0a07145 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 11:21:45 +0530 Subject: [PATCH 06/15] [fix] rename company abbr --- erpnext/setup/doctype/company/company.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index d35892813c..50f2865bb3 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -27,8 +27,12 @@ class Company(Document): return exists def validate(self): + self.abbr = self.abbr.strip() if self.get('__islocal') and len(self.abbr) > 5: frappe.throw(_("Abbreviation cannot have more than 5 characters")) + + if not self.abbr.strip(): + frappe.throw(_("Abbr can not be blank or space")) self.previous_default_currency = frappe.db.get_value("Company", self.name, "default_currency") if self.default_currency and self.previous_default_currency and \ @@ -199,16 +203,19 @@ class Company(Document): @frappe.whitelist() def replace_abbr(company, old, new): + new = new.strip() + if not new: + frappe.throw(_("Abbr can not be blank or space")) + frappe.only_for("System Manager") frappe.db.set_value("Company", company, "abbr", new) def _rename_record(dt): for d in frappe.db.sql("select name from `tab%s` where company=%s" % (dt, '%s'), company): - parts = d[0].split(" - ") - if parts[-1].lower() == old.lower(): - name_without_abbr = " - ".join(parts[:-1]) - frappe.rename_doc(dt, d[0], name_without_abbr + " - " + new) + parts = d[0].rsplit(" - ", 1) + if len(parts) == 1 or parts[1].lower() == old.lower(): + frappe.rename_doc(dt, d[0], parts[0] + " - " + new) for dt in ["Account", "Cost Center", "Warehouse"]: _rename_record(dt) From 8d76d14614d342209282eaf10959de8052a1fe06 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 12:22:39 +0530 Subject: [PATCH 07/15] reset item's default accounts, warehouses on deletion of company --- erpnext/setup/doctype/company/company.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 50f2865bb3..227512d017 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -178,6 +178,10 @@ class Company(Document): """ Trash accounts and cost centers for this company if no gl entry exists """ + accounts = frappe.db.sql_list("select name from tabAccount where company=%s", self.name) + cost_centers = frappe.db.sql_list("select name from `tabCost Center` where company=%s", self.name) + warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name) + rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name) if not rec: # delete Account @@ -196,7 +200,24 @@ class Company(Document): frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name) frappe.defaults.clear_default("company", value=self.name) + + # clear default accounts, warehouses from item + for f in ["default_warehouse", "website_warehouse"]: + frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" + % (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses)) + + frappe.db.sql("""update `tabItem Reorder` set warehouse=NULL where warehouse in (%s)""" + % ', '.join(['%s']*len(warehouses)), tuple(warehouses)) + + for f in ["income_account", "expense_account"]: + frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" + % (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts)) + + for f in ["selling_cost_center", "buying_cost_center"]: + frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" + % (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers)) + # reset default company frappe.db.sql("""update `tabSingles` set value="" where doctype='Global Defaults' and field='default_company' and value=%s""", self.name) From f61f76ba45779bad58586a8563539bd9d5da5570 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 12:23:03 +0530 Subject: [PATCH 08/15] [fix] gross profit report --- .../report/gross_profit/gross_profit.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index 5ede88214b..618c9cf91d 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -98,7 +98,7 @@ class GrossProfitGenerator(object): row.base_amount = flt(row.base_net_amount) - sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict()) + sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.parent, frappe._dict()) # get buying amount if row.item_code in sales_boms: @@ -158,7 +158,7 @@ class GrossProfitGenerator(object): def get_buying_amount_from_sales_bom(self, row, sales_bom): buying_amount = 0.0 - for bom_item in sales_bom[row.item_code]: + for bom_item in sales_bom: if bom_item.get("parent_detail_docname")==row.item_row: buying_amount += self.get_buying_amount(row, bom_item.item_code) @@ -174,14 +174,17 @@ class GrossProfitGenerator(object): return flt(row.qty) * item_rate else: - if row.dn_detail: - row.parenttype = "Delivery Note" - row.parent = row.delivery_note - row.item_row = row.dn_detail + if row.update_stock or row.dn_detail: + if row.dn_detail: + row.parenttype = "Delivery Note" + row.parent = row.delivery_note + row.item_row = row.dn_detail my_sle = self.sle.get((item_code, row.warehouse)) for i, sle in enumerate(my_sle): # find the stock valution rate from stock ledger entry + print sle.voucher_type, row.parenttype, sle.voucher_no, row.parent, \ + sle.voucher_detail_no, row.item_row if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \ sle.voucher_detail_no == row.item_row: previous_stock_value = len(my_sle) > i+1 and \ @@ -215,7 +218,7 @@ class GrossProfitGenerator(object): if self.filters.to_date: conditions += " and posting_date <= %(to_date)s" - self.si_list = frappe.db.sql("""select item.parenttype, si.name, + self.si_list = frappe.db.sql("""select item.parenttype, item.parent, si.posting_date, si.posting_time, si.project_name, si.update_stock, si.customer, si.customer_group, si.territory, item.item_code, item.item_name, item.description, item.warehouse, From 4809d36fbe55094861e96b9c1e4d7afd98d947a3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 12:57:22 +0530 Subject: [PATCH 09/15] validate fields value with reference docs --- erpnext/stock/doctype/delivery_note/delivery_note.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 831e53763d..f52f7e51ca 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -110,7 +110,8 @@ class DeliveryNote(SellingController): def validate_with_previous_doc(self): items = self.get("items") - for fn in (("Sales Order", "against_sales_order"), ("Sales Invoice", "against_sales_invoice")): + for fn in (("Sales Order", "against_sales_order", "so_detail"), + ("Sales Invoice", "against_sales_invoice", "si_detail")): if filter(None, [getattr(d, fn[1], None) for d in items]): super(DeliveryNote, self).validate_with_previous_doc({ fn[0]: { @@ -123,7 +124,7 @@ class DeliveryNote(SellingController): if cint(frappe.defaults.get_global_default('maintain_same_sales_rate')): super(DeliveryNote, self).validate_with_previous_doc({ fn[0] + " Item": { - "ref_dn_field": "so_detail", + "ref_dn_field": fn[2], "compare_fields": [["rate", "="]], "is_child_table": True } From 43539673ccca2e32da63f49a98992f9c2850b5a0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 14:12:48 +0530 Subject: [PATCH 10/15] [fix] sales person wise transaction summary --- .../sales_person_wise_transaction_summary.py | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py index 0dee7ab3ea..47611176ca 100644 --- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py @@ -34,7 +34,7 @@ def get_columns(filters): def get_entries(filters): date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date" - conditions, items = get_conditions(filters, date_field) + conditions, values = get_conditions(filters, date_field) entries = frappe.db.sql("""select dt.name, dt.customer, dt.territory, dt.%s as posting_date, dt_item.item_code, dt_item.qty, dt_item.base_net_amount, st.sales_person, st.allocated_percentage, dt_item.base_net_amount*st.allocated_percentage/100 as contribution_amt @@ -42,31 +42,33 @@ def get_entries(filters): where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" % (date_field, filters["doc_type"], filters["doc_type"], '%s', conditions), - tuple([filters["doc_type"]] + items), as_dict=1) + tuple([filters["doc_type"]] + values), as_dict=1, debug=1) return entries def get_conditions(filters, date_field): - conditions = "" - if filters.get("company"): conditions += " and dt.company = '%s'" % \ - filters["company"].replace("'", "\'") - if filters.get("customer"): conditions += " and dt.customer = '%s'" % \ - filters["customer"].replace("'", "\'") - if filters.get("territory"): conditions += " and dt.territory = '%s'" % \ - filters["territory"].replace("'", "\'") - - if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \ - (date_field, filters["from_date"]) - if filters.get("to_date"): conditions += " and dt.%s <= '%s'" % (date_field, filters["to_date"]) - - if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \ - filters["sales_person"].replace("'", "\'") + conditions = [""] + values = [] + + for field in ["company", "customer", "territory", "sales_person"]: + if filters.get(field): + conditions.append("dt.{0}=%s".format(field)) + values.append(filters[field]) + + if filters.get("from_date"): + conditions.append("dt.{0}>=%s".format(date_field)) + values.append(filters["from_date"]) + + if filters.get("to_date"): + conditions.append("dt.{0}<=%s".format(date_field)) + values.append(filters["to_date"]) items = get_items(filters) if items: - conditions += " and dt_item.item_code in (%s)" % ', '.join(['%s']*len(items)) + conditions.append("dt_item.item_code in (%s)" % ', '.join(['%s']*len(items))) + values += items - return conditions, items + return " and ".join(conditions), values def get_items(filters): if filters.get("item_group"): key = "item_group" From b62068f784014ffb9717a332b2d0516106ca0d14 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 14:46:12 +0530 Subject: [PATCH 11/15] removed debug --- .../sales_person_wise_transaction_summary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py index 47611176ca..e102f0d768 100644 --- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py @@ -42,7 +42,7 @@ def get_entries(filters): where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" % (date_field, filters["doc_type"], filters["doc_type"], '%s', conditions), - tuple([filters["doc_type"]] + values), as_dict=1, debug=1) + tuple([filters["doc_type"]] + values), as_dict=1) return entries From c4fa74f51d0bca8a8464456a11514db45fc98989 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 15:17:29 +0530 Subject: [PATCH 12/15] sales partner field added in sms center --- erpnext/selling/doctype/sms_center/sms_center.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json index e3b42433e6..c966ef32e8 100644 --- a/erpnext/selling/doctype/sms_center/sms_center.json +++ b/erpnext/selling/doctype/sms_center/sms_center.json @@ -36,6 +36,15 @@ "options": "Supplier", "permlevel": 0 }, + { + "depends_on": "eval:doc.send_to=='All Sales Partner Contact'", + "fieldname": "sales_partner", + "fieldtype": "Link", + "label": "Sales Partner", + "options": "Sales Partner", + "permlevel": 0, + "precision": "" + }, { "depends_on": "eval:doc.send_to=='All Employee (Active)'", "fieldname": "department", @@ -108,7 +117,7 @@ "idx": 1, "in_create": 0, "issingle": 1, - "modified": "2015-02-05 05:11:46.773913", + "modified": "2015-05-25 17:46:37.555503", "modified_by": "Administrator", "module": "Selling", "name": "SMS Center", From e2787cf2ec1855c84d0f571132a6092451a20278 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 15:27:40 +0530 Subject: [PATCH 13/15] [fix] unique employee id validation for sales person --- erpnext/setup/doctype/sales_person/sales_person.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py index 5f70b23335..21a86cf58d 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.py +++ b/erpnext/setup/doctype/sales_person/sales_person.py @@ -29,5 +29,7 @@ class SalesPerson(NestedSet): return frappe.db.get_value("User", user, "email") or user def validate_employee_id(self): - if frappe.db.exists({"doctype": "Sales Person","employee": self.employee}): - frappe.throw("Another sales person with the same employee id exists.", frappe.DuplicateEntryError) + sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee}) + + if sales_person and sales_person != self.name: + frappe.throw(_("Another sales person {0} exists with the same employee id").format(sales_person)) From 63e431a21931302e7b47d6e296a610d5ee1581ef Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 May 2015 16:15:39 +0530 Subject: [PATCH 14/15] minor fixes --- erpnext/setup/doctype/company/company.py | 2 +- erpnext/setup/doctype/sales_person/sales_person.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 227512d017..6c67e60e50 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -206,7 +206,7 @@ class Company(Document): frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" % (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses)) - frappe.db.sql("""update `tabItem Reorder` set warehouse=NULL where warehouse in (%s)""" + frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)""" % ', '.join(['%s']*len(warehouses)), tuple(warehouses)) for f in ["income_account", "expense_account"]: diff --git a/erpnext/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py index 21a86cf58d..8542c88546 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.py +++ b/erpnext/setup/doctype/sales_person/sales_person.py @@ -32,4 +32,4 @@ class SalesPerson(NestedSet): sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee}) if sales_person and sales_person != self.name: - frappe.throw(_("Another sales person {0} exists with the same employee id").format(sales_person)) + frappe.throw(_("Another Sales Person {0} exists with the same Employee id").format(sales_person)) From ac9c2de8b916ca7d770168cbb7ea0bed42dfc655 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 25 May 2015 17:02:12 +0600 Subject: [PATCH 15/15] bumped to version 5.0.9 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 84aceadcf8..9821e97a0a 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.0.8' +__version__ = '5.0.9' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 750f8112fc..74631d170a 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.0.8" +app_version = "5.0.9" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 58be999f6d..44d7bdeefe 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.0.8" +version = "5.0.9" with open("requirements.txt", "r") as f: install_requires = f.readlines()