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

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

Browse Source
This commit is contained in:
Brahma K 2011-08-31 12:33:39 +05:30
commit 369c7009ec
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hr/doctype/salary_manager/test_salary_manager.py
View File

@ -5,7 +5,7 @@ from webnotes.model.doc import Document
from webnotes.model.code import get_obj
sql = webnotes.conn.sql
class TestSalarySlip(unittest.TestCase):
class TestSalaryManager(unittest.TestCase):
def setUp(self):
webnotes.conn.begin()
for rec in [des1, dep1, branch1, grade1, comp1, emp1, emp2]:

7
patches/patch.py
View File

@ -1,7 +1,8 @@
# REMEMBER to update this
# ========================
last_patch = 350
last_patch = 351
#-------------------------------------------
@ -252,6 +253,8 @@ def execute(patch_no):
elif patch_no == 344:
sql("delete from `tabDocFormat` where ifnull(format, '') = '' and parent = 'Delivery Note'")
elif patch_no == 345:
# rerun 343 (merge confict)
reload_doc('stock','doctype','item_customer_detail')
sql("delete from `tabModule Def Item` where display_name = 'Salary Slip Control Panel' and parent = 'HR'")
reload_doc('hr','Module Def','HR')
elif patch_no == 346:
@ -272,3 +275,5 @@ def execute(patch_no):
elif patch_no == 350:
reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'doctype', 'item_customer_detail')
elif patch_no == 351:
reload_doc('home', 'page', 'dashboard')