Commit graph

104 commits

Author SHA1 Message Date
Philipp Rothmann
93143c28f2 merge automatic group order invoice generation
see https://github.com/foodcoops/foodsoft/pull/907 for reference
and original work by viehlieb

Co-authored-by: viehlieb <pf@pragma-shift.net>

fix PDF Pdf

make explicit deposit in invoices work

add ordergroupname to invoice file name

mark bold sum for vat exempt foodcoops

download multiple group order invoice as zip
2023-10-05 10:21:35 +02:00
Philipp Rothmann
fb2b4d8a8a chore: rubocop
chore: fix api test conventions

chore: rubocop -A spec/

chore: more rubocop -A

fix failing test

rubocop fixes

removes helper methods that are in my opinion dead code

more rubocop fixes

rubocop -a --auto-gen-config
2023-06-09 17:35:05 +02:00
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
twothreenine
f3493b3242 charge transport cost as well when accounting order (fix #861 after f7c7b56) 2022-02-18 13:27:09 +01:00
Patrick Gansterer
47d9c79617 Use ActiveJob instead of Resque directly
This allows us to directly pass entities to the job.
2021-03-08 12:30:58 +01:00
Patrick Gansterer
ea2862fdef Run rubocop --fix-layout and remove encoding comments 2021-03-02 09:12:19 +01:00
wvengen
f7c7b56bd0
Split order close method (PR #829) 2021-02-17 18:42:52 +01:00
wvengen
e1d50e5b9c API v1 group_order_articles endpoints 2021-02-17 17:07:39 +01:00
wvengen
127ae83f04 API v1 orders endpoints 2021-02-17 17:07:39 +01:00
lentschi
085562dbf4
#779 Received state for orders (PR #789, #779) 2021-02-03 20:57:53 +01:00
Patrick Gansterer
44a198c7bc Adopt Rails 5 belongs_to_required_by_default 2020-09-05 14:40:11 +02:00
Patrick Gansterer
5f60844a13 Change supplier_id of stock orders to NULL 2020-09-04 12:26:19 +02:00
Patrick Gansterer
4c567fece1 Add transport costs to Order 2020-08-07 00:52:43 +02:00
Florian Lentsch
5eb8abf431 Potential fix for one of the issues mentioned in #49
Reduces the number of SQL queries used on group_orders/index and
group_orders/archive, but adds extra  complexity to the code
2020-07-29 13:15:11 +02:00
Patrick Gansterer
739914ad43 Show only started orders to members for ordering 2020-03-23 16:25:54 +01:00
Patrick Gansterer
17059a8104 Adopt model to reference GroupOrder in generated FinancialTransaction 2020-03-17 09:38:44 +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
de94220758 Add FoodsoftConfig.scope to ExceptionNotifier.notify_exception 2019-11-11 11:18:51 +01:00
Patrick Gansterer
63e1541aa3 Use the default locale when sending mails to suppliers 2019-02-05 23:32:00 +01:00
Patrick Gansterer
abe847c0ee Add and inherit from ApplicationRecord to match Rails 5.0 style 2019-01-15 04:40:05 +01:00
Patrick Gansterer
4137992032 fix auto_close_and_send_min_quantity 2018-10-12 15:47:32 +02: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
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
Patrick Gansterer
564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer
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
Patrick Gansterer
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
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
497488ef0e Improve associations 2015-04-10 18:30:12 +02:00
wvengen
118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
c64a7ba3cd validate date and time inputs 2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8 edit order user-interface update
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen
3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen
852f3484ad make settle directly less dangerous
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen
2c85618284 fix balancing and matrix since receive 2014-02-13 16:06:45 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
Julius
28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +02:00
Robert Waltemath
142de28ade Split up messages for stock/ supplier orders. 2013-09-18 10:50:56 +02:00
Robert Waltemath
805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Robert Waltemath
bb25bdc6eb Improved error data passing. 2013-09-03 17:37:49 +02:00
Robert Waltemath
1c9fad0a7b Added validation for removed but ordered articles. 2013-09-03 12:09:33 +02:00
wvengen
713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
wvengen
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
Benjamin Meichsner
13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen
f81e315d6f finish i18n of models without view 2013-03-22 01:21:44 +01:00
bennibu
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