Oliver Walters
142a1462bb
Merge remote-tracking branch 'inventree/master'
2020-08-20 16:02:18 +10:00
Oliver
852a680c09
Merge pull request #916 from SchrodingersGat/null-customer
...
StockItem: Allow customer field to be blank
2020-08-20 14:59:06 +10:00
Oliver Walters
90d34cdfcf
StockItem: Allow customer field to be blank
2020-08-20 14:54:55 +10:00
Oliver Walters
2f88cc9fe0
Merge remote-tracking branch 'inventree/master'
2020-08-20 14:48:16 +10:00
Oliver
4f1b469cee
Merge pull request #915 from SchrodingersGat/tex-response
...
Tex response
2020-08-20 14:14:24 +10:00
Oliver Walters
8e0dfa9c6f
PEP fix
2020-08-20 14:05:55 +10:00
Oliver Walters
64ae181bf6
Add some more context data
2020-08-20 14:01:41 +10:00
Oliver Walters
5a8804f4bc
If LaTeX template errors, return the raw LaTeX!
2020-08-20 13:57:29 +10:00
Oliver Walters
c1956d13b5
Merge remote-tracking branch 'inventree/master'
2020-08-20 09:04:17 +10:00
Oliver
71f3662ebc
Merge pull request #914 from SchrodingersGat/recursive-bom
...
Bugfix: Recursive BOM display
2020-08-20 09:01:26 +10:00
Oliver Walters
0aeb7ddbdf
Allow column show/hide on BOM table
2020-08-20 08:57:11 +10:00
Oliver Walters
41c4a5376b
Bugfix: Recursive BOM display
...
- Actually request recursively! (duh)
- Fix the idField and parentIdField for the BOM display (was incredibly wrong)
- Sub-rows are initially displayed in the "collapsed" state
2020-08-20 08:52:22 +10:00
Oliver Walters
6930456e2b
Merge remote-tracking branch 'inventree/master'
2020-08-19 14:19:43 +10:00
Oliver
8556bdec6a
Merge pull request #913 from SchrodingersGat/supplier-data-in-bom
...
Supplier data in bom
2020-08-19 14:13:53 +10:00
Oliver Walters
0faba39dfc
PEP: Remove unused variable
...
(cherry picked from commit e49a1c1ad2
2020-08-19 14:08:52 +10:00
Oliver Walters
7e829e88af
Add option for including supplier data for BOM export
...
(cherry picked from commit d0b5550c86
2020-08-19 14:08:47 +10:00
Oliver Walters
3d0012a3bf
Bugfix: accomodate missing manfufacturer links
...
If a supplier_part does not have an associated manufacturer, the code would break
(cherry picked from commit 965dba4739
2020-08-19 14:08:41 +10:00
eeintech
b5bc8935a2
Added manufacturer data to BoM export
...
(cherry picked from commit c7ddccc4ec
2020-08-19 14:08:34 +10:00
Oliver Walters
f8bb357e6c
Merge remote-tracking branch 'inventree/master'
2020-08-18 21:30:08 +10:00
Oliver Walters
50460ed527
Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree
2020-08-18 21:29:48 +10:00
Oliver
13b64c6a04
Merge pull request #910 from SchrodingersGat/multi-level-bom
...
Multi level bom
2020-08-18 21:28:47 +10:00
Oliver Walters
1767ef7a3a
Fix issues with tree sorting
...
- Need to set parent ID based on the BOM items
- This is to prevent data duplication that was weird and dumb
2020-08-18 21:24:11 +10:00
Oliver Walters
82903d2bd6
BOM display is now heirarchical
2020-08-18 21:01:22 +10:00
Oliver Walters
4cd54203a2
Add jquery-treegrid plugin
2020-08-18 20:53:50 +10:00
Oliver Walters
37baec2db6
bootstrap-table: Add "extensions"
2020-08-18 20:53:05 +10:00
Oliver Walters
32133fecc7
Merge remote-tracking branch 'upstream/master'
2020-08-18 14:41:03 +10:00
Oliver
316dfe5e38
Merge pull request #909 from SchrodingersGat/bom-import-export
...
BOM upload: improve generation of "import" template
2020-08-18 14:37:48 +10:00
Oliver Walters
92ac93aac5
More intelligent checking for circular BOM
...
- Check all the way down a BOM "tree"
- Validate BOM tree before allowing BOM submission
2020-08-18 14:17:59 +10:00
Oliver Walters
ca4d3df287
Update translation files
2020-08-18 14:01:40 +10:00
Oliver Walters
68fb599c73
Major improvements to BOM upload
...
- Column headings now match the values provided in BOM import template
- Add a new column for part selection, while displaying all imported data
- Better code documentation
- Improve data validation
- Allow decimal quantity (not just integer!)
- Better matching logic
2020-08-18 14:01:01 +10:00
Oliver Walters
7349b396ca
Merge remote-tracking branch 'upstream/master' into bom-import-export
2020-08-18 11:50:40 +10:00
Oliver
561516e8d7
Merge pull request #908 from eeintech/bom_upload_part_match_auto_and_ipn
...
BoM Upload: Automatic Part match using name or IPN
2020-08-18 11:50:10 +10:00
Oliver Walters
476cc5f661
BOM upload: improve generation of "import" template
...
- Better field naming
- Remove some fields which are not required here
- Better description of what is going to happen
2020-08-18 11:47:27 +10:00
Oliver Walters
badc306f33
Merge remote-tracking branch 'upstream/master'
2020-08-18 10:39:24 +10:00
eeintech
783a94acce
Corrected MakeBomTemplate method's queryset
2020-08-17 16:42:28 -05:00
eeintech
84c0ec7937
BoM: added part matching based on IPN
2020-08-17 16:35:38 -05:00
eeintech
303157c586
Added part match auto-selection (if partial_ratio >= 100) to BoM part selection form
2020-08-17 14:10:24 -05:00
eeintech
685a58b807
Merge remote-tracking branch 'origin/master' into bom_dev
2020-08-17 12:05:54 -05:00
Oliver
89c7f72caf
Merge pull request #907 from SchrodingersGat/bom-level-int
...
Make BOM levels integers
2020-08-17 10:43:31 +10:00
Oliver Walters
25d90f643a
Make BOM levels integers
2020-08-17 10:39:35 +10:00
Oliver Walters
e67327953d
Merge remote-tracking branch 'inventree/master'
2020-08-16 15:10:23 +10:00
Oliver
4dcd6ee136
Update version.py
2020-08-16 14:03:49 +10:00
Oliver
ab62f8fc59
Update version.py
...
Increment version number
2020-08-16 14:03:20 +10:00
Oliver
b5b882d3b6
Merge pull request #906 from SchrodingersGat/blabel
...
Label Printing Functionality
2020-08-16 14:02:38 +10:00
Oliver Walters
d52278e423
Icon tweak
2020-08-16 13:45:58 +10:00
Oliver Walters
da079b23dc
Fix duplicate label printing menu action
2020-08-16 13:43:59 +10:00
Oliver Walters
ccda637e3c
Fixes for barcode decoding
2020-08-16 13:42:27 +10:00
Oliver Walters
a4267f76e8
Fixes for barcode data rendering
2020-08-16 13:39:05 +10:00
Oliver Walters
2bbc65cc59
Add "brief" version of QR codes
...
- Use this to render to labels (as it contains much less information)
2020-08-16 13:29:38 +10:00
Oliver Walters
2f5e3efada
Update translations
2020-08-16 12:11:22 +10:00
