wvengen
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
wvengen
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
wvengen
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
wvengen
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
Patrick Gansterer
e16a0fb336
Add config option to disable the invites
...
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
Patrick Gansterer
a5d0c5ccab
Add a button to add all ordergroups to a new finanacial transaction collection
...
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
2016-03-06 11:53:31 +01:00
Patrick Gansterer
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
Patrick Gansterer
5e744453f8
Add more infos to the invoice page
...
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
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
01cf6431a9
Add messagegroup
...
Messagegroups are a new kind of group. Every user can join and leave such a
group on her own. They are useful to create topics for mails.
E.g. if there is a weekly newsletter we can create a new messagegroup for
it and every user which is interested in receiving the newsletter can join
the corresponding group.
2016-03-04 18:32:57 +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
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +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
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
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
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
9d7735849d
Disable relevant ordering buttons in boxfill phase
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
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
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
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
fd51b07e21
Allow editing recurring task groups, basic functionality for #152
2015-05-01 21:14:16 +02:00
wvengen
dd799cf642
Allow to sort receive on unit
2015-04-22 20:08:24 +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
wvengen
c08c29b0e7
Don't show deleted ordergroups ( closes foodcoops/foodsoft#362 )
2015-04-17 18:27:50 +02:00
wvengen
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
wvengen
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
wvengen
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
wvengen
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
wvengen
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
wvengen
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
