wvengen
961c50b7e5
Hide delete attachment button when none present
2016-05-06 15:57:15 +02:00
wvengen
3e5b320a6b
Merge pull request #345 from foodcoop1040/attachment
...
Add possibility to add an attachment to an invoice
2016-05-06 15:57:05 +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
de66cd5a2b
Update badge urls
2016-04-29 15:13:45 +02:00
wvengen
86d8e90c06
Merge pull request #424 from foodcoop1040/stock_order_fixes
...
Add missing changes for the stock order
2016-04-29 15:06:58 +02:00
wvengen
2e2efec5e7
Get rid of coffeescript.
2016-04-25 20:34:30 +02:00
wvengen
483c2aba29
Fix rake in production environment
2016-04-25 09:01:19 +02:00
wvengen
6a7b0ae409
Fix sync ignored article count
2016-04-16 21:15:53 +02:00
wvengen
61189dc035
Bundle update
2016-04-07 16:07:58 +02:00
wvengen
9e0ec35e9c
Fix schema version ( closes foodcoops/foodsoft#425 )
2016-03-30 20:27:00 +02:00
Patrick Gansterer
5c56ae6775
Add missing changes for the stock order
2016-03-11 22:52:49 +01: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
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +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
wvengen
b56df39623
Merge pull request #417 from foodcoop1040/deliveries_col
...
Hide deliveries column if there are no deliveries
2016-03-11 11:53:40 +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
80ab359860
Correct messages i18n
2016-03-07 22:17:18 +01:00
wvengen
5d9e1845b7
Fix i18n key typo
2016-03-07 21:06:49 +01:00
wvengen
a0358aab01
Merge pull request #420 from foodcoop1040/wiki_diff
...
Add diff for wiki pages
2016-03-07 20:23:09 +01:00
wvengen
8545190a84
Merge pull request #419 from foodcoop1040/wiki
...
Improve sorting of wiki pages
2016-03-07 20:22:32 +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
wvengen
58e84b8923
Merge pull request #411 from foodcoop1040/invoice_total
...
Add more infos to the invoice page
2016-03-07 19:42:38 +01:00
Patrick Gansterer
7aacc7fef6
Fix German ui.* translations
2016-03-07 15:21:03 +01:00
Patrick Gansterer
ad036c948f
Add diff for wiki pages
2016-03-06 21:05:06 +01:00
Patrick Gansterer
bd2c961e23
Improve sorting of wiki pages
...
Sorting is completely broken. Also align the sorting UI with other pages.
2016-03-06 18:32:46 +01:00
Patrick Gansterer
7d7dfd7155
Hide deliveries column if there are no deliveries
...
For foodcoops which do not use the delivery feature the column occupies
space in the table, which could be user better with something else.
2016-03-06 14:01:24 +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
wvengen
f5b6fbcf18
Merge pull request #408 from foodcoop1040/count_to_any
...
Replace "count > 0" with "any?"
2016-03-04 21:37:21 +01:00
wvengen
50e6c9f88b
Merge pull request #409 from foodcoop1040/confirm
...
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 21:37:03 +01:00
wvengen
e5db84b17c
Merge pull request #410 from foodcoop1040/user_count
...
Count only undeleted users for the user_count expansion varibale
2016-03-04 21:36:35 +01:00
Patrick Gansterer
294d14624c
Count only undeleted users for the user_count expansion varibale
2016-03-04 20:47:49 +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
wvengen
179f442a87
Small message group improvements
2016-03-04 19:02:36 +01:00
