28834431ce
Display financial bookings in the ui
2020-06-10 19:27:38 +02:00
5691f0eeec
implement customers index
2020-06-10 19:27:16 +02:00
7f643987f3
fix wrong closing tags in customerOrder/id.html
2020-06-10 19:12:34 +02:00
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
691916894f
Apply some changes according to comments on the pullrequest
2020-06-10 11:48:38 +02:00
e7e2017825
Merge pull request 'Show a hyphen in supplier column if an article is not offered by anyone' ( #56 ) from fix/null_pointer_deref_in_SupplierOfferController into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-09 14:06:51 +02:00
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
8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings
2020-06-08 18:15:34 +02:00
6317780dfa
Merge pull request 'Implement Warehouse....' ( #47 ) from feature/intern_warehouse into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-08 13:40:10 +02:00
78a7ad053a
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:22:06 +02:00
f6554629d7
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:14:50 +02:00
eb82d05f4f
Use Spring model for template attributes
2020-06-08 09:14:11 +02:00
41320473d9
Merge pull request 'feature/supplier_page' ( #52 ) from feature/supplier_page into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-07 15:00:56 +02:00
bd6be54149
removed space in SupplierOrderRepo
2020-06-07 11:45:53 +02:00
99612165f5
fixed review requests
2020-06-07 11:44:50 +02:00
9dff6adb3d
rebase to master
2020-06-05 21:25:38 +02:00
445b504188
code cleanup
2020-06-05 21:20:54 +02:00
bd8b3db7f3
added post form for marking order as delivered
2020-06-05 21:18:04 +02:00
8a4ff4cfa5
added supplier bookings table
2020-06-05 21:18:04 +02:00
2245309198
added supplier balance label
2020-06-05 21:18:04 +02:00
d078c44027
finished supplier orders
2020-06-05 21:18:04 +02:00
bd8b07990b
finished show orders based on supplier
2020-06-05 21:18:04 +02:00
2f4c45ed71
show orders based on supplier
2020-06-05 21:18:04 +02:00
b600040bf3
basic detail page for supplier
2020-06-05 21:18:04 +02:00
4f5e1fe185
list suppliers page
2020-06-05 21:18:04 +02:00
f348d33c94
Show the balances of the main and vat account in the dashboard
2020-06-05 19:17:44 +02:00
6f90b9c941
Fix a bug where bookings were invisible if they affected only one account
2020-06-05 18:58:16 +02:00
e53c1e0872
Allow the user to create manual bookings
2020-06-05 18:45:25 +02:00
e138476d76
code cleanup
2020-06-05 18:05:10 +02:00
c1b9588189
added post form for marking order as delivered
2020-06-05 17:37:19 +02:00
5e05100d21
added supplier bookings table
2020-06-05 15:43:46 +02:00
93a5863fbe
added supplier balance label
2020-06-05 13:10:16 +02:00
7f652e38f0
fix nullpointer in category search
2020-06-05 12:32:34 +02:00
0061d25082
Display financial bookings in the ui
2020-06-05 07:49:11 +02:00
d4ddd8a9a3
Merge pull request 'feature/user' ( #38 ) from feature/user into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-03 18:36:06 +02:00
a192f0ac51
Set Tracing Id in Warehouse/finish not in Checkout. This was wrong.
2020-06-03 16:55:36 +02:00
9660e52f34
Merge pull request 'feature/31_js_magic_article_edit' ( #50 ) from feature/31_js_magic_article_edit into master
2020-06-02 07:47:28 +02:00
72ddfa42ef
Merge pull request 'Show Tax in Article Edit View. Fixes #48 ' ( #49 ) from feature/48_not_showing_tax_edit_view into master
2020-06-02 07:47:04 +02:00
fc239983a7
Fix article links.
2020-06-01 21:15:27 +02:00
5e1170839e
Update Gross Price in Article Edit View. Fixes #31
2020-06-01 21:11:15 +02:00
2ef9eb29ac
Show Tax in Article Edit View. Fixes #48
2020-06-01 20:46:00 +02:00
f4ba79a4cd
add id's to form inputs
2020-06-01 20:27:19 +02:00
976e2d1949
Implement Warehouse....
...
Sry, only one commit. No time to make history ;D
2020-06-01 20:25:51 +02:00
b7134a60da
rename CustomerOrderRepo in Cronjob
2020-06-01 20:25:31 +02:00
ff4c984f54
fix error message
2020-06-01 20:24:45 +02:00
21502a0b1c
Merge branch 'master' into feature/user
2020-06-01 19:03:42 +02:00
b38ffdea34
Merge pull request 'feature/offered_article_supplier' ( #40 ) from feature/offered_article_supplier into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-01 17:10:21 +02:00
6988d3f213
minor code clean up
2020-06-01 17:10:04 +02:00
f5ad05f49f
Merge branch 'master' into feature/offered_article_supplier
2020-06-01 17:04:52 +02:00
e539a9433a
Merge pull request 'implement better search' ( #43 ) from feature/search into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-01 16:59:37 +02:00
