Commit Graph

5396 Commits

Author SHA1 Message Date
Oliver Walters
bd34a9eed2 Merge remote-tracking branch 'inventree/master' 2021-05-13 17:31:27 +10:00
Oliver
a1fa3315b1
Merge pull request #1579 from SchrodingersGat/report-naming
Adds a "filename_template" field to reports
2021-05-13 14:03:30 +10:00
Oliver Walters
82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
Oliver Walters
6de44a5921 Adds a "filename_template" field to reports
- Allows users to define the naming scheme for generated reports
- Templated, can use any context variable already available to the report instance
- Adds some more context variables to various reports
2021-05-13 13:23:51 +10:00
Oliver
8f6e14193a
Merge pull request #1576 from matmair/matmair/issue1574
copy-btn in all the places
2021-05-13 10:45:51 +10:00
Matthias
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
Matthias
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
Matthias
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
Matthias
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
Matthias
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
Matthias
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00
Oliver
07c7af1f2e
Merge pull request #1569 from SchrodingersGat/docker-dev
Development docker image
2021-05-12 22:27:50 +10:00
Oliver
9d98ecca92
Merge pull request #1561 from eeintech/multi_part_forms
Multi-step form framework + Purchase order upload file view
2021-05-12 22:18:35 +10:00
Oliver Walters
719b1775f2 Add entrypoint for running development worker 2021-05-12 22:12:26 +10:00
Oliver Walters
530f28ba95 Fix for running webserver 2021-05-12 21:35:54 +10:00
Oliver Walters
00c5a88383 Split environment variables out into a .env file
- No need to collect "static" file when we are running in DEBUG mode
2021-05-12 21:15:53 +10:00
Oliver Walters
3381c5e257 Improvements to development docker-compose script
- Python packages are installed in a virtual environment within the src dir
- This prevents a LONG installation process each time the docker image is rebuilt
2021-05-12 20:53:50 +10:00
Oliver Walters
914db9e913 Development docker image
- Uses multistage build
- Adds a docker compose file for dev
2021-05-12 19:28:04 +10:00
Oliver Walters
12b40542d0 Merge remote-tracking branch 'inventree/master' 2021-05-12 11:09:54 +10:00
Oliver
d301794516
Merge pull request #1572 from SchrodingersGat/stock-item-history
Stock item history
2021-05-12 10:57:56 +10:00
Oliver Walters
3b252b8409 Record the user when updating stock items 2021-05-12 10:42:09 +10:00
Oliver Walters
30ff48d803 Fixes 2021-05-12 10:09:02 +10:00
Oliver Walters
68b53acbf1 remove old fields from the StockItemTracking model 2021-05-12 08:07:03 +10:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
7e6ac54015 YAML does not get installed during django-import-export package? 2021-05-11 14:13:21 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
Oliver Walters
03a231bffb Updates
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
2021-05-11 23:38:26 +10:00
Oliver Walters
84bfffd5a7 Override 'add_note' when new StockItem is created
- This allows us to prevent the issue of duplicate notes being created
2021-05-11 22:51:29 +10:00
Oliver Walters
0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00
Oliver Walters
93e6eb6dc7 Unit test fixes 2021-05-11 22:26:03 +10:00
Oliver Walters
a1203aa1e5 Fixes for unit testing 2021-05-11 21:22:54 +10:00
Oliver Walters
0020e85397 Refactor add_tracking_entry 2021-05-11 20:56:20 +10:00
Oliver Walters
385131137f Extract stock location from legacy stocktracking entry
- Not 100% accurate - e.g. if the stock location has been altered!
2021-05-11 20:55:14 +10:00
Oliver Walters
ed4da4d338 Improve introspection in migration file 2021-05-11 18:23:29 +10:00
Oliver Walters
725a64c29d Extract more information from legacy tracking data 2021-05-11 18:11:27 +10:00
Oliver Walters
1126e2e110 "Guess" stock history code from recorded title string 2021-05-11 17:41:37 +10:00
Oliver Walters
70ad0ba0de Improve reporting in stock history API 2021-05-11 17:41:17 +10:00
Oliver Walters
af53b341f0 Replace "addTrasactionNote" function with "add_tracking_entry"
- Does not add translated strings to the database
2021-05-11 17:17:48 +10:00
Oliver Walters
82c6d10c33 Add translateable status codes for StockHistory 2021-05-11 17:12:31 +10:00
Oliver
efec09e9a7
Merge pull request #1571 from SchrodingersGat/clipboard-tweaks
Trim content when copying to clipboard
2021-05-11 08:39:14 +10:00
eeintech
c9e77edf04 Almost there? 2021-05-10 17:31:29 -04:00
eeintech
6d8f94619b Improved template render, raised bar for automatic field matching 2021-05-10 12:52:34 -04:00
eeintech
f0932040ee Fixed form validation for previous step, hide tab depending on order status, added purchase_price field 2021-05-10 11:42:22 -04:00
Francois
6857964c17
Merge pull request #1 from matmair/fix-eeintech
Looks good, thanks @matmair !
2021-05-10 07:55:29 -05:00
Oliver Walters
6aab704144 Trim content when copying to clipboard 2021-05-10 19:40:54 +10:00
Oliver
c7d625f23e
Merge pull request #1565 from matmair/clipboard-ui
Clipboard UI
2021-05-10 17:24:31 +10:00
Matthias
fc83458bdb changes as suggested by @SchrodingersGat 2021-05-10 07:53:58 +02:00