Commit Graph

386 Commits

Author SHA1 Message Date
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
Patrick Gansterer 36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
Patrick Gansterer 8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
Patrick Gansterer 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
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
Patrick Gansterer 53b51f0f5c Remove useless upper bound of 99 items #388 2016-02-24 00:39:57 +01:00
Patrick Gansterer 3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen 90b21ecc3a Allow increasing just tolerance in the boxfill phase 2015-11-13 18:10:46 +01:00
wvengen a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen ec03d579d0 Merge branch 'feature/edit-recurring-task'
Conflicts:
	config/locales/en.yml
2015-05-08 20:10:23 +02:00
Robert a8a434ef7b Move due date according to delta 2015-05-01 21:31:06 +02:00
Robert fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen 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
wvengen c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen 4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen 07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen 4239843b3e Merge foodcoop1040:order_message into master
Conflicts:
	plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
wvengen 497488ef0e Improve associations 2015-04-10 18:30:12 +02:00
wvengen 1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
wvengen 118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen 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
wvengen f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen 219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen 6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen 0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner 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
Benjamin Meichsner 0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen cf360335ee fix articles with zero quantity showing
complements 8913ad615c
2014-09-11 13:47:03 +02:00
wvengen 8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen 3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
wvengen d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00