Commit Graph

810 Commits

Author SHA1 Message Date
Patrick Gansterer 3f25138997 Add option to create foodcoop transaction when creating a collection
This option can be used, if a kind of "double-entry accounting" is used
and every transaction should have a corresponding transaction.
2020-07-29 18:11:51 +02:00
Patrick Gansterer 602f663245 Add UI to show and create financial transactions for the foodcoop 2020-07-29 11:43:45 +02:00
Patrick Gansterer 1a49bee42d Adopt model to allow FinancialTransaction without an ordergroup
This will allow us to add accounting for the foodcoop itself, to support
listing for spendings independent of the order (e.g. rent, electricity).
2020-07-29 11:43:31 +02:00
Patrick Gansterer e16f03eebf Add reference_calculator 2020-07-29 11:02:58 +02:00
wvengen ef1903381b Improve testing on docker 2020-07-27 18:17:30 +02:00
wvengen b96ce06d94
API v1 financial_transactions endpoints (#627) 2020-07-25 14:18:59 +00:00
wvengen e3746eebd7 Translation fixes + Crowdin roundtrip 2020-07-25 15:48:36 +02:00
Florian Feigenbutz 2f19ca1289 Fixed typo in German translation 2020-06-22 16:51:43 +02:00
Patrick Gansterer 0aa853c53d Add information text to the receive view 2020-06-22 16:35:22 +02:00
Patrick Gansterer 5a9cc811c9 Add download for articles 2020-06-22 16:35:22 +02:00
Patrick Gansterer b6f5295267 Add created_by user to Task 2020-04-11 00:04:49 +02:00
Patrick Gansterer 9b889dd643 Add option to create ordergroup together with user 2020-04-11 00:04:49 +02:00
Patrick Gansterer 3b79c05ffe Add link to unpaid invoices to invoice index page 2020-04-11 00:03:55 +02:00
Patrick Gansterer a3defc5463 Add FinacialTransaction create_collection for ordergroup custom fields
Custom fields of an ordergroup can set financial_transaction_source to
true, to act as an source for a new collection of FinacialTransaction.

A typical usecase would be a variable membership fee, which will be stored
in a custom field on the ordergroup. When a new membership period begins
a collection with all membership fees can be created with one click.
2020-03-23 17:40:18 +01:00
Patrick Gansterer 3a4519757e Add move operation for documents plugin 2020-03-23 16:31:26 +01:00
Patrick Gansterer ecb4a8a4ba Add method to close all invoices with an invoice direct
When the charge_members_manually option is active there is no need for an
explicit balancing step. This new function allows to close_direct all
orders which have an assigned invoice, which is usually indication enough
to find orders which can be closed finally.
2020-02-28 12:17:27 +01:00
Patrick Gansterer 5d84156bd8 Add BankAccountConnector to implement bank import methods in plugins 2020-02-24 14:30:03 +01:00
Patrick Gansterer f15ca8610b Add pickup date to order_result message 2020-02-18 19:04:10 +01:00
Martin Meyerhoff a45fd38e37 Remove `config.mass_assignment_sanitizer from development.rb sample
This configuration option has been removed in Rails 4; I've only found
references to it from people running Rails 3.
2019-11-12 13:11:14 +01:00
Patrick Gansterer e498f9cb58 Add default roles for users
Some foodcoops want to give some roles to every member by default,
without adding every users to a workgroup.
2019-11-04 11:39:33 +01:00
Patrick Gansterer ff76fa60c0 Allow deletion of financial transactions 2019-11-01 20:56:00 +01:00
Patrick Gansterer 260ef90f6b Add option to create a financial_link when creating financial_transaction
If multiple financial transaction belong to a bank transaction, it
is sometimes easier to create them as a collection and add the bank
transaction instead of adding all financial transaction to a link
created via a bank transaction.
2019-10-30 22:27:18 +01:00
Patrick Gansterer c559a31a9e Fix and clean up bank account translations for English and German 2019-10-30 12:42:41 +01:00
Patrick Gansterer 30c53746fc Replace custom search placeholder with ui.search_placeholder 2019-10-30 12:00:46 +01:00
Patrick Gansterer 39aff78f11 Remove protected_attributes gem
We do not enforce the rules, so removing it and switching the existing
annotations to strong_parameters does not make our situation worse.
2019-10-29 18:09:24 +01:00
Patrick Gansterer 9fc51bdce8 Add rake task to import bank_transactions 2019-10-29 18:06:53 +01:00
Patrick Gansterer 1773018191 Use class Rack::Cors instead of string to fix rails 5 warnings 2019-10-29 17:45:37 +01:00
Patrick Gansterer 8e2ca5e7d7 Add automatic generation of financial transactions and links 2019-10-29 13:52:56 +01:00
Patrick Gansterer 91eeac6c40 Set the common ActionMailer default_url_options only once
There is no need to set options other than the foodcoop during every
change of the scope. This also makes sure that the correct options will
be loaded during testing to fix problems with newer rails versions.
2019-10-29 13:40:45 +01:00
Patrick Gansterer bee671c90e Remove deprecated and obsolete quiet_assets gem
As of sprockets-rails version 3.1.0 the same functionality can be
enabled via config.assets.quiet.
2019-10-29 09:40:22 +01:00
Patrick Gansterer ae11931ca5 Create database.yml via Dockerfile 2019-10-28 19:01:02 +01:00
wvengen 9840803a9f Crowdin roundtrip 2019-10-26 21:24:46 +02:00
wvengen d4d82846e1 Update Crowdin configuration
This makes the Crowdin CLI work, when you set CROWDIN_API_KEY.
2019-10-26 21:03:08 +02:00
wvengen 132b9765ed Move translations to printer plugin 2019-10-21 17:42:25 +00:00
wvengen 3cbb5783d4 Move translations to wiki plugin 2019-10-21 17:42:25 +00:00
wvengen ca76de8a5b Move translations to messages plugin 2019-10-21 17:42:25 +00:00
wvengen 4366a9b2bb Move translations to documents plugin 2019-10-21 17:42:25 +00:00
wvengen f3ffcdaf6a Move translations to discourse plugin 2019-10-21 17:42:25 +00:00
wvengen c03bd5996c Move translations to current_orders plugin 2019-10-21 17:42:25 +00:00
Rolf Schröder 7f963b43dc Make DE translations consistent (PR #678) 2019-10-15 15:35:51 +00:00
JuliusR 71bdf3bfcc Allow to copy articles (PR #673, #541) 2019-10-14 07:25:34 +00:00
JuliusR 2d0a81c92d Fix and cleanup stock takings (PR #667) 2019-05-14 14:24:41 +00:00
wvengen 22e1748f81 Allow three-letter locale files 2019-05-03 12:19:18 +02:00
wvengen f963bfee92 Don't dump schema in production 2019-05-03 10:35:29 +02:00
wvengen e9be38b3e9 Add OAuth scopes
https://github.com/foodcoops/foodsoft/issues/582#issuecomment-442513237
2019-04-03 17:20:44 +00:00
wvengen e6e060cab9 Fix mailcatcher 2019-04-03 17:06:23 +00:00
Tom Carchrae 99052fa3a7 Don't allow changes to settled orders (PR #614) 2019-03-26 19:14:39 +00:00
Tom Carchrae a524dd0325 use a sensible default if no redis. 2019-03-26 18:59:34 +00:00
wvengen 5fa61912c9 Slightly improve app config 2019-03-24 22:01:28 +01:00
Tom Carchrae 567e27d99a take note 2019-02-20 22:26:51 +01:00
Tom Carchrae fcf958981d use original label 2019-02-20 22:26:51 +01:00
Tom Carchrae 02328eba2b fix missing translation 2019-02-20 22:26:51 +01:00
Patrick Gansterer 226192f7cb Allow changing the visibitly (public/privat) of messages (fixes #625) 2019-02-11 16:54:30 +01:00
Patrick Gansterer c955a6ee40 Add a printer job queue via the printer plugin 2019-02-05 23:32:20 +01:00
Patrick Gansterer a2188cb6b8 Add financial_transaction_type to CSV (fixes #578) 2019-01-15 05:27:45 +01:00
Patrick Gansterer f8507655df Show associated group when sending messages (fixes #559) 2019-01-15 05:20:06 +01:00
Patrick Gansterer 389f205a6b Add set_balance to FinancialTransactions#new_collection (fixes #438)
A new checkbox will allow user to set the balance to a given ABSOLUTE value
in addition to changing it by a RELATIVE value. This can be used if the
balance is tracked outside of foodsoft and should be syncroniced or for
setting the balance to zero for multiple ordergroups.
2019-01-15 04:44:16 +01:00
Tom Carchrae 31689dfb75 allow override of default limit (<200) on articles on shared suppliers (#609) 2019-01-15 02:55:12 +01:00
wvengen 554be093b9 API v1 navigation endpoint 2018-10-13 20:41:47 +02:00
wvengen 9c5a5d9492 API v1 config endpoint 2018-10-13 20:41:47 +02:00
wvengen 110c7cc3e9 API v1 user endpoint 2018-10-13 20:41:47 +02:00
wvengen fd96b6ccc1
Prepare for API v1 (PR #570) 2018-10-13 20:16:35 +02:00
Patrick Gansterer 903086ab97 Add import route for bank_transactions 2018-10-12 15:47:02 +02:00
Patrick Gansterer 0bb0536903 Add short name to FinancialTransactionType 2018-10-12 13:33:41 +02:00
Patrick Gansterer 707501e3f8 Add edit functionality for financial links 2018-10-12 13:18:23 +02:00
Patrick Gansterer f0a55fb951 Add model and views for bank accounts 2018-10-11 22:29:15 +02:00
Patrick Gansterer ac11ba1cc1 Add pickups role 2018-01-25 18:09:29 +01:00
Patrick Gansterer 209ad615b4 Add view to sort orders by pickup day 2017-12-09 12:56:34 +01:00
Patrick Gansterer bd49a64cd7 Make the download button of orders reusable 2017-12-09 12:25:29 +01:00
Patrick Gansterer 3e156bbbf3 Rewrite OrderPdfs to support multiple orders at once 2017-12-09 12:22:37 +01:00
Patrick Gansterer 80899afcb0 Add English and German translations for financial transaction types 2017-12-09 11:51:23 +01:00
Patrick Gansterer dae4d075fe Add UI to manage the financial transaction types and classes 2017-12-09 11:51:23 +01:00
Patrick Gansterer 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
Patrick Gansterer dc94e98138 Add folders to the documents plugin 2017-11-21 10:12:13 +01:00
wvengen 33aa1c4b4a Localeapp roundtrip 2017-11-10 17:06:20 +01:00
Patrick Gansterer 816f699f69 Switch license to AGPL (fixes #496, PR #513) 2017-11-10 17:02:35 +01:00
acracia 3b18dc7532 Add translations for Spanish 2017-11-06 20:12:03 +01:00
Patrick Gansterer f77f2fcbfd Localeapp roundtrip 2017-10-29 01:17:49 +02:00
Patrick Gansterer 9f2e5bb992 Add missing German translations 2017-10-28 21:34:15 +02:00
Patrick Gansterer 53bb096046 Add FinancialLinks
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
Patrick Gansterer 75deec9f06 Add custom fields to invoice, odergroup, supplier and user 2017-10-28 20:16:47 +02:00
Patrick Gansterer 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
wvengen f5bea41ccf
Remove Capistrano (#491, PR #521) 2017-10-28 19:50:02 +02:00
wvengen 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
Patrick Gansterer 6989e2f4f7 Add view for unpaid invoices 2017-10-26 21:27:26 +02:00
Patrick Gansterer 564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer f509f85327 Save the timestamp of the last mail to supplier and confirm resending it 2017-10-11 23:48:27 +02:00
Patrick Gansterer f27bbc2ffa Add a button to send the order to the supplier 2017-10-10 23:45:37 +02:00
Patrick Gansterer 9cd3c800bd Use ExceptionNotification via generator generated code
Ensure that FoodsoftConfig is loaded before running the initalizers.
This also enables notifaction for Resque.
2017-10-09 10:32:32 +02:00
Patrick Gansterer 463e448351 Clean up the German mail bodies and fix some typos 2017-10-02 19:34:35 +02:00
Patrick Gansterer 287cce2e92 Make "via Foodsoft" in mail From-header translateable 2017-10-02 16:08:16 +02:00
Patrick Gansterer 578e929e0d Add handling for bounce mails 2017-10-02 16:02:39 +02:00
Patrick Gansterer 97abcabffa Log mail delivery errors to database and add an UI for it 2017-10-02 16:02:39 +02:00
wvengen 0363f2dadc Improve Docker setup (PR #497) 2017-10-01 13:57:36 +02:00
Patrick Gansterer a10aa75f49 Improve user interface for creating new messages in messages plugin 2017-10-01 00:12:10 +02:00
Patrick Gansterer 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
Patrick Gansterer ba052efe5e Set the path of the _foodsoft_session cookie to the slug
This allows the usage of different foodcoops at the same time.
2017-09-29 00:47:00 +02:00
Patrick Gansterer 6185e18cc5 Notify users also about tasks which are not on sundays (PR #494)
notify_users_of_weekly_task notifies workgroups about tasks with and due
date of 7 days in the future. Call it every day to notify users of all tasks.
2017-08-21 16:01:36 +02:00
Patrick Gansterer 251681bb66 Add option to configure SMTP server via environment variables in production.rb 2017-08-08 23:27:28 +02:00
Patrick Gansterer d6325de35c Add support for RAILS_SERVE_STATIC_FILES to production.rb an use it with Docker 2017-08-08 23:27:28 +02:00