Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2450 commits 22 branches 1 tag 31 MiB
Commit graph

2450 commits

This branch
This branch
All branches
Author SHA1 Message Date
Patrick Gansterer
26a91ec957 Avoid page breaks during tables in OrderPdf 2021-02-12 14:56:21 +01:00
Patrick Gansterer
9f2e630266 Add CSV downloads for BankTransaction and Invoice 2021-02-12 14:55:59 +01:00
Patrick Gansterer
e0c0834690 Show stockorder in PDFs 
When generating a PDF, which contains a order from a supplier and stock,
we want show that some articles are from stock instead of showing the
original supplier, since the people want to know where to look for their
products during pickup.
 2021-02-08 01:05:29 +01:00
Patrick Gansterer
6e4b9696a2 Do not show deleted articles and suppliers for new deleiveries 2021-02-08 01:05:21 +01:00
Patrick Gansterer
d0e73ea1ff Improve selecting deliveries/orders when creating an invoice 
When creating an invoice after balancing an order, it's not
possible to  the corresponding order. Change the elements in
the select box to the latest ended/delivered items (which
have not been assigned already) instead.
 2021-02-08 01:05:13 +01:00
Patrick Gansterer
8fd484eda5 Use ordergroup_name instead of ordergroup.name in FinancialTransactionsCsv 2021-02-08 01:05:04 +01:00
Patrick Gansterer
373d137f9f Hide IBAN of BankTransactions when empty 2021-02-08 01:04:57 +01:00
Patrick Gansterer
979439f967 Hide stock order button in stock orders 2021-02-08 01:04:46 +01:00
Florian Lentsch
8e12b15c88 On #805: Turn bigint IDs back into normal integers 
see https://stackoverflow.com/questions/44390225/how-to-turn-off-bigint-primary-keys-in-rails-5-1
and https://edgeguides.rubyonrails.org/5_1_release_notes.html#active-record-notable-changes
 2021-02-07 13:03:27 +01:00
lentschi
45a8911ca6
Add option to ignore delivered amounts in order group distribution (#765) 2021-02-05 16:19:05 +01:00
Florian Lentsch
ecda1c1478 Added rspec tests for order boolean states 2021-02-05 14:57:26 +01:00
Florian Lentsch
f7b65856aa Refactored order model's scope rspec test to ignore sequence 2021-02-05 14:57:26 +01:00
Florian Lentsch
e33d2d7f48 Added order scope rspec tests for #779 2021-02-05 14:57:26 +01:00
Florian Lentsch
e3c720589d On #779 Use new received state for 'Receive' button in orders index 
This slightly increases the performance as the associated order_articles
no longer need to be fetched.
 2021-02-05 12:06:29 +01:00
Florian Lentsch
a96dbd563b Migrations for new received order state (s. #779) 2021-02-05 12:05:23 +01:00
Florian Lentsch
64113ab7f6 Closes #805 - updated db/schema.rb to Rails 5.2 dump 2021-02-05 11:30:19 +01:00
lentschi
085562dbf4
#779 Received state for orders (PR #789, #779) 2021-02-03 20:57:53 +01:00
lentschi
67ad202859
Fix permission issue in pickups (PR #800, #799) 2021-01-30 11:21:00 +01:00
JuliusR
a32319572f continue development after release 2020-12-30 16:53:53 +01:00
JuliusR
ae569ecb1b Bumped new version: 4.7.1 2020-12-30 11:44:47 +01:00
Patrick Gansterer
b22dda4638 Run select_foodcoop as the first before_action 
When e.g. authenticate is run as before_action, it could use the wrong
database in a multicoop installation, if select_foodcoop is not run first.
 2020-11-09 12:33:46 +01:00
JuliusR
4043433539 fix searching in external article database (#772) 2020-10-17 12:21:04 +02:00
JuliusR
661fab0e0c fix small.{en,nl}.seeds.rb 
this handles problems unveiled by 18ed8934d916962b3271645eec6f5f8965f6722e
 2020-10-14 19:08:45 +02:00
JuliusR
a1bf2a36ad prefer exception-raising methods in database seeds 2020-10-14 19:08:45 +02:00
JuliusR
9a01cd67a6 fix SupplierCategory seed from minimal.seeds.rb (#774) 2020-10-14 19:08:45 +02:00
Patrick Gansterer
9b092ee362 Use GitHub Actions insted of Travis CI 2020-10-12 00:09:21 +02:00
Patrick Gansterer
3d5043fd05 Set updated_by when changing an GroupOrder via controller 2020-10-10 20:40:22 +02:00
Patrick Gansterer
beaca7d384 Make user in Task model optional to support old database entries 2020-10-10 20:39:40 +02:00
wvengen
78c4ebcb4b Make navigation API more robust. 
Fixes https://github.com/foodcoops/foodsoft/issues/755.
 2020-10-07 14:45:22 +02:00
wvengen
912f57ba42 continue development after release 2020-09-11 14:29:49 +02:00
wvengen
1f1330c379 Bumped new version: 4.7.0 2020-09-11 14:29:13 +02:00
wvengen
3752c5c680 Fix small database seeds 2020-09-11 14:19:00 +02:00
Patrick Gansterer
00bb10d14a Fix CreateStockEvents migration for DBs without Delivery and/or StockTaking 2020-09-07 13:55:48 +02:00
Patrick Gansterer
c6250de945 Disable JavaScript errors in tests 2020-09-05 16:55:43 +02:00
Patrick Gansterer
899a83bec4 Rails 5.2 2020-09-05 14:40:11 +02:00
Patrick Gansterer
4642eb6c54 Rails 5.1 2020-09-05 14:40:11 +02:00
Patrick Gansterer
74531f90c7 Add Rails release to ActiveRecord::Migration 2020-09-05 14:40:11 +02:00
Patrick Gansterer
44a198c7bc Adopt Rails 5 belongs_to_required_by_default 2020-09-05 14:40:11 +02:00
Patrick Gansterer
2557645f4f Rails 5.0 2020-09-05 14:40:11 +02:00
Patrick Gansterer
2892d5272d bundle update 2020-09-05 13:59:17 +02:00
Patrick Gansterer
785313ac23 Make StockEvent a base class for Delivery and StockTaking 
This helps to share code between the two entities and allows easier
extensions in the future.
 2020-09-05 13:52:18 +02:00
Patrick Gansterer
a5582e9542 Rename Delivery.delivered_on to date 
This aligns it with column names of StockTaking and us to use inheritance
in a next step to share common code between the entities.
 2020-09-05 13:52:18 +02:00
wvengen
7b2072251e Fix i18n reference 2020-09-05 13:28:56 +02:00
wvengen
85e16c3e28 Crowdin roundtrip 2020-09-05 13:22:28 +02:00
Patrick Gansterer
266e9337be Various small rails 5 adoptions 2020-09-04 12:54:42 +02:00
Patrick Gansterer
3a6276aece Ensure that the article_id is set for every article_price 
This addresses the TODO from dc92de771e.
 2020-09-04 12:29:17 +02:00
Patrick Gansterer
26aecbbe9e Do not limit the number of page versions to 20 
This reverts 164653dbfc.
 2020-09-04 12:27:05 +02:00
Patrick Gansterer
271af8f59f Update HAML 2020-09-04 12:26:44 +02:00
Patrick Gansterer
5f60844a13 Change supplier_id of stock orders to NULL 2020-09-04 12:26:19 +02:00
Patrick Gansterer
aa44291b69 Handle more possible inputs for polls correct 2020-08-13 17:20:49 +02:00