Patrick Gansterer
e742958c0c
Add missing German translations
2017-01-21 22:41:18 +01:00
wvengen
0d309af5f6
Update translations from localeapp
2016-06-28 20:43:53 +02:00
wvengen
c6a625e5ed
Localeapp update
2016-06-11 19:19:30 +02:00
Patrick Gansterer
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
wvengen
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
wvengen
42eb6c8509
Make ordergroup break fields a bit nicer
2016-03-11 13:56:02 +01:00
wvengen
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
wvengen
4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
Patrick Gansterer
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
Patrick Gansterer
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
Patrick Gansterer
253512eb51
Add break to ordergroup
...
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
wvengen
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
wvengen
5d9e1845b7
Fix i18n key typo
2016-03-07 21:06:49 +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
cb8205e4de
Merge pull request #413 from foodcoop1040/error_translations
...
Add missing German translations for error messages
2016-03-07 19:44:29 +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
7aacc7fef6
Fix German ui.* translations
2016-03-07 15:21:03 +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
f24a18371e
Add missing German translations for error messages
2016-03-04 23:23:56 +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
Patrick Gansterer
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +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
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
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +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
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
bc0c1f1bbe
Localeapp roundtrip
2015-11-14 16:38:35 +01:00
wvengen
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01: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
dc731ee40d
Make current_orders plugin configurable
2015-07-21 00:13:15 +02:00
wvengen
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
wvengen
13768285e4
localeapp roundtrip
2015-05-15 14:26:08 +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
wvengen
beee5a1245
Localeapp roundtrip
2015-05-02 15:27:06 +02:00
wvengen
5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +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
d5a7f6a074
Move file import logic to model
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
08c8d25a9d
New message form and checkbox papercuts
2015-04-11 02:32:30 +02:00
wvengen
07311aa032
Merge pull request #357 from foodcoop1040/user_activity
...
Add last user login and activity
2015-04-03 16:01:18 +02:00
