Nabin Hait
|
49e170153e
|
Include in print rate validation added
|
2012-07-16 15:38:11 +05:30 |
|
Nabin Hait
|
8f5cd388cc
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 12:50:25 +05:30 |
|
Nabin Hait
|
388e09834c
|
Check duplicate SO entry for same po no and customer
|
2012-07-16 12:49:52 +05:30 |
|
Anand Doshi
|
f42d050eb7
|
Merge branch 'master' into dev
Conflicts:
public/js/all-app.js
|
2012-07-16 12:19:18 +05:30 |
|
Anand Doshi
|
57fefaa3de
|
show assign to only after save
|
2012-07-16 12:18:08 +05:30 |
|
Anand Doshi
|
bb81c198f5
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-07-13 16:48:08 +05:30 |
|
Anand Doshi
|
2fef0ee4e1
|
Merge branch 'master' into dev
|
2012-07-13 16:47:09 +05:30 |
|
Anand Doshi
|
9ec8024db7
|
show order type icon in sales order list view
|
2012-07-13 16:46:12 +05:30 |
|
Rushabh Mehta
|
2d7cb22f1f
|
added auth_table patch file:
|
2012-07-13 15:07:07 +05:30 |
|
Rushabh Mehta
|
91ba346354
|
profile cleanup start and new auth table for better security
|
2012-07-13 14:54:40 +05:30 |
|
Nabin Hait
|
981446c7cc
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-13 11:19:27 +05:30 |
|
Rushabh Mehta
|
d47efd57ac
|
check_required fix
|
2012-07-13 11:15:25 +05:30 |
|
Nabin Hait
|
0c9a262de4
|
fixed conflict
|
2012-07-13 10:39:45 +05:30 |
|
Nabin Hait
|
91223d325b
|
fixed conflict
|
2012-07-13 10:35:44 +05:30 |
|
Anand Doshi
|
158e7751a8
|
Merge branch 'master' into dev
|
2012-07-13 08:53:17 +05:30 |
|
Anand Doshi
|
255d58b3a0
|
fixes in error logging and refresh cache issues
|
2012-07-13 08:53:07 +05:30 |
|
Anand Doshi
|
31d8e5618e
|
Merge branch 'master' into dev
|
2012-07-13 08:24:28 +05:30 |
|
Anand Doshi
|
6c3b622c00
|
fixes in cms2 patch
|
2012-07-13 08:24:16 +05:30 |
|
Anand Doshi
|
1d2826d69d
|
Merge branch 'master' into dev
|
2012-07-13 08:15:34 +05:30 |
|
Anand Doshi
|
665f6048f1
|
do not delete web cache in refresh cache
|
2012-07-13 08:15:03 +05:30 |
|
Anand Doshi
|
72a824f483
|
do not delete web cache in refresh cache
|
2012-07-13 08:14:32 +05:30 |
|
Anand Doshi
|
91f731641c
|
Merge branch 'master' into dev
|
2012-07-13 02:16:54 +05:30 |
|
Anand Doshi
|
4cf55c5a04
|
fixes in blog caching
|
2012-07-13 02:16:22 +05:30 |
|
Anand Doshi
|
46ac229edc
|
Merge branch 'master' into dev
|
2012-07-13 01:45:33 +05:30 |
|
Anand Doshi
|
53bd49d46c
|
fixes in blog cache logic
|
2012-07-13 01:45:19 +05:30 |
|
Anand Doshi
|
d738a2106d
|
Merge branch 'master' into dev
|
2012-07-13 01:32:36 +05:30 |
|
Anand Doshi
|
51eb8a18ba
|
fix in blog caching
|
2012-07-13 01:32:23 +05:30 |
|
Anand Doshi
|
0842fad927
|
Merge branch 'master' into dev
|
2012-07-13 01:22:32 +05:30 |
|
Anand Doshi
|
970988664a
|
clear cache if home page
|
2012-07-13 01:22:19 +05:30 |
|
Anand Doshi
|
aa3ab5ec59
|
Merge branch 'master' into dev
|
2012-07-13 01:15:08 +05:30 |
|
Anand Doshi
|
200c443b72
|
fixes in blog list
|
2012-07-13 01:14:52 +05:30 |
|
Anand Doshi
|
8b8478178c
|
Merge branch 'master' into dev
|
2012-07-13 00:47:17 +05:30 |
|
Anand Doshi
|
f01059fd3e
|
fixes in blog list
|
2012-07-13 00:46:59 +05:30 |
|
Anand Doshi
|
4a56e996f1
|
Merge branch 'master' into dev
|
2012-07-12 23:38:45 +05:30 |
|
Anand Doshi
|
4659b1eb25
|
log error on saving doclist in cms2 patch
|
2012-07-12 23:38:31 +05:30 |
|
Anand Doshi
|
c97f780940
|
Merge branch 'master' into dev
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
|
2012-07-12 22:16:19 +05:30 |
|
Anand Doshi
|
af1f437fad
|
update in cms2 patch: delete html files
|
2012-07-12 22:06:27 +05:30 |
|
Anand Doshi
|
3d53e86755
|
fixes in log comment and web page saving
|
2012-07-12 20:12:40 +05:30 |
|
Anand Doshi
|
54e79bbfa7
|
updates in install_erpnext.py
|
2012-07-12 19:51:17 +05:30 |
|
Anand Doshi
|
1ebced2a95
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-12 19:37:06 +05:30 |
|
Rushabh Mehta
|
b165ee5acb
|
latest patched master.sql file
|
2012-07-12 15:58:41 +02:00 |
|
Anand Doshi
|
c4eb9bf838
|
cms2 patch updates
|
2012-07-12 19:15:52 +05:30 |
|
Anand Doshi
|
c655f47fb1
|
fixed wnframework repository url to https one
|
2012-07-12 19:08:48 +05:30 |
|
Anand Doshi
|
1a51cc9ad0
|
fixes in cms2 updates
|
2012-07-12 19:03:58 +05:30 |
|
Anand Doshi
|
d68dceb791
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-12 18:53:35 +05:30 |
|
Anand Doshi
|
9b88baa6f8
|
updates in install_erpnext.py
|
2012-07-12 18:52:59 +05:30 |
|
Anand Doshi
|
51146c07c3
|
cleaner web cache code
|
2012-07-12 18:41:12 +05:30 |
|
Rushabh Mehta
|
8cbbab2e75
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-12 18:01:31 +05:30 |
|
Rushabh Mehta
|
357fb2640b
|
sales bom fixes and mandatory in table fields
|
2012-07-12 18:00:21 +05:30 |
|
Nabin Hait
|
51f8a6d0d5
|
select employee based on joining and relieving date in salary maanger
|
2012-07-12 16:25:13 +05:30 |
|