Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Dropbox, Scheduler, 3to4 migration

Browse Source
This commit is contained in:
Anand Doshi 2014-03-11 15:17:13 +05:30
parent 09a9f4c0c9
commit c379c78fec
6 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/hooks.txt
View File

@ -39,18 +39,18 @@ standard_queries = Customer:erpnext.selling.doctype.customer.customer.get_custom
#### Frequently #### Frequently
scheduler_event = all:erpnext.support.doctype.support_ticket.get_support_mails.get_support_mails scheduler_event:all = erpnext.support.doctype.support_ticket.get_support_mails.get_support_mails
scheduler_event = all:erpnext.hr.doctype.job_applicant.get_job_applications.get_job_applications scheduler_event:all = erpnext.hr.doctype.job_applicant.get_job_applications.get_job_applications
scheduler_event = all:erpnext.selling.doctype.lead.get_leads.get_leads scheduler_event:all = erpnext.selling.doctype.lead.get_leads.get_leads
#### Daily #### Daily
scheduler_event = daily:erpnext.accounts.doctype.sales_invoice.sales_invoice.manage_recurring_invoices scheduler_event:daily = erpnext.accounts.doctype.sales_invoice.sales_invoice.manage_recurring_invoices
scheduler_event = daily:erpnext.setup.doctype.backup_manager.backup_manager.take_backups_daily scheduler_event:daily_long = erpnext.setup.doctype.backup_manager.backup_manager.take_backups_daily
scheduler_event = daily:erpnext.stock.utils.reorder_item scheduler_event:daily = erpnext.stock.utils.reorder_item
scheduler_event = daily:erpnext.setup.doctype.email_digest.email_digest.send scheduler_event:daily = erpnext.setup.doctype.email_digest.email_digest.send
scheduler_event = daily:support.doctype.support_ticket.support_ticket.auto_close_tickets scheduler_event:daily = erpnext.support.doctype.support_ticket.support_ticket.auto_close_tickets
#### Weekly #### Weekly
scheduler_event = weekly:erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly scheduler_event:weekly_long = erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly

1
erpnext/patches.txt
View File

@ -1,3 +1,4 @@
erpnext.patches.4_0.validate_v3_patch
erpnext.patches.4_0.update_user_properties erpnext.patches.4_0.update_user_properties
erpnext.patches.4_0.move_warehouse_user_to_restrictions erpnext.patches.4_0.move_warehouse_user_to_restrictions
erpnext.patches.4_0.new_permissions erpnext.patches.4_0.new_permissions

12
erpnext/patches/4_0/validate_v3_patch.py Normal file
View File

@ -0,0 +1,12 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
def execute():
from frappe.modules.patch_handler import executed
last_v3_patch = 'patches.1401.fix_planned_qty'
if not executed(last_v3_patch):
raise Exception, "site not ready to migrate to version 4"

15
erpnext/setup/doctype/backup_manager/backup_dropbox.py
View File

@ -21,7 +21,7 @@ def get_dropbox_authorize_url():
sess = get_dropbox_session() sess = get_dropbox_session()
request_token = sess.obtain_request_token() request_token = sess.obtain_request_token()
return_address = get_request_site_address(True) \ return_address = get_request_site_address(True) \
+ "?cmd=setup.doctype.backup_manager.backup_dropbox.dropbox_callback" + "?cmd=erpnext.setup.doctype.backup_manager.backup_dropbox.dropbox_callback"
url = sess.build_authorize_url(request_token, return_address) url = sess.build_authorize_url(request_token, return_address)
@ -71,13 +71,12 @@ def dropbox_callback(oauth_token=None, not_approved=False):
def backup_to_dropbox(): def backup_to_dropbox():
from dropbox import client, session from dropbox import client, session
from conf import dropbox_access_key, dropbox_secret_key
from frappe.utils.backups import new_backup from frappe.utils.backups import new_backup
from frappe.utils import get_files_path, get_backups_path from frappe.utils import get_files_path, get_backups_path
if not frappe.db: if not frappe.db:
frappe.connect() frappe.connect()
sess = session.DropboxSession(dropbox_access_key, dropbox_secret_key, "app_folder") sess = session.DropboxSession(frappe.conf.dropbox_access_key, frappe.conf.dropbox_secret_key, "app_folder")
sess.set_token(frappe.db.get_value("Backup Manager", None, "dropbox_access_key"), sess.set_token(frappe.db.get_value("Backup Manager", None, "dropbox_access_key"),
frappe.db.get_value("Backup Manager", None, "dropbox_access_secret")) frappe.db.get_value("Backup Manager", None, "dropbox_access_secret"))
@ -121,12 +120,10 @@ def get_dropbox_session():
except: except:
frappe.msgprint(_("Please install dropbox python module"), raise_exception=1) frappe.msgprint(_("Please install dropbox python module"), raise_exception=1)
try: if not (frappe.conf.dropbox_access_key or frappe.conf.dropbox_secret_key):
from conf import dropbox_access_key, dropbox_secret_key frappe.throw(_("Please set Dropbox access keys in your site config"))
except ImportError:
frappe.msgprint(_("Please set Dropbox access keys in") + " conf.py", sess = session.DropboxSession(frappe.conf.dropbox_access_key, frappe.conf.dropbox_secret_key, "app_folder")
raise_exception=True)
sess = session.DropboxSession(dropbox_access_key, dropbox_secret_key, "app_folder")
return sess return sess
def upload_file_to_dropbox(filename, folder, dropbox_client): def upload_file_to_dropbox(filename, folder, dropbox_client):

6
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -314,8 +314,10 @@ class DocType(DocListController):
return 0, "<p>Calendar Events</p>" return 0, "<p>Calendar Events</p>"
def get_todo_list(self, user_id): def get_todo_list(self, user_id):
from frappe.core.page.todo.todo import get todo_list = frappe.db.sql("""select *
todo_list = get() from `tabToDo` where (owner=%s or assigned_by=%s)
order by field(priority, 'High', 'Medium', 'Low') asc, date asc""",
(user_id, user_id), as_dict=True)
html = "" html = ""
if todo_list: if todo_list:

2
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@ -30,7 +30,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
frappe.app.logout(); frappe.app.logout();
}, 2000); }, 2000);
} else { } else {
window.location = "app.html"; window.location = "/desk";
} }
}, 2000); }, 2000);
} }