4c567fece1
Add transport costs to Order
2020-08-07 00:52:43 +02:00
67ab647eb0
Remove number_display.rb
2020-08-03 15:31:34 +02:00
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
ef545e978e
add search to balancing page (PR #651 )
...
(cherry picked from commit 2039da54b2077a6befccb409ef02a3172bcba237)
2019-05-01 17:33:32 +00:00
99052fa3a7
Don't allow changes to settled orders (PR #614 )
2019-03-26 19:14:39 +00:00
02328eba2b
fix missing translation
2019-02-20 22:26:51 +01:00
e5f64cff8c
units cannot show html in tooltip
2019-01-18 18:26:11 +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
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
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
59ab628e2f
fix layout bug
2014-06-23 17:51:20 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +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
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +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
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
3d511ea2fb
only show receive in finance when access to ordering
2013-12-18 22:19:36 +01:00
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
37e5b0c25c
add balancing integration spec
2013-07-26 18:34:03 +02:00
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +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
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
Patrick Gansterer
Tom Carchrae
Tom Carchrae
wvengen
Julius
Benjamin Meichsner
Manuel Wiedenmann