inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
5,235 Commits 9 Branches 164 Tags
89e0856824e04d9fbe128ed18883fe04b51afa5a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub e47a8d6d5e Merge pull request #1545 from matmair/issue1425 
adds sales order line item price
 2021-05-07 23:54:45 +10:00
OliverandGitHub 3511b4adda Merge pull request #1550 from matmair/layout-fix 
Layout fix
 2021-05-06 08:58:08 +10:00
OliverandGitHub ecc9eec084 Merge pull request #1547 from SchrodingersGat/no-wrap 
Disable wrapping for translation files
 2021-05-05 17:54:01 +10:00
Oliver Walters 7a19145be1 Disable wrapping for translation files 
This ensures that the updates pushed back from crowding don't have unnecessary file deltas

Ref: https://docs.djangoproject.com/en/3.2/ref/django-admin/#django-admin-makemessages
 2021-05-05 17:34:35 +10:00
OliverandGitHub 54fb96f239 Merge pull request #1542 from matmair/matmair/issue1513 
adds auto price-update from price-brake to purchase order lines
 2021-05-05 09:22:59 +10:00
OliverandGitHub 6bf4887284 Merge pull request #1544 from matmair/matmair/issue1543 
[BUG] invoke: too many arguments
 2021-05-05 09:18:56 +10:00
OliverandGitHub 5d214fc869 Merge pull request #1535 from eeintech/get_price 
Added support for fractional price and lower price break
 2021-05-01 09:52:21 +10:00
OliverandGitHub 706f3a913d Update README.md 2021-05-01 09:12:36 +10:00
OliverandGitHub 94ff8829f7 Merge pull request #1536 from eeintech/manufacturer_part_api_fix 
API fixes related to ManufacturerPart
 2021-05-01 08:26:32 +10:00
OliverandGitHub ecbea8ca30 Merge pull request #1537 from matmair/credits 
Link for credits in UI and README Closes #1533
 2021-05-01 08:25:17 +10:00
OliverandGitHub c60f4c4f2f Merge pull request #1529 from matmair/matmair/issue1527 
per session user-language settings
 2021-04-30 11:53:39 +10:00
OliverandGitHub 2eafdd53b8 Merge pull request #1530 from eeintech/complete_build_output_fix 
Fixes to create build output form
 2021-04-29 14:56:29 +10:00
OliverandGitHub dd03efe5f2 Merge pull request #1532 from eeintech/purchase_order_fixes 
Purchase order fixes
 2021-04-29 09:48:11 +10:00
OliverandGitHub 28b4e12d8c Merge pull request #1528 from matmair/BUG/polish 
fixed wrong i18n-code for polish
 2021-04-28 22:21:57 +10:00
OliverandGitHub 9feed0dcdc Merge pull request #1522 from eeintech/import_records_fix 
Add owner model to imports ignore list
 2021-04-28 09:01:48 +10:00
OliverandGitHub e6c2252887 Merge pull request #1523 from eeintech/required_parts_build_order 
Updated "Required for Build Orders" API queryset
 2021-04-28 08:57:30 +10:00
OliverandGitHub 2e5be35517 Merge pull request #1525 from matmair/matmair/issue1524 
[BUG] no attribute MPN
 2021-04-28 07:52:17 +10:00
OliverandGitHub 4d2e23f701 Merge pull request #1521 from matmair/matmair/issue1519 
More syntax for adding serial numbers #1519
 2021-04-27 20:43:46 +10:00
OliverandGitHub 90d12a7406 Merge pull request #1517 from SchrodingersGat/import-export-fixes 
Import export fixes
 2021-04-25 12:44:46 +10:00
Oliver Walters 80f11290c9 Remove old command 2021-04-25 12:30:59 +10:00
Oliver Walters 5dbebf37b7 Duplicate import of the same data should *NOT* error out 2021-04-25 12:30:14 +10:00
Oliver Walters f8ec32c3f5 Remove unused include 2021-04-25 12:24:05 +10:00
Oliver Walters b08cd8da20 Remove dbbackup integration 
- Data dumping and restoring is now very complex!
- We should use the invoke export-records function now, rather than relying on dbbackup / dbrestore
- Documentation will be updated to match
 2021-04-25 12:14:36 +10:00
Oliver Walters 2f2354afdc Pre-process json data before importing 
- Removes any unwanted "permissions" entries from data imported from an *older* version of InvenTree
 2021-04-25 12:07:58 +10:00
