b7a96cb390
Merge branch 'master' of git.someserver.de:k4ever
2012-01-07 00:02:55 +01:00
35195d69f0
Admin: Added filter for UserProfile: balance < 0
2011-12-23 02:00:12 +01:00
Sebastian Lohff
d788878d57
Removed obsolete c-display daemon
2011-12-06 19:04:05 +01:00
Sebastian Lohff
738b8cf240
Fix for encoding problems with barcode-display ( fixes #26 )
2011-11-30 22:39:56 +01:00
MasterofJOKers
9e2b0574ee
make some buyable urls accessible by name
...
Gives the advantage of only having to change the urls.py instead
of every link that has been set somewhere. This also verifies that
all parameters needed by the URL are given.
2011-11-24 02:32:25 +01:00
MasterofJOKers
602c6585f8
Rebuild main view
...
Mostly for testing purposes, but also to unify the usage of
buyable in templates.
This also fixes the problem of having to make the retrieved lists
for usersLast* unique manually.
2011-11-24 02:32:18 +01:00
Sebastian Lohff
9bad46cf2d
Fixed Transaction ,-usage and error for transactiontype
2011-11-10 17:06:39 +01:00
Sebastian Lohff
b71b95436f
Fixed: Using default checked value for api transactions
2011-11-09 20:58:20 +01:00
Sebastian Lohff
c0e9f81bf0
Added helper for Authblob
2011-11-04 17:34:13 +01:00
Sebastian Lohff
e87b8e6ca1
Allows multiple Authblobs ( Fixes #22 )
2011-11-04 17:30:11 +01:00
Sebastian Lohff
70766bba44
Order and Purchase now consistend ( Fixes #14 )
2011-11-03 19:01:07 +01:00
614b77b6ac
Merge branch 'master' of git.someserver.de:k4ever
2011-10-31 23:24:06 +01:00
86a9ecd598
Kontostand auf Konto-seite hinzugefuegt.
2011-10-31 23:23:38 +01:00
Sebastian Lohff
9f55a64923
Cleaned up Transaction save/delete
2011-10-31 17:22:21 +01:00
Sebastian Lohff
c2d144ea91
Removed transfer (transact-alias) urls from api2
2011-10-31 16:29:51 +01:00
Sebastian Lohff
df32875789
API refactoring, introduced getError
2011-10-31 15:21:26 +01:00
Sebastian Lohff
5dc8770783
Added API-Support for Virtual Transactions
2011-10-31 14:57:56 +01:00
Sebastian Lohff
f97a501f1c
Fixed exception on user-not-found in form
2011-10-30 03:18:11 +01:00
f7dc5bda50
Improve admin interface: Transaction list, filters, order list with purchases, buyable list...
2011-10-30 02:21:56 +01:00
7da1e4875b
showItem: *fix: BuyDeposit-button where there is no deposiyyy
2011-10-28 22:09:19 +02:00
7e608ae6af
virtualtransaction: add listingz
2011-10-28 21:51:28 +02:00
d480ea8805
client-barcode: Add workaround for German keyboard layout
2011-10-27 23:38:03 +02:00
294425f2b6
client-barcode: Add "neu" highlight to 5 euro charge code on howto sheet
2011-10-27 23:38:03 +02:00
621f8017c8
client-barcode: Allow empty commit (bug #17 , broken by introduction of bulkbuy)
2011-10-26 17:52:14 +02:00
64ce18cb74
client-barcode: Save empty bulkbuy going over the line
2011-10-26 17:51:38 +02:00
156a0df88d
client-barcode: Split Status.commit() up into sub-functions
2011-10-26 17:50:57 +02:00
Sebastian Lohff
27962ad107
Cleanup and regex enhancement of CurrencyField
2011-10-26 01:38:28 +02:00
Sebastian Lohff
38068e1ebb
transaction: change "minValue('0')" to "notZero"
2011-10-25 20:17:38 +02:00
Sebastian Lohff
f432ffc70b
Fixed race condition when transacting to own user
2011-10-25 19:41:02 +02:00
Sebastian Lohff
16cfd63e4a
Merge branch 'master' of git.someserver.de:k4ever
2011-10-25 19:04:11 +02:00
Sebastian Lohff
5f0c0c14fc
Cleanup of VirtualTransaction
2011-10-25 19:03:51 +02:00
526cc6c6c8
client-barcode: Fix call to LCD code
2011-10-25 17:06:30 +02:00
Sebastian Lohff
ccd9e327c7
Merge branch 'master' of git.someserver.de:k4ever
2011-10-25 15:48:10 +02:00
Sebastian Lohff
c3100ad09a
Implemented first part for VirtualTransactions.
...
See Ticket #4
2011-10-25 15:47:10 +02:00
04f9741de7
client-barcode: Implement and integrate bulkbuy
2011-10-24 19:08:09 +02:00
Sebastian Lohff
4e93c66b64
Fixed API urls, allowed to use bulkbuy without /
2011-10-24 17:28:11 +02:00
Sebastian Lohff
1e7820b80b
completed er for virtual transactions
2011-10-24 14:45:50 +02:00
1e26d28122
Merge branch 'master' of someserver.de:k4ever
2011-10-22 22:58:36 +02:00
38e1bb44dc
ER-diagram: add VirtualTransaction
2011-10-22 00:33:03 +02:00
0a26f74872
display escape codes replaced by api calls
2011-10-21 20:52:34 +02:00
Sebastian Lohff
fd46332e65
Fixed transaction checking.
...
Now the default value for the form is set to the value
given in TransactionType.needsCheck
2011-10-21 18:41:27 +02:00
Sebastian Lohff
eaf1551fa1
Added password changing for non-ldap user
2011-10-21 03:05:07 +02:00
Sebastian Lohff
b458cfaead
Fixed #5 - Wrong API-Doc for Api /buy/
2011-10-21 01:25:52 +02:00
bc18ed6661
fix: javascript-enabled click&buy didnt recognize deposit or item+deposit buttons
2011-10-21 00:03:55 +02:00
f2ad3bb89b
client-barcode: Replace 10 Euro by 5 Euro on howto sheet
2011-10-19 23:44:39 +02:00
0ee86a1228
Merge branch 'master' of git.someserver.de:k4ever
2011-10-19 23:36:41 +02:00
447224b0fe
transactions: add filter against 0.00 transactions
2011-10-19 23:34:49 +02:00
53368e49ac
client-barcode: Commit 6 deposits of 1.00 Euro as one deposit of 6.00 Euro (bug #203 )
2011-10-19 20:32:17 +02:00
7046890acf
client-barcode: Show sum of commodity and deposit on item info page, too (bug #202 )
2011-10-19 19:44:21 +02:00
eff542bc99
client-barcode: Increase presentation time of item info page (bug #202 )
2011-10-19 19:30:26 +02:00
Theresa Enghardt
Sebastian Lohff
MasterofJOKers