341f86d98e
Fix invoice redirect
2020-02-18 19:02:34 +01:00
9babb6cfe9
Fix rendering of financial transaction types sums
2019-11-11 13:57:06 +01:00
ff76fa60c0
Allow deletion of financial transactions
2019-11-01 20:56:00 +01:00
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
c559a31a9e
Fix and clean up bank account translations for English and German
2019-10-30 12:42:41 +01:00
1550eedb5a
Add additional eager loading annotations
2019-10-30 11:53:44 +01:00
8e2ca5e7d7
Add automatic generation of financial transactions and links
2019-10-29 13:52:56 +01:00
2100c738af
Change deprecated *_filter methods to *_action
2019-10-29 09:41:01 +01:00
52323b98b8
Fix create_collection in FinancialTransactionsController
2019-01-17 20:27:43 +01:00
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
4eef0f07d5
Fix internal server error at invoices
2018-10-12 15:47:16 +02:00
903086ab97
Add import route for bank_transactions
2018-10-12 15:47:02 +02:00
707501e3f8
Add edit functionality for financial links
2018-10-12 13:18:23 +02:00
f0a55fb951
Add model and views for bank accounts
2018-10-11 22:29:15 +02:00
66e9629858
Fix balancing with financial_transaction_types
2018-06-11 15:54:18 +02:00
924f346b4c
Show the financial transaction type if there are more than one type #367
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
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
8fe633fc42
Include nested objects in database queries of Finance::BaseController
2017-10-02 19:06:39 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +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
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +01:00
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
17bbb0705b
fix i18n
2013-10-02 17:23:49 +02:00
6cfaa4979a
show lines with zero units but with member orders in balancing screen ( closes foodcoops/foodsoft#179 )
2013-10-02 16:32:29 +02:00
f224735718
remember what member ordered when deleted in balancing screen
2013-09-17 14:19:46 +02:00
1bb257c41b
remember member order when order article is deleted + test
2013-09-13 15:37:30 +02:00
7dbe1363ed
fix adding article balancing failing with 'already taken' ( closes foodcoops/foodsoft#125 )
2013-06-24 13:32:07 +02:00
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
Patrick Gansterer
wvengen
Julius
Benjamin Meichsner