Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
28b9551acf
|
fixes in patch
|
2012-04-30 11:55:25 +05:30 |
|
Nabin Hait
|
d1ac71c3e7
|
patch list updated
|
2012-04-30 11:53:58 +05:30 |
|
Rushabh Mehta
|
30cb5c20a1
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-27 18:39:56 +05:30 |
|
Rushabh Mehta
|
389880d0b6
|
more website cleanups
|
2012-04-27 18:39:14 +05:30 |
|
Nabin Hait
|
7ff69e10bf
|
repost stock for entries where posting time goes wrong
|
2012-04-27 18:27:06 +05:30 |
|
Anand Doshi
|
864e220ec5
|
fixes in serial no patch
|
2012-04-27 17:12:47 +05:30 |
|
Anand Doshi
|
d461148296
|
fix in reload_c_form path
|
2012-04-27 17:05:50 +05:30 |
|
Nabin Hait
|
92ec4dcb6f
|
minor fixes
|
2012-04-26 13:13:10 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
aa577ed82e
|
serial no fixes: sle creation through import data
|
2012-04-25 18:25:13 +05:30 |
|
Nabin Hait
|
3afecb9e30
|
update permission in appraisal
|
2012-04-24 13:32:26 +05:30 |
|
Nabin Hait
|
9a6dbfca8f
|
updated permlevel in address
|
2012-04-24 12:40:50 +05:30 |
|
Nabin Hait
|
dd828be432
|
updated patch list
|
2012-04-24 12:25:39 +05:30 |
|
Nabin Hait
|
3fb741c3ef
|
update role in address
|
2012-04-24 12:23:12 +05:30 |
|
Nabin Hait
|
69f6d79791
|
patch list modified
|
2012-04-23 18:27:53 +05:30 |
|
Nabin Hait
|
a45f44d805
|
remove def val from rv detail cost center
|
2012-04-23 18:26:08 +05:30 |
|
Nabin Hait
|
e848300958
|
patch list modified
|
2012-04-23 18:24:22 +05:30 |
|
Nabin Hait
|
ca102d567e
|
change cacheitem schema
|
2012-04-23 18:23:17 +05:30 |
|
Nabin Hait
|
9ceaccce86
|
create custom flds for bullows account
|
2012-04-23 16:04:41 +05:30 |
|
Nabin Hait
|
c425d8bd16
|
after sync cleanup
|
2012-04-23 16:04:16 +05:30 |
|
Nabin Hait
|
708917db50
|
some fixes in cleanup
|
2012-04-23 16:03:38 +05:30 |
|
Nabin Hait
|
51834a45a7
|
purchase invoice with write off feature
|
2012-04-23 12:47:12 +05:30 |
|
Anand Doshi
|
0f8e491bdd
|
removed Knowledge Base module, fixed questions page name
|
2012-04-20 13:42:43 +05:30 |
|
Anand Doshi
|
b8660fb51c
|
fixes in production, porjects, packing slip
|
2012-04-20 11:21:47 +05:30 |
|
Nabin Hait
|
8c0dcd383b
|
some more fixes in support
|
2012-04-16 18:47:20 +05:30 |
|
Nabin Hait
|
eaf8b91402
|
hr reports cleanup
|
2012-04-16 12:31:36 +05:30 |
|
Nabin Hait
|
dbffc2d8d0
|
fixed hr issues
|
2012-04-16 12:22:47 +05:30 |
|
Rushabh Mehta
|
cabfc65fe0
|
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py)
|
2012-04-14 16:08:45 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Nabin Hait
|
e77164955b
|
removed repair fn, fixes in reports
|
2012-04-13 11:53:06 +05:30 |
|
Anand Doshi
|
09e8c4cd2d
|
further fixes
|
2012-04-12 17:51:53 +05:30 |
|
Anand Doshi
|
e68fe505b9
|
custom fields creation patch - not to be executed automatically
|
2012-04-11 17:49:21 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Anand Doshi
|
a9ccc7d6bd
|
naming series changes now saved as property setter
|
2012-04-10 15:31:48 +05:30 |
|
Anand Doshi
|
966b6f1aa0
|
fix in patches
|
2012-04-10 12:38:17 +05:30 |
|
Anand Doshi
|
87a2c5cc69
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
|
2012-04-09 12:14:53 +05:30 |
|
Anand Doshi
|
85eb840ab4
|
fix in rename dt patch
|
2012-04-09 12:02:15 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Nabin Hait
|
3525d92cfb
|
c-form reload pach
|
2012-04-06 17:49:25 +05:30 |
|
Nabin Hait
|
c63a58d416
|
c-form reload pach
|
2012-04-06 17:42:02 +05:30 |
|
Anand Doshi
|
7e0479bc4c
|
cleanup of search criteria
|
2012-04-05 18:27:56 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
a6eb15df4a
|
fix in earning and deduction type field tyep
|
2012-04-03 13:22:20 +05:30 |
|
Anand Doshi
|
be9562dcd5
|
rerun of rename_dt
|
2012-04-02 19:13:00 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
5c6cdb06b2
|
fix in decimal places
|
2012-04-02 15:02:34 +05:30 |
|
Rushabh Mehta
|
c7f1e5a54a
|
patch fixes
|
2012-04-02 14:24:35 +05:30 |
|
Rushabh Mehta
|
5475a3ca66
|
patch fixes
|
2012-04-02 14:06:46 +05:30 |
|
Anand Doshi
|
896c6fdc3c
|
fix in patch order
|
2012-04-02 14:06:33 +05:30 |
|
Anand Doshi
|
0442bc5d63
|
fix in patch list
|
2012-04-02 13:09:20 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Nabin Hait
|
dc8ce0190d
|
Merge branch 'master' into renamedt
|
2012-03-29 11:53:02 +05:30 |
|
Anand Doshi
|
8ac5ccae0a
|
fix in Sales Order-Receivable Voucher Mapper
|
2012-03-28 19:29:55 +05:30 |
|
Anand Doshi
|
9767f79845
|
fix in Sales Order-Receivable Voucher Mapper
|
2012-03-28 19:25:29 +05:30 |
|
Anand Doshi
|
419260298b
|
fix in mapper
|
2012-03-28 19:12:36 +05:30 |
|
Nabin Hait
|
79bc01e33d
|
updated rename_dt
|
2012-03-28 16:19:01 +05:30 |
|
Nabin Hait
|
6370ba8280
|
Merge branch 'master' of github.com:webnotes/erpnext into renamedt
|
2012-03-28 16:17:53 +05:30 |
|
Nabin Hait
|
e6340f26c2
|
mapper fix in DN_RV
|
2012-03-28 14:11:31 +05:30 |
|
Nabin Hait
|
5b00addaf7
|
reload mapper for checking ref value
|
2012-03-28 11:38:25 +05:30 |
|
Nabin Hait
|
6ed0450dba
|
reload mapper for checking ref value
|
2012-03-28 11:32:44 +05:30 |
|
Anand Doshi
|
b489297108
|
added delete_docformat in patch_list
|
2012-03-27 19:41:45 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Anand Doshi
|
66ea30543c
|
sync patches
|
2012-03-27 15:02:30 +05:30 |
|
Nabin Hait
|
bb6f10098e
|
updated rename_dt
|
2012-03-26 11:06:34 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Anand Doshi
|
9b56a8ada9
|
Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
js/all-app.js
version.num
|
2012-03-23 13:55:20 +05:30 |
|
Nabin Hait
|
191e55f1bc
|
sync ref db patch
|
2012-03-22 15:07:28 +05:30 |
|
Rushabh Mehta
|
3f46696db2
|
removed slider ui
|
2012-03-22 11:37:08 +05:30 |
|
Anand Doshi
|
71d0b2a428
|
permission engine fix - is doctype submittable
|
2012-03-21 17:15:49 +05:30 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Nabin Hait
|
93162f603d
|
update bom no options in stock entry
|
2012-03-21 16:02:44 +05:30 |
|
Nabin Hait
|
830b8baa9d
|
update bom no options in stock entry
|
2012-03-21 15:56:22 +05:30 |
|
Nabin Hait
|
91375d64f1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 12:05:30 +05:30 |
|
Nabin Hait
|
39a24794eb
|
Purpose others to other
|
2012-03-21 11:02:50 +05:30 |
|
Anand Doshi
|
310bc462b9
|
fix in doctype refactor patch
|
2012-03-20 17:49:23 +05:30 |
|
Nabin Hait
|
ba62cf3b5a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-20 17:40:16 +05:30 |
|
Nabin Hait
|
ceb9f41f15
|
lead organization fld added in quotation for printing: patch
|
2012-03-20 17:04:32 +05:30 |
|
Nabin Hait
|
de51040763
|
lead organization fld added in quotation for printing
|
2012-03-20 16:47:03 +05:30 |
|
Nabin Hait
|
594ee37d26
|
patch list updated
|
2012-03-20 14:26:32 +05:30 |
|
Nabin Hait
|
547478f973
|
stock entry: new purpose others added in stock entry
|
2012-03-20 14:26:14 +05:30 |
|
Anand Doshi
|
6ba51ca693
|
POS Invoice fix
|
2012-03-20 12:24:51 +05:30 |
|
Anand Doshi
|
547ce9f9c8
|
POS Invoice fix
|
2012-03-20 12:11:38 +05:30 |
|
Anand Doshi
|
5dabfdd920
|
sync doctype - first cut
|
2012-03-19 14:26:14 +05:30 |
|
Nabin Hait
|
3ffca32ace
|
rename dt patch updated
|
2012-03-16 16:21:44 +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 |
|
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 |
|
Nabin Hait
|
64f40fab6d
|
Rename doctype for more meaningful name
|
2012-03-14 11:07:00 +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
|
ae4d1f973c
|
modules cleanup
|
2012-03-12 14:34:55 +05:30 |
|
Nabin Hait
|
4e154d2233
|
removed rv series def val
|
2012-03-06 11:19:29 +05:30 |
|
Nabin Hait
|
d342e2a4f2
|
reload item tables
|
2012-03-05 15:22:55 +05:30 |
|
Nabin Hait
|
d14bea3de5
|
patch list updated
|
2012-03-05 11:03:54 +05:30 |
|
Nabin Hait
|
3f958f7433
|
reload patch: field order changed
|
2012-03-05 10:59:02 +05:30 |
|
Nabin Hait
|
80d5261100
|
patch list updated
|
2012-03-01 18:56:06 +05:30 |
|
Nabin Hait
|
423474da5c
|
transaction date issue in mapper patch
|
2012-03-01 18:04:08 +05:30 |
|
Nabin Hait
|
7807c6f173
|
clear cache patch
|
2012-03-01 15:58:30 +05:30 |
|
Nabin Hait
|
995d79421d
|
error fixed in patch
|
2012-03-01 15:51:33 +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
|
fe521fdbc2
|
add messages to always show and add attribution to patch
|
2012-03-01 13:39:09 +05:30 |
|
Rushabh Mehta
|
cc6398e7c7
|
patch - update user_image in profile
|
2012-03-01 12:15:54 +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 |
|
Rushabh Mehta
|
1572adf7f7
|
minor fix
|
2012-02-29 15:19:20 +05:30 |
|
Rushabh Mehta
|
12852e73ab
|
added activity page
|
2012-02-29 15:11:06 +05:30 |
|
Nabin Hait
|
1f4aeab85c
|
error fixed in label_cleanup
|
2012-02-28 14:14:20 +05:30 |
|
Nabin Hait
|
6c75cce4b9
|
fixed confilct
|
2012-02-28 11:46:43 +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 |
|
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
|
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
|
40ee8d6432
|
UI fixes in support ticket and desktop
|
2012-02-24 19:21:47 +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
|
2886b95da0
|
added todo
|
2012-02-24 11:26:31 +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
|
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 |
|
Rushabh Mehta
|
393d325e00
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 13:15:02 +01:00 |
|
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
|
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
|
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
|
e55778627f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-21 08:57:24 +01:00 |
|
Nabin Hait
|
5fe6760406
|
reorder level checking based on stores and reserved warehouse
|
2012-02-21 13:25:27 +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
|
c3023be794
|
notifications of todo items
|
2012-02-20 16:31:55 +05:30 |
|
Rushabh Mehta
|
7c76f80966
|
gateway patch
|
2012-02-16 10:58:45 +01:00 |
|
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 |
|
Nabin Hait
|
da1f48b96e
|
mentioed account type for some tax/chargeable account
|
2012-02-16 10:55:05 +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 |
|
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 |
|
Nabin Hait
|
75ef7c7a89
|
def val of is_subcontracted is NO
|
2012-02-14 16:08:22 +05:30 |
|
Anand Doshi
|
507cb3c592
|
add website manager patch
|
2012-02-14 12:58:47 +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
|
d7ddea1e2a
|
domain list patch
|
2012-02-13 18:59:43 +05:30 |
|
Anand Doshi
|
e8928b8bff
|
website settings
|
2012-02-13 17:56:59 +05:30 |
|
Nabin Hait
|
e63ea67b54
|
error fixed in patch
|
2012-02-13 15:38:15 +05:30 |
|
Nabin Hait
|
42852a88dc
|
account type patch added in patch list
|
2012-02-13 15:29:51 +05:30 |
|
Nabin Hait
|
bd0c05bf94
|
Mentioned account type in default accounts
|
2012-02-13 14:48:34 +05:30 |
|
Rushabh Mehta
|
0b2874afdb
|
fix to install
|
2012-02-09 12:45: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
|
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
|
cc54fd46bc
|
website fixes
|
2012-02-06 13:09:08 +01:00 |
|
Rushabh Mehta
|
b4244bacba
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 10:59:48 +01:00 |
|
Rushabh Mehta
|
4167e2f97a
|
patch fix
|
2012-02-06 10:58:48 +01:00 |
|
Rushabh Mehta
|
74fab55948
|
add home in website patch
|
2012-02-06 14:34:42 +05:30 |
|
Rushabh Mehta
|
6147451da3
|
refactored patches, bug fix for assign_to
|
2012-02-04 09:53:25 +05:30 |
|
Rushabh Mehta
|
b4c814484e
|
fix to patch
|
2012-02-03 13:36:44 +05:30 |
|
Rushabh Mehta
|
63d669f390
|
updated feed for comments and login
|
2012-02-03 12:56:12 +05:30 |
|
Rushabh Mehta
|
adc9a61bd7
|
bugfix
|
2012-02-02 16:45:26 +05:30 |
|
Rushabh Mehta
|
50e2cfe78e
|
dateutil.js/patch fix
|
2012-02-02 16:40:01 +05:30 |
|
Rushabh Mehta
|
63adcb7355
|
patch update
|
2012-02-02 13:44:28 +05:30 |
|
Rushabh Mehta
|
a3d21a46e8
|
version
|
2012-02-02 13:43:20 +05:30 |
|
Rushabh Mehta
|
7018b19f42
|
added website settings, refactored home
|
2012-02-02 13:42:28 +05:30 |
|
Anand Doshi
|
a9a5128402
|
Merge branch 'stable' into latest
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
|
2012-02-02 11:44:25 +05:30 |
|
Anand Doshi
|
75d30b803f
|
Packing Slip and its patches
|
2012-02-02 11:38:15 +05:30 |
|
Rushabh Mehta
|
9ef63f93d6
|
moved back to 'index.cgi' model
|
2012-02-01 14:47:29 +05:30 |
|
Anand Doshi
|
3325d0db74
|
Patch to set docstatus=2 for purchase returned serial no
|
2012-02-01 11:36:31 +05:30 |
|
Anand Doshi
|
0717ca63b2
|
Fix in Purchase Return - Serial No. status issue
|
2012-01-31 16:20:37 +05:30 |
|
Rushabh Mehta
|
bc5ec4f19e
|
version
|
2012-01-30 14:02:41 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
e72de12993
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-30 11:59:05 +05:30 |
|
Anand Doshi
|
69cfc5566a
|
Email settings check on save
|
2012-01-30 11:54:59 +05:30 |
|
Rushabh Mehta
|
3a751e8f82
|
added blog subscriber, unsubscribe
|
2012-01-27 18:00:14 +05:30 |
|
Rushabh Mehta
|
c8d2e73ee6
|
added blog
|
2012-01-27 15:57:17 +05:30 |
|
Rushabh Mehta
|
51e51da63f
|
added about_us
|
2012-01-27 12:17:09 +05:30 |
|
Anand Doshi
|
af1ad9a31e
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-01-25 17:27:57 +05:30 |
|
Anand Doshi
|
6e174cc2c4
|
Merge branch 'master' into latest
Conflicts:
erpnext/setup/doctype/notification_control/notification_control.js
index.html
version.num
|
2012-01-25 17:21:14 +05:30 |
|
Anand Doshi
|
46848a48fe
|
Show DocType Labels instead of DocType names in Customize Form View
|
2012-01-25 17:15:46 +05:30 |
|
Rushabh Mehta
|
4b1fe0528a
|
added home template
|
2012-01-25 15:06:28 +05:30 |
|
Rushabh Mehta
|
a8ad3907db
|
added website page, home, patch
|
2012-01-25 10:37:35 +05:30 |
|
Anand Doshi
|
c655e37f1a
|
Fixes in production and stock modules
|
2012-01-25 09:58:06 +05:30 |
|
Anand Doshi
|
6be842f960
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-24 14:58:41 +05:30 |
|
Anand Doshi
|
a2c9e39ca3
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-24 14:58:24 +05:30 |
|
Rushabh Mehta
|
7cca292494
|
version
|
2012-01-24 14:34:27 +05:30 |
|
Rushabh Mehta
|
865c00a79a
|
started website
|
2012-01-24 14:33:21 +05:30 |
|
Anand Doshi
|
2e3ce6cc02
|
Fix error in patch due to single quote in name
|
2012-01-24 11:37:28 +05:30 |
|
Anand Doshi
|
3c572d7468
|
change patch file in patch list customer address contact patch
|
2012-01-24 10:55:04 +05:30 |
|
Anand Doshi
|
590be7e643
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-23 18:37:09 +05:30 |
|
Anand Doshi
|
706baf77ae
|
customer address contact patch
|
2012-01-23 18:35:28 +05:30 |
|
Anand Doshi
|
9a7ea9285e
|
Customer Address Contact report
|
2012-01-23 18:32:20 +05:30 |
|
Rushabh Mehta
|
49ebfb6a30
|
version
|
2012-01-20 15:32:18 +05:30 |
|
Rushabh Mehta
|
764fdb942e
|
updated account url and js version
|
2012-01-20 12:07:56 +05:30 |
|
Rushabh Mehta
|
0a5657809a
|
fixes to add user
|
2012-01-20 10:52:53 +05:30 |
|
Rushabh Mehta
|
3a32478db9
|
confict fix
|
2012-01-19 15:11:07 +05:30 |
|
Rushabh Mehta
|
d31bf62c9a
|
fixed patches, small bugs
|
2012-01-19 15:09:49 +05:30 |
|
Anand Doshi
|
39eff71864
|
remove get tds button
|
2012-01-19 14:57:23 +05:30 |
|
Anand Doshi
|
26814e7bad
|
Remove Get TDS button, which appears twice in JV
|
2012-01-19 14:26:25 +05:30 |
|
Anand Doshi
|
ad2f5d1270
|
Merge branch 'stable'
|
2012-01-19 12:42:11 +05:30 |
|
Anand Doshi
|
f343a8bc75
|
remove extra buttons labelled Make Maintenance Visit
|
2012-01-19 12:41:54 +05:30 |
|
Anand Doshi
|
4b0b4a7fdc
|
Merge branch 'stable'
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:35:54 +05:30 |
|
Anand Doshi
|
5f72836f11
|
Patch to change allocated_to options to 'Profile'
|
2012-01-19 12:32:15 +05:30 |
|
Rushabh Mehta
|
94b88b9e22
|
added patch for subdomain
|
2012-01-18 10:55:39 +05:30 |
|
Anand Doshi
|
d3a23b5e8c
|
Item Manufacturer/Supplier Details in item doctype
|
2012-01-17 18:46:43 +05:30 |
|
Anand Doshi
|
a9023b1787
|
Merge branch 'stable'
|
2012-01-16 17:39:10 +05:30 |
|
Rushabh Mehta
|
cb60ca13a9
|
added patch to convert tables to utf8
|
2012-01-16 11:58:14 +05:30 |
|
Anand Doshi
|
ada0b5d554
|
Merge branch 'stable'
|
2012-01-13 13:24:53 +05:30 |
|
Anand Doshi
|
7b96d1f300
|
search_criteria patch
|
2012-01-13 11:53:22 +05:30 |
|
Anand Doshi
|
4b80a81a2e
|
Rename Search Criteria Patch
|
2012-01-13 11:14:29 +05:30 |
|
Anand Doshi
|
640955f91d
|
Patch for fixes after major production rewrite
|
2012-01-12 12:55:29 +05:30 |
|
Nabin Hait
|
a8077bdd20
|
Error fixed in patch
|
2012-01-11 17:22:54 +05:30 |
|
Nabin Hait
|
42a411398a
|
Error fixed in patches
|
2012-01-11 16:57:44 +05:30 |
|
Nabin Hait
|
55c037c250
|
Added production_cleanup patch
|
2012-01-11 16:44:07 +05:30 |
|
Nabin Hait
|
c5d6bcbb8f
|
Production module cleanup
|
2012-01-11 16:41:16 +05:30 |
|
Anand Doshi
|
bf166e487d
|
Patch to rename doctype indent
|
2012-01-10 17:06:16 +05:30 |
|
Anand Doshi
|
3a82dfd171
|
Rename Indent to Purchase Requisition
|
2012-01-10 16:56:11 +05:30 |
|
Anand Doshi
|
bc45f896f7
|
Merged master with stable
|
2012-01-10 14:11:07 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +05:30 |
|
Anand Doshi
|
a9df960494
|
On Print Hide, hide net_total, rounded_total_export and grand_total_export
|
2012-01-09 16:55:30 +05:30 |
|
Anand Doshi
|
58455c9d8e
|
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
|
2012-01-06 14:33:57 +05:30 |
|
Nabin Hait
|
7394239e05
|
delete purpose of service
|
2012-01-05 12:16:28 +05:30 |
|
Nabin Hait
|
2abc6026f2
|
reload po-pr mapper
|
2012-01-05 11:24:49 +05:30 |
|
Nabin Hait
|
d2686b1c31
|
reload doctype
|
2012-01-05 11:16:18 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Nabin Hait
|
db126e80b8
|
pos setting patch
|
2012-01-03 11:10:11 +05:30 |
|
Anand Doshi
|
d56d57d205
|
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
|
2012-01-02 16:25:05 +05:30 |
|
Nabin Hait
|
21d0b68a7d
|
Fixes in pending_patches
|
2011-12-29 15:39:26 +05:30 |
|
Nabin Hait
|
0dfb8e939c
|
Pending patches to be run from patch.py
|
2011-12-29 14:40:05 +05:30 |
|
Anand Doshi
|
c50f605450
|
Enabled Attachments in Support Ticket
|
2011-12-27 17:44:30 +05:30 |
|
Nabin Hait
|
a0778fec61
|
Reload gl mapper patches
|
2011-12-26 12:28:14 +05:30 |
|
Nabin Hait
|
cf0163d09e
|
Patch updated
|
2011-12-26 11:13:49 +05:30 |
|
Nabin Hait
|
a0286e986e
|
patch updated
|
2011-12-26 11:08:32 +05:30 |
|
Nabin Hait
|
56f7ccbe70
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-23 18:26:34 +05:30 |
|
Nabin Hait
|
c6359a9179
|
Patch to update against_voucher in gle for jv aganst jv
|
2011-12-23 18:26:17 +05:30 |
|
Anand Doshi
|
8d53f7635a
|
Merge pull request #179 from anandpdoshi/master
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
|
2011-12-23 00:21:53 -08:00 |
|
Anand Doshi
|
ac20eb2107
|
Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create
|
2011-12-23 13:50:28 +05:30 |
|
Nabin Hait
|
e323ef20b0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-22 19:05:08 +05:30 |
|
Nabin Hait
|
d0a892ffe7
|
print hide price list flds
|
2011-12-22 19:04:49 +05:30 |
|
Anand Doshi
|
4714424de0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-22 18:22:46 +05:30 |
|
Anand Doshi
|
0188df1609
|
Amended the patch to import class Document
|
2011-12-22 18:21:57 +05:30 |
|
Anand Doshi
|
27b05eac7a
|
Merge pull request #176 from anandpdoshi/master
Patch to enable income year to date summary in email digest
|
2011-12-22 04:48:57 -08:00 |
|
Anand Doshi
|
68f3967de0
|
Patch to enable income year to date summary in email digest
|
2011-12-22 18:18:10 +05:30 |
|
Anand Doshi
|
99479bdb7f
|
Merge pull request #172 from anandpdoshi/master
remove previous field property setter
|
2011-12-22 01:50:07 -08:00 |
|
Anand Doshi
|
f2f4c87bb6
|
remove previous field property setter
|
2011-12-22 15:19:16 +05:30 |
|
Anand Doshi
|
d1bfe839fa
|
Merge pull request #171 from anandpdoshi/master
Patch to update idx which starts with 0
|
2011-12-22 01:37:04 -08:00 |
|
Anand Doshi
|
9ca7e5255b
|
Patch to update idx.. start idx from 1
|
2011-12-22 15:05:14 +05:30 |
|
Nabin Hait
|
7e812bbee0
|
Error fixed in patch
|
2011-12-22 12:58:34 +05:30 |
|
Nabin Hait
|
6998261a7e
|
Error fixed in auto indent patches
|
2011-12-22 12:56:57 +05:30 |
|
Anand Doshi
|
5a32f78bf3
|
Merge pull request #170 from anandpdoshi/master
calls on_update method of email_digest obj for creating a scheduler entry
|
2011-12-21 22:59:31 -08:00 |
|
Anand Doshi
|
248f8f5687
|
Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry
|
2011-12-22 12:26:36 +05:30 |
|
Anand Doshi
|
c9b2743e1c
|
Merge pull request #168 from anandpdoshi/master
Fix Image attachments and Enable Email Digests
|
2011-12-21 22:45:13 -08:00 |
|
Anand Doshi
|
972b165850
|
Modified deploy_email_digest to enable all the default email digests
|
2011-12-22 12:04:28 +05:30 |
|
Nijil Y
|
36f58835e6
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 16:35:43 +05:30 |
|
Nijil Y
|
9e6f00abab
|
fixes for notification
|
2011-12-21 14:54:14 +05:30 |
|
Nijil Y
|
2c19960996
|
account conflict
|
2011-12-21 13:30:09 +05:30 |
|
Nijil Y
|
9b6fc0f83d
|
Merge branch 'master' of github.com:nijil/erpnext
|
2011-12-21 13:24:02 +05:30 |
|
Nabin Hait
|
520de0529f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-21 12:51:38 +05:30 |
|
Nijil Y
|
0f9eaeaa3c
|
updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
|
2011-12-21 12:34:13 +05:30 |
|
Nijil Y
|
16ca593bbf
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 12:20:07 +05:30 |
|
Nijil Y
|
4d6a71c5f2
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 11:56:42 +05:30 |
|
Nijil Y
|
35aa35bea3
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 11:50:20 +05:30 |
|
Nabin Hait
|
53ef4009ba
|
Fixes in patches
|
2011-12-21 11:22:32 +05:30 |
|
Nijil Y
|
205e042113
|
patch file
|
2011-12-20 21:14:43 +05:30 |
|
Anand Doshi
|
146f47faab
|
Merge pull request #167 from anandpdoshi/master
Patch to remove extra button from Email Digest Form
|
2011-12-20 05:40:59 -08:00 |
|
Nabin Hait
|
63b94c42e4
|
Price list patch
|
2011-12-20 19:09:23 +05:30 |
|
Anand Doshi
|
6a605b47ef
|
Patch to remove 'Add Recipients' button from Email Digest form
|
2011-12-20 18:31:57 +05:30 |
|
Nijil Y
|
d82e8df7e5
|
patch update for auto indent with email notify
|
2011-12-20 17:30:41 +05:30 |
|
Nijil Y
|
8dd861bda5
|
Auto Indent creation when stock reaches re-order level
|
2011-12-20 17:17:51 +05:30 |
|
Nabin Hait
|
b8cec492c5
|
Fixed issue in c-form patch
|
2011-12-16 16:48:17 +05:30 |
|
Nabin Hait
|
488bcc8700
|
reload_employeewise_balance_leave_report patch updated
|
2011-12-16 16:29:31 +05:30 |
|
Nabin Hait
|
e3daffe477
|
reload_employeewise_balance_leave_report
|
2011-12-16 16:28:26 +05:30 |
|
Nabin Hait
|
3bfeefafcd
|
Modified patch
|
2011-12-16 16:19:38 +05:30 |
|
Nabin Hait
|
f8bfcdc495
|
Modified patch
|
2011-12-16 16:15:31 +05:30 |
|
Nabin Hait
|
c57c5b0b44
|
Return if old patch.py executed anyway
|
2011-12-16 10:17:26 +05:30 |
|
Nabin Hait
|
9a0d05d354
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-15 15:48:51 +05:30 |
|