Oliver Walters b6cfa50e12 Allow data operations to run for 'test' 2021-04-25 11:59:35 +10:00
Oliver Walters f766711838 Add fixture for users / groups 2021-04-25 11:41:48 +10:00
Oliver Walters e13850515d PEP fixes 2021-04-25 11:30:17 +10:00
Oliver Walters d9d6a2392d Custom post-processing step as part of export-records command: 
- We must delete the permission objects associated with a user or group, as auth.permissions are *NOT* included in the exported data file
- The permissions will be automatically created on first run of the server
 2021-04-25 11:29:07 +10:00
Oliver Walters 8ad16ceb9c Refactorin' 2021-04-25 11:07:57 +10:00
Oliver Walters 368a5c3f63 Gotsta create tables first ... 2021-04-25 11:07:43 +10:00
Oliver Walters dd8c0276c7 Ignore session data when exporting records 2021-04-25 10:52:47 +10:00
Oliver Walters 06afd4d726 Refactor "ready" state into a function 2021-04-25 10:52:31 +10:00
Oliver Walters 6e5fc43105 Prevent copying of labels and templates during data import phase 2021-04-25 10:33:11 +10:00
Oliver Walters 2d7bff0773 Prevent auto-update of group permissions during loaddata stage 2021-04-25 10:30:56 +10:00
Oliver Walters 4f9898fba5 Test import / export for MySQL and PostgreSQL 2021-04-25 10:30:31 +10:00
Oliver Walters 792ff16127 Ignore data file 2021-04-25 10:14:13 +10:00
Oliver Walters de720afd0e Exclude unwanted modules from import / export 2021-04-25 10:13:31 +10:00
OliverandGitHub 525a49f001 Merge pull request #1514 from 42CrMo4/multi-platform-docker 
docker image armv7
 2021-04-23 18:08:32 +10:00
OliverandGitHub 43a36754dc Update README.md 
Added more translation badges
 2021-04-23 09:53:38 +10:00
OliverandGitHub bdd5219019 Merge pull request #1511 from 42CrMo4/multi-platform-docker 
Multi platform docker image
 2021-04-23 09:07:26 +10:00
OliverandGitHub 2b66eed7fb Merge pull request #1510 from SchrodingersGat/new-translation 
Adds some more translatable strings
 2021-04-22 23:37:50 +10:00
Oliver Walters 50d6007afa Cleanup 2021-04-22 23:25:00 +10:00
Oliver eb55fb3e6b Update translations.yml 
Fix the context in which this actions runs

(cherry picked from commit a09e852ecb)
 2021-04-22 23:24:13 +10:00
OliverandGitHub a09e852ecb Update translations.yml 
Fix the context in which this actions runs
 2021-04-22 23:23:32 +10:00
Oliver Walters d6ef9ee212 Adds some more translatable strings 
- Mostly just to check the workflow integration
 2021-04-22 23:19:11 +10:00
OliverandGitHub 92f6c13fcd Merge pull request #1500 from matmair/feature/translation-action 
translations action
 2021-04-22 22:50:47 +10:00
OliverandGitHub 2f4e78fe51 Merge pull request #1508 from matmair/use-spaces 
use spaces instead of tabs
 2021-04-22 21:16:45 +10:00
OliverandGitHub 12954f885c Merge pull request #1507 from SchrodingersGat/report-permissions 
Allow 'admin' account access to the report models
 2021-04-22 17:20:54 +10:00
Oliver Walters 4a522bb05a Allow 'admin' account access to the report models 2021-04-22 14:53:42 +10:00
OliverandGitHub 022219e3cf Merge pull request #1506 from SchrodingersGat/docker-compose-fixes 
docker-compose improvements
 2021-04-22 13:34:51 +10:00
Oliver Walters 0c572486ba Revert volume path 2021-04-22 12:49:11 +10:00
Oliver Walters 52deb20e85 docker-compose improvements 
- Prepend "inventree" to the name of each container
- Explicitly expose more env variables required for InvenTree db lookup
- Adjust server name in nginx-conf file
 2021-04-22 12:15:25 +10:00
OliverandGitHub 99060159e3 Merge pull request #1495 from matmair/feature/performance-op 
performance improvments docker
 2021-04-22 08:53:00 +10:00
OliverandGitHub c5b6e22a58 Merge pull request #1505 from eeintech/email_reset 
Enabled default email sender setting
 2021-04-22 08:50:05 +10:00
OliverandGitHub 34341c31f2 Merge pull request #1504 from SchrodingersGat/turkish 
Added skeleton for Turkish translation
 2021-04-22 08:46:31 +10:00
