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
4,406 Commits 6 Branches 99 Tags 484 MiB
ff5846732c
Commit Graph

4406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
4193d2e7fe Except IntegrityError 
- This error may be thrown if the correct migrations have not been applied
 2020-10-20 19:52:04 +11:00
Oliver
85ac1bfb95
Merge pull request #1058 from SchrodingersGat/stock-table-ordering 
Fix table sorting when groups are used.
 2020-10-20 12:07:11 +11:00
Oliver Walters
1e8721282d Merge remote-tracking branch 'inventree/master' 2020-10-20 12:00:23 +11:00
Oliver Walters
73a1765a11 Fix table sorting when groups are used. 
This is necessary because the field names of the tables are specified like "part_detail.IPN" and multi-level string-based object access is weird.
Luckily someone has worked out the hard part for me.

Ref: https://stackoverflow.com/questions/6393943/convert-javascript-string-in-dot-notation-into-an-object-reference
 2020-10-20 11:54:54 +11:00
Oliver
d242e04e64
Merge pull request #1055 from SchrodingersGat/build-reference 
Build reference
 2020-10-20 09:03:25 +11:00
Oliver Walters
a2ee172058 Updates tables for PurchaseOrder and SalesOrder 2020-10-20 08:45:17 +11:00
Oliver Walters
5a6697866f Update translations 2020-10-20 08:41:13 +11:00
Oliver Walters
406d7bcf80 Load build order prefix setting 2020-10-20 08:41:08 +11:00
Oliver Walters
7aa473712f Remove unused setting page 2020-10-20 08:32:00 +11:00
Oliver Walters
226a91718b Add a simple unit test for the settings model 2020-10-20 08:29:06 +11:00
Oliver Walters
c6e61c20fe Generate default settings for all InvenTreeSetting object 2020-10-20 08:24:23 +11:00
Oliver Walters
98d20bceeb Change "Build Title" to "Description" 2020-10-20 00:26:26 +11:00
Oliver Walters
e8a0095e50 Add some options for the build order settings page 
- Not editable yet
 2020-10-20 00:24:33 +11:00
Oliver Walters
a5639c380f Add regex validator to build order reference field 2020-10-20 00:13:43 +11:00
Oliver Walters
06040f94ee Remove "description" field from InvenTreeSettings key:value fields 2020-10-20 00:02:54 +11:00
Oliver Walters
92c1e3c1a5 Update settings pages 2020-10-19 23:50:39 +11:00
Oliver Walters
c13cee2407 Fixes for unit testing 2020-10-19 23:31:52 +11:00
Oliver Walters
9b7a9a3ee0 Update formatting of order pages 2020-10-19 23:23:16 +11:00
Oliver Walters
b5d15aab08 Add function to "predict" next build order reference value 2020-10-19 23:22:09 +11:00
Oliver Walters
5405ad566e Add 'reference' to API serializer 2020-10-19 22:53:40 +11:00
Oliver Walters
0b7cf9e7f3 Add "reference" to build order forms 2020-10-19 22:49:28 +11:00
Oliver Walters
a8d47c54f9 Upate admin interface 2020-10-19 22:40:19 +11:00
Oliver Walters
934078a42c Add "Reference" field to Build model 2020-10-19 22:36:14 +11:00
Oliver Walters
4604d7c90d Merge remote-tracking branch 'inventree/master' 2020-10-19 22:19:43 +11:00
Oliver
416cfb99da
Merge pull request #1053 from SchrodingersGat/modal-errors 
Modal errors
 2020-10-19 22:19:10 +11:00
Oliver Walters
6b99d923d7 Change "status code" to "error code" 2020-10-19 16:44:33 +11:00
Oliver Walters
396b7dba73 Extra error information when a modal dialog fails 2020-10-19 16:42:53 +11:00
Oliver
957c538136
Merge pull request #1052 from SchrodingersGat/barcode-add 
Change text for barcode
 2020-10-19 16:31:47 +11:00
Oliver Walters
647e2cf64d Change text for barcode 2020-10-19 16:06:18 +11:00
Oliver
ce1cce99bb
Merge pull request #1051 from SchrodingersGat/po-stock-list 
Display table of items received against a particular purchase order
 2020-10-19 11:55:25 +11:00
Oliver Walters
634410294b Display table of items received against a particular purchase order 
- Adds new tab to "Purchase Order" view
- Adds ability to filter StockList API by purchase_order ID
 2020-10-19 11:40:57 +11:00
Oliver
2dc9109b11
Merge pull request #1047 from eeintech/add_ipn_supplier_part_str 
Added IPN to Supplier Part string representation (global)
 2020-10-19 11:21:34 +11:00
eeintech
dfa4d3f8ed Display IPN and pipe char only if IPN exists 2020-10-18 14:37:35 -05:00
eeintech
d1df647dde Merge branch 'master' of git://github.com/inventree/InvenTree into add_ipn_supplier_part_str 2020-10-18 14:33:38 -05:00
Oliver Walters
c0a18ef244 Merge remote-tracking branch 'upstream/master' 2020-10-19 00:03:15 +11:00
Oliver
529c4052ff
Merge pull request #1038 from mpdgraev/fix_int_barcode 
fix error when submitting some non-dict barcodes
 2020-10-19 00:01:38 +11:00
Oliver
7edd08035f
Merge pull request #1049 from SchrodingersGat/api-default-location 
Update creation of StockItem via API
 2020-10-18 22:49:09 +11:00
Oliver Walters
3c175a6c8d Update creation of StockItem via API 
- If no location is specified, but a default location exists for the part, use that
- If a location is specified (even if it is null) then the specified value is used instead
 2020-10-18 22:24:45 +11:00
Oliver
83077514cb
Merge pull request #1041 from eeintech/api_default_location 
Added part 'default_location' to serializer
 2020-10-18 22:01:35 +11:00
Oliver
4d4f0e5cfc
Merge pull request #1044 from eeintech/stock_permissions 
Fixed insertion of backslash in the Stock barcode button group
 2020-10-18 21:11:09 +11:00
Oliver Walters
1ec6bc86d1 Merge remote-tracking branch 'upstream/master' 2020-10-18 20:14:36 +11:00
eeintech
5a6cac43f5 Updated migration 2020-10-16 15:42:23 -05:00
eeintech
0b26d68d0f Added admin view, improved validation of part related relationship 2020-10-16 15:29:58 -05:00
eeintech
34e4409e7f Functional checkpoint: add/delete related parts from template 2020-10-16 13:50:31 -05:00
eeintech
8579abb9c2 Added related parts urls, views, form and templates 
Adding related part relationships work but are still not shown in the part detail page
 2020-10-15 16:58:39 -05:00
eeintech
3d9223c2ee Introduced PartRelated model to store part relationships 2020-10-15 14:11:24 -05:00
eeintech
af6b30eaca Added IPN to Supplier Part string representation 
Improved Supplier Part templates and fixed 'Order Part' button in supplier_part_orders
 2020-10-15 13:09:00 -05:00
eeintech
dbee26aaad Fixed insertion of backslash in the barcode button group 2020-10-13 10:29:34 -05:00
eeintech
70a3b7f891 Improved migration, still fails if email duplicates exist in current DB 2020-10-13 07:43:57 -05:00
eeintech
ac82640c6c Company: allowed duplicate names, made email field unique, custom migration 2020-10-12 17:51:48 -05:00