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 |
|
Anand Doshi
|
358304d216
|
fix in sales common regarding date formatting
|
2012-03-23 11:12:03 +05:30 |
|
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 |
|
Anand Doshi
|
7944b4b888
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 14:34:35 +05:30 |
|
Anand Doshi
|
3697534f10
|
Merge branch 'master' into handlerupdate
|
2012-03-22 14:32:10 +05:30 |
|
Rushabh Mehta
|
479061df9c
|
merge
|
2012-03-22 13:53:34 +05:30 |
|
Rushabh Mehta
|
fa0e7b6933
|
listing/messages fix
|
2012-03-22 13:44:04 +05:30 |
|
Anand Doshi
|
8463870a4f
|
Added Custom Scripts in setup page
|
2012-03-22 13:39:23 +05:30 |
|
Rushabh Mehta
|
1952f5b033
|
lead listview
|
2012-03-22 12:21:56 +05:30 |
|
Rushabh Mehta
|
6ac1d73731
|
lead listview
|
2012-03-22 12:10:49 +05:30 |
|
Rushabh Mehta
|
27cf13b541
|
merge
|
2012-03-22 11:37:56 +05:30 |
|
Rushabh Mehta
|
3f46696db2
|
removed slider ui
|
2012-03-22 11:37:08 +05:30 |
|
Anand Doshi
|
98f847c01f
|
fix in todo
|
2012-03-22 11:18:28 +05:30 |
|
Rushabh Mehta
|
a12a28bec6
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-22 06:35:35 +01:00 |
|
Anand Doshi
|
f1eb1b1508
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 11:02:46 +05:30 |
|
Anand Doshi
|
06fcfdfcde
|
assign to - allow comments
|
2012-03-22 11:01:38 +05:30 |
|
Rushabh Mehta
|
aaac794a8e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 06:08:04 +01:00 |
|
Nabin Hait
|
40d4b4d939
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:34:13 +05:30 |
|
Nabin Hait
|
2f82219fd0
|
item query changes in stock entry
|
2012-03-22 10:32:06 +05:30 |
|
Nabin Hait
|
9066dcaba5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:26:07 +05:30 |
|
Nabin Hait
|
afeeb9c484
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:24:39 +05:30 |
|
Nabin Hait
|
bad13149b2
|
item query changes in stock entry
|
2012-03-22 10:24:26 +05:30 |
|
Rushabh Mehta
|
d0f26026af
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 13:34:00 +01:00 |
|
Anand Doshi
|
29ed95ba22
|
simple fixes in todo
|
2012-03-21 18:02:17 +05:30 |
|
Anand Doshi
|
71d0b2a428
|
permission engine fix - is doctype submittable
|
2012-03-21 17:15:49 +05:30 |
|
Rushabh Mehta
|
b1f77d1bde
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 12:39:54 +01:00 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Nabin Hait
|
653536596d
|
fax added in address display
|
2012-03-21 17:07:42 +05:30 |
|
Rushabh Mehta
|
2d229b423e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 12:28:42 +01:00 |
|
Nabin Hait
|
d551281cbe
|
cdt not defined fixed
|
2012-03-21 16:57:08 +05:30 |
|
Rushabh Mehta
|
9851fcef2c
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:33:27 +01:00 |
|
Nabin Hait
|
93162f603d
|
update bom no options in stock entry
|
2012-03-21 16:02:44 +05:30 |
|
Rushabh Mehta
|
c1f8af58d1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:29:06 +01:00 |
|
Nabin Hait
|
31fcc4bb36
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 15:57:07 +05:30 |
|
Nabin Hait
|
830b8baa9d
|
update bom no options in stock entry
|
2012-03-21 15:56:22 +05:30 |
|
Nabin Hait
|
2a68bdf231
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:50:14 +05:30 |
|
Rushabh Mehta
|
e07c38f5f5
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:06:38 +01:00 |
|
Nabin Hait
|
c37cb4d7c3
|
Update erpnext/stock/doctype/stock_entry/stock_entry.js
|
2012-03-21 15:35:41 +05:30 |
|
Nabin Hait
|
ac9adff1bb
|
Update erpnext/stock/doctype/stock_entry/stock_entry.py
|
2012-03-21 15:35:04 +05:30 |
|
Nabin Hait
|
7ff14ede3c
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:33:50 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
5bd00adeed
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 09:06:02 +01:00 |
|
Rushabh Mehta
|
983a171567
|
using font lato
|
2012-03-21 13:35:34 +05:30 |
|
Nabin Hait
|
e8da15cb5b
|
sync ref file
|
2012-03-21 12:45:14 +05:30 |
|
Rushabh Mehta
|
7aaea5e2be
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 08:00:11 +01:00 |
|
Rushabh Mehta
|
c01b7e9c75
|
website topbar fix, doclistnew, back fix
|
2012-03-21 12:29:56 +05:30 |
|
Nabin Hait
|
91375d64f1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 12:05:30 +05:30 |
|
Rushabh Mehta
|
69c9065e7c
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:23:11 +01:00 |
|