Merge pull request #1208 from nabinhait/hotfix
fixes in stock projected qty report
diff --git a/config.json b/config.json
index cf1b11c..68782da 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
{
"app_name": "ERPNext",
- "app_version": "3.3.0",
+ "app_version": "3.3.2",
"base_template": "app/portal/templates/base.html",
"modules": {
"Accounts": {
@@ -74,5 +74,5 @@
"type": "module"
}
},
- "requires_framework_version": "==3.3.0"
+ "requires_framework_version": "==3.3.1"
}
\ No newline at end of file
diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py
index b1fa78e..6811571 100644
--- a/patches/1311/p07_scheduler_errors_digest.py
+++ b/patches/1311/p07_scheduler_errors_digest.py
@@ -12,11 +12,20 @@
if not system_managers:
return
+ # no default company
+ company = webnotes.conn.get_default("company")
+ if not company:
+ company = webnotes.conn.sql_list("select name from `tabCompany`")
+ if company:
+ company = company[0]
+ if not company:
+ return
+
# scheduler errors digest
edigest = webnotes.new_bean("Email Digest")
edigest.doc.fields.update({
"name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
+ "company": company,
"frequency": "Daily",
"enabled": 1,
"recipient_list": "\n".join(system_managers),
diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/setup/doctype/backup_manager/backup_dropbox.py
index bbd33b5..1583f7e 100644
--- a/setup/doctype/backup_manager/backup_dropbox.py
+++ b/setup/doctype/backup_manager/backup_dropbox.py
@@ -16,8 +16,6 @@
from webnotes.utils import get_request_site_address, cstr
from webnotes import _
-from backup_manager import ignore_list
-
@webnotes.whitelist()
def get_dropbox_authorize_url():
sess = get_dropbox_session()
@@ -100,9 +98,7 @@
path = get_files_path()
for filename in os.listdir(path):
filename = cstr(filename)
- if filename in ignore_list:
- continue
-
+
found = False
filepath = os.path.join(path, filename)
for file_metadata in response["contents"]:
diff --git a/setup/doctype/backup_manager/backup_manager.js b/setup/doctype/backup_manager/backup_manager.js
index c011757..6fdb9e4 100644
--- a/setup/doctype/backup_manager/backup_manager.js
+++ b/setup/doctype/backup_manager/backup_manager.js
@@ -87,7 +87,7 @@
cur_frm.save();
},
- upload_backups_to_gdrive: function() {
- cur_frm.save();
- },
+ // upload_backups_to_gdrive: function() {
+ // cur_frm.save();
+ // },
});
\ No newline at end of file
diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py
index 0a83dea..b094464 100644
--- a/setup/doctype/backup_manager/backup_manager.py
+++ b/setup/doctype/backup_manager/backup_manager.py
@@ -7,8 +7,6 @@
import webnotes
from webnotes import _
-ignore_list = []
-
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
@@ -39,10 +37,6 @@
file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)]
error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback())
webnotes.errprint(error_message)
-
- if not webnotes.conn:
- webnotes.connect()
-
send_email(False, "Dropbox", error_message)
#backup to gdrive
@@ -62,6 +56,7 @@
send_email(False, "Google Drive", error_message)
def send_email(success, service_name, error_status=None):
+ from webnotes.utils.email_lib import sendmail
if success:
subject = "Backup Upload Successful"
message ="""<h3>Backup Uploaded Successfully</h3><p>Hi there, this is just to inform you
@@ -76,7 +71,8 @@
<p>Please contact your system manager for more information.</p>
""" % (service_name, error_status)
- # email system managers
- from webnotes.utils.email_lib import sendmail
- sendmail(webnotes.conn.get_value("Backup Manager", None, "send_notifications_to").split(","),
- subject=subject, msg=message)
+ if not webnotes.conn:
+ webnotes.connect()
+
+ recipients = webnotes.conn.get_value("Backup Manager", None, "send_notifications_to").split(",")
+ sendmail(recipients, subject=subject, msg=message)
diff --git a/setup/page/setup_wizard/setup_wizard.py b/setup/page/setup_wizard/setup_wizard.py
index b5133ef..962f600 100644
--- a/setup/page/setup_wizard/setup_wizard.py
+++ b/setup/page/setup_wizard/setup_wizard.py
@@ -175,7 +175,8 @@
if not system_managers:
return
- for company in webnotes.conn.sql_list("select name FROM `tabCompany`"):
+ companies = webnotes.conn.sql_list("select name FROM `tabCompany`")
+ for company in companies:
if not webnotes.conn.exists("Email Digest", "Default Weekly Digest - " + company):
edigest = webnotes.bean({
"doctype": "Email Digest",
@@ -192,16 +193,17 @@
edigest.insert()
# scheduler errors digest
- edigest = webnotes.new_bean("Email Digest")
- edigest.doc.fields.update({
- "name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
- "frequency": "Daily",
- "recipient_list": "\n".join(system_managers),
- "scheduler_errors": 1,
- "enabled": 1
- })
- edigest.insert()
+ if companies:
+ edigest = webnotes.new_bean("Email Digest")
+ edigest.doc.fields.update({
+ "name": "Scheduler Errors",
+ "company": companies[0],
+ "frequency": "Daily",
+ "recipient_list": "\n".join(system_managers),
+ "scheduler_errors": 1,
+ "enabled": 1
+ })
+ edigest.insert()
def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 22ded6d..9a641c2 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2013-11-02 19:41:45",
+ "modified": "2013-12-18 10:38:39",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -326,7 +326,7 @@
"fieldname": "schedule_date",
"fieldtype": "Date",
"label": "Required By",
- "no_copy": 1,
+ "no_copy": 0,
"oldfieldname": "schedule_date",
"oldfieldtype": "Date",
"print_hide": 1,