fd96b6ccc1
Prepare for API v1 (PR #570 )
2018-10-13 20:16:35 +02:00
0bb0536903
Add short name to FinancialTransactionType
2018-10-12 13:33:41 +02:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
209ad615b4
Add view to sort orders by pickup day
2017-12-09 12:56:34 +01:00
bd49a64cd7
Make the download button of orders reusable
2017-12-09 12:25:29 +01:00
3e156bbbf3
Rewrite OrderPdfs to support multiple orders at once
2017-12-09 12:22:37 +01:00
80899afcb0
Add English and German translations for financial transaction types
2017-12-09 11:51:23 +01:00
dae4d075fe
Add UI to manage the financial transaction types and classes
2017-12-09 11:51:23 +01:00
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
dc94e98138
Add folders to the documents plugin
2017-11-21 10:12:13 +01:00
3b18dc7532
Add translations for Spanish
2017-11-06 20:12:03 +01:00
f77f2fcbfd
Localeapp roundtrip
2017-10-29 01:17:49 +02:00
9f2e5bb992
Add missing German translations
2017-10-28 21:34:15 +02:00
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
72b5a5ca82
Add option to show account balance instead of available funds
...
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
b49bfb0d8c
Localeapp roundtrip + fixes
...
This includes an overdue synchronization of plugin locales. To make
translation easier for non-developers, we keep the strings at localeapp,
which puts everything in one file. All plugins enabled by default are
therefore included in Foodsoft's locales.
2017-10-27 22:37:32 +02:00
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +02:00
463e448351
Clean up the German mail bodies and fix some typos
2017-10-02 19:34:35 +02:00
287cce2e92
Make "via Foodsoft" in mail From-header translateable
2017-10-02 16:08:16 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
a10aa75f49
Improve user interface for creating new messages in messages plugin
2017-10-01 00:12:10 +02:00
add281c738
Remove email from subject of feedback mail
...
The mail address of the user sending the feedback is now set in the
Reply-To header of the mail already.
2017-09-30 12:14:16 +02:00
e73bf9c7cb
Localeapp roundtrip
2017-04-14 12:34:02 +02:00
c8999333a6
Localeapp roundtrip
2017-04-01 16:51:05 +02:00
eb2fc56fc8
Fix translations of messages plugin
...
We need to copy the locales of overrides into the main locales files
to work properly. Also add the missing German translations.
2017-02-03 20:25:00 +01:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
e742958c0c
Add missing German translations
2017-01-21 22:41:18 +01:00
0d309af5f6
Update translations from localeapp
2016-06-28 20:43:53 +02:00
c6a625e5ed
Localeapp update
2016-06-11 19:19:30 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
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
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
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
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
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
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
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
5d9e1845b7
Fix i18n key typo
2016-03-07 21:06:49 +01:00
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
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
cb8205e4de
Merge pull request #413 from foodcoop1040/error_translations
...
Add missing German translations for error messages
2016-03-07 19:44:29 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
7aacc7fef6
Fix German ui.* translations
2016-03-07 15:21:03 +01:00
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
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
f24a18371e
Add missing German translations for error messages
2016-03-04 23:23:56 +01:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
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
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +01:00
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
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
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
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
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
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
bc0c1f1bbe
Localeapp roundtrip
2015-11-14 16:38:35 +01:00
13768285e4
localeapp roundtrip
2015-05-15 14:26:08 +02:00
beee5a1245
Localeapp roundtrip
2015-05-02 15:27:06 +02:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
55e8ff481c
Add reply_to and group_id to messages schema
2015-02-27 17:30:26 +01:00
26c364bf4b
Merge pull request #354 from foodcoop1040/recipients
...
Show recipients of messages
2015-02-18 23:28:29 +01:00
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
23f0a1613a
Show recipients of messages
2015-02-18 17:45:20 +01:00
cfdfe5f23e
Improve header+footer in PDFs
2015-01-03 00:24:33 +01:00
6272816358
Localeapp roundtrip
2014-12-31 13:11:39 +01:00
0aa098e75b
localeapp roundtrip
2014-12-15 21:11:41 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
e9dcaadb06
localeapp roundtrip
2014-10-14 18:39:05 +02:00
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
94e100b78b
localeapp roundtrip
2014-06-23 17:51:20 +02:00
873e8d44a2
harmonize foodsoft capitalisation
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
c54e15dc04
localeapp roundtrip
2014-06-23 17:51:18 +02:00
a7ebf78fd4
hide insignificant zeroes for percentage
2014-05-17 14:20:48 +02:00
cf0558b1ff
localeapp roundtrip
2014-05-13 17:01:27 +02:00
9743a9f112
localeapp roundtrip
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
9214fff5a1
localeapp roundtrip (mostly formatting changes)
2014-03-15 17:17:25 +01:00
346bf00b67
localeapp roundtrip (includes updated German translation)
2014-02-19 11:42:25 +01:00
286c96196c
localeapp roundtrip
2014-02-15 12:37:01 +01:00
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
3b2d4dfd08
localeapp roundtrip
2014-01-20 12:59:57 +01:00
6c0de3dc74
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
...
Conflicts:
config/locales/de.yml
config/locales/en.yml
2014-01-20 12:12:00 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
45e529b008
revert i18n attributes pluralisation
...
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e09db8cb72df
2014-01-11 16:30:17 +01:00
cb3e2f7ca0
Merge branch 'master' into feature-receive
...
Conflicts:
config/locales/de.yml
2014-01-11 15:56:33 +01:00
9db8cb72df
Synchronize German and English locales
2014-01-10 20:50:58 +01:00
063ec61753
localeapp roundtrip
2014-01-10 00:00:57 +01:00
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
2f02f89089
Allow login through link in message (and remember requested page).
2014-01-03 15:27:15 +01:00
wvengen
Patrick Gansterer
acracia
wvengen
Julius
Robert Waltemath