Nabin Hait
|
a189af48f6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-19 16:27:42 +05:30 |
|
Nabin Hait
|
16d9f4942a
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:48:08 +05:30 |
|
Nabin Hait
|
422f7e99db
|
Update erpnext/selling/doctype/customer/customer.txt
|
2012-03-19 15:37:03 +05:30 |
|
Nabin Hait
|
9aa3777ba6
|
Update erpnext/setup/doctype/sales_person/sales_person.txt
|
2012-03-19 15:21:30 +05:30 |
|
Nabin Hait
|
e5d99f5ed1
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:15:20 +05:30 |
|
Anand Doshi
|
a7158f6ea9
|
fix in session expiry
|
2012-03-19 14:41:05 +05:30 |
|
Anand Doshi
|
5dabfdd920
|
sync doctype - first cut
|
2012-03-19 14:26:14 +05:30 |
|
Rushabh Mehta
|
6498cee998
|
fixed conflict
|
2012-03-19 09:01:16 +01:00 |
|
Nabin Hait
|
b6cd3316c4
|
error fixed in lease receipts client wise
|
2012-03-19 13:27:06 +05:30 |
|
Anand Doshi
|
f02c9e7b6c
|
fix in due_date fetching for receivable voucher
|
2012-03-19 11:43:24 +05:30 |
|
Rushabh Mehta
|
a0a53c90f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 06:12:43 +01:00 |
|
Nabin Hait
|
15a0271557
|
Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
|
2012-03-19 10:22:32 +05:30 |
|
Nabin Hait
|
9f5b2cd8d9
|
Update erpnext/stock/doctype/delivery_note/delivery_note.txt
|
2012-03-19 10:20:22 +05:30 |
|
Rushabh Mehta
|
7afaa8665d
|
major reworking of page navigation
|
2012-03-16 18:28:09 +05:30 |
|
Nabin Hait
|
3ffca32ace
|
rename dt patch updated
|
2012-03-16 16:21:44 +05:30 |
|
Nabin Hait
|
deac31fd2d
|
Update erpnext/selling/doctype/sales_common/sales_common.py
|
2012-03-16 15:14:27 +05:30 |
|
Nabin Hait
|
15afe87984
|
cost center will be fetched from other charges master
|
2012-03-16 15:11:02 +05:30 |
|
Rushabh Mehta
|
8e3d596cbc
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-15 16:44:19 +05:30 |
|
Rushabh Mehta
|
2438de4c9b
|
fixed tags in list2
|
2012-03-15 16:43:46 +05:30 |
|
Rushabh Mehta
|
2f052fd1ff
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-15 07:22:39 +01:00 |
|
Rushabh Mehta
|
5b9e0951d7
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-15 07:21:43 +01:00 |
|
Anand Doshi
|
92da889d32
|
fix in report builder saving
|
2012-03-15 11:50:26 +05:30 |
|
Anand Doshi
|
96188f0310
|
sync with gateway moved to defs
|
2012-03-15 11:11:57 +05:30 |
|
Rushabh Mehta
|
f47192c5ce
|
merge
|
2012-03-14 19:07:11 +05:30 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
3b3e336fcc
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-14 13:25:19 +01:00 |
|
Anand Doshi
|
018f075b66
|
Merge branch 'master' into sync
|
2012-03-14 17:54:32 +05:30 |
|
Anand Doshi
|
0e2461fa7c
|
fix in qa inspection report link
|
2012-03-14 17:53:53 +05:30 |
|
Anand Doshi
|
4b7ddff4c9
|
patch after doctype.py refactor
|
2012-03-14 17:45:54 +05:30 |
|
Rushabh Mehta
|
3bbc7aeeb8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-14 07:58:10 +01:00 |
|
Anand Doshi
|
0493897297
|
Merge branch 'master' into sync
Conflicts:
js/all-app.js
js/all-web.js
version.num
|
2012-03-14 12:24:37 +05:30 |
|
Anand Doshi
|
990599ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-14 12:20:58 +05:30 |
|
Nabin Hait
|
4af2c094cc
|
rename dt error fixed
|
2012-03-14 12:12:23 +05:30 |
|
Nabin Hait
|
1732905db8
|
rename dt error fixed
|
2012-03-14 12:04:16 +05:30 |
|
Anand Doshi
|
7854f81ca0
|
show todo, calendar and support desktop notifications
|
2012-03-14 12:01:13 +05:30 |
|
Nabin Hait
|
64f40fab6d
|
Rename doctype for more meaningful name
|
2012-03-14 11:07:00 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +05:30 |
|
Nabin Hait
|
c6b989c9d7
|
update stock reco permission
|
2012-03-13 12:47:07 +05:30 |
|
Nabin Hait
|
9826ccce54
|
update stock reco permission
|
2012-03-13 12:45:53 +05:30 |
|
Rushabh Mehta
|
b9878d01e1
|
style fixes
|
2012-03-12 16:12:09 +05:30 |
|
Rushabh Mehta
|
ae4d1f973c
|
modules cleanup
|
2012-03-12 14:34:55 +05:30 |
|
Anand Doshi
|
5230aa89a2
|
Merge branch 'master' into sync
|
2012-03-12 13:28:15 +05:30 |
|
Rushabh Mehta
|
09595eee3e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-12 13:21:07 +05:30 |
|
Nabin Hait
|
b5b39f0e48
|
update cost as per LPR and standard rate
|
2012-03-12 11:25:10 +05:30 |
|
Rushabh Mehta
|
9f89e35ebe
|
search selector fix for link
|
2012-03-09 17:51:39 +05:30 |
|
Rushabh Mehta
|
519f70b384
|
new autosuggest, other fixes
|
2012-03-09 16:44:21 +05:30 |
|
Nabin Hait
|
6715172211
|
sub contracted item are allowed to create po
|
2012-03-09 16:04:19 +05:30 |
|
Anand Doshi
|
4cc7d3e392
|
fix in support ticket rendering
|
2012-03-08 14:49:49 +05:30 |
|
Anand Doshi
|
c37c772678
|
fix in support ticket thread
|
2012-03-08 14:35:19 +05:30 |
|
Anand Doshi
|
20f63da794
|
fix in messages
|
2012-03-08 12:10:51 +05:30 |
|
Anand Doshi
|
eb55df0aa3
|
fix in messages
|
2012-03-08 12:06:27 +05:30 |
|
Anand Doshi
|
a6952c935c
|
doctype refactor first commit
|
2012-03-07 19:37:23 +05:30 |
|
Rushabh Mehta
|
9a1bdf7224
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-07 18:20:33 +05:30 |
|
Rushabh Mehta
|
f81a64e57f
|
new listing and changed wn.widgets.listing to wn.ui.listing
|
2012-03-07 18:19:41 +05:30 |
|
Nabin Hait
|
928e89a359
|
validation added in enquire
|
2012-03-07 13:11:24 +05:30 |
|
Nabin Hait
|
20f68b342b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-07 12:51:19 +05:30 |
|
Nabin Hait
|
00260870d1
|
fixes in rv
|
2012-03-07 12:50:55 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Anand Doshi
|
18b6c1d4e9
|
minor changes in support ticket
|
2012-03-06 18:31:25 +05:30 |
|
Anand Doshi
|
2bc141f5db
|
fix in support ticket and email settings
|
2012-03-06 18:05:23 +05:30 |
|
Anand Doshi
|
a872d81983
|
trying to fix support ticket
|
2012-03-06 17:09:53 +05:30 |
|
Anand Doshi
|
2b60484bab
|
fix in reverted my company
|
2012-03-06 16:17:34 +05:30 |
|
Anand Doshi
|
bb64d302df
|
email digest fix
|
2012-03-06 11:42:32 +05:30 |
|
Nabin Hait
|
4e154d2233
|
removed rv series def val
|
2012-03-06 11:19:29 +05:30 |
|
Nabin Hait
|
b659457b4d
|
Removed def value from invoice naming series
|
2012-03-06 11:07:24 +05:30 |
|
Rushabh Mehta
|
60871c3f54
|
merge, doclist2
|
2012-03-05 18:29:34 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +05:30 |
|
Nabin Hait
|
a528f54dcb
|
serial no fld print_hide=0
|
2012-03-05 17:45:38 +05:30 |
|
Rushabh Mehta
|
23d366a0be
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-05 11:31:04 +01:00 |
|
Nabin Hait
|
d342e2a4f2
|
reload item tables
|
2012-03-05 15:22:55 +05:30 |
|
Nabin Hait
|
cf9c4c45a5
|
export /import fld hide issue, discount issue
|
2012-03-05 15:21:35 +05:30 |
|
Rushabh Mehta
|
2f69c14e36
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-05 06:34:17 +01:00 |
|
Nabin Hait
|
d14bea3de5
|
patch list updated
|
2012-03-05 11:03:54 +05:30 |
|
Rushabh Mehta
|
38305a4b65
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-05 06:30:10 +01:00 |
|
Nabin Hait
|
3f958f7433
|
reload patch: field order changed
|
2012-03-05 10:59:02 +05:30 |
|
Nabin Hait
|
07e9ff3d30
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-05 10:55:24 +05:30 |
|
Nabin Hait
|
9cee59cd05
|
field order changed
|
2012-03-05 10:54:54 +05:30 |
|
Anand Doshi
|
821cb64987
|
fix in delivery note detail double entry
|
2012-03-03 16:27:48 +05:30 |
|
Anand Doshi
|
5478842d80
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-03 15:02:18 +05:30 |
|
Anand Doshi
|
146f17bf57
|
fix in delivery note submission - error caused due to default packed qty
|
2012-03-03 15:01:41 +05:30 |
|
Nabin Hait
|
97e1770296
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 17:15:21 +05:30 |
|
Nabin Hait
|
89a30ff7dc
|
Company 'all' removed from financial statements
|
2012-03-02 17:15:01 +05:30 |
|
Rushabh Mehta
|
c326075bdb
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-02 12:36:39 +01:00 |
|
Anand Doshi
|
c4e2d62333
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 17:05:33 +05:30 |
|
Anand Doshi
|
d536f16c53
|
user addition fix
|
2012-03-02 17:05:04 +05:30 |
|
Rushabh Mehta
|
bb8bf194a7
|
merge
|
2012-03-02 16:28:09 +05:30 |
|
Rushabh Mehta
|
ee92f4b8ca
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 16:25:35 +05:30 |
|
Rushabh Mehta
|
e45ffd6daf
|
activity date fix
|
2012-03-02 16:25:22 +05:30 |
|
Nabin Hait
|
a0801f7e39
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 16:06:46 +05:30 |
|
Nabin Hait
|
40c514612b
|
price list rate hiding issue
|
2012-03-02 16:06:33 +05:30 |
|
Anand Doshi
|
5cc8cd7dc1
|
do not record logins by demo@webnotestech.com
|
2012-03-02 15:42:08 +05:30 |
|
Nabin Hait
|
7e6b62eafd
|
print hide issue
|
2012-03-02 15:12:52 +05:30 |
|
Nabin Hait
|
fae852eb78
|
print hide issue
|
2012-03-02 15:10:51 +05:30 |
|
Rushabh Mehta
|
d0fb5e5d5d
|
merge
|
2012-03-02 14:58:39 +05:30 |
|
Nabin Hait
|
e0eb58ad26
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 14:57:56 +05:30 |
|
Nabin Hait
|
0d155a9135
|
print hide issue
|
2012-03-02 14:57:44 +05:30 |
|
Nabin Hait
|
1841d8defa
|
pr/dn no mapping through sales/pur return
|
2012-03-02 14:57:27 +05:30 |
|
Rushabh Mehta
|
a86f3e4507
|
cleanup of handler.js
|
2012-03-02 14:56:51 +05:30 |
|
Rushabh Mehta
|
58cdaa8590
|
fix in support ticket sending
|
2012-03-02 10:03:16 +01:00 |
|
Anand Doshi
|
31c3190681
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 13:13:04 +05:30 |
|
Anand Doshi
|
f68e3053a7
|
fix in support ticket.. checks sync_support_mails checkbox before sending emails
|
2012-03-02 13:11:53 +05:30 |
|
Nabin Hait
|
6db30a5b5a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 12:29:23 +05:30 |
|
Nabin Hait
|
88986ca007
|
column break print hide issue
|
2012-03-02 12:29:08 +05:30 |
|
Anand Doshi
|
86fa67065e
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
version.num
|
2012-03-02 12:21:01 +05:30 |
|
Anand Doshi
|
ecd8df8cfb
|
fix in user password change by system manager
|
2012-03-02 12:18:47 +05:30 |
|
Rushabh Mehta
|
305717a629
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 11:30:00 +05:30 |
|
Rushabh Mehta
|
37f531b6da
|
fixes to profile update
|
2012-03-02 11:29:09 +05:30 |
|
Anand Doshi
|
a7c2de6164
|
fix in user passwordgs
|
2012-03-02 11:27:50 +05:30 |
|
Anand Doshi
|
1e9b15eb5d
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
version.num
|
2012-03-01 19:28:36 +05:30 |
|
Anand Doshi
|
e306a1f5e1
|
fix in sales and purchase common column hide
|
2012-03-01 19:25:33 +05:30 |
|
Nabin Hait
|
06292433a6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 19:23:42 +05:30 |
|
Nabin Hait
|
760e91e949
|
print hide issue fixed in dn
|
2012-03-01 19:23:21 +05:30 |
|
Rushabh Mehta
|
84e0c6f7ba
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:59:01 +05:30 |
|
Rushabh Mehta
|
b5af807281
|
browser support
|
2012-03-01 18:58:29 +05:30 |
|
Nabin Hait
|
c4bc429cf7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:56:33 +05:30 |
|
Nabin Hait
|
80d5261100
|
patch list updated
|
2012-03-01 18:56:06 +05:30 |
|
Rushabh Mehta
|
97ceffccce
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:53:50 +05:30 |
|
Rushabh Mehta
|
5d267a4ad7
|
browse support
|
2012-03-01 18:53:06 +05:30 |
|
Nabin Hait
|
1fb0058283
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:48:54 +05:30 |
|
Nabin Hait
|
db4af96388
|
issue fixed in pos
|
2012-03-01 18:47:51 +05:30 |
|
Rushabh Mehta
|
f6cca4f218
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:42:44 +05:30 |
|
Rushabh Mehta
|
70f7674aed
|
browse support and images
|
2012-03-01 18:42:05 +05:30 |
|
Anand Doshi
|
50b950b692
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:21:27 +05:30 |
|
Anand Doshi
|
68fb2c9b19
|
fix in import error due to indentation issues in item_grou[
|
2012-03-01 18:20:31 +05:30 |
|
Nabin Hait
|
96639d76b2
|
fixed indentation issue for custom script
|
2012-03-01 18:11:27 +05:30 |
|
Nabin Hait
|
823f192876
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:04:29 +05:30 |
|
Nabin Hait
|
423474da5c
|
transaction date issue in mapper patch
|
2012-03-01 18:04:08 +05:30 |
|
Nabin Hait
|
f237a67183
|
transaction date issue in mapper
|
2012-03-01 18:03:47 +05:30 |
|
Anand Doshi
|
232d725fd7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 17:55:13 +05:30 |
|
Anand Doshi
|
e90e35dcda
|
restoring contact control
|
2012-03-01 17:52:31 +05:30 |
|
Nabin Hait
|
e3ce5b4e0c
|
voucher date removal issue fixed
|
2012-03-01 17:37:36 +05:30 |
|
Nabin Hait
|
be0b090d27
|
voucher date removal issue fixed
|
2012-03-01 17:31:51 +05:30 |
|
Nabin Hait
|
7807c6f173
|
clear cache patch
|
2012-03-01 15:58:30 +05:30 |
|
Nabin Hait
|
5b29deb968
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 15:52:12 +05:30 |
|
Nabin Hait
|
995d79421d
|
error fixed in patch
|
2012-03-01 15:51:33 +05:30 |
|
Anand Doshi
|
496d9a0980
|
Merge branch 'master' into navupdate
|
2012-03-01 14:55:22 +05:30 |
|
Anand Doshi
|
48ca42beb9
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-03-01 14:54:01 +05:30 |
|
Anand Doshi
|
08c8edb87f
|
fix in desktop and notifications
|
2012-03-01 14:53:05 +05:30 |
|
Nabin Hait
|
b95ad21208
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 14:48:13 +05:30 |
|
Nabin Hait
|
cf907f98bd
|
error fixed in posting balance
|
2012-03-01 14:47:56 +05:30 |
|
Rushabh Mehta
|
4a0cc249a9
|
merge
|
2012-03-01 13:59:47 +05:30 |
|
Rushabh Mehta
|
b473a4d489
|
added all_read condition to check if user can read
|
2012-03-01 13:58:17 +05:30 |
|
Anand Doshi
|
8acf46c725
|
update in patches
|
2012-03-01 13:58:13 +05:30 |
|
Anand Doshi
|
552093c3fd
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-03-01 13:51:23 +05:30 |
|
Anand Doshi
|
1f4efc77ac
|
fix in print formats and file rename
|
2012-03-01 13:50:33 +05:30 |
|
Rushabh Mehta
|
b6023a4d34
|
users - list condition
|
2012-03-01 13:47:51 +05:30 |
|
Rushabh Mehta
|
df33cb3a39
|
added activity avatar and removed menus.css
|
2012-03-01 13:44:09 +05:30 |
|
Rushabh Mehta
|
fe521fdbc2
|
add messages to always show and add attribution to patch
|
2012-03-01 13:39:09 +05:30 |
|
Rushabh Mehta
|
cc131af77a
|
add messages to always show
|
2012-03-01 13:35:07 +05:30 |
|
Rushabh Mehta
|
5ce587be33
|
merge
|
2012-03-01 13:32:06 +05:30 |
|
Rushabh Mehta
|
4c1e9e7db4
|
added attributions pages
|
2012-03-01 13:30:34 +05:30 |
|
Nabin Hait
|
2b9a13d81f
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 13:05:23 +05:30 |
|
Nabin Hait
|
eaf144a545
|
form cleanup in pur cycle
|
2012-03-01 13:05:04 +05:30 |
|
Nabin Hait
|
e73db0e331
|
set serial_no status="In Store" if purchase return cancelled
|
2012-03-01 12:26:12 +05:30 |
|
Anand Doshi
|
fba591cbb3
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 12:21:16 +05:30 |
|
Rushabh Mehta
|
111bca8220
|
activity image
|
2012-03-01 12:19:18 +05:30 |
|
Anand Doshi
|
91797904c9
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 12:17:54 +05:30 |
|
Anand Doshi
|
0e140962b8
|
Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults
|
2012-03-01 12:16:02 +05:30 |
|
Rushabh Mehta
|
cc6398e7c7
|
patch - update user_image in profile
|
2012-03-01 12:15:54 +05:30 |
|
Rushabh Mehta
|
b4a2f4c98f
|
activty images, website heading fix
|
2012-03-01 11:49:54 +05:30 |
|
Rushabh Mehta
|
ffb25fc36b
|
users button fix
|
2012-03-01 11:29:22 +05:30 |
|
Rushabh Mehta
|
94a2fecf9d
|
merge
|
2012-03-01 11:26:07 +05:30 |
|
Rushabh Mehta
|
428929b1f7
|
fixed permissions
|
2012-03-01 11:24:45 +05:30 |
|
Nabin Hait
|
bb4539e458
|
fixed conflict in version
|
2012-03-01 10:58:48 +05:30 |
|
Nabin Hait
|
6d517ff005
|
form cleanup: fixed callback issues
|
2012-03-01 10:57:23 +05:30 |
|
Nabin Hait
|
284a07e23b
|
if more info unchecked, more info in customer, supplier will be visible
|
2012-03-01 10:55:41 +05:30 |
|
Nabin Hait
|
177ca8dbbd
|
Description changed
|
2012-03-01 10:54:34 +05:30 |
|
Nabin Hait
|
63b275c97f
|
allowed debit and credit against same acc head
|
2012-03-01 10:35:35 +05:30 |
|
Rushabh Mehta
|
a4f454faa0
|
module page link fix
|
2012-02-29 19:19:01 +05:30 |
|
Rushabh Mehta
|
204e77d125
|
background, user_info
|
2012-02-29 19:09:20 +05:30 |
|
Rushabh Mehta
|
dc7e6889dd
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 19:06:56 +05:30 |
|
Anand Doshi
|
9a63996699
|
fix in account setup and user addition
|
2012-02-29 18:59:45 +05:30 |
|
Anand Doshi
|
fd5a213890
|
fix in account setup and user addition
|
2012-02-29 18:58:02 +05:30 |
|
Rushabh Mehta
|
4240ade0de
|
user background
|
2012-02-29 18:40:21 +05:30 |
|
Rushabh Mehta
|
412a65c23c
|
user background
|
2012-02-29 18:38:18 +05:30 |
|
Anand Doshi
|
0b8ac7fc68
|
fix in company setup
|
2012-02-29 18:33:39 +05:30 |
|
Anand Doshi
|
8049c27d78
|
Merge branch 'master' into navupdate
|
2012-02-29 16:22:30 +05:30 |
|
Rushabh Mehta
|
79ae16506b
|
minor fix
|
2012-02-29 15:23:25 +05:30 |
|
Rushabh Mehta
|
1572adf7f7
|
minor fix
|
2012-02-29 15:19:20 +05:30 |
|
Rushabh Mehta
|
864a47933e
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 15:11:27 +05:30 |
|
Rushabh Mehta
|
12852e73ab
|
added activity page
|
2012-02-29 15:11:06 +05:30 |
|
Anand Doshi
|
c70933373b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-02-29 14:06:25 +05:30 |
|
Anand Doshi
|
1304d97416
|
fix in import data page
|
2012-02-29 14:05:43 +05:30 |
|
Nabin Hait
|
41d6852218
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 11:25:09 +05:30 |
|
Nabin Hait
|
a3eee118fc
|
Added on_trash function for checking link of the master
|
2012-02-29 11:24:55 +05:30 |
|
Rushabh Mehta
|
a38bbe28ce
|
home page fixes
|
2012-02-29 10:55:43 +05:30 |
|
Nabin Hait
|
902b14592f
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 10:44:51 +05:30 |
|
Nabin Hait
|
22aa17bcce
|
changes in trend analyzer query
|
2012-02-29 10:44:27 +05:30 |
|
Nabin Hait
|
72d412567c
|
Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py
|
2012-02-29 10:43:21 +05:30 |
|
Rushabh Mehta
|
17da764d04
|
modules_setup
|
2012-02-28 18:56:56 +05:30 |
|
Rushabh Mehta
|
75d8f51e7d
|
messages and merge
|
2012-02-28 17:44:16 +05:30 |
|
Rushabh Mehta
|
aaf86ba4ef
|
added users
|
2012-02-28 17:40:13 +05:30 |
|
Nabin Hait
|
bef8b86331
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-28 14:14:49 +05:30 |
|
Nabin Hait
|
1f4aeab85c
|
error fixed in label_cleanup
|
2012-02-28 14:14:20 +05:30 |
|
Anand Doshi
|
6b69b4f6a4
|
Merge branch 'master' into navupdate
|
2012-02-28 13:51:29 +05:30 |
|
Anand Doshi
|
fc60335620
|
fix in leave application query
|
2012-02-28 13:51:04 +05:30 |
|
Nabin Hait
|
6c75cce4b9
|
fixed confilct
|
2012-02-28 11:46:43 +05:30 |
|
Anand Doshi
|
f9e4b16731
|
fix in scheduler related import issue
|
2012-02-28 11:31:46 +05:30 |
|
Anand Doshi
|
b37f22dc97
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-27 19:16:40 +05:30 |
|
Anand Doshi
|
ac144121ff
|
fix in hover effect
|
2012-02-27 19:16:24 +05:30 |
|
Rushabh Mehta
|
caebd1bff6
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-27 19:05:44 +05:30 |
|
Rushabh Mehta
|
1a5c9c5926
|
message reply
|
2012-02-27 18:56:31 +05:30 |
|
Nabin Hait
|
5bdd20c46b
|
dynamic label change, form cleanup, hide/unhide in purchase cycle
|
2012-02-27 18:46:51 +05:30 |
|
Anand Doshi
|
2b8c4d78f3
|
reload messages
|
2012-02-27 18:42:00 +05:30 |
|
Rushabh Mehta
|
ef29e55469
|
message delete
|
2012-02-27 18:41:11 +05:30 |
|
Anand Doshi
|
f9f73bfa55
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-02-27 18:32:38 +05:30 |
|
Anand Doshi
|
e68a1e5ecc
|
click effect on button
|
2012-02-27 18:31:15 +05:30 |
|
Rushabh Mehta
|
07a36a4baa
|
messages
|
2012-02-27 18:17:57 +05:30 |
|
Rushabh Mehta
|
05c339cea7
|
merge
|
2012-02-27 18:08:27 +05:30 |
|
Rushabh Mehta
|
fdea966198
|
messages
|
2012-02-27 18:03:54 +05:30 |
|
Anand Doshi
|
226df715b2
|
support ticket css
|
2012-02-27 17:24:47 +05:30 |
|
Anand Doshi
|
b25b4b7624
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-27 17:19:03 +05:30 |
|
Anand Doshi
|
5b1beebd33
|
Changed position of menus in navbar
|
2012-02-27 17:17:48 +05:30 |
|
Anand Doshi
|
0455ddfb98
|
Merge branch 'master' into navupdate
Conflicts:
version.num
|
2012-02-27 13:21:48 +05:30 |
|
Rushabh Mehta
|
a3211d3e94
|
calendar bug fixes
|
2012-02-27 12:54:47 +05:30 |
|
Rushabh Mehta
|
aa999df088
|
calendar fix
|
2012-02-27 12:54:04 +05:30 |
|
Nabin Hait
|
5b09122264
|
fixed conflict while merging
|
2012-02-27 12:52:46 +05:30 |
|
Nabin Hait
|
78805e702e
|
patch for form/label cleanup
|
2012-02-27 12:48:35 +05:30 |
|
Nabin Hait
|
0959341130
|
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
|
2012-02-27 12:47:40 +05:30 |
|
Nabin Hait
|
0cde984dc5
|
Update future year balances at the time of tranaction and acc bal reposting patch
|
2012-02-27 12:34:14 +05:30 |
|
Anand Doshi
|
01a7558589
|
added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background
|
2012-02-24 19:35:09 +05:30 |
|
Anand Doshi
|
d45ab64a85
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-02-24 19:28:09 +05:30 |
|
Anand Doshi
|
40ee8d6432
|
UI fixes in support ticket and desktop
|
2012-02-24 19:21:47 +05:30 |
|
Rushabh Mehta
|
a50b762d36
|
support link
|
2012-02-24 18:13:08 +05:30 |
|
Anand Doshi
|
db62876bc9
|
desktop icons
|
2012-02-24 17:56:00 +05:30 |
|
Anand Doshi
|
eaaf65131b
|
desktop: first cut
|
2012-02-24 15:29:07 +05:30 |
|
Rushabh Mehta
|
b73fa49f34
|
cleaned up kb
|
2012-02-24 15:07:39 +05:30 |
|
Rushabh Mehta
|
2886b95da0
|
added todo
|
2012-02-24 11:26:31 +05:30 |
|
Anand Doshi
|
ef041114bb
|
show submittable warning
|
2012-02-23 12:56:45 +05:30 |
|
Rushabh Mehta
|
3966f1dc5d
|
added license files
|
2012-02-23 12:35:32 +05:30 |
|
Rushabh Mehta
|
c023cdd0c0
|
Merge branch 'master' of github.com:webnotes/erpnext into navupdate
|
2012-02-23 11:46:39 +05:30 |
|
Rushabh Mehta
|
1a35574afe
|
redesigned scheduler
|
2012-02-23 11:46:28 +05:30 |
|
Anand Doshi
|
23b9de1582
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-02-23 11:32:07 +05:30 |
|
Anand Doshi
|
bfa58a3516
|
allow deletion of products
|
2012-02-23 11:31:17 +05:30 |
|
Anand Doshi
|
9f94275d65
|
allow deletion of products
|
2012-02-23 11:27:40 +05:30 |
|
Nabin Hait
|
8569b7400a
|
Update erpnext/production/doctype/bill_of_materials/bill_of_materials.py
|
2012-02-23 10:46:24 +05:30 |
|
Anand Doshi
|
cab5b31ffa
|
change product's document type to Master
|
2012-02-22 18:33:39 +05:30 |
|
Nabin Hait
|
72129a8587
|
Product document type set as master
|
2012-02-22 18:30:20 +05:30 |
|
Rushabh Mehta
|
17773d0763
|
added docdiff and removed un-necessary files
|
2012-02-22 15:55:41 +05:30 |
|
Rushabh Mehta
|
c5471ddb8d
|
added setup and removed multi-col layout in body
|
2012-02-22 12:07:42 +05:30 |
|
Rushabh Mehta
|
2478363bba
|
Merge branch 'master' of github.com:webnotes/erpnext into navupdate
|
2012-02-21 19:04:14 +05:30 |
|
Rushabh Mehta
|
35fabf76a6
|
updated module pages
|
2012-02-21 19:03:50 +05:30 |
|
Anand Doshi
|
ffbfd2c60a
|
Update feed on submission
|
2012-02-21 18:15:31 +05:30 |
|
Rushabh Mehta
|
393d325e00
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 13:15:02 +01:00 |
|
Rushabh Mehta
|
085617ed12
|
merge latest
|
2012-02-21 17:31:04 +05:30 |
|
Anand Doshi
|
c70e8d9791
|
fix in remove_archive
|
2012-02-21 17:30:36 +05:30 |
|
Rushabh Mehta
|
50144468be
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 12:58:48 +01:00 |
|
Anand Doshi
|
b8fa4a37e5
|
fix in remove_archive
|
2012-02-21 17:27:24 +05:30 |
|
Rushabh Mehta
|
d025133b39
|
added module pages and other css updates
|
2012-02-21 17:26:50 +05:30 |
|
Rushabh Mehta
|
307da4f91b
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 12:17:20 +01:00 |
|
Anand Doshi
|
62a3872480
|
fix in remove_archive
|
2012-02-21 16:46:57 +05:30 |
|
Rushabh Mehta
|
534b6a7d7f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 12:16:13 +01:00 |
|
Anand Doshi
|
5ff541b53c
|
fix in remove_archive patch
|
2012-02-21 16:44:31 +05:30 |
|
Rushabh Mehta
|
7a867fc1f8
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 12:00:02 +01:00 |
|
Anand Doshi
|
8e703ef26f
|
packing slip fix
|
2012-02-21 16:29:46 +05:30 |
|
Rushabh Mehta
|
0c410b8261
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 11:58:03 +01:00 |
|
Anand Doshi
|
0bcc20f980
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 16:26:36 +05:30 |
|
Anand Doshi
|
ff33677624
|
Packing Slip Fix
|
2012-02-21 16:26:08 +05:30 |
|
Nabin Hait
|
e1f976ce05
|
deleted supp quotation
|
2012-02-21 14:33:45 +05:30 |
|
Rushabh Mehta
|
02b36eba1c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 09:54:33 +01:00 |
|
Nabin Hait
|
b461e1788a
|
patch list updated
|
2012-02-21 14:22:06 +05:30 |
|
Rushabh Mehta
|
cdf0b7a502
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 09:45:46 +01:00 |
|
Anand Doshi
|
f9e9000092
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 14:12:39 +05:30 |
|
Anand Doshi
|
c05ee5bf64
|
patch to remove archive
|
2012-02-21 14:12:13 +05:30 |
|
Rushabh Mehta
|
25e57421f7
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 09:17:30 +01:00 |
|
Nabin Hait
|
4b36c1e8f4
|
insert after fld should be no copy in custom fld
|
2012-02-21 13:43:59 +05:30 |
|
Rushabh Mehta
|
2fe8f12424
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 09:06:55 +01:00 |
|
Nabin Hait
|
8e9b578c00
|
expected delivery date can be equal to po date, not before po date
|
2012-02-21 13:35:28 +05:30 |
|
Rushabh Mehta
|
e55778627f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 08:57:24 +01:00 |
|
Nabin Hait
|
1a7cd16dba
|
reorder qty fld in item
|
2012-02-21 13:26:49 +05:30 |
|
Nabin Hait
|
5fe6760406
|
reorder level checking based on stores and reserved warehouse
|
2012-02-21 13:25:27 +05:30 |
|
Rushabh Mehta
|
98902f82db
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 07:24:52 +01:00 |
|
Rushabh Mehta
|
6e156c748b
|
moved to boostrap 2.0
|
2012-02-21 11:19:24 +05:30 |
|
Nabin Hait
|
468008717b
|
removed extra cond from bom
|
2012-02-21 11:14:49 +05:30 |
|
Rushabh Mehta
|
4dc2f43c0d
|
moving to bootstrap 2.0
|
2012-02-21 10:30:43 +05:30 |
|
Rushabh Mehta
|
f70760d8c8
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-20 14:09:09 +01:00 |
|
Anand Doshi
|
0b3f4d40c4
|
fix in support ticket and email digest
|
2012-02-20 18:38:33 +05:30 |
|
Rushabh Mehta
|
09a897afe4
|
added selling-home
|
2012-02-20 18:30:52 +05:30 |
|
Rushabh Mehta
|
d25e0957d4
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-20 12:06:55 +01:00 |
|
Anand Doshi
|
2a7fa0451c
|
todo_item patch
|
2012-02-20 16:36:08 +05:30 |
|
Anand Doshi
|
09ef7dc416
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-20 16:33:28 +05:30 |
|
Anand Doshi
|
c3023be794
|
notifications of todo items
|
2012-02-20 16:31:55 +05:30 |
|
Rushabh Mehta
|
3f29b85f5d
|
2 col layout in form, docbrowser and home
|
2012-02-20 15:40:29 +05:30 |
|
Rushabh Mehta
|
cb1ab98bec
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-20 08:35:47 +01:00 |
|
Nabin Hait
|
f361289147
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-20 13:05:01 +05:30 |
|
Nabin Hait
|
6ac0be5fb2
|
delete all cancelled gl entry on account deletion
|
2012-02-20 13:04:36 +05:30 |
|
Rushabh Mehta
|
5ceab06bb5
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-20 08:06:37 +01:00 |
|
Rushabh Mehta
|
13531b73eb
|
form bugfix and otehr minor fixes
|
2012-02-20 12:35:23 +05:30 |
|
Nabin Hait
|
db0df4fd53
|
over-wrinting of child tables data in import_data
|
2012-02-17 15:55:51 +05:30 |
|
Rushabh Mehta
|
7b7af279cf
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-17 08:18:30 +01:00 |
|
Rushabh Mehta
|
aa848bee28
|
website css cleanups + dropdown in top toolbar
|
2012-02-17 12:06:33 +05:30 |
|
Rushabh Mehta
|
639c268abd
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-17 05:59:46 +01:00 |
|
Anand Doshi
|
e31d94ffc4
|
fix in control panel issue of sales and purchase return wizard
|
2012-02-17 10:27:46 +05:30 |
|
Rushabh Mehta
|
265c41b604
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 12:05:24 +01:00 |
|
Anand Doshi
|
e7ecb86ce7
|
roles for a new company's first user
|
2012-02-16 16:34:47 +05:30 |
|
Rushabh Mehta
|
ee5ba8105e
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 11:46:59 +01:00 |
|
Anand Doshi
|
aa92ecdd26
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 15:56:57 +05:30 |
|
Anand Doshi
|
8aa841866f
|
add Website Manager Role to first user
|
2012-02-16 15:56:36 +05:30 |
|
Rushabh Mehta
|
22eb57a217
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 11:00:23 +01:00 |
|
Nabin Hait
|
60e81ce8f5
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 15:29:09 +05:30 |
|
Rushabh Mehta
|
7c76f80966
|
gateway patch
|
2012-02-16 10:58:45 +01:00 |
|
Nabin Hait
|
195b620787
|
callback issue in packing slip
|
2012-02-16 15:21:39 +05:30 |
|
Rushabh Mehta
|
1b1179477b
|
added patch
|
2012-02-16 15:11:28 +05:30 |
|
Rushabh Mehta
|
8425c87d5f
|
fixed old style file names
|
2012-02-16 13:01:28 +05:30 |
|
Anand Doshi
|
761a044cd7
|
fix in user addition email sending..
|
2012-02-16 12:47:11 +05:30 |
|
Anand Doshi
|
ec1af179cb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-16 12:08:10 +05:30 |
|
Anand Doshi
|
f8395343f7
|
fix in password not copied to server database during company creation
|
2012-02-16 12:07:38 +05:30 |
|
Nabin Hait
|
da1f48b96e
|
mentioed account type for some tax/chargeable account
|
2012-02-16 10:55:05 +05:30 |
|
Nabin Hait
|
470e18a380
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-15 17:31:56 +05:30 |
|
Nabin Hait
|
2d8ac7f3f9
|
fixed asynchronus issue
|
2012-02-15 17:31:23 +05:30 |
|
Anand Doshi
|
2c2991c3b7
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-15 15:42:34 +05:30 |
|
Anand Doshi
|
65bc9db85e
|
File Data rename
|
2012-02-15 15:42:18 +05:30 |
|
Rushabh Mehta
|
f27b67b474
|
fix in change password
|
2012-02-15 10:45:29 +01:00 |
|
Nabin Hait
|
237ac638f5
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-15 14:28:57 +05:30 |
|
Nabin Hait
|
ab90ee04f5
|
callback issues and item default get most priority
|
2012-02-15 14:28:02 +05:30 |
|
Rushabh Mehta
|
533bc77976
|
rolling back gateway changes
|
2012-02-15 09:35:42 +01:00 |
|
Nabin Hait
|
0e14191163
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 18:55:34 +05:30 |
|
Nabin Hait
|
13e62ccbc9
|
clear cache patch
|
2012-02-14 18:55:01 +05:30 |
|
Rushabh Mehta
|
c9b10fd8d4
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 17:25:40 +05:30 |
|
Rushabh Mehta
|
eec8e92604
|
login, analytics fix
|
2012-02-14 17:25:31 +05:30 |
|
Anand Doshi
|
518202f9f2
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 16:16:42 +05:30 |
|
Anand Doshi
|
737c2f9432
|
fix in login as
|
2012-02-14 16:16:13 +05:30 |
|
Nabin Hait
|
75ef7c7a89
|
def val of is_subcontracted is NO
|
2012-02-14 16:08:22 +05:30 |
|
Nabin Hait
|
3d794a682d
|
required by date should be mapped in indent-po
|
2012-02-14 15:25:11 +05:30 |
|
Nabin Hait
|
461a071dfa
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 15:13:52 +05:30 |
|
Nabin Hait
|
84d73103f8
|
sales team mapping issue in SO-DN and SO-RV
|
2012-02-14 15:13:21 +05:30 |
|
Anand Doshi
|
ec6f9fedd6
|
Fix in smtplib import issue
|
2012-02-14 13:54:04 +05:30 |
|
Anand Doshi
|
507cb3c592
|
add website manager patch
|
2012-02-14 12:58:47 +05:30 |
|
Anand Doshi
|
b2be11cad1
|
error due to old packing slip hide fields in feature setup
|
2012-02-14 12:45:55 +05:30 |
|
Rushabh Mehta
|
56c5ae5bc8
|
version
|
2012-02-14 11:47:05 +05:30 |
|
Rushabh Mehta
|
afaac60982
|
made all.js and all.css and all guests share same session
|
2012-02-14 11:44:13 +05:30 |
|
Nabin Hait
|
5bd88d99b5
|
fixes
|
2012-02-14 11:39:42 +05:30 |
|
Nabin Hait
|
7eda1cac27
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 09:57:57 +05:30 |
|
Anand Doshi
|
2c582d5f65
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-13 19:00:24 +05:30 |
|
Anand Doshi
|
d7ddea1e2a
|
domain list patch
|
2012-02-13 18:59:43 +05:30 |
|
Nabin Hait
|
c45337bf97
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-02-13 18:25:52 +05:30 |
|
Nabin Hait
|
409612457b
|
error fixed in trash control
|
2012-02-13 18:24:14 +05:30 |
|
Rushabh Mehta
|
bfc03cf8bd
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-13 13:41:51 +01:00 |
|
Rushabh Mehta
|
a9bd79487d
|
company whitelist fix
|
2012-02-13 13:41:45 +01:00 |
|
Anand Doshi
|
ce0c65f173
|
Merge branch 'stable' into latest
|
2012-02-13 18:01:23 +05:30 |
|
Anand Doshi
|
5fe5df370f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-13 17:57:45 +05:30 |
|
Anand Doshi
|
e8928b8bff
|
website settings
|
2012-02-13 17:56:59 +05:30 |
|
Rushabh Mehta
|
f17ce7bc67
|
added whitelist check
|
2012-02-13 16:50:52 +05:30 |
|
Nabin Hait
|
e63ea67b54
|
error fixed in patch
|
2012-02-13 15:38:15 +05:30 |
|
Anand Doshi
|
82cfe4b28d
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-02-13 15:30:24 +05:30 |
|
Nabin Hait
|
42852a88dc
|
account type patch added in patch list
|
2012-02-13 15:29:51 +05:30 |
|
Anand Doshi
|
702f174265
|
call update item details in post render
|
2012-02-13 15:29:41 +05:30 |
|
Rushabh Mehta
|
ff0946bbda
|
naming fix in web page, list style
|
2012-02-13 15:26:17 +05:30 |
|
Nabin Hait
|
bd0c05bf94
|
Mentioned account type in default accounts
|
2012-02-13 14:48:34 +05:30 |
|
Anand Doshi
|
945b3c4680
|
Domain Name list in Website Settings
|
2012-02-13 14:04:54 +05:30 |
|
Nabin Hait
|
7949b33b70
|
Logout session if user deleted
|
2012-02-13 12:43:38 +05:30 |
|
Nabin Hait
|
043b0f26bd
|
Merge branch 'stable' of github.com:webnotes/erpnext
|
2012-02-13 12:26:45 +05:30 |
|
Nabin Hait
|
bf0d92e125
|
deleted and disabled users excluded in applicable to and approver link fields
|
2012-02-13 12:22:08 +05:30 |
|
Nabin Hait
|
b0fd0b3615
|
Edited through patch
|
2012-02-13 11:34:36 +05:30 |
|
Anand Doshi
|
ba746dfb2f
|
Stop support ticket refresh on send, if there is a server message
|
2012-02-10 15:46:54 +05:30 |
|
Anand Doshi
|
701e0559e9
|
Merge branch 'stable' into latest
|
2012-02-10 13:44:03 +05:30 |
|
Anand Doshi
|
00f9b58bba
|
Do not refresh is there is an exception
|
2012-02-10 13:43:39 +05:30 |
|
Anand Doshi
|
15d2d45b36
|
Merge branch 'stable' into latest
|
2012-02-10 10:57:26 +05:30 |
|
Anand Doshi
|
110047ea5b
|
Debit/Credit note creation on purchase/sales return
|
2012-02-10 10:48:35 +05:30 |
|
Anand Doshi
|
dae6e1e6a2
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-09 12:48:13 +05:30 |
|
Anand Doshi
|
ad37575701
|
First name and last name in setup account dialog
|
2012-02-09 12:48:04 +05:30 |
|
Rushabh Mehta
|
96765f170d
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-09 12:46:17 +05:30 |
|
Rushabh Mehta
|
0b2874afdb
|
fix to install
|
2012-02-09 12:45:50 +05:30 |
|
Anand Doshi
|
95e89de21d
|
Merge branch 'stable' into latest
Conflicts:
erpnext/home/page/event_updates/event_updates.js
|
2012-02-09 12:23:15 +05:30 |
|
Anand Doshi
|
3801804a8a
|
First Name and Last Name in setup account dialog box
|
2012-02-09 12:16:47 +05:30 |
|
Anand Doshi
|
83302dfe63
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 16:23:47 +05:30 |
|
Anand Doshi
|
cf5f0232a9
|
Merge branch 'stable' into latest
|
2012-02-08 16:23:35 +05:30 |
|
Anand Doshi
|
df3f452a14
|
Fix in Purchase Invoice creation due to item tax stringify issue
|
2012-02-08 16:22:59 +05:30 |
|
Rushabh Mehta
|
f16e32eca1
|
report builder fix'
|
2012-02-08 16:16:28 +05:30 |
|
Rushabh Mehta
|
b8d6497818
|
many style fixes
|
2012-02-08 12:33:13 +05:30 |
|
Anand Doshi
|
a685379d6b
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 11:06:12 +05:30 |
|
Anand Doshi
|
9908d6e4be
|
Merge branch 'stable' into latest
|
2012-02-08 11:05:47 +05:30 |
|
Rushabh Mehta
|
a1f3764238
|
about us style fix
|
2012-02-08 10:51:08 +05:30 |
|
Anand Doshi
|
c9fcc05792
|
Allow IS POS to be set as default from customize form view
|
2012-02-08 10:46:27 +05:30 |
|
Rushabh Mehta
|
02ec8c06fb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 10:44:33 +05:30 |
|
Rushabh Mehta
|
3fd279977b
|
website p sty;e
|
2012-02-08 10:44:02 +05:30 |
|
Anand Doshi
|
c6eea1e1ca
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 10:24:16 +05:30 |
|
Anand Doshi
|
88e4a0ffc2
|
Merge branch 'stable' into latest
|
2012-02-08 10:24:03 +05:30 |
|
Rushabh Mehta
|
bd20d29dae
|
pre style
|
2012-02-08 10:23:16 +05:30 |
|
Anand Doshi
|
d7ac84f430
|
removed msgprint in pending po items to receive report
|
2012-02-08 10:18:30 +05:30 |
|
Anand Doshi
|
a629fa3f05
|
Merge branch 'stable' into latest
|
2012-02-07 18:02:42 +05:30 |
|
Anand Doshi
|
02035d071a
|
Fix in import docs containing utf-8 encoding
|
2012-02-07 17:57:40 +05:30 |
|
Rushabh Mehta
|
a7f0c448bb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:58:14 +05:30 |
|
Rushabh Mehta
|
4d20b2246c
|
style fixes
|
2012-02-07 14:57:49 +05:30 |
|
Anand Doshi
|
f812acf063
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:51:56 +05:30 |
|
Anand Doshi
|
8d3d2a9905
|
Merge branch 'stable' into latest
|
2012-02-07 14:51:38 +05:30 |
|
Anand Doshi
|
e59f456ad4
|
If support ticket doesnt have body, then do not append in reply to string
|
2012-02-07 14:50:50 +05:30 |
|
Rushabh Mehta
|
5b625fa592
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:32:20 +05:30 |
|
Rushabh Mehta
|
f9620eaf44
|
fix to product, blog
|
2012-02-07 14:31:49 +05:30 |
|
Anand Doshi
|
b65363aa46
|
Merge branch 'stable' into latest
|
2012-02-07 14:28:29 +05:30 |
|
Anand Doshi
|
188a499f45
|
Fix in default customer group fetch while converting lead to customer
|
2012-02-07 14:28:05 +05:30 |
|
Anand Doshi
|
4e47c48707
|
Merge branch 'stable' into latest
|
2012-02-07 13:33:10 +05:30 |
|
Anand Doshi
|
7e8082e193
|
Fixed mapping of conversion rate for PO-PR and PO-PV
|
2012-02-07 13:32:20 +05:30 |
|
Rushabh Mehta
|
518533fde0
|
added sitemap, rss feeds
|
2012-02-07 13:29:31 +05:30 |
|
Rushabh Mehta
|
9c7fe3bce4
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 11:43:51 +05:30 |
|
Rushabh Mehta
|
8b96b05163
|
fixes to products
|
2012-02-07 11:43:41 +05:30 |
|
Rushabh Mehta
|
002340080d
|
fixes to products
|
2012-02-07 07:08:05 +01:00 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|