Commit Graph

3542 Commits

Author SHA1 Message Date
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
Rushabh Mehta
357dd3b3ac added master sql back to repository 2012-10-02 09:52:44 +02:00
Nabin Hait
f7b26b3dae permission fixes 2012-10-02 12:08:32 +05:30
Nabin Hait
835ebe5b58 error fixed in new general ledger 2012-10-02 10:34:31 +05:30
Anand Doshi
769392eee9 in create profile, set password in auth table 2012-10-01 20:44:54 +05:30
Rushabh Mehta
beb3a872ce Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Nabin Hait
e070d72fb3 fetch item description_html in opportunity 2012-10-01 14:05:35 +05:30
Nabin Hait
ecf2e0ed10 Either debit or credit amount should be entered in journal voucher 2012-10-01 12:51:44 +05:30
Nabin Hait
ce15b3e3bc shipping address in sales order should be hidden 2012-10-01 12:16:31 +05:30
Anand Doshi
3245a15cb7 added future imports 2012-10-01 11:35:49 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
1e6989c3a5 fixed merge conflict 2012-10-01 11:04:05 +05:30
Rushabh Mehta
3c04193afb form, appframe ui fixes 2012-09-28 18:47:47 +05:30
Anand Doshi
5b553b2709 allow deletion of profile 2012-09-28 16:45:05 +05:30
Nabin Hait
b4422f5850 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-28 16:17:04 +05:30
Nabin Hait
3cd9b31268 due date based on credit days in pur invoice 2012-09-28 16:14:38 +05:30
Rushabh Mehta
90f4d9a608 Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 16:12:31 +05:30
Rushabh Mehta
b0d32b7a25 form toolbar ui fixes and added themes 2012-09-28 16:11:57 +05:30
Anand Doshi
dcb6c2c707 fixed expiry message 2012-09-28 16:09:49 +05:30
Anand Doshi
9912d0e5e6 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-28 16:06:45 +05:30
Anand Doshi
62091db7a8 fix in expiry msg 2012-09-28 16:06:06 +05:30
Anand Doshi
440c1eb465 deprecated account balance and fixed expiry msg 2012-09-28 16:04:10 +05:30
Nabin Hait
ea69ff207a repost_acc_bal patch andpur taxes and charges 2012-09-28 15:27:23 +05:30
Anand Doshi
9e9996dbc9 fixed patch after merge 2012-09-28 12:41:18 +05:30
Anand Doshi
b83307823b Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 12:39:37 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
534a7a92fe updated shortcuts 2012-09-28 12:33:42 +05:30
Nabin Hait
133c9c60f5 Default category in purchase taxes and charges 2012-09-28 12:26:11 +05:30
Rushabh Mehta
cebb02753c added shortcuts 2012-09-28 12:18:43 +05:30