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
|
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
|
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 |
|
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 |
|
Rushabh Mehta
|
fd563b4874
|
support ticket listview
|
2012-03-21 11:52:49 +05:30 |
|
Rushabh Mehta
|
f74ef4c64b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:18:41 +01:00 |
|
Rushabh Mehta
|
a665c1f60d
|
stylefixes and listviews
|
2012-03-21 11:47:58 +05:30 |
|
Rushabh Mehta
|
dad4e3ebac
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:17:28 +01:00 |
|
Nabin Hait
|
5f04061291
|
changes in recurring invoice print format
|
2012-03-21 11:47:00 +05:30 |
|
Rushabh Mehta
|
0d1e918177
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 06:33:35 +01:00 |
|
Nabin Hait
|
39a24794eb
|
Purpose others to other
|
2012-03-21 11:02:50 +05:30 |
|
Rushabh Mehta
|
454c6ac716
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 05:42:31 +01:00 |
|
Rushabh Mehta
|
437c1b512c
|
listview update and form fix
|
2012-03-20 18:45:28 +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
|
39c26f4580
|
billing period in recurring sales invoice mail
|
2012-03-20 17:39:48 +05:30 |
|
Anand Doshi
|
986caee03d
|
clear item cache on update of certain docs
|
2012-03-20 17:30:31 +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
|
9ff92369ad
|
lead organization fld added in quotation for printing
|
2012-03-20 16:44:15 +05:30 |
|
Anand Doshi
|
8347aad402
|
email settings separated from control panel
|
2012-03-20 14:54:25 +05:30 |
|
Rushabh Mehta
|
9b1afe197d
|
cleanup of form, rename, route, added fonts
|
2012-03-20 14:37:44 +05:30 |
|
Nabin Hait
|
93654a3e04
|
stock entry: new purpose others added
|
2012-03-20 14:31:14 +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
|
d05aad6474
|
fix in POS invoice
|
2012-03-20 12:33:02 +05:30 |
|
Anand Doshi
|
6ba51ca693
|
POS Invoice fix
|
2012-03-20 12:24:51 +05:30 |
|
Anand Doshi
|
4f5e92a06c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-20 12:17:50 +05:30 |
|
Anand Doshi
|
547ce9f9c8
|
POS Invoice fix
|
2012-03-20 12:11:38 +05:30 |
|
Anand Doshi
|
3401086d66
|
POS Invoice fix
|
2012-03-20 12:07:18 +05:30 |
|
Nabin Hait
|
bdd6877a4f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-19 18:56:08 +05:30 |
|
Nabin Hait
|
31e0eacb7a
|
Update erpnext/selling/doctype/sales_order/sales_order.js
|
2012-03-19 18:54:11 +05:30 |
|
Rushabh Mehta
|
9d0fc767b2
|
merge
|
2012-03-19 18:44:33 +05:30 |
|
Nabin Hait
|
11824ffb90
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-19 18:43:51 +05:30 |
|
Nabin Hait
|
fdab486720
|
Update erpnext/selling/doctype/sales_order/sales_order.js
|
2012-03-19 18:43:07 +05:30 |
|
Rushabh Mehta
|
d48417c93b
|
slide navigation fixes
|
2012-03-19 18:42:13 +05:30 |
|
Nabin Hait
|
7107d4af2b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-19 18:39:42 +05:30 |
|
Rushabh Mehta
|
8d8fa66e8f
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 14:06:12 +01:00 |
|
Nabin Hait
|
b7dce7da31
|
Update erpnext/stock/doctype/delivery_note/delivery_note.js
|
2012-03-19 18:35:57 +05:30 |
|
Rushabh Mehta
|
ffe9d358e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 12:40:07 +01:00 |
|
Nabin Hait
|
65ad3b1a0f
|
Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py
|
2012-03-19 17:09:14 +05:30 |
|
Nabin Hait
|
a189af48f6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-19 16:27:42 +05:30 |
|
Nabin Hait
|
16d9f4942a
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:48:08 +05:30 |
|
Nabin Hait
|
422f7e99db
|
Update erpnext/selling/doctype/customer/customer.txt
|
2012-03-19 15:37:03 +05:30 |
|
Nabin Hait
|
9aa3777ba6
|
Update erpnext/setup/doctype/sales_person/sales_person.txt
|
2012-03-19 15:21:30 +05:30 |
|
Nabin Hait
|
e5d99f5ed1
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:15:20 +05:30 |
|
Anand Doshi
|
a7158f6ea9
|
fix in session expiry
|
2012-03-19 14:41:05 +05:30 |
|
Anand Doshi
|
5dabfdd920
|
sync doctype - first cut
|
2012-03-19 14:26:14 +05:30 |
|
Rushabh Mehta
|
6498cee998
|
fixed conflict
|
2012-03-19 09:01:16 +01:00 |
|
Nabin Hait
|
b6cd3316c4
|
error fixed in lease receipts client wise
|
2012-03-19 13:27:06 +05:30 |
|
Anand Doshi
|
f02c9e7b6c
|
fix in due_date fetching for receivable voucher
|
2012-03-19 11:43:24 +05:30 |
|
Rushabh Mehta
|
a0a53c90f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 06:12:43 +01:00 |
|
Nabin Hait
|
15a0271557
|
Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
|
2012-03-19 10:22:32 +05:30 |
|
Nabin Hait
|
9f5b2cd8d9
|
Update erpnext/stock/doctype/delivery_note/delivery_note.txt
|
2012-03-19 10:20:22 +05:30 |
|
Rushabh Mehta
|
7afaa8665d
|
major reworking of page navigation
|
2012-03-16 18:28:09 +05:30 |
|
Nabin Hait
|
3ffca32ace
|
rename dt patch updated
|
2012-03-16 16:21:44 +05:30 |
|
Nabin Hait
|
deac31fd2d
|
Update erpnext/selling/doctype/sales_common/sales_common.py
|
2012-03-16 15:14:27 +05:30 |
|
Nabin Hait
|
15afe87984
|
cost center will be fetched from other charges master
|
2012-03-16 15:11:02 +05:30 |
|
Rushabh Mehta
|
8e3d596cbc
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-15 16:44:19 +05:30 |
|
Rushabh Mehta
|
2438de4c9b
|
fixed tags in list2
|
2012-03-15 16:43:46 +05:30 |
|
Rushabh Mehta
|
2f052fd1ff
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-15 07:22:39 +01:00 |
|
Rushabh Mehta
|
5b9e0951d7
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-15 07:21:43 +01:00 |
|
Anand Doshi
|
92da889d32
|
fix in report builder saving
|
2012-03-15 11:50:26 +05:30 |
|
Anand Doshi
|
96188f0310
|
sync with gateway moved to defs
|
2012-03-15 11:11:57 +05:30 |
|
Rushabh Mehta
|
f47192c5ce
|
merge
|
2012-03-14 19:07:11 +05:30 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
3b3e336fcc
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-14 13:25:19 +01:00 |
|
Anand Doshi
|
018f075b66
|
Merge branch 'master' into sync
|
2012-03-14 17:54:32 +05:30 |
|
Anand Doshi
|
0e2461fa7c
|
fix in qa inspection report link
|
2012-03-14 17:53:53 +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 |
|
Anand Doshi
|
0493897297
|
Merge branch 'master' into sync
Conflicts:
js/all-app.js
js/all-web.js
version.num
|
2012-03-14 12:24:37 +05:30 |
|
Anand Doshi
|
990599ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-14 12:20:58 +05:30 |
|
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 |
|
Anand Doshi
|
7854f81ca0
|
show todo, calendar and support desktop notifications
|
2012-03-14 12:01:13 +05:30 |
|
Nabin Hait
|
64f40fab6d
|
Rename doctype for more meaningful name
|
2012-03-14 11:07:00 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +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
|
b9878d01e1
|
style fixes
|
2012-03-12 16:12:09 +05:30 |
|
Rushabh Mehta
|
ae4d1f973c
|
modules cleanup
|
2012-03-12 14:34:55 +05:30 |
|
Anand Doshi
|
5230aa89a2
|
Merge branch 'master' into sync
|
2012-03-12 13:28:15 +05:30 |
|
Rushabh Mehta
|
09595eee3e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-12 13:21:07 +05:30 |
|
Nabin Hait
|
b5b39f0e48
|
update cost as per LPR and standard rate
|
2012-03-12 11:25:10 +05:30 |
|
Rushabh Mehta
|
9f89e35ebe
|
search selector fix for link
|
2012-03-09 17:51:39 +05:30 |
|
Rushabh Mehta
|
519f70b384
|
new autosuggest, other fixes
|
2012-03-09 16:44:21 +05:30 |
|
Nabin Hait
|
6715172211
|
sub contracted item are allowed to create po
|
2012-03-09 16:04:19 +05:30 |
|
Anand Doshi
|
4cc7d3e392
|
fix in support ticket rendering
|
2012-03-08 14:49:49 +05:30 |
|
Anand Doshi
|
c37c772678
|
fix in support ticket thread
|
2012-03-08 14:35:19 +05:30 |
|
Anand Doshi
|
20f63da794
|
fix in messages
|
2012-03-08 12:10:51 +05:30 |
|
Anand Doshi
|
eb55df0aa3
|
fix in messages
|
2012-03-08 12:06:27 +05:30 |
|
Anand Doshi
|
a6952c935c
|
doctype refactor first commit
|
2012-03-07 19:37:23 +05:30 |
|
Rushabh Mehta
|
9a1bdf7224
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-07 18:20:33 +05:30 |
|
Rushabh Mehta
|
f81a64e57f
|
new listing and changed wn.widgets.listing to wn.ui.listing
|
2012-03-07 18:19:41 +05:30 |
|
Nabin Hait
|
928e89a359
|
validation added in enquire
|
2012-03-07 13:11:24 +05:30 |
|
Nabin Hait
|
20f68b342b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-07 12:51:19 +05:30 |
|
Nabin Hait
|
00260870d1
|
fixes in rv
|
2012-03-07 12:50:55 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Anand Doshi
|
18b6c1d4e9
|
minor changes in support ticket
|
2012-03-06 18:31:25 +05:30 |
|
Anand Doshi
|
2bc141f5db
|
fix in support ticket and email settings
|
2012-03-06 18:05:23 +05:30 |
|
Anand Doshi
|
a872d81983
|
trying to fix support ticket
|
2012-03-06 17:09:53 +05:30 |
|
Anand Doshi
|
2b60484bab
|
fix in reverted my company
|
2012-03-06 16:17:34 +05:30 |
|
Anand Doshi
|
bb64d302df
|
email digest fix
|
2012-03-06 11:42:32 +05:30 |
|
Nabin Hait
|
4e154d2233
|
removed rv series def val
|
2012-03-06 11:19:29 +05:30 |
|
Nabin Hait
|
b659457b4d
|
Removed def value from invoice naming series
|
2012-03-06 11:07:24 +05:30 |
|
Rushabh Mehta
|
60871c3f54
|
merge, doclist2
|
2012-03-05 18:29:34 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +05:30 |
|
Nabin Hait
|
a528f54dcb
|
serial no fld print_hide=0
|
2012-03-05 17:45:38 +05:30 |
|
Rushabh Mehta
|
23d366a0be
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
version.num
|
2012-03-05 11:31:04 +01:00 |
|
Nabin Hait
|
d342e2a4f2
|
reload item tables
|
2012-03-05 15:22:55 +05:30 |
|
Nabin Hait
|
cf9c4c45a5
|
export /import fld hide issue, discount issue
|
2012-03-05 15:21:35 +05:30 |
|
Rushabh Mehta
|
2f69c14e36
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-05 06:34:17 +01:00 |
|
Nabin Hait
|
d14bea3de5
|
patch list updated
|
2012-03-05 11:03:54 +05:30 |
|
Rushabh Mehta
|
38305a4b65
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-05 06:30:10 +01:00 |
|
Nabin Hait
|
3f958f7433
|
reload patch: field order changed
|
2012-03-05 10:59:02 +05:30 |
|
Nabin Hait
|
07e9ff3d30
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-05 10:55:24 +05:30 |
|
Nabin Hait
|
9cee59cd05
|
field order changed
|
2012-03-05 10:54:54 +05:30 |
|
Anand Doshi
|
821cb64987
|
fix in delivery note detail double entry
|
2012-03-03 16:27:48 +05:30 |
|
Anand Doshi
|
5478842d80
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-03 15:02:18 +05:30 |
|
Anand Doshi
|
146f17bf57
|
fix in delivery note submission - error caused due to default packed qty
|
2012-03-03 15:01:41 +05:30 |
|
Nabin Hait
|
97e1770296
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 17:15:21 +05:30 |
|
Nabin Hait
|
89a30ff7dc
|
Company 'all' removed from financial statements
|
2012-03-02 17:15:01 +05:30 |
|
Rushabh Mehta
|
c326075bdb
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-02 12:36:39 +01:00 |
|
Anand Doshi
|
c4e2d62333
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 17:05:33 +05:30 |
|
Anand Doshi
|
d536f16c53
|
user addition fix
|
2012-03-02 17:05:04 +05:30 |
|
Rushabh Mehta
|
bb8bf194a7
|
merge
|
2012-03-02 16:28:09 +05:30 |
|
Rushabh Mehta
|
ee92f4b8ca
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 16:25:35 +05:30 |
|
Rushabh Mehta
|
e45ffd6daf
|
activity date fix
|
2012-03-02 16:25:22 +05:30 |
|
Nabin Hait
|
a0801f7e39
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 16:06:46 +05:30 |
|
Nabin Hait
|
40c514612b
|
price list rate hiding issue
|
2012-03-02 16:06:33 +05:30 |
|
Anand Doshi
|
5cc8cd7dc1
|
do not record logins by demo@webnotestech.com
|
2012-03-02 15:42:08 +05:30 |
|
Nabin Hait
|
7e6b62eafd
|
print hide issue
|
2012-03-02 15:12:52 +05:30 |
|
Nabin Hait
|
fae852eb78
|
print hide issue
|
2012-03-02 15:10:51 +05:30 |
|
Rushabh Mehta
|
d0fb5e5d5d
|
merge
|
2012-03-02 14:58:39 +05:30 |
|
Nabin Hait
|
e0eb58ad26
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 14:57:56 +05:30 |
|
Nabin Hait
|
0d155a9135
|
print hide issue
|
2012-03-02 14:57:44 +05:30 |
|
Nabin Hait
|
1841d8defa
|
pr/dn no mapping through sales/pur return
|
2012-03-02 14:57:27 +05:30 |
|
Rushabh Mehta
|
a86f3e4507
|
cleanup of handler.js
|
2012-03-02 14:56:51 +05:30 |
|
Rushabh Mehta
|
58cdaa8590
|
fix in support ticket sending
|
2012-03-02 10:03:16 +01:00 |
|
Anand Doshi
|
31c3190681
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 13:13:04 +05:30 |
|
Anand Doshi
|
f68e3053a7
|
fix in support ticket.. checks sync_support_mails checkbox before sending emails
|
2012-03-02 13:11:53 +05:30 |
|
Nabin Hait
|
6db30a5b5a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 12:29:23 +05:30 |
|
Nabin Hait
|
88986ca007
|
column break print hide issue
|
2012-03-02 12:29:08 +05:30 |
|
Anand Doshi
|
86fa67065e
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
version.num
|
2012-03-02 12:21:01 +05:30 |
|
Anand Doshi
|
ecd8df8cfb
|
fix in user password change by system manager
|
2012-03-02 12:18:47 +05:30 |
|
Rushabh Mehta
|
305717a629
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-02 11:30:00 +05:30 |
|
Rushabh Mehta
|
37f531b6da
|
fixes to profile update
|
2012-03-02 11:29:09 +05:30 |
|
Anand Doshi
|
a7c2de6164
|
fix in user passwordgs
|
2012-03-02 11:27:50 +05:30 |
|
Anand Doshi
|
1e9b15eb5d
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
version.num
|
2012-03-01 19:28:36 +05:30 |
|
Anand Doshi
|
e306a1f5e1
|
fix in sales and purchase common column hide
|
2012-03-01 19:25:33 +05:30 |
|
Nabin Hait
|
06292433a6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 19:23:42 +05:30 |
|
Nabin Hait
|
760e91e949
|
print hide issue fixed in dn
|
2012-03-01 19:23:21 +05:30 |
|
Rushabh Mehta
|
84e0c6f7ba
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:59:01 +05:30 |
|
Rushabh Mehta
|
b5af807281
|
browser support
|
2012-03-01 18:58:29 +05:30 |
|
Nabin Hait
|
c4bc429cf7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:56:33 +05:30 |
|
Nabin Hait
|
80d5261100
|
patch list updated
|
2012-03-01 18:56:06 +05:30 |
|
Rushabh Mehta
|
97ceffccce
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:53:50 +05:30 |
|
Rushabh Mehta
|
5d267a4ad7
|
browse support
|
2012-03-01 18:53:06 +05:30 |
|
Nabin Hait
|
1fb0058283
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:48:54 +05:30 |
|
Nabin Hait
|
db4af96388
|
issue fixed in pos
|
2012-03-01 18:47:51 +05:30 |
|
Rushabh Mehta
|
f6cca4f218
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:42:44 +05:30 |
|
Rushabh Mehta
|
70f7674aed
|
browse support and images
|
2012-03-01 18:42:05 +05:30 |
|
Anand Doshi
|
50b950b692
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:21:27 +05:30 |
|
Anand Doshi
|
68fb2c9b19
|
fix in import error due to indentation issues in item_grou[
|
2012-03-01 18:20:31 +05:30 |
|
Nabin Hait
|
96639d76b2
|
fixed indentation issue for custom script
|
2012-03-01 18:11:27 +05:30 |
|
Nabin Hait
|
823f192876
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 18:04:29 +05:30 |
|
Nabin Hait
|
423474da5c
|
transaction date issue in mapper patch
|
2012-03-01 18:04:08 +05:30 |
|
Nabin Hait
|
f237a67183
|
transaction date issue in mapper
|
2012-03-01 18:03:47 +05:30 |
|
Anand Doshi
|
232d725fd7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 17:55:13 +05:30 |
|
Anand Doshi
|
e90e35dcda
|
restoring contact control
|
2012-03-01 17:52:31 +05:30 |
|
Nabin Hait
|
e3ce5b4e0c
|
voucher date removal issue fixed
|
2012-03-01 17:37:36 +05:30 |
|
Nabin Hait
|
be0b090d27
|
voucher date removal issue fixed
|
2012-03-01 17:31:51 +05:30 |
|
Nabin Hait
|
7807c6f173
|
clear cache patch
|
2012-03-01 15:58:30 +05:30 |
|
Nabin Hait
|
5b29deb968
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-01 15:52:12 +05:30 |
|
Nabin Hait
|
995d79421d
|
error fixed in patch
|
2012-03-01 15:51:33 +05:30 |
|
Anand Doshi
|
496d9a0980
|
Merge branch 'master' into navupdate
|
2012-03-01 14:55:22 +05:30 |
|
Anand Doshi
|
48ca42beb9
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-03-01 14:54:01 +05:30 |
|
Anand Doshi
|
08c8edb87f
|
fix in desktop and notifications
|
2012-03-01 14:53:05 +05:30 |
|
Nabin Hait
|
b95ad21208
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 14:48:13 +05:30 |
|
Nabin Hait
|
cf907f98bd
|
error fixed in posting balance
|
2012-03-01 14:47:56 +05:30 |
|
Rushabh Mehta
|
4a0cc249a9
|
merge
|
2012-03-01 13:59:47 +05:30 |
|
Rushabh Mehta
|
b473a4d489
|
added all_read condition to check if user can read
|
2012-03-01 13:58:17 +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
|
b6023a4d34
|
users - list condition
|
2012-03-01 13:47:51 +05:30 |
|
Rushabh Mehta
|
df33cb3a39
|
added activity avatar and removed menus.css
|
2012-03-01 13:44:09 +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
|
cc131af77a
|
add messages to always show
|
2012-03-01 13:35:07 +05:30 |
|
Rushabh Mehta
|
5ce587be33
|
merge
|
2012-03-01 13:32:06 +05:30 |
|
Rushabh Mehta
|
4c1e9e7db4
|
added attributions pages
|
2012-03-01 13:30:34 +05:30 |
|
Nabin Hait
|
2b9a13d81f
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 13:05:23 +05:30 |
|
Nabin Hait
|
eaf144a545
|
form cleanup in pur cycle
|
2012-03-01 13:05:04 +05:30 |
|
Nabin Hait
|
e73db0e331
|
set serial_no status="In Store" if purchase return cancelled
|
2012-03-01 12:26:12 +05:30 |
|
Anand Doshi
|
fba591cbb3
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 12:21:16 +05:30 |
|
Rushabh Mehta
|
111bca8220
|
activity image
|
2012-03-01 12:19:18 +05:30 |
|
Anand Doshi
|
91797904c9
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 12:17:54 +05:30 |
|
Anand Doshi
|
0e140962b8
|
Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults
|
2012-03-01 12:16:02 +05:30 |
|
Rushabh Mehta
|
cc6398e7c7
|
patch - update user_image in profile
|
2012-03-01 12:15:54 +05:30 |
|
Rushabh Mehta
|
b4a2f4c98f
|
activty images, website heading fix
|
2012-03-01 11:49:54 +05:30 |
|
Rushabh Mehta
|
ffb25fc36b
|
users button fix
|
2012-03-01 11:29:22 +05:30 |
|
Rushabh Mehta
|
94a2fecf9d
|
merge
|
2012-03-01 11:26:07 +05:30 |
|
Rushabh Mehta
|
428929b1f7
|
fixed permissions
|
2012-03-01 11:24:45 +05:30 |
|
Nabin Hait
|
bb4539e458
|
fixed conflict in version
|
2012-03-01 10:58:48 +05:30 |
|
Nabin Hait
|
6d517ff005
|
form cleanup: fixed callback issues
|
2012-03-01 10:57:23 +05:30 |
|
Nabin Hait
|
284a07e23b
|
if more info unchecked, more info in customer, supplier will be visible
|
2012-03-01 10:55:41 +05:30 |
|
Nabin Hait
|
177ca8dbbd
|
Description changed
|
2012-03-01 10:54:34 +05:30 |
|
Nabin Hait
|
63b275c97f
|
allowed debit and credit against same acc head
|
2012-03-01 10:35:35 +05:30 |
|
Rushabh Mehta
|
a4f454faa0
|
module page link fix
|
2012-02-29 19:19:01 +05:30 |
|
Rushabh Mehta
|
204e77d125
|
background, user_info
|
2012-02-29 19:09:20 +05:30 |
|
Rushabh Mehta
|
dc7e6889dd
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 19:06:56 +05:30 |
|
Anand Doshi
|
9a63996699
|
fix in account setup and user addition
|
2012-02-29 18:59:45 +05:30 |
|
Anand Doshi
|
fd5a213890
|
fix in account setup and user addition
|
2012-02-29 18:58:02 +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 |
|
Anand Doshi
|
8049c27d78
|
Merge branch 'master' into navupdate
|
2012-02-29 16:22:30 +05:30 |
|
Rushabh Mehta
|
79ae16506b
|
minor fix
|
2012-02-29 15:23:25 +05:30 |
|
Rushabh Mehta
|
1572adf7f7
|
minor fix
|
2012-02-29 15:19:20 +05:30 |
|
Rushabh Mehta
|
864a47933e
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 15:11:27 +05:30 |
|
Rushabh Mehta
|
12852e73ab
|
added activity page
|
2012-02-29 15:11:06 +05:30 |
|
Anand Doshi
|
c70933373b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-02-29 14:06:25 +05:30 |
|
Anand Doshi
|
1304d97416
|
fix in import data page
|
2012-02-29 14:05:43 +05:30 |
|
Nabin Hait
|
41d6852218
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 11:25:09 +05:30 |
|
Nabin Hait
|
a3eee118fc
|
Added on_trash function for checking link of the master
|
2012-02-29 11:24:55 +05:30 |
|
Rushabh Mehta
|
a38bbe28ce
|
home page fixes
|
2012-02-29 10:55:43 +05:30 |
|
Nabin Hait
|
902b14592f
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 10:44:51 +05:30 |
|
Nabin Hait
|
22aa17bcce
|
changes in trend analyzer query
|
2012-02-29 10:44:27 +05:30 |
|
Nabin Hait
|
72d412567c
|
Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py
|
2012-02-29 10:43:21 +05:30 |
|
Rushabh Mehta
|
17da764d04
|
modules_setup
|
2012-02-28 18:56:56 +05:30 |
|
Rushabh Mehta
|
75d8f51e7d
|
messages and merge
|
2012-02-28 17:44:16 +05:30 |
|
Rushabh Mehta
|
aaf86ba4ef
|
added users
|
2012-02-28 17:40:13 +05:30 |
|
Nabin Hait
|
bef8b86331
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-28 14:14:49 +05:30 |
|
Nabin Hait
|
1f4aeab85c
|
error fixed in label_cleanup
|
2012-02-28 14:14:20 +05:30 |
|
Anand Doshi
|
6b69b4f6a4
|
Merge branch 'master' into navupdate
|
2012-02-28 13:51:29 +05:30 |
|
Anand Doshi
|
fc60335620
|
fix in leave application query
|
2012-02-28 13:51:04 +05:30 |
|
Nabin Hait
|
6c75cce4b9
|
fixed confilct
|
2012-02-28 11:46:43 +05:30 |
|
Anand Doshi
|
f9e4b16731
|
fix in scheduler related import issue
|
2012-02-28 11:31:46 +05:30 |
|
Anand Doshi
|
b37f22dc97
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-27 19:16:40 +05:30 |
|
Anand Doshi
|
ac144121ff
|
fix in hover effect
|
2012-02-27 19:16:24 +05:30 |
|
Rushabh Mehta
|
caebd1bff6
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-27 19:05:44 +05:30 |
|
Rushabh Mehta
|
1a5c9c5926
|
message reply
|
2012-02-27 18:56:31 +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 |
|