63e1541aa3
Use the default locale when sending mails to suppliers
2019-02-05 23:32:00 +01:00
abe847c0ee
Add and inherit from ApplicationRecord to match Rails 5.0 style
2019-01-15 04:40:05 +01:00
4137992032
fix auto_close_and_send_min_quantity
2018-10-12 15:47:32 +02: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
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02: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
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
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
497488ef0e
Improve associations
2015-04-10 18:30:12 +02:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
f340b127dc
Fix fast test failing
2015-01-02 18:08:38 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
c64a7ba3cd
validate date and time inputs
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
3a41e9530f
fix order bug
2014-05-13 17:01:27 +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
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
2c85618284
fix balancing and matrix since receive
2014-02-13 16:06:45 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
28644dc334
Force update in Order#finish; rescue if error raised
2013-10-08 19:58:11 +02:00
142de28ade
Split up messages for stock/ supplier orders.
2013-09-18 10:50:56 +02:00
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
bb25bdc6eb
Improved error data passing.
2013-09-03 17:37:49 +02:00
1c9fad0a7b
Added validation for removed but ordered articles.
2013-09-03 12:09:33 +02:00
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +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
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
28343fc124
Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2
...
Prevent sold-out articles from being removed from stock order when editing
2013-03-17 11:50:56 -07: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
6aa0e0b736
Rename and comment new functions for fixing stock ordering
2013-03-15 08:50:55 +01:00
8d0761a6c8
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
2013-03-14 21:14:42 +01:00
40d9195eac
Fixed broken group_orders after editing order.
...
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
2013-03-12 11:26:14 +01:00
c18fb20115
Ensure to get also deleted entries in belongs_to assoc.
2013-03-10 19:39:59 +01:00
b0e12d177e
Fixed editing an order and take care of group_orders.
2013-03-10 19:22:26 +01:00
63d8a3a1a6
Do not exclude ordered articles (with zero quantity) when editing orders.
2013-03-07 20:43:02 +01:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
3ab3ff2bc4
Minor speed improvements for group order load.
2013-01-26 15:18:35 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
1298af8377
Small improvement for update price. Removed delayed job.
...
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
2012-12-16 21:46:24 +01:00
9919183cb0
Fixed missing group_order_article in group_order show.
...
Also add eager loading for associated objects.
2012-12-16 16:50:09 +01:00
b86172bc62
Performance improvements for ordergroup.update_stats!
...
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
2012-12-16 13:48:15 +01:00
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
Patrick Gansterer
wvengen
Julius
Robert Waltemath
Benjamin Meichsner