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,520 Commits 6 Branches 99 Tags 484 MiB
b805cfabb0
Commit Graph

4520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
4dff18e4a6 Remove common_currency model entirely 
- A lot of views / pages / etc needed to be updated too
- Now uses django-money fields entirely
- Create a manual rate exchange backend (needs more work!)
 2020-11-11 00:21:06 +11:00
Oliver Walters
1fc2ef5f18 Custom migration for PartSellPriceBreak 2020-11-10 22:31:46 +11:00
Oliver Walters
83582ae87f Add custom migration for the part_supplierpricebreak model 
- Copies across existing pricing data
- Yikes
 2020-11-10 22:25:05 +11:00
Oliver Walters
e4f2eecb3b Remove defunct 'build_order' field from StockItem model 
- This is now handled by the new-and-improved build system, no longer required
 2020-11-10 20:12:39 +11:00
Oliver Walters
978fd7c683 Implement default currency selection 
- Add 'choices' option to InvenTreeSetting class
- Add support for ChoiceField in InvenTreeSetting form
 2020-11-10 17:08:08 +11:00
Oliver Walters
48c20c600a List supported currencies in the configuration template 2020-11-10 16:28:55 +11:00
Oliver Walters
734436b02e Add integration of django-money 
- Proper currency support
- Add PurchasePrice field to StockItem model
- This keeps track of both the price and the currency
- Display purchase price on the stockitem detail page
 2020-11-10 16:22:42 +11:00
Oliver Walters
0f80c2699e Merge remote-tracking branch 'inventree/master' 2020-11-10 12:28:05 +11:00
Oliver
9d9ef5fc9c
Merge pull request #1116 from SchrodingersGat/duplicate-ipn 
Add setting to allow or prohibit duplicate IPN values
 2020-11-10 10:52:30 +11:00
Oliver
9ac334ddd2
Merge pull request #1115 from eeintech/fix_form_errors 
Fix for #1111 (missing logic to check for model errors)
 2020-11-10 10:25:09 +11:00
Oliver Walters
a6028f027a Add setting to allow or prohibit duplicate IPN values 2020-11-10 09:03:26 +11:00
eeintech
b17b8db25c Fix for #1111 (missing logic) 2020-11-09 17:00:12 -05:00
Oliver
eead52a5dd
Merge pull request #1114 from SchrodingersGat/part_options 
Part options
 2020-11-10 08:28:23 +11:00
Oliver Walters
7286281a06 Fix for unit testing 2020-11-10 07:14:38 +11:00
Oliver Walters
c4296ad4f1 Update migrations and translation 2020-11-09 23:47:31 +11:00
Oliver Walters
c95f124578 Add some helper magic for setting objects 
- If the setting is defined as a "bool" then the returned value is automatically cast to a bool
- Add some more unit testing
 2020-11-09 23:44:54 +11:00
Oliver Walters
75ab7b247b Push part settings into part/settings.py 
- Use the user-configurable defaults in the database model itself
- This means they are observed even when using the API / etc
 2020-11-09 23:16:04 +11:00
Oliver Walters
e1b70ff68f Add default values for create part form 2020-11-09 22:52:32 +11:00
Oliver Walters
8149759852 Add some more part options which set the default values for the following fields: 
- Purchaseable
- Salable
- Trackable
 2020-11-09 20:26:19 +11:00
Oliver
826c471179
Merge pull request #1107 from eeintech/fix_postgres_migration 
Fix PostGreSQL migration (permissions handler)
 2020-11-06 07:58:56 +11:00
Oliver
dadf4d4c13
Merge pull request #1110 from eeintech/order_save_fix 
Fixed saving of purchase and sales order create forms
 2020-11-06 07:53:41 +11:00
Oliver
d23444a86a
Merge pull request #1111 from eeintech/disable_crispy_form_errors 
Disable crispy form errors
 2020-11-06 07:53:11 +11:00
