Anand Doshi
|
04d47aae6f
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-14 12:46:44 +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
|
05f4c290ec
|
added tinymce to all-app.js
|
2012-02-14 12:12:13 +05:30 |
|
Rushabh Mehta
|
868e084322
|
added jquery-ui to all-app.js
|
2012-02-14 12:03:02 +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 |
|
Anand Doshi
|
d758a83791
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-14 11:40:41 +05:30 |
|
Nabin Hait
|
5bd88d99b5
|
fixes
|
2012-02-14 11:39:42 +05:30 |
|
Anand Doshi
|
afc5079aa0
|
fix in grid toolbar issue
|
2012-02-14 11:31: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
|
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
|
bae6908bdc
|
added sync_with_gateway change function in wnf.py
|
2012-02-09 13:34:12 +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 |
|