Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,884 Commits 6 Branches 99 Tags 484 MiB
55df46c8b9
Commit Graph

11884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
681e007092 Add clean() function for PurchaseOrderLineItem 
Also adds renderer for purchaseorder model
 2022-01-26 22:56:00 +11:00
Oliver
34d8a4b4df
Merge pull request #2570 from matmair/style-fix 
Small style fixes
 2022-01-25 15:39:26 +11:00
Matthias
1704a50d92
Merge branch 'style-fix' of https://github.com/matmair/InvenTree into style-fix 2022-01-24 23:46:39 +01:00
Matthias Mair
d998f8bfbe
Merge branch 'inventree:master' into fix-html-tags 2022-01-24 23:39:21 +01:00
Matthias Mair
af04056843
Merge branch 'inventree:master' into style-fix 2022-01-24 23:39:17 +01:00
Matthias
6bfb17f2ab
pep fix 2022-01-24 23:38:12 +01:00
Matthias
3ab93dcdd5
only one exception type needed 2022-01-21 02:17:30 +01:00
Matthias
02058389b2
remove unneeded pass 2022-01-21 02:13:41 +01:00
Matthias
b3d031c473
make expression simpler 2022-01-21 02:12:40 +01:00
Matthias
f04de517d1
fix tags 2022-01-21 02:11:34 +01:00
Matthias Mair
d045bffa84
Merge branch 'inventree:master' into template-reduce-duplication 2022-01-21 01:31:45 +01:00
Oliver
b9d5906e10
Merge pull request #2563 from matmair/code-fix 
Small code quality fixes
 2022-01-21 11:28:21 +11:00
Matthias
2e0198e7cd
refactor field matching 2022-01-21 01:20:32 +01:00
Matthias
3c02c918b2
reduce code in wizard templates 2022-01-21 01:12:11 +01:00
Matthias
116369bba1
fix indent 2022-01-21 00:31:03 +01:00
Matthias
ff897ccc41
remove dead code 2022-01-21 00:30:51 +01:00
Matthias
c44565f9e3
fix reused builtins 2022-01-21 00:17:52 +01:00
Matthias
cbd84a23f9
fix default empy dict 2022-01-21 00:11:26 +01:00
Matthias
b2eb4e131a
remove empty test 2022-01-21 00:08:36 +01:00
Matthias
a96ceba0be
use constant for content type 2022-01-20 23:58:36 +01:00
Matthias
16239289c0
remove dead code 2022-01-20 23:56:39 +01:00
Matthias
967efae8f1
make simpler 2022-01-20 23:55:48 +01:00
Matthias
21125eb892
add docstring 2022-01-20 23:55:07 +01:00
Matthias
3d2113d98b
make simpler 2022-01-20 23:53:50 +01:00
Matthias
9da234002b
add comment 2022-01-20 23:51:53 +01:00
Matthias
f8c4470d98
make simpler 2022-01-20 23:51:42 +01:00
Matthias
db66546606
rename to not shadow builtin 2022-01-20 23:49:21 +01:00
Matthias
ef22b9fc1b
remove unneeded assingments 2022-01-20 23:47:59 +01:00
Oliver
9ed0a6fece
Merge pull request #2559 from SchrodingersGat/modal-form-fixes 
Modal form fixes
 2022-01-19 19:39:27 +11:00
Oliver Walters
9ffcdbc417 Fix issues when re-opening a secondary modal 2022-01-19 19:18:20 +11:00
Oliver Walters
3c328feb65 Donate keyboard focus when creating a secondary modal 2022-01-19 19:03:47 +11:00
Oliver Walters
21f2dd5896 Use modal "depth" to construct form fields 
- Top level modals are not changed
 2022-01-19 18:57:53 +11:00
Oliver
688806b5d3
Merge pull request #2558 from SchrodingersGat/user-menu-fix 
Slight menu and icon tweaks
 2022-01-19 15:17:17 +11:00
Oliver Walters
f16b18f7ad icon fixes 2022-01-19 14:41:22 +11:00
Oliver Walters
40564f0357 Rearrange drop-down menu 2022-01-19 14:38:05 +11:00
Oliver
cc6bbdf09a
Merge pull request #2557 from SchrodingersGat/docker-dev-proxy 
Adds an option to enable nginx proxy for "dev mode" in docker
 2022-01-19 13:06:39 +11:00
Oliver Walters
f9ffbe322a Adds note 2022-01-19 12:32:30 +11:00
Oliver Walters
fcb958c5c0 Adds an option to enable nginx proxy for "dev mode" in docker 
- Commented out by default
- No functional change unless code is un-commented in the docker-compose script
 2022-01-19 12:31:35 +11:00
Oliver
dc84b41c90
Merge pull request #2556 from eeintech/po_qty_decimal_fix 
Allow decimal for quantity received on PO
 2022-01-19 10:39:50 +11:00
eeintech
391836689d Allow decimal for quantity received on PO 2022-01-17 09:04:14 -05:00
Oliver
a066b9b18d
Merge pull request #2548 from SchrodingersGat/i18n-fix 
Fix for i18n javascript
 2022-01-14 00:26:35 +11:00
Oliver Walters
6f3918deea Fix for i18n javascript 2022-01-14 00:02:00 +11:00
Oliver
9b1ccedbb4
Merge pull request #2546 from SchrodingersGat/plugin-bool-fix 
Display "boolean" plugin setting values as checkboxes
 2022-01-13 17:18:01 +11:00
Oliver
c64ab4b605
Merge pull request #2547 from SchrodingersGat/form-checkbox-patch 
"patch" for legacy checkboxes in HTML forms
 2022-01-13 17:17:49 +11:00
Oliver
2f01691095 "patch" for legacy checkboxes in HTML forms 
- Update to match the style of more "modern" API-driven forms
- These legacy forms will be removed in future revision anyway
 2022-01-13 16:37:42 +11:00
Oliver
eb21e1f844 Display "boolean" plugin setting values as checkboxes 2022-01-13 16:22:38 +11:00
Oliver
8afce7b61a
Merge pull request #2545 from inventree/dependabot/pip/django-3.2.11 
Bump django from 3.2.10 to 3.2.11
 2022-01-13 14:35:07 +11:00
dependabot[bot]
1927daa56d
Bump django from 3.2.10 to 3.2.11 
Bumps [django](https://github.com/django/django) from 3.2.10 to 3.2.11.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.10...3.2.11)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 02:26:20 +00:00
Oliver
f6566bd476
Merge pull request #2544 from inventree/dependabot/pip/pillow-9.0.0 
Bump pillow from 8.3.2 to 9.0.0
 2022-01-13 13:25:40 +11:00
dependabot[bot]
f997e092b1
Bump pillow from 8.3.2 to 9.0.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 01:11:42 +00:00