Commit Graph

3621 Commits

Author SHA1 Message Date
Rushabh Mehta
3836a0d13b Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 18:32:33 +05:30
Rushabh Mehta
b62bbc6dc7 update to messages, added avatar-large 2012-10-03 18:32:10 +05:30
Nabin Hait
97971c43e0 bank reco fixes 2012-10-03 17:47:10 +05:30
Nabin Hait
bb00fdbfb8 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 17:01:27 +05:30
Nabin Hait
5e66ce121b fix wrong vouchers due to Valuation charges 2012-10-03 16:58:24 +05:30
Rushabh Mehta
8a4cc1b585 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 16:51:59 +05:30
Nabin Hait
c09de35ba5 fix wrong vouchers due to Valuation charges 2012-10-03 16:34:53 +05:30
Nabin Hait
1e79441457 fix wrong vouchers due to Valuation charges 2012-10-03 16:31:45 +05:30
Rushabh Mehta
eff64629de blog_subscribe.html: rss icon fix 2012-10-03 16:31:13 +05:30
Nabin Hait
8b223bd616 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 16:19:55 +05:30
Nabin Hait
8a5be5b747 fix wrong vouchers due to Valuation charges 2012-10-03 16:19:28 +05:30
Rushabh Mehta
15c478d5d6 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 15:21:33 +05:30
Rushabh Mehta
034460de98 listview in single line, spacing in module pages 2012-10-03 15:21:05 +05:30
Nabin Hait
92e7242808 find wrong vouchers 2012-10-03 14:53:08 +05:30
Nabin Hait
f84237642e find wrong vouchers 2012-10-03 14:51:42 +05:30
Nabin Hait
1f33e46e34 find wrong vouchers 2012-10-03 14:47:41 +05:30
Nabin Hait
f3a7f347c2 find wrong vouchers 2012-10-03 14:45:45 +05:30
Nabin Hait
703d289f29 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 14:41:52 +05:30
Nabin Hait
3af321fa59 find wrong vouchers 2012-10-03 14:41:36 +05:30
Rushabh Mehta
92f3c02e42 message based on id changed 2012-10-03 14:10:45 +05:30
Nabin Hait
bd037ab540 find wrong vouchers 2012-10-03 13:46:45 +05:30
Nabin Hait
061141b3b8 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 13:33:33 +05:30
Nabin Hait
92dd87f0fe debit-credit tolerance increased to .005 2012-10-03 13:33:13 +05:30
Rushabh Mehta
9a56fe4871 bugfix in profile_settings, removed files from conf (always public/files) and changed default avatar to defunct brightkite avatar 2012-10-03 12:54:35 +05:30
Rushabh Mehta
204ddefe61 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 12:22:34 +05:30
Rushabh Mehta
ac7baf046a commonified ripped paper effect and ctrl+s in todo 2012-10-03 12:22:13 +05:30
Nabin Hait
347fabd4aa Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 12:08:25 +05:30
Nabin Hait
3fd3b8e7fe Find wrong vouchers (temp) 2012-10-03 12:08:01 +05:30
Rushabh Mehta
c919d2579e Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 11:57:13 +05:30
Rushabh Mehta
3009c46ba5 moved to bootstrap 2.1 and some ui fixes in todo and messages 2012-10-03 11:56:38 +05:30
Nabin Hait
9462ce9aef Taxes and charges category issue fixed 2012-10-03 11:54:06 +05:30
Nabin Hait
cd2f40ffef reload purchase invoice gl mapper 2012-10-03 11:17:37 +05:30
Nabin Hait
bc06c7c17c Fixes in GL Mapper 2012-10-03 11:13:12 +05:30
Anand Doshi
2e6e0963d0 do not send email digests to expired accounts 2012-10-03 09:18:16 +05:30
Anand Doshi
86e240177e removed install erpnext -- created a gist, as installation to be independent of repository 2012-10-02 19:33:53 +05:30
Anand Doshi
d522a8fa4d Merge branch 'master' of github.com:webnotes/erpnext 2012-10-02 19:14:47 +05:30
Anand Doshi
a4cc383625 added 'fixed' property to background so that it does not scroll 2012-10-02 19:13:04 +05:30
Nabin Hait
111a086900 floating point issue fixed tax calculation 2012-10-02 18:30:07 +05:30
Rushabh Mehta
079df382f9 login css 2012-10-02 16:54:42 +05:30
Rushabh Mehta
2ccabb26c2 jv print format & core module appframe fix 2012-10-02 16:49:41 +05:30
Rushabh Mehta
9a8b7bb335 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-02 16:28:13 +05:30
Rushabh Mehta
4b1894aa85 jv merge fix 2012-10-02 16:27:23 +05:30
Nabin Hait
3820096714 Update patches/september_2012/plot_patch.py 2012-10-02 16:17:00 +05:30
Rushabh Mehta
0b24c5ec0c Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-02 15:58:19 +05:30
Rushabh Mehta
9d1faea10c separated query-report and added module marker to appframe 2012-10-02 14:56:41 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
2012-10-02 14:35:20 +05:30
Nabin Hait
47d8947012 get_field replaced with Meta.get_field 2012-10-02 14:22:53 +05:30
Anand Doshi
5bc86087fd Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-02 13:50:21 +05:30
Anand Doshi
05f6f181f7 fixes in add user of Setup Control 2012-10-02 13:40:42 +05:30
Nabin Hait
32128e82f3 account on_trash fix 2012-10-02 13:25:20 +05:30