 matmair
|
153be2df13
|
Merge branch 'master' of https://github.com/inventree/InvenTree into allocated-sort-qty
|
2021-06-29 00:17:29 +02:00 |
|
|
matmair
|
cd6d13fa7d
|
Merge branch 'master' of https://github.com/inventree/InvenTree into bom-pricing
|
2021-06-27 14:38:23 +02:00 |
|
|
matmair
|
e4a9d56ba0
|
style fixes
|
2021-06-27 14:26:51 +02:00 |
|
|
matmair
|
4f726931a6
|
adds in money-conversion helper
|
2021-06-27 14:18:37 +02:00 |
|
|
matmair
|
a3ec24fbcc
|
Reenabling prices for BOM items
Closes #1721
|
2021-06-27 13:48:08 +02:00 |
|
|
matmair
|
67128c308b
|
fixing typo
|
2021-06-27 12:26:02 +02:00 |
|
|
matmair
|
9ce5a9823e
|
added doc for internal price
|
2021-06-24 21:48:00 +02:00 |
|
|
matmair
|
abe00232f3
|
use internal price in more places
|
2021-06-24 21:47:11 +02:00 |
|
|
matmair
|
b503c62464
|
Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price
|
2021-06-22 00:27:56 +02:00 |
|
|
matmair
|
c8defae575
|
fixing allocation sorting
|
2021-06-22 00:03:54 +02:00 |
|
|
matmair
|
8b515571ca
|
I think a fix for #1663
Closes #1663
|
2021-06-21 23:33:27 +02:00 |
|
|
matmair
|
80e47b6f76
|
addd in sorting for category
fixes #1689
|
2021-06-20 22:49:06 +02:00 |
|
|
matmair
|
a0b83d530c
|
refactor
|
2021-06-20 20:19:11 +02:00 |
|
|
matmair
|
59aae51652
|
show stock history starting by 1 element
|
2021-06-20 20:17:01 +02:00 |
|
|
matmair
|
b32a6b50d2
|
fixes #1671
|
2021-06-20 20:16:14 +02:00 |
|
|
matmair
|
4d0ce643a1
|
fix for timezone warning on heartbeat
|
2021-06-20 19:53:17 +02:00 |
|
|
matmair
|
a3517b9313
|
fixes: response data stays persistent throughout views
|
2021-06-20 18:52:55 +02:00 |
|
|
matmair
|
b4412ef575
|
also show prices of the value 0
|
2021-06-20 13:32:52 +02:00 |
|
|
matmair
|
452d2004ce
|
added handling for no supplier price
|
2021-06-19 23:46:31 +02:00 |
|
|
matmair
|
7d5aa8189d
|
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
|
2021-06-18 23:30:54 +02:00 |
|
|
matmair
|
b86793703e
|
Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import
|
2021-06-18 23:14:48 +02:00 |
|
|
matmair
|
59e6cc1a10
|
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
|
2021-06-18 23:10:59 +02:00 |
|
|
matmair
|
15804f873b
|
Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price
|
2021-06-18 16:46:11 +02:00 |
|
|
matmair
|
2cbdeae914
|
style-fix
|
2021-06-18 00:18:45 +02:00 |
|
|
matmair
|
865a2b4af8
|
Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price
|
2021-06-17 23:44:45 +02:00 |
|
|
matmair
|
f0dd543ffa
|
render price in oer-modal if enabled in settings
|
2021-06-17 23:44:22 +02:00 |
|
|
matmair
|
a3a623a5ca
|
update-button for modal, repeat 1st step on use
|
2021-06-17 23:24:32 +02:00 |
|
|
matmair
|
2d8b96a6b8
|
setting to control visibility of price
|
2021-06-17 23:15:42 +02:00 |
|
|
matmair
|
4c7508cd6b
|
tag to call a method with (multiple)args
|
2021-06-17 23:11:31 +02:00 |
|
|
matmair
|
58b6bbb236
|
tag to read out dict value
|
2021-06-17 23:09:50 +02:00 |
|
|
matmair
|
c74ee4e925
|
doc for option.buttons
|
2021-06-17 19:24:08 +02:00 |
|
|
matmair
|
96c29847e1
|
add custom buttons with response
|
2021-06-17 19:23:30 +02:00 |
|
|
matmair
|
3d17388b48
|
set modal title with response
|
2021-06-17 19:22:00 +02:00 |
|
|
matmair
|
ebe2ae77a5
|
hide error message with response
|
2021-06-17 19:18:34 +02:00 |
|
|
matmair
|
789865b996
|
style-fix
|
2021-06-17 18:25:05 +02:00 |
|
|
matmair
|
997d68694e
|
fix for part with no bom-price #1678
|
2021-06-17 18:21:11 +02:00 |
|
|
matmair
|
6e77029d7d
|
Revert "fix for part with no bom"
This reverts commit dd58f89977.
|
2021-06-17 18:12:41 +02:00 |
|
|
matmair
|
dd58f89977
|
fix for part with no bom
|
2021-06-17 14:51:41 +02:00 |
|
|
matmair
|
af2cfe55be
|
missed a translation there
|
2021-06-17 00:51:53 +02:00 |
|
|
matmair
|
ddd84dcd7c
|
Merge branch 'master' of https://github.com/inventree/InvenTree into so-total
|
2021-06-17 00:50:39 +02:00 |
|
|
matmair
|
bbe7edbf82
|
totals like in #1666
|
2021-06-17 00:50:10 +02:00 |
|
|
matmair
|
5d3360e63b
|
added quantity total
|
2021-06-17 00:23:08 +02:00 |
|
|
matmair
|
dac112d908
|
added footer total for price
|
2021-06-17 00:22:32 +02:00 |
|
|
matmair
|
2fc185bd71
|
show footer
|
2021-06-16 23:57:33 +02:00 |
|
|
matmair
|
70e0933336
|
total price column as per #1660
|
2021-06-16 23:52:00 +02:00 |
|
|
matmair
|
ec19d77523
|
fix whitespaces in paths
|
2021-06-13 20:08:42 +02:00 |
|
|
matmair
|
447a7dd4e4
|
style fix
|
2021-06-13 15:04:57 +02:00 |
|
|
matmair
|
3f04a57452
|
added test for internal prices
|
2021-06-13 15:01:03 +02:00 |
|
|
matmair
|
3fb95bea7e
|
added test for sell price breaks
|
2021-06-13 13:31:31 +02:00 |
|
|
matmair
|
c0e50128dd
|
display latest serial on all part-views #1648
|
2021-06-11 23:43:23 +02:00 |
|
|
matmair
|
74c4c559e4
|
clearer wording for internal price settings
|
2021-06-07 05:33:20 +02:00 |
|
|
matmair
|
4f3bfe569a
|
added in internal prices in price calculations
|
2021-06-07 05:25:13 +02:00 |
|
|
matmair
|
0e8a97acb0
|
added permissions
|
2021-06-07 05:23:13 +02:00 |
|
|
matmair
|
37c0025399
|
settings for internal prices added
|
2021-06-07 04:58:37 +02:00 |
|
|
matmair
|
62638f76ed
|
fixing wrong page title
|
2021-06-07 04:00:12 +02:00 |
|
|
matmair
|
6ae9fa716c
|
added internal price to part_pricing
|
2021-06-07 00:19:37 +02:00 |
|
|
matmair
|
27282c8049
|
Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price
|
2021-06-06 18:15:41 +02:00 |
|
|
matmair
|
413fa2e842
|
merging in sidebar icon changes fr upstream
|
2021-06-06 17:50:13 +02:00 |
|
|
matmair
|
5a869d247f
|
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
|
2021-06-06 17:46:33 +02:00 |
|
|
matmair
|
d70b4bcabb
|
refactor
|
2021-06-06 17:44:02 +02:00 |
|
|
matmair
|
4f7edac213
|
back button
|
2021-06-06 17:43:16 +02:00 |
|
|
matmair
|
a535f8df42
|
hide scrollbar if not needed
|
2021-06-06 16:40:51 +02:00 |
|
|
matmair
|
a2a2c61e31
|
refactor and fix rendering on error
|
2021-06-06 16:36:01 +02:00 |
|
|
matmair
|
7439f72ab1
|
hide error messagre on error
|
2021-06-06 16:33:19 +02:00 |
|
|
matmair
|
5e6919f14e
|
hide error message
|
2021-06-06 16:32:46 +02:00 |
|
|
matmair
|
ded68bb4f6
|
change titel with modal submit
|
2021-06-06 16:09:51 +02:00 |
|
|
matmair
|
35451248c2
|
reseting modal on open
|
2021-06-06 15:25:56 +02:00 |
|
|
matmair
|
fcf360f2a3
|
clearer information text? as in #1577
|
2021-06-06 14:33:26 +02:00 |
|
|
matmair
|
36ff21f11e
|
hide supply part price on start
|
2021-06-06 14:21:08 +02:00 |
|
|
matmair
|
ced7768030
|
calculate button added
|
2021-06-06 14:20:30 +02:00 |
|
|
matmair
|
06d3489ede
|
fix: added ruleset
|
2021-06-05 18:06:26 +02:00 |
|
|
matmair
|
81f00753c6
|
style
|
2021-06-05 17:24:04 +02:00 |
|
|
matmair
|
0bac7ebf3e
|
styling
|
2021-06-05 17:18:46 +02:00 |
|
|
matmair
|
768080f9a0
|
Adding internal functions to use internal prices
|
2021-06-05 17:06:58 +02:00 |
|
|
matmair
|
0d93c96f2a
|
adding internal price breaks as in #1606
|
2021-06-05 17:01:49 +02:00 |
|
|
matmair
|
05d79a4c19
|
same nav sidebar distance for everything
|
2021-06-05 15:18:08 +02:00 |
|
|
matmair
|
44717b646f
|
using new tag for currency
|
2021-06-05 15:07:42 +02:00 |
|
|
matmair
|
0eff7d000a
|
added tag to replace dynamic setting
|
2021-06-05 15:05:05 +02:00 |
|
|
matmair
|
691142ea4c
|
fixing currency display
|
2021-06-05 13:27:39 +02:00 |
|
|
matmair
|
d87592aedb
|
use the default currency in forms
|
2021-06-05 13:22:11 +02:00 |
|
|
matmair
|
daf3d06cf0
|
added in optional matches
|
2021-06-05 01:19:12 +02:00 |
|
|
matmair
|
625d868a3f
|
fix for form_list
|
2021-06-03 00:29:24 +02:00 |
|
|
matmair
|
fc9e1e6770
|
suggested changes @eeintech
|
2021-06-03 00:17:29 +02:00 |
|
|
matmair
|
75cdec81ae
|
style fix
|
2021-06-02 00:39:38 +02:00 |
|
|
matmair
|
495babe712
|
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
|
2021-06-02 00:36:15 +02:00 |
|
|
matmair
|
3c384947b2
|
spaces cleanup
|
2021-06-02 00:26:30 +02:00 |
|
|
matmair
|
ee582a5490
|
fixes the problem reported by @eeintech ?
|
2021-06-02 00:21:01 +02:00 |
|
|
matmair
|
9d5b90190b
|
style + merge fix
|
2021-05-26 13:18:07 +02:00 |
|
|
matmair
|
79374c5dfd
|
ajax implementation for part import
|
2021-05-26 13:05:20 +02:00 |
|
|
matmair
|
421b0a896d
|
AjaxView for reuse of FormViews
|
2021-05-26 13:04:21 +02:00 |
|
|
matmair
|
002706849c
|
enrich context with form if not set
|
2021-05-26 12:20:37 +02:00 |
|
|
matmair
|
4319ba16af
|
Settings to show import-button
|
2021-05-26 09:20:50 +02:00 |
|
|
matmair
|
b15c20611d
|
style
|
2021-05-24 22:45:00 +02:00 |
|
|
matmair
|
b4c9edcd27
|
bom-price ranges as pie-chart
|
2021-05-24 22:31:33 +02:00 |
|
|
matmair
|
3363969c17
|
added in randomColor for dynamic color gen
|
2021-05-24 19:14:38 +02:00 |
|
|
matmair
|
206bab137b
|
refactor
|
2021-05-24 17:39:32 +02:00 |
|
|
matmair
|
fe8e03c666
|
additional information for graph
|
2021-05-24 15:46:11 +02:00 |
|
|
matmair
|
d5b2bfedbc
|
re-layouting tables
|
2021-05-24 02:18:34 +02:00 |
|
|
matmair
|
25681fb805
|
style
|
2021-05-24 01:30:37 +02:00 |
|
|
matmair
|
84d71d928f
|
removing new stuff in pricing modal
|
2021-05-24 01:14:15 +02:00 |
|