Commit Graph

37 Commits

Author SHA1 Message Date
Jannik 5d506a1526 Merge pull request 'Fix display order in various locations. closes #120' (#121) from feateure/display_order_intern into master
Reviewed-on: #121
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:59:14 +02:00
CodeSteak 0d547c8903 Fix display order in various locations. closes #120 2020-06-24 02:15:31 +02:00
CodeSteak 8d27c486d5 Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 2020-06-24 00:37:58 +02:00
CodeSteak 7397698929 fix check for missing article 2020-06-13 11:54:25 +02:00
CodeSteak a664b42853 Allow reuse of empty warehouse slots. Also fixes #59 2020-06-12 19:48:21 +02:00
CodeSteak 56f4ec0dda Implement Arrival of Supplier Order. 2020-06-12 19:22:36 +02:00
Jannik 6b8bf25e0e Merge pull request 'feature/cash_bookings' (#55) from feature/cash_bookings into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-10 19:04:45 +02:00
Lukas Fürderer 691916894f
Apply some changes according to comments on the pullrequest 2020-06-10 11:48:38 +02:00
Lukas Fürderer 03d557d67b
Show a hyphen in supplier column if an article is not offered by anyone
Closes #54
2020-06-08 18:56:35 +02:00
Lukas Fürderer 8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings 2020-06-08 18:15:34 +02:00
Hendrik Schutter 445b504188 code cleanup 2020-06-05 21:20:54 +02:00
Hendrik Schutter bd8b3db7f3 added post form for marking order as delivered 2020-06-05 21:18:04 +02:00
Hendrik Schutter 8a4ff4cfa5 added supplier bookings table 2020-06-05 21:18:04 +02:00
Hendrik Schutter 2245309198 added supplier balance label 2020-06-05 21:18:04 +02:00
Hendrik Schutter d078c44027 finished supplier orders 2020-06-05 21:18:04 +02:00
Hendrik Schutter bd8b07990b finished show orders based on supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter 2f4c45ed71 show orders based on supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter b600040bf3 basic detail page for supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter 4f5e1fe185 list suppliers page 2020-06-05 21:18:04 +02:00
Lukas Fürderer e53c1e0872
Allow the user to create manual bookings 2020-06-05 18:45:25 +02:00
Lukas Fürderer 0061d25082
Display financial bookings in the ui 2020-06-05 07:49:11 +02:00
Jannik 6988d3f213
minor code clean up 2020-06-01 17:10:04 +02:00
Hendrik Schutter 1b2e75a82c updates scripts 2020-05-30 12:29:40 +02:00
Hendrik Schutter 286edb33ed show supplier name at offered article page 2020-05-30 11:52:30 +02:00
Hendrik Schutter 9cfb1cd0ad add offered article to listed article 2020-05-19 16:30:27 +02:00
Hendrik Schutter d8032c2bd7 load offeredArticles from DB and display basic info 2020-05-19 00:12:26 +02:00
Hendrik Schutter d4be2b9e94 Revert "Revert "added link from listedArticles page to related offered article""
This reverts commit 3c69f38367.
2020-05-16 22:48:40 +02:00
Hendrik Schutter 14bef592c4 Revert "Revert "UImodel for offeredArticle page, html cleanup""
This reverts commit 0840eda369.
2020-05-16 22:48:20 +02:00
Hendrik Schutter 0840eda369 Revert "UImodel for offeredArticle page, html cleanup"
This reverts commit e0f638f0bd.
2020-05-16 22:46:42 +02:00
Hendrik Schutter 3c69f38367 Revert "added link from listedArticles page to related offered article"
This reverts commit 39fb735f21.
2020-05-16 22:46:18 +02:00
Hendrik Schutter 39fb735f21 added link from listedArticles page to related offered article 2020-05-16 21:49:31 +02:00
Hendrik Schutter e0f638f0bd UImodel for offeredArticle page, html cleanup 2020-05-16 13:42:07 +02:00
Hendrik Schutter 4f6388e4b9 fixed links to offered articles page 2020-05-15 20:57:56 +02:00
Hendrik Schutter a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
Hendrik Schutter d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
CodeSteak da9a737fd0 Fix Duplicate Names of Controllers 2020-05-01 10:48:12 +02:00
CodeSteak de6c750e7f Refactor Package Layout 2020-04-29 22:44:16 +02:00