eeintech
ba2da17f1e Disabled crispy form errors 2020-11-05 14:44:04 -05:00
eeintech
5b3dd63b89 Fixed saving of purchase and sales order forms 2020-11-05 14:38:54 -05:00
eeintech
684db67733 Added check for remove too 2020-11-05 09:37:01 -05:00
eeintech
0b76d1d036 Check if permission is not NoneType before adding to group 2020-11-05 09:34:18 -05:00
Oliver
15ea73a448
Merge pull request #1106 from SchrodingersGat/build-tabs 
Rename tabs for build order
 2020-11-05 20:39:25 +11:00
Oliver Walters
a35c4a5a95 Rename tabs for build order 2020-11-05 20:07:23 +11:00
Oliver Walters
bf1490c68a Merge remote-tracking branch 'inventree/master' 2020-11-05 18:29:53 +11:00
Oliver Walters
b8c4690fd8 Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree 2020-11-05 18:29:30 +11:00
Oliver
7e4b84f016
Merge pull request #1105 from SchrodingersGat/build-fix-fixes 
Set the specified location of a build output
 2020-11-05 18:25:00 +11:00
Oliver Walters
2591d34260 Fixed bug where "New output" button stopped working 
- Build status was changing from "PENDING" to "PRODUCTION"
- Created new check for active builds
 2020-11-05 15:57:46 +11:00
Oliver Walters
d44092b209 Fix issue with shadowed form field 
- Rename "quantity" to "output_quantity" to address this
 2020-11-05 15:52:38 +11:00
Oliver Walters
8b7789cdb3 Set the specified location of a build output 2020-11-05 15:46:42 +11:00
Oliver
6c89a2aaeb
Merge pull request #1099 from eeintech/fix_related_parts 
Fix PartRelated (based on updated AjaxCreateView class)
 2020-11-05 09:51:06 +11:00
eeintech
324645b67c Added same level category checkbox and method when adding category template 2020-11-04 12:26:10 -05:00
eeintech
e401bb8e3c Improved tests, fixed admin, improved naming 2020-11-04 12:06:07 -05:00
eeintech
1c14c2237a Moved category templates processing to Part save() method 2020-11-04 09:52:26 -05:00
eeintech
9eba564ff6 Merge branch 'master' of git://github.com/inventree/InvenTree into categories_parameters 2020-11-04 07:52:16 -05:00
eeintech
142cea0cbb Removed custom form save method, remove unused model methods, restored InvenTree CreateAjaxView, improved part related testing 2020-11-04 07:44:06 -05:00
eeintech
853a821497 Merge branch 'master' of git://github.com/inventree/InvenTree into fix_related_parts 2020-11-04 06:46:20 -05:00
Oliver Walters
c9cbea95c9 Merge remote-tracking branch 'inventree/master' 2020-11-04 19:54:11 +11:00
Oliver
dc626ed68b
Merge pull request #1103 from SchrodingersGat/image-upload-fixes 
Bug fix: Part thumbnail API list was not working
 2020-11-04 16:24:04 +11:00
Oliver Walters
f560be1a9a Bug fix: Part thumbnail API list was not working 
- Part images could not be selected from grid
 2020-11-04 15:41:17 +11:00
Oliver
ede7d6dbde
Merge pull request #1102 from SchrodingersGat/coveralls-fix 
Updated to latest version of coverage and coveralls
 2020-11-04 14:12:57 +11:00
Oliver Walters
8a1b255b67 Merge remote-tracking branch 'upstream/master' 2020-11-04 14:01:06 +11:00
Oliver Walters
5f6f722d6c Change from python-coveralls to coveralls 2020-11-04 13:30:17 +11:00
Oliver Walters
f8da15287c Updated to latest version of coverage and coveralls 2020-11-04 09:35:43 +11:00
Oliver
fc99086c8f
Merge pull request #1101 from SchrodingersGat/delete-on-deplete-fix 
Logic fix for editing stock item creation form
 2020-11-04 09:33:52 +11:00
eeintech
4e157fe956 Fixed text for parent categories checkbox 2020-11-03 17:05:08 -05:00