99052fa3a7
Don't allow changes to settled orders (PR #614 )
2019-03-26 19:14:39 +00:00
d70c3a9bf1
allow 1 char unit, eg L or g
2019-03-26 18:58:36 +00:00
25deefced1
Move setting availability to sync method
2019-03-24 22:14:10 +01:00
cd164bc3eb
Small performance improvement for sync with many new articles
2019-03-24 22:02:53 +01:00
9283ed4f5e
Fix syncing articles with non-import sync methods ( #633 )
2019-03-23 18:31:22 +01:00
d669edb173
Fix shared database sync (relates to PR #610 )
2019-03-23 08:54:10 +01:00
63e1541aa3
Use the default locale when sending mails to suppliers
2019-02-05 23:32:00 +01:00
d925533366
Fix rendering of stock order in OrderByGroups
2019-02-05 23:31:45 +01:00
a4f5b8fb33
Do not show deleted users as members of groups ( fixes #587 )
2019-01-15 05:20:58 +01:00
71fd6f2a24
Add CSV download for ordergroups
2019-01-15 04:50:32 +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
abe847c0ee
Add and inherit from ApplicationRecord to match Rails 5.0 style
2019-01-15 04:40:05 +01:00
7e88798778
big speedup in syncing via caching/reducing queries ( #610 )
2019-01-15 02:56:21 +01:00
31689dfb75
allow override of default limit (<200) on articles on shared suppliers ( #609 )
2019-01-15 02:55:12 +01:00
a66a44bdcf
error was on incorrect property
2019-01-14 21:01:30 +01:00
4137992032
fix auto_close_and_send_min_quantity
2018-10-12 15:47:32 +02:00
903086ab97
Add import route for bank_transactions
2018-10-12 15:47:02 +02:00
0bb0536903
Add short name to FinancialTransactionType
2018-10-12 13:33:41 +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
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01: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
9d588f70cc
Fix group_order for stock order
2017-10-29 20:44:05 +01:00
f08715cda3
Fix Task.next_unassigned_tasks_for() for non-periodic tasks
2017-10-29 00:06:05 +02:00
f209f4907e
Add a parameter for financial_link to Ordergroup.add_financial_transaction
2017-10-28 21:46:13 +02:00
47e4a9afdf
Show only 2 tasks of the same periodic_task_group at dashboard
2017-10-28 20:17:45 +02: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
75deec9f06
Add custom fields to invoice, odergroup, supplier and user
2017-10-28 20:16:47 +02: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
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
2d4891bf1d
Remove code-duplication of artice price calculation
2017-10-08 12:20:54 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
ac00942f34
Fix list of invoices when an invoice has an invalid created_by user
2017-09-26 13:13:20 +02:00
1056b86f9d
Make sure that newly created periodic task are not done
2017-01-26 20:54:53 +01:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
36706511c0
Be a bit more safe displaying stock ordergroup
2016-08-12 15:56:45 +02:00
b9bdd04311
Fix current_order's ordergroups document preloading
2016-06-09 19:14:53 +02:00
70c79137cf
Fix order_articles document preloading
2016-06-09 19:14:53 +02:00
020b75cac8
Fix group_orders document preloading
2016-06-09 19:14:52 +02:00
f08d131842
Fix Heroku deployment
2016-05-25 02:05:55 +02:00
be287cf67e
Fix new stock article failing
2016-05-20 21:30:56 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +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
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
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
9ae7c05a89
Create next tasks directly after creating a periodic task
2016-03-04 17:13:16 +01:00
36dd19f324
Require due_date for periodic tasks
2016-03-04 17:11:47 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +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
53b51f0f5c
Remove useless upper bound of 99 items #388
2016-02-24 00:39:57 +01:00
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
90b21ecc3a
Allow increasing just tolerance in the boxfill phase
2015-11-13 18:10:46 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a8a434ef7b
Move due date according to delta
2015-05-01 21:31:06 +02:00
fd51b07e21
Allow editing recurring task groups, basic functionality for #152
2015-05-01 21:14:16 +02:00
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02:00
17cbc57850
Don't error when deleting supplier/group with already existing deleted name ( closes foodcoops/foodsoft#197 )
2015-04-17 20:09:40 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
497488ef0e
Improve associations
2015-04-10 18:30:12 +02:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
1b9b81fa75
Make sync work when unit has no name
...
(closes foodcoops#337)
Conflicts:
app/models/article.rb
2015-01-02 23:20:36 +01:00
f340b127dc
Fix fast test failing
2015-01-02 18:08:38 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
0e1cde9e2b
more extensive database seeds (in two languages) (closes foodcoops#277)
2014-09-29 17:26:27 +02:00
91bcf0c580
Avoid out of range error when using big numbers in financial transactions.
...
The database schema allows numbers up (+/-) 999_999.99. But as we are also adding the amount to the Ordergroup#account_balance, we use lower barriers to avoid running in errors when updating the account balance.
So, technically the user has to make 10 times the maximum input to raise an account balance error. This should be sufficient, I hope.
2014-09-22 11:36:10 +02:00
0231df9d5b
Delete memberships when deleting associated groups.
2014-09-21 12:47:58 +02:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
8473f16091
query performance improvements
2014-09-02 12:58:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
3918e22214
synchronize price on two decimal places only
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
ecf5601023
make missing_units get correct details for closed orders
2014-09-01 12:25:42 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
a43020463d
normalize article and category attributes (closes foodcoops#294)
2014-06-23 17:51:19 +02:00
7c2ecd8658
add some model api docs
2014-06-23 17:51:19 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02: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
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
c25d4d3f4f
use ruby-units for unit parsing ( closes foodcoops/foodsoft#200 )
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +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
Tom Carchrae
Tom Carchrae
wvengen
Patrick Gansterer
Robert
wvengen
Benjamin Meichsner