Anand Doshi
|
2513e50dc4
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
|
2012-03-27 19:37:10 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Nabin Hait
|
a0a3ca3178
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-27 17:09:03 +05:30 |
|
Anand Doshi
|
3107096890
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
|
2012-03-27 15:02:38 +05:30 |
|
Anand Doshi
|
66ea30543c
|
sync patches
|
2012-03-27 15:02:30 +05:30 |
|
Anand Doshi
|
94d26f0338
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 22:34:18 +05:30 |
|
Anand Doshi
|
063fe503db
|
fix in queries in stock reconciliation
|
2012-03-26 22:32:34 +05:30 |
|
Rushabh Mehta
|
91c79305e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 12:11:22 +02:00 |
|
Nabin Hait
|
854935f12c
|
added docstatus in item get_query in PV
|
2012-03-26 15:40:56 +05:30 |
|
Nabin Hait
|
b66ade11e0
|
modified item code get_query in purchase cycle
|
2012-03-26 15:30:11 +05:30 |
|
Rushabh Mehta
|
20dc45f7bd
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 10:50:40 +02:00 |
|
Anand Doshi
|
c009450ef0
|
fix in item addition - details fetching
|
2012-03-26 14:17:30 +05:30 |
|
Nabin Hait
|
eecea8ef19
|
modified item code get_query in purchase cycle
|
2012-03-26 13:11:15 +05:30 |
|
Rushabh Mehta
|
4227d3fe58
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:23:18 +02:00 |
|
Nabin Hait
|
9329b5a461
|
modified item code get_query in purchase cycle
|
2012-03-26 11:52:16 +05:30 |
|
Rushabh Mehta
|
4a19819fe9
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:12:32 +02:00 |
|
Anand Doshi
|
4943af6d6c
|
fix in address issue - customer coming in supplied field
|
2012-03-26 11:42:09 +05:30 |
|
Rushabh Mehta
|
6fd7395101
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:03:19 +02:00 |
|
Nabin Hait
|
ea36202fbf
|
modified item code get_query in purchase cycle
|
2012-03-26 11:33:03 +05:30 |
|
Rushabh Mehta
|
5b80423dbb
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:55:45 +02:00 |
|
Nabin Hait
|
2bd086f1c3
|
modified item code get_query in purchase cycle
|
2012-03-26 11:25:31 +05:30 |
|
Rushabh Mehta
|
f06d6f34e7
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:48:21 +02:00 |
|
Nabin Hait
|
68764ce775
|
modified item code get_query in purchase cycle
|
2012-03-26 11:16:41 +05:30 |
|
Nabin Hait
|
e2fe5629f0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 11:07:01 +05:30 |
|
Nabin Hait
|
bb6f10098e
|
updated rename_dt
|
2012-03-26 11:06:34 +05:30 |
|
Rushabh Mehta
|
9d0ea6a5f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:25:22 +02:00 |
|
Nabin Hait
|
6d4ee80cca
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 10:54:31 +05:30 |
|
Anand Doshi
|
964dee9f18
|
fix in stock reconciliation
|
2012-03-26 10:54:05 +05:30 |
|
Nabin Hait
|
67016dcfea
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 10:54:05 +05:30 |
|
Nabin Hait
|
f23d18316a
|
modified item code get_query in purchase cycle
|
2012-03-26 10:53:45 +05:30 |
|
Rushabh Mehta
|
b0d15db17d
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-23 11:25:15 +01:00 |
|
Rushabh Mehta
|
339afe858c
|
link empty value and kb fix
|
2012-03-23 15:54:49 +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
|
2d4139cbeb
|
sync_handler_merge
|
2012-03-23 14:46:07 +05:30 |
|
Rushabh Mehta
|
a6f063d9f9
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-23 09:50:12 +01:00 |
|
Rushabh Mehta
|
b6f808846d
|
website fixes
|
2012-03-23 14:19:49 +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 |
|
Anand Doshi
|
134ca41db8
|
Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db
|
2012-03-23 12:45:05 +05:30 |
|
Rushabh Mehta
|
d9831e9073
|
listing fix
|
2012-03-23 11:48:48 +05:30 |
|
Rushabh Mehta
|
06f74cc730
|
listing fix
|
2012-03-23 11:47:30 +05:30 |
|
Anand Doshi
|
358304d216
|
fix in sales common regarding date formatting
|
2012-03-23 11:12:03 +05:30 |
|
Rushabh Mehta
|
357a170f3b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 12:49:48 +01:00 |
|
Anand Doshi
|
268b2196d8
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-22 17:18:11 +05:30 |
|
Anand Doshi
|
365453e479
|
fix in filter location
|
2012-03-22 17:17:12 +05:30 |
|
Rushabh Mehta
|
ee10a66639
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 10:37:41 +01:00 |
|
Nabin Hait
|
191e55f1bc
|
sync ref db patch
|
2012-03-22 15:07:28 +05:30 |
|
Nabin Hait
|
f88326ba3f
|
sync ref db
|
2012-03-22 15:07:05 +05:30 |
|
Rushabh Mehta
|
14079e5ea6
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 15:06:11 +05:30 |
|
Rushabh Mehta
|
e8a2fda06e
|
list button-group one more time
|
2012-03-22 14:59:25 +05:30 |
|
Rushabh Mehta
|
f3e8721e2b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 10:05:40 +01:00 |
|