Commit Graph

112 Commits

Author SHA1 Message Date
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +05:30
Anand Doshi
22807a61cd patch to remove accounts/utils folder and removed unrequired test cases related to unused tax controller 2013-02-06 15:41:32 +05:30
Nabin Hait
7bdf27b19c new feature: validation on account negative balance 2013-02-05 15:52:46 +05:30
Nabin Hait
c06e29ddbc removed sales order pending items report 2013-02-01 18:35:35 +05:30
Nabin Hait
c40a64a634 patch for resetting payment reconciliation values 2013-02-01 14:23:22 +05:30
Nabin Hait
ce4178b180 permission reloaded for bom replace tool 2013-02-01 12:14:45 +05:30
Nabin Hait
3210cc99bd Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 10:48:52 +05:30
Nabin Hait
a0d6b3443e removed patch of jan_mar period 2013-01-29 10:48:33 +05:30
Rushabh Mehta
6abb2e67e9 added tabsessions_to_myisam 2013-01-28 17:00:59 +05:30
Rushabh Mehta
d4ae9861f4 added tabsessions_to_myisam 2013-01-28 16:56:32 +05:30
Rushabh Mehta
fe99c293a9 reset modified dates 2013-01-28 15:30:02 +05:30
Nabin Hait
163bebb670 fixed conflict 2013-01-25 17:42:25 +05:30
Nabin Hait
e37b344e54 reload print formats patch 2013-01-25 17:38:48 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Nabin Hait
a8454e2764 removed unwanted permission 2013-01-23 16:01:35 +05:30
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Nabin Hait
f0881a9e92 updated fraction for USD 2013-01-22 11:21:55 +05:30
Rushabh Mehta
6dd9d4583d updated payment receipt voucher format 2013-01-21 18:44:43 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	patches/patch_list.py
2013-01-18 12:32:00 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Rushabh Mehta
f0b7972102 consolidated permission checking and added patch 2013-01-14 17:02:13 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
2013-01-14 13:28:31 +05:30
Anand Doshi
2ab31ab2d3 updated stock reconciliation patch 2013-01-14 11:17:34 +05:30
Rushabh Mehta
7d033d09dc set default report permission based on read 2013-01-13 14:34:38 +05:30
Rushabh Mehta
1d2710d54d added 'report' permission 2013-01-10 17:11:48 +05:30
Anand Doshi
6f88c6680e patch to fix existing holiday lists 2013-01-08 19:36:33 +05:30
Nabin Hait
0b65700ef8 serial No Status report 2013-01-04 12:06:54 +05:30
Rushabh Mehta
7590650a73 patch_list merge 2013-01-02 16:46:01 +05:30
Rushabh Mehta
3a509befdb Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-02 16:43:18 +05:30
Rushabh Mehta
1a76f67116 fixes to valid elements 2013-01-02 16:36:30 +05:30
Anand Doshi
55bf3a3357 Merge branch 'master' into edge 2013-01-02 16:24:41 +05:30
Anand Doshi
5ee3ec18f6 deprecated stock search criteria patches 2013-01-02 16:08:27 +05:30
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +05:30
Anand Doshi
22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge
Conflicts:
	patches/patch_list.py
2013-01-02 14:02:36 +05:30
Anand Doshi
946442d7a5 added new item-wise pricelist report and deprecated search criteria of Stock module 2013-01-02 13:51:29 +05:30
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Rushabh Mehta
b4c54e55a3 update print width 2012-12-28 10:35:44 +05:30
Anand Doshi
9ea03f371a Merged conflict 2012-12-27 18:07:29 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Anand Doshi
98d588cd7d deprecated form 16 print format 2012-12-25 18:53:25 +05:30
Rushabh Mehta
7285a720a0 added patch to rebuild item group tree 2012-12-25 18:24:35 +05:30