Matthias
8fad704d76
disable ordering on stock
2021-08-20 22:53:25 +02:00
Matthias
5a59a37a89
disable ordering on category
2021-08-20 22:52:57 +02:00
Matthias
109b8c943e
disable ordering on part-name
2021-08-20 22:52:14 +02:00
Matthias
7533a9ac0c
disable ordering on IPN if fixed ordering
2021-08-20 22:51:36 +02:00
Oliver
8646c73021
Merge pull request #1980 from matmair/housekeeping
...
Housekeeping
2021-08-20 09:02:33 +10:00
Oliver
5bd31f11eb
Merge pull request #1978 from matmair/fix-translate
...
Fix translations stats - task
2021-08-20 09:01:50 +10:00
Oliver
831ccec399
Merge pull request #1981 from matmair/coverage-to-setup
...
Merge coverage settings
2021-08-20 09:01:12 +10:00
Matthias Mair
e24a158919
Merge branch 'inventree:master' into bpm-purchase-price
2021-08-20 00:42:50 +02:00
Matthias
c4700d0e10
move coverage settings into setup.cfg
2021-08-20 00:35:25 +02:00
Matthias
e17f15f403
updating year on license
2021-08-20 00:31:10 +02:00
Matthias
e34c27e360
removed translation part - is done now by action
2021-08-20 00:25:55 +02:00
Oliver
414d2dbc96
Merge pull request #1977 from eeintech/company_templates
...
Fixed company templates
2021-08-20 07:47:29 +10:00
Matthias
575cf87b98
also run static on update
2021-08-19 23:37:38 +02:00
Matthias
ee33de711a
move translation stats into own task
2021-08-19 23:36:54 +02:00
Matthias
cb1e7a6cc5
only process purchase_price if prices present
2021-08-19 23:22:58 +02:00
eeintech
ec7392303d
Fixed company templates
2021-08-19 10:47:46 -04:00
Oliver
c16ce925dd
Merge pull request #1973 from SchrodingersGat/delete-expired-sessions
...
Run periodic (daily) task to clear out expired sessions
2021-08-19 16:53:19 +10:00
Oliver
f0415640d5
Run periodic (daily) task to clear out expired sessions
2021-08-19 16:34:57 +10:00
Oliver
c3048a1bf1
Merge pull request #1970 from SchrodingersGat/entrypoint
...
Entrypoint
2021-08-19 12:12:01 +10:00
Oliver
9ed2025021
Add a TODO for future reference
2021-08-19 11:14:13 +10:00
Oliver
52bdfe5465
Env interpolation doesn't seem to work in the CMD
2021-08-18 20:52:14 +10:00
Oliver
eeac561b9b
typo fix
2021-08-18 17:07:23 +10:00
Oliver
2095d66677
Fix entrypoint / cmd for production server
2021-08-18 16:29:54 +10:00
Oliver
79d7a9f922
fix typo in dockerfile
2021-08-18 15:16:22 +10:00
Oliver
41db0ff60d
Need to specify python3
2021-08-18 14:58:16 +10:00
Oliver
db477bceab
typo fix
2021-08-18 14:47:34 +10:00
Oliver
d756579a06
Split production environment variables out into a .env file
2021-08-18 13:02:36 +10:00
Oliver
c1ea6dbb9b
Remove commented out functionality from the entrypoint command
2021-08-18 12:28:09 +10:00
Oliver
c2af401854
Pin base python package requirements
...
- Require invoke to be installed before we can run "invoke update"
2021-08-18 12:03:24 +10:00
Oliver
8fea9bc645
Re-add docker file git version info
2021-08-18 11:25:19 +10:00
Oliver
7bfddd6d51
Simplify init scripts
...
Single script init.sh which performs the following tasks:
- Creates required directory structure
- Activates python venv (if required)
- Waits for database connection
- Runs command
2021-08-18 09:52:27 +10:00
Oliver
3b8ee48581
Fix env defines in dockerfile
2021-08-18 09:34:09 +10:00
Oliver
da834d8bcc
Reduce cruft in logs
2021-08-18 00:04:38 +10:00
Oliver
b48db6f8fe
Dockerfile fixes
2021-08-17 23:15:05 +10:00
Oliver
187c9b0971
Add server init script
...
- Taken (mostly) from https://github.com/inventree/InvenTree/pull/1949
2021-08-17 23:10:57 +10:00
Oliver
8b66babd49
Refactor dockerfile
...
- Ref: https://github.com/inventree/InvenTree/pull/1949
- Squash all apk commands into single line
- Drop to inventree user rather than running as root
- Separate entrypoint and cmd for each target
- Set the INVENTREE_PY_ENV variable in development mode
2021-08-17 22:58:44 +10:00
Oliver
b6e97f06dd
Merge pull request #1968 from SchrodingersGat/docker-internal-vars
...
Cleanup docker vars for dev setup
2021-08-17 21:18:09 +10:00
Oliver
0294a1c323
Fix for staticfile collection
...
- Was generating a *lot* of warning messages
- Ref: https://github.com/django-compressor/django-compressor/issues/720
2021-08-17 21:02:45 +10:00
Oliver
895f9f3ce0
Pull debug level out into the .env file
2021-08-17 20:45:57 +10:00
Oliver
d5d89c67b1
Error out if the static or media directories are not properly defined
2021-08-17 20:42:19 +10:00
Oliver
a474000361
Fix critical error in dockerfile
...
- Don't' be putting no spaces in!
2021-08-17 20:29:48 +10:00
Oliver
7bf3229595
Add comment to docker-compose file
2021-08-17 20:00:54 +10:00
Oliver
07857c3088
Simplify dev-config.env file
...
- Don't need to re-specify the internal docker variables
- Add comments
2021-08-17 19:59:32 +10:00
Oliver
206743b58d
Add a default value for INVENTREE_WEB_ADDR
2021-08-17 19:58:55 +10:00
Oliver
a5808d4360
Merge pull request #1967 from SchrodingersGat/always-translate
...
Run translation step as part of "update"
2021-08-17 19:52:58 +10:00
Oliver
92aace1278
Run translation step as part of "update"
2021-08-17 18:22:07 +10:00
Guusggg
d8eefec065
Print multi part label ( #1963 )
...
* Added description as list for StockLocation
* Merge pull request #1874 from SchrodingersGat/docker-dev-fix
Copy static files when starting dev server
(cherry picked from commit 50eb70f538#1877 from eeintech/fix_search_js
Fixed missing comma propagating to translated JS files
(cherry picked from commit 2009773d9d#1890 from matmair/fix-for-1888
catch connection errors in exchange update
(cherry picked from commit db57e9516b#1887 from matmair/settings-safety
settings fixes
(cherry picked from commit d154ca08ea#1894 from SchrodingersGat/non-int-serial-fix
Fix for non-integer serial numbers
(cherry picked from commit 529742b520f5178e9fc3
2021-08-17 12:42:40 +10:00
Oliver
d6c9ff41ff
Merge pull request #1964 from eeintech/import_part_nav
...
Added navbar on part import page
2021-08-17 09:59:35 +10:00
eeintech
99839e78fd
Added navbar on part import page
2021-08-16 10:21:57 -04:00
Oliver
fa163b8866
Merge pull request #1962 from SchrodingersGat/attachment-edit
...
Attachment edit
2021-08-16 11:14:14 +10:00
