Commit Graph

422 Commits

Author SHA1 Message Date
JuliusR 00458f79ab Suppress deleted suppliers from SharedSupplier.suppliers
Fixes #546.
2019-06-14 10:10:20 +00:00
JuliusR 5bf7f41005 Fix matching of uploaded articles by order_number 2019-06-14 10:08:19 +00:00
Tom Carchrae 99052fa3a7 Don't allow changes to settled orders (PR #614) 2019-03-26 19:14:39 +00:00
Tom Carchrae d70c3a9bf1 allow 1 char unit, eg L or g 2019-03-26 18:58:36 +00:00
wvengen 25deefced1 Move setting availability to sync method 2019-03-24 22:14:10 +01:00
wvengen cd164bc3eb Small performance improvement for sync with many new articles 2019-03-24 22:02:53 +01:00
wvengen 9283ed4f5e Fix syncing articles with non-import sync methods (#633) 2019-03-23 18:31:22 +01:00
wvengen d669edb173 Fix shared database sync (relates to PR #610) 2019-03-23 08:54:10 +01:00
Patrick Gansterer 63e1541aa3 Use the default locale when sending mails to suppliers 2019-02-05 23:32:00 +01:00
Patrick Gansterer d925533366 Fix rendering of stock order in OrderByGroups 2019-02-05 23:31:45 +01:00
Patrick Gansterer a4f5b8fb33 Do not show deleted users as members of groups (fixes #587) 2019-01-15 05:20:58 +01:00
Patrick Gansterer 71fd6f2a24 Add CSV download for ordergroups 2019-01-15 04:50:32 +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
Patrick Gansterer abe847c0ee Add and inherit from ApplicationRecord to match Rails 5.0 style 2019-01-15 04:40:05 +01:00
Tom Carchrae 7e88798778 big speedup in syncing via caching/reducing queries (#610) 2019-01-15 02:56:21 +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
Tom Carchrae a66a44bdcf error was on incorrect property 2019-01-14 21:01:30 +01:00
Patrick Gansterer 4137992032 fix auto_close_and_send_min_quantity 2018-10-12 15:47:32 +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 924f346b4c Show the financial transaction type if there are more than one type #367 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 9d588f70cc Fix group_order for stock order 2017-10-29 20:44:05 +01:00
Patrick Gansterer f08715cda3 Fix Task.next_unassigned_tasks_for() for non-periodic tasks 2017-10-29 00:06:05 +02:00
Patrick Gansterer f209f4907e Add a parameter for financial_link to Ordergroup.add_financial_transaction 2017-10-28 21:46:13 +02:00
Patrick Gansterer 47e4a9afdf Show only 2 tasks of the same periodic_task_group at dashboard 2017-10-28 20:17:45 +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
Patrick Gansterer 564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer 386bc7382d Support integers for price_markup
The config panel writes an integer into the settings table in the
database, which results in a wrong calculation of the fc_price.
2017-10-08 12:33:44 +02:00
Patrick Gansterer 2d4891bf1d Remove code-duplication of artice price calculation 2017-10-08 12:20:54 +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
Patrick Gansterer ac00942f34 Fix list of invoices when an invoice has an invalid created_by user 2017-09-26 13:13:20 +02:00
Patrick Gansterer 1056b86f9d Make sure that newly created periodic task are not done 2017-01-26 20:54:53 +01:00
Patrick Gansterer c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
wvengen 36706511c0 Be a bit more safe displaying stock ordergroup 2016-08-12 15:56:45 +02:00
wvengen b9bdd04311 Fix current_order's ordergroups document preloading 2016-06-09 19:14:53 +02:00
wvengen 70c79137cf Fix order_articles document preloading 2016-06-09 19:14:53 +02:00
wvengen 020b75cac8 Fix group_orders document preloading 2016-06-09 19:14:52 +02:00
wvengen f08d131842 Fix Heroku deployment 2016-05-25 02:05:55 +02:00
wvengen be287cf67e Fix new stock article failing 2016-05-20 21:30:56 +02:00
Patrick Gansterer 749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +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 5e744453f8 Add more infos to the invoice page
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
Patrick Gansterer b05ac2ab64 Add deleted_at for User
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
Patrick Gansterer 9ae7c05a89 Create next tasks directly after creating a periodic task 2016-03-04 17:13:16 +01:00