Commit graph

1170 commits

Author SHA1 Message Date
wvengen
f5b6fbcf18 Merge pull request #408 from foodcoop1040/count_to_any
Replace "count > 0" with "any?"
2016-03-04 21:37:21 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
wvengen
97f81d9826 Merge pull request #406 from foodcoop1040/delete_user
Add deleted_at for User
2016-03-04 19:12:04 +01:00
Patrick Gansterer
b623b6abbf Remove useless if in invoices form
The created_at field has a value all the time, so the check if it is set
make no sense since it evaluates to true all the time.
2016-03-04 19:06:05 +01:00
Patrick Gansterer
b05ac2ab64 Add deleted_at for User
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
Patrick Gansterer
b30b4e46d8 Order items in select boxes 2016-03-04 18:28:00 +01:00
Patrick Gansterer
72ef31c0ec Make unassigned tasks more prominent in the dashboard
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
Patrick Gansterer
4cae94eff9 Sort Task index 2016-03-04 17:14:43 +01:00
Patrick Gansterer
9ae7c05a89 Create next tasks directly after creating a periodic task 2016-03-04 17:13:16 +01:00
Patrick Gansterer
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
Patrick Gansterer
d383288f4f Add missing class="btn" to edit button of invoice
This aligns the interface with all other pages.
2016-03-04 17:04:00 +01:00
Patrick Gansterer
8ac1471a89 Add message threads #394
This new view sorts the messages by threads based on the reply_to.
Now we store only the message which started a new thread in the reply_to
field to avoid recursive queries.
2016-03-04 16:52:34 +01:00
wvengen
d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
wvengen
4cacb740d1 Small improvement in invoice edit 2016-03-04 16:14:54 +01:00
Patrick Gansterer
1315103a7d Add role_invoices
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
Patrick Gansterer
273969ac90 Change sort order of ordergroups to ascending
Since we sort usually sort list ascending it seams strange to do this
different for ordergroups. So align the sort order with the other lists.
2016-03-04 15:59:35 +01:00
Patrick Gansterer
460cf1e82c Change relationship of invoices #390
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
Patrick Gansterer
53b51f0f5c Remove useless upper bound of 99 items #388 2016-02-24 00:39:57 +01:00
Patrick Gansterer
a97eee68b1 Make date clickable in finance overview #392 2016-02-24 00:39:50 +01:00
Patrick Gansterer
a42dd07d5c Make invoice date clickable #391 2016-02-24 00:39:34 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
dcf921dc8d Improve delta-input styling 2015-11-18 22:44:38 +01:00
wvengen
90b21ecc3a Allow increasing just tolerance in the boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
adb6089773 Disable +/- buttons on boundaries in ordering 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen
4a9cf862be Merge pull request #373 from foodcoops/feature/current-orders-plugin
Add current_orders plugin
2015-08-07 19:36:05 +02:00
wvengen
cb000a0438 Fix current_order PDFs and update article/group PDFs too 2015-07-21 00:13:15 +02:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
58df186a2a Make sharedlists optional (and disabled by default) 2015-07-20 22:33:28 +02:00
wvengen
b07e855235 Make compatible with Ruby 2.0 2015-06-05 15:35:19 +02:00
wvengen
6ded06a8ce Merge pull request #365 from akirk/master
Add color marking to items in group orders that have missing items
2015-06-04 10:02:09 +02:00
Alexander Kirk
d9b3064c2e fix missing units calculation, change missing-none background color 2015-05-19 17:58:29 +02:00
wvengen
1a62ce55e3 Fix task form 2015-05-08 20:54:48 +02:00
wvengen
ec03d579d0 Merge branch 'feature/edit-recurring-task'
Conflicts:
	config/locales/en.yml
2015-05-08 20:10:23 +02:00
wvengen
a00e7c94be Rework user-interface for editing recurring tasks 2015-05-08 17:39:20 +02:00
Alexander Kirk
75967bad22 Add color marking to items in group orders that have missing items 2015-05-04 06:16:14 +02:00
Robert
a8a434ef7b Move due date according to delta 2015-05-01 21:31:06 +02:00
Robert
fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen
aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen
dd799cf642 Allow to sort receive on unit 2015-04-22 20:08:24 +02:00
wvengen
17cbc57850 Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197) 2015-04-17 20:09:40 +02:00
wvengen
b028431bf0 Merge pull request #361 from foodcoops/feature/spreadsheets
Let upload provide same functionality as shared database sync
2015-04-17 19:18:44 +02:00