nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2013-05-23 15:22:47 +05:30
parent 65d8755567 ded5da5b40
commit 4543884021
35 changed files with 463 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
startup/schedule_handlers.py
View File

@@ -55,6 +55,10 @@ def execute_daily():
from setup.doctype.backup_manager.backup_manager import take_backups_daily
take_backups_daily()
# check reorder level
from stock.utils import reorder_item
run_fn(reorder_item)
def execute_weekly():
from setup.doctype.backup_manager.backup_manager import take_backups_weekly
take_backups_weekly()

4
startup/website.py
View File

@@ -1,5 +1,5 @@
import webnotes, conf, os
from webnotes.utils import cint, cstr
from webnotes.utils import cint, cstr, encode
def get_templates_path():
return os.path.join(os.path.dirname(conf.__file__), "app", "website", "templates")
@@ -72,7 +72,7 @@ def update_template_args(page_name, args):
args[k] = cint(args.get(k) or 0)
args.url = quote(str(get_request_site_address(full_address=True)), str(""))
args.encoded_title = quote(str(args.title or ""), str(""))
args.encoded_title = quote(encode(args.title or ""), str(""))
return args