Anand Doshi 9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master ... Conflicts: accounts/doctype/pos_setting/pos_setting.txt patches/patch_list.py		2013-08-12 20:00:33 +05:30
..
__init__.py	[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285	2013-08-02 19:31:41 +05:30
p01_hr_settings.py	[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166	2013-08-06 17:23:44 +05:30
p02_rename_price_list.py	[minor] [fix] [patch] rename price list	2013-08-12 12:29:36 +05:30
p03_pos_setting_replace_customer_account.py	Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master	2013-08-12 20:00:33 +05:30