Merge branch 'master' of github.com:webnotes/erpnext into responsive

Conflicts:
	buying/doctype/purchase_common/purchase_common.py
This commit is contained in:
Anand Doshi
2013-06-17 12:02:04 +05:30
4 changed files with 79 additions and 39 deletions

View File

@@ -53,7 +53,7 @@ def execute_daily():
# daily backup
from setup.doctype.backup_manager.backup_manager import take_backups_daily
take_backups_daily()
run_fn(take_backups_daily)
# check reorder level
from stock.utils import reorder_item
@@ -61,7 +61,7 @@ def execute_daily():
def execute_weekly():
from setup.doctype.backup_manager.backup_manager import take_backups_weekly
take_backups_weekly()
run_fn(take_backups_weekly)
def execute_monthly():
pass