OliverandGitHub 6259d73583 Merge pull request #1503 from matmair/l10n_trans 
added german translations
 2021-04-22 08:46:15 +10:00
Oliver Walters d9cf721589 Added skeleton for Turkish translation 2021-04-21 22:36:57 +10:00
OliverandGitHub 8d8ef22b8d Update README.md 
Typo fix
 2021-04-21 22:19:05 +10:00
OliverandGitHub 2583ab12ae Update README.md 2021-04-21 22:04:46 +10:00
Oliver ae51b1d9ee Update Crowdin configuration file 2021-04-21 20:41:39 +10:00
Oliver 4b069f83bf Update Crowdin configuration file 2021-04-21 20:39:51 +10:00
Oliver 53f2060c40 Update Crowdin configuration file 2021-04-21 20:27:44 +10:00
OliverandGitHub 2d59c0a119 Merge pull request #1499 from SchrodingersGat/ci-fixes 
Change file just to re-run CI
 2021-04-21 17:51:22 +10:00
Oliver Walters 3e63334125 Change file just to re-run CI 2021-04-21 17:34:56 +10:00
OliverandGitHub cfddaadccf Merge pull request #1492 from SchrodingersGat/build-order-simplification 
Build order simplification
 2021-04-21 17:29:24 +10:00
Oliver Walters c0ab2d1da9 Unit test fixes 2021-04-21 17:16:07 +10:00
Oliver Walters 59341397ba Fixes 2021-04-21 16:44:18 +10:00
Oliver Walters 9b763ca715 Adds ability to specify "status" of a build output at time of completion 2021-04-21 16:44:18 +10:00
Oliver Walters 0722aea58a Further fixes for unit tests 2021-04-21 16:44:18 +10:00
Oliver Walters debc086f89 Unit test improvements 2021-04-21 16:44:17 +10:00
Oliver Walters 715d912137 Bug fixes 2021-04-21 16:44:17 +10:00
Oliver Walters 5a44a50f3b Fix date in build table 2021-04-21 16:44:17 +10:00
Oliver Walters 76e2b67f36 Fix logic for completing builds 
- Display better messages to the user, too
 2021-04-21 16:44:17 +10:00
Oliver Walters 4420557863 Refactor various functions for assessing build allocation 2021-04-21 16:44:17 +10:00
Oliver Walters 05e2b62305 Bug fix - calculate button PK at run time!! 2021-04-21 16:44:17 +10:00
Oliver Walters 16b01ed772 significant rework of the build allocation tables / views 2021-04-21 16:44:16 +10:00
Oliver Walters f0595cc052 Fix for display of "outstanding" allocations 2021-04-21 16:44:16 +10:00
Oliver Walters 9e470d4064 Add separate section for "untracked" part allocation 2021-04-21 16:44:16 +10:00
OliverandGitHub 852cc9c4fa Merge pull request #1498 from SchrodingersGat/new-locales 
Add some new (empty) locale translation entries
 2021-04-21 13:27:52 +10:00
Oliver Walters 64c29d73cc gettext required for translation 2021-04-21 13:11:57 +10:00
Oliver Walters 043d929dbb Fix proper good 2021-04-21 12:57:54 +10:00
Oliver Walters 096403b429 CI file fixes 2021-04-21 12:37:20 +10:00
Oliver Walters a1e835e01b Add some new (empty) locale translation entries 
- fr
- it
- ja
- pl
- ru
- zh

Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)

The CI pipeline now runs the translation and static collection steps, to check those for errors.
 2021-04-21 12:33:56 +10:00
OliverandGitHub 45d23bd606 Merge pull request #1497 from SchrodingersGat/docker-push 
Changes to docker workflow
 2021-04-21 11:27:45 +10:00
Oliver Walters b20c832702 Changes to docker workflow 2021-04-21 11:13:37 +10:00
OliverandGitHub 4903826be1 Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
OliverandGitHub 9addad9b46 Merge pull request #1493 from SchrodingersGat/multi-location-print 
Split "part category" view into separate pages
 2021-04-20 21:10:46 +10:00
Oliver Walters 4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters 2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters 38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters 412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters 6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
OliverandGitHub 21708dabaf Merge pull request #1490 from SchrodingersGat/django-3.2 
Update to django 3.2
 2021-04-20 11:25:25 +10:00
Oliver Walters 0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters 6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters 12f1fb9526 Update to django 3.2 2021-04-20 08:15:43 +10:00
OliverandGitHub 6c159e91cc Merge pull request #1489 from eeintech/stock_fixes 
Stock return to customer fix
 2021-04-20 07:38:32 +10:00