Rushabh Mehta
|
ec557ee053
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 11:49:01 +01:00 |
|
Rushabh Mehta
|
c821f2b3ff
|
leave application type fix
|
2012-12-07 16:17:59 +05:30 |
|
Rushabh Mehta
|
6b118571db
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 15:48:01 +05:30 |
|
Rushabh Mehta
|
0db74a7ebd
|
cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification
|
2012-12-07 15:47:32 +05:30 |
|
Rushabh Mehta
|
91e760ade1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 10:51:55 +01:00 |
|
Anand Doshi
|
197d1b4e55
|
show expiry date in setup home page
|
2012-12-07 15:21:34 +05:30 |
|
Rushabh Mehta
|
ec46d02ac0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 10:14:35 +01:00 |
|
Nabin Hait
|
9b924ce695
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 14:43:40 +05:30 |
|
Nabin Hait
|
2ce027fc9f
|
floating point issue in percentage delivered/billed
|
2012-12-07 14:43:06 +05:30 |
|
Rushabh Mehta
|
20eb244983
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 09:42:19 +01:00 |
|
Rushabh Mehta
|
2af5832bf3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 09:05:04 +01:00 |
|
Anand Doshi
|
bee690497b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 13:34:26 +05:30 |
|
Anand Doshi
|
8b9507f461
|
fixes in leave application and expense claim
|
2012-12-07 13:34:05 +05:30 |
|
Rushabh Mehta
|
7c24a42076
|
website: home_page fix
|
2012-12-07 13:29:32 +05:30 |
|
Rushabh Mehta
|
98b99bd396
|
website: home_page fix
|
2012-12-07 12:55:06 +05:30 |
|
Rushabh Mehta
|
b5c3970145
|
website: home_page fix
|
2012-12-07 12:54:08 +05:30 |
|
Rushabh Mehta
|
a494b88ad8
|
updates to website: removed webnotes.cms
|
2012-12-07 12:44:45 +05:30 |
|
Rushabh Mehta
|
187fd8b31f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 07:23:39 +01:00 |
|
Rushabh Mehta
|
571377a313
|
added html to tinymce + moved website/web_cache.py > website/utils.py
|
2012-12-07 11:00:26 +05:30 |
|
Rushabh Mehta
|
ac5b240936
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 05:56:17 +01:00 |
|
Rushabh Mehta
|
0ea130a97c
|
leave application: status no_copy and draft on Open
|
2012-12-07 10:25:07 +05:30 |
|
Rushabh Mehta
|
2fd32859e7
|
added: sales_orders_pending_to_be_delivered
|
2012-12-07 10:17:22 +05:30 |
|
Rushabh Mehta
|
1e840c5a18
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 18:22:01 +01:00 |
|
Anand Doshi
|
a113d85461
|
removed Self Approval Not Allowed validation
|
2012-12-06 22:04:32 +05:30 |
|
Rushabh Mehta
|
fcf8b4a5f8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 15:44:40 +01:00 |
|
Anand Doshi
|
67327a3df1
|
fix in number of comments
|
2012-12-06 20:13:57 +05:30 |
|
Rushabh Mehta
|
5b0a4dcd05
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 15:39:28 +01:00 |
|
Anand Doshi
|
ddd8bddffd
|
website fixes
|
2012-12-06 20:08:36 +05:30 |
|
Rushabh Mehta
|
5a0c12a02c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 15:31:52 +01:00 |
|
Anand Doshi
|
41c0a321e5
|
fix in blog comments and load_from_cache
|
2012-12-06 19:57:18 +05:30 |
|
Anand Doshi
|
711f98654d
|
fix in blog list
|
2012-12-06 19:49:00 +05:30 |
|
Rushabh Mehta
|
b9999b2698
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 13:57:53 +01:00 |
|
Anand Doshi
|
a367bfe059
|
fixes after website refactor
|
2012-12-06 18:26:09 +05:30 |
|
Anand Doshi
|
0e0b2317e1
|
fixes in item after change in website
|
2012-12-06 18:18:58 +05:30 |
|
Rushabh Mehta
|
68f11060a6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 13:08:12 +01:00 |
|
Anand Doshi
|
c842f79811
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 17:35:48 +05:30 |
|
Anand Doshi
|
14dcb47dc2
|
fix in expense claim
|
2012-12-06 17:34:57 +05:30 |
|
Nabin Hait
|
c3414cd9d1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 17:25:24 +05:30 |
|
Nabin Hait
|
f71d8e0ee4
|
debit/credit adjustment if there is difference due to rounding
|
2012-12-06 17:24:59 +05:30 |
|
Rushabh Mehta
|
b3f0f1fc4e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:40:59 +01:00 |
|
Rushabh Mehta
|
e587b43e9d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 17:10:19 +05:30 |
|
Rushabh Mehta
|
a2e4cb0235
|
item, leave_balance: hotfix
|
2012-12-06 17:09:38 +05:30 |
|
Rushabh Mehta
|
c5e39b2b76
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:30:25 +01:00 |
|
Anand Doshi
|
787374b79e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 16:52:38 +05:30 |
|
Rushabh Mehta
|
4a542cf578
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:22:33 +01:00 |
|
Rushabh Mehta
|
76432721d9
|
patch fix
|
2012-12-06 16:52:17 +05:30 |
|
Rushabh Mehta
|
9b8742ffaa
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:20:48 +01:00 |
|
Anand Doshi
|
c62dabdead
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 16:50:46 +05:30 |
|
Rushabh Mehta
|
aaa36874bc
|
patch fix
|
2012-12-06 16:49:18 +05:30 |
|
Rushabh Mehta
|
ed39b79e3e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:17:54 +01:00 |
|