From 1569cf8eb300d9ff1ca661cf88aba5e3e3717b87 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 28 Oct 2016 16:39:45 +0530 Subject: [PATCH 1/4] Fix user for demo --- erpnext/demo/setup/setup_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py index f25bbc337a..278c398c2a 100644 --- a/erpnext/demo/setup/setup_data.py +++ b/erpnext/demo/setup/setup_data.py @@ -41,9 +41,9 @@ def complete_setup(domain='Manufacturing'): setup_complete({ "first_name": "Test", "last_name": "User", - "email": "test_demo@erpnext.com", + "email": "demo@erpnext.com", "company_tagline": 'Awesome Products and Services', - "password": "test", + "password": "demo", "fy_start_date": "2015-01-01", "fy_end_date": "2015-12-31", "bank_account": "National Bank", From 9dde085144066977e03b6b09a7746dbc16db58da Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 28 Oct 2016 18:59:33 +0530 Subject: [PATCH 2/4] Fixes to demo --- erpnext/demo/user/stock.py | 3 ++- erpnext/stock/doctype/purchase_receipt/purchase_receipt.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/demo/user/stock.py b/erpnext/demo/user/stock.py index ac380f2e47..ea23853fea 100644 --- a/erpnext/demo/user/stock.py +++ b/erpnext/demo/user/stock.py @@ -85,9 +85,10 @@ def make_stock_reconciliation(): def submit_draft_stock_entries(): from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, \ - DuplicateEntryForProductionOrderError, OperationsNotCompleteError + DuplicateEntryForProductionOrderError, OperationsNotCompleteError # try posting older drafts (if exists) + frappe.db.commit() for st in frappe.db.get_values("Stock Entry", {"docstatus":0}, "name"): try: ste = frappe.get_doc("Stock Entry", st[0]) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 6d6ae9719a..38110590a3 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -8,7 +8,7 @@ from frappe.utils import flt, cint, nowdate from frappe import throw, _ import frappe.defaults - +from frappe.utils import getdate from erpnext.controllers.buying_controller import BuyingController from erpnext.accounts.utils import get_account_currency from frappe.desk.notifications import clear_doctype_notifications @@ -59,7 +59,7 @@ class PurchaseReceipt(BuyingController): pc_obj = frappe.get_doc('Purchase Common') self.check_for_closed_status(pc_obj) - if self.posting_date > nowdate(): + if self.posting_date > getdate(nowdate()): throw(_("Posting Date cannot be future date")) From 6da2b08ceabeff03d829436087c8bdc573a86b62 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 31 Oct 2016 17:13:30 +0530 Subject: [PATCH 3/4] Fixes for demo --- erpnext/demo/setup/manufacture.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/demo/setup/manufacture.py b/erpnext/demo/setup/manufacture.py index 8ac203903b..24ffd926fe 100644 --- a/erpnext/demo/setup/manufacture.py +++ b/erpnext/demo/setup/manufacture.py @@ -63,7 +63,10 @@ def setup_item(): for i in items: item = frappe.new_doc('Item') item.update(i) - item.default_warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)[0].name + if item.default_warehouse: + warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1) + if warehouse: + item.default_warehouse = warehouse[0].name item.insert() def setup_product_bundle(): From dec9f2558ef419f1206224bb341f35ed615cfc79 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 29 Oct 2016 14:49:33 +0530 Subject: [PATCH 4/4] Update purchase_receipt.py --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 38110590a3..86fb88b9c7 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -59,7 +59,7 @@ class PurchaseReceipt(BuyingController): pc_obj = frappe.get_doc('Purchase Common') self.check_for_closed_status(pc_obj) - if self.posting_date > getdate(nowdate()): + if getdate(self.posting_date) > getdate(nowdate()): throw(_("Posting Date cannot be future date"))