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 |
|
Nabin Hait
|
7291ec7147
|
Event in Lead fixed
|
2012-09-28 10:58:58 +05:30 |
|
Rushabh Mehta
|
224714c248
|
no role access for financial analytics
|
2012-09-28 10:23:27 +05:30 |
|
Rushabh Mehta
|
b02744de8f
|
updates to form comment (post on enter) and global defaults
|
2012-09-28 09:56:55 +05:30 |
|
Rushabh Mehta
|
294778a83c
|
messages.js: allow user to task messages
|
2012-09-27 15:43:06 +02:00 |
|
Rushabh Mehta
|
dd46b52467
|
updated messages
|
2012-09-27 19:01:52 +05:30 |
|
Rushabh Mehta
|
7f9c369266
|
updated messages
|
2012-09-27 18:48:43 +05:30 |
|
Rushabh Mehta
|
6e04ef7989
|
updated messages
|
2012-09-27 18:41:46 +05:30 |
|
Rushabh Mehta
|
901af83f48
|
lead.js, bugfix
|
2012-09-27 17:17:23 +05:30 |
|
Anand Doshi
|
4bfbee8281
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-27 13:06:23 +05:30 |
|
Anand Doshi
|
4487e47233
|
fixed nested set model - group move, deletion
|
2012-09-27 13:05:25 +05:30 |
|
Rushabh Mehta
|
b0f1d71950
|
fixed voucher import tool
|
2012-09-26 16:22:03 +02:00 |
|
Rushabh Mehta
|
55fd5f3ed6
|
added voucher import tool
|
2012-09-26 19:00:02 +05:30 |
|
Nabin Hait
|
7f59913286
|
shipping address hidden in SO
|
2012-09-26 13:10:37 +05:30 |
|
Nabin Hait
|
f0d07b31d6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-26 12:47:20 +05:30 |
|
Nabin Hait
|
29bd66e9e0
|
fixed stock reco cancellation
|
2012-09-26 12:46:57 +05:30 |
|
Anand Doshi
|
47ee285ff9
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
|
2012-09-26 12:44:44 +05:30 |
|