Commit Graph

4731 Commits

Author SHA1 Message Date
Oliver
310728ead4
Merge pull request #1583 from SchrodingersGat/server-info
Add debug mode and database backend as info to the "stats" dialog
2021-05-14 12:56:12 +10:00
Oliver Walters
7deea1ec00 Style fixes 2021-05-14 12:40:42 +10:00
Oliver Walters
f76bc5a7b8 Add debug mode and database backend as info to the "stats" dialog 2021-05-14 12:38:38 +10:00
github-actions[bot]
65e6756c45 updated translation base 2021-05-13 21:51:17 +00:00
Oliver
033aa29531
Merge pull request #1580 from matmair/BUG-copy
fixing bug from refactor
2021-05-14 07:50:33 +10:00
eeintech
68f5ec8b6a Added currency conversion 2021-05-13 17:09:52 -04:00
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Nigel
bca2f4a07b
feat(sales_order): Stock Items show the PO number
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
2021-05-13 14:18:25 -06:00
eeintech
32d0f3039d Obviously new float fields should be read-only... 2021-05-13 16:17:45 -04:00
eeintech
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
eeintech
f2e9f58f1b Added purchase price range and average to BOM items/view 2021-05-13 15:47:42 -04:00
Matthias
e382f2a57e fixing bug from refactor 2021-05-13 15:46:27 +02:00
Oliver Walters
aa6bbdc82c Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-05-13 17:30:58 +10:00
Oliver
499bad2be8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:49 +10:00
Oliver
ef0a49c55a Fix: New translations django.po from Crowdin 2021-05-13 14:17:48 +10:00
Oliver
6f9982b2db Fix: New translations django.po from Crowdin 2021-05-13 14:17:45 +10:00
Oliver
5bd538a889 Fix: New translations django.po from Crowdin 2021-05-13 14:17:43 +10:00
Oliver
26a83a45b3 Fix: New translations django.po from Crowdin 2021-05-13 14:17:42 +10:00
Oliver
cfa6cbd831 Fix: New translations django.po from Crowdin 2021-05-13 14:17:41 +10:00
Oliver
455cf0a0f8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:39 +10:00
Oliver
defdd638fc Fix: New translations django.po from Crowdin 2021-05-13 14:17:37 +10:00
Oliver
68ef2ba0ac Fix: New translations django.po from Crowdin 2021-05-13 14:17:36 +10:00
github-actions[bot]
ec6affa9c7 updated translation base 2021-05-13 04:04:55 +00:00
Oliver Walters
82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
Oliver Walters
6de44a5921 Adds a "filename_template" field to reports
- Allows users to define the naming scheme for generated reports
- Templated, can use any context variable already available to the report instance
- Adds some more context variables to various reports
2021-05-13 13:23:51 +10:00
Oliver
d5fa4d5f66 Fix: New translations django.po from Crowdin 2021-05-13 11:07:51 +10:00
Oliver
c58665fed2 Fix: New translations django.po from Crowdin 2021-05-13 11:07:49 +10:00
Oliver
5a51219671 Fix: New translations django.po from Crowdin 2021-05-13 11:07:48 +10:00
Oliver
1802f12325 Fix: New translations django.po from Crowdin 2021-05-13 11:07:46 +10:00
Oliver
da727d3143 Fix: New translations django.po from Crowdin 2021-05-13 11:07:45 +10:00
Oliver
dfd784df99 Fix: New translations django.po from Crowdin 2021-05-13 11:07:43 +10:00
Oliver
7a6b269586 Fix: New translations django.po from Crowdin 2021-05-13 11:07:42 +10:00
Oliver
6d66a83123 Fix: New translations django.po from Crowdin 2021-05-13 11:07:40 +10:00
Oliver
66429ed545 Fix: New translations django.po from Crowdin 2021-05-13 11:07:39 +10:00
github-actions[bot]
3d8b350082 updated translation base 2021-05-13 00:47:10 +00:00
Matthias
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
Matthias
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
Matthias
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
Oliver
a9dd53d81f Fix: New translations django.po from Crowdin 2021-05-13 01:57:52 +10:00
Oliver
34f7452c8a Fix: New translations django.po from Crowdin 2021-05-13 01:01:46 +10:00
Oliver
705bbf519a Fix: New translations django.po from Crowdin 2021-05-13 00:04:55 +10:00
Matthias
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
Matthias
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
Matthias
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00
Oliver
6c2c92a6e9 Fix: New translations django.po from Crowdin 2021-05-12 23:05:38 +10:00
Oliver
2175e8a4c0 Fix: New translations django.po from Crowdin 2021-05-12 23:05:36 +10:00
Oliver
5bc24f9a36 Fix: New translations django.po from Crowdin 2021-05-12 23:05:34 +10:00
Oliver
45ddb6231b Fix: New translations django.po from Crowdin 2021-05-12 23:05:32 +10:00
Oliver
a0e7d5c731 Fix: New translations django.po from Crowdin 2021-05-12 23:05:29 +10:00
Oliver
edb8af38c0 Fix: New translations django.po from Crowdin 2021-05-12 23:05:27 +10:00
Oliver
15d23581fa Fix: New translations django.po from Crowdin 2021-05-12 23:05:24 +10:00
Oliver
d617add182 Fix: New translations django.po from Crowdin 2021-05-12 23:05:22 +10:00
Oliver
d14043c756 Fix: New translations django.po from Crowdin 2021-05-12 23:05:19 +10:00
github-actions[bot]
bad4cc65d0 updated translation base 2021-05-12 12:29:35 +00:00
Oliver
07c7af1f2e
Merge pull request #1569 from SchrodingersGat/docker-dev
Development docker image
2021-05-12 22:27:50 +10:00
github-actions[bot]
4dfaa96834 updated translation base 2021-05-12 12:19:46 +00:00
Oliver
9d98ecca92
Merge pull request #1561 from eeintech/multi_part_forms
Multi-step form framework + Purchase order upload file view
2021-05-12 22:18:35 +10:00
Oliver
a144763d92 Fix: New translations django.po from Crowdin 2021-05-12 22:07:15 +10:00
Oliver
77624532c2 Fix: New translations django.po from Crowdin 2021-05-12 20:55:22 +10:00
Oliver Walters
3381c5e257 Improvements to development docker-compose script
- Python packages are installed in a virtual environment within the src dir
- This prevents a LONG installation process each time the docker image is rebuilt
2021-05-12 20:53:50 +10:00
Oliver
bfe3cffa66 Fix: New translations django.po from Crowdin 2021-05-12 11:18:05 +10:00
Oliver
7fde507d85 Fix: New translations django.po from Crowdin 2021-05-12 11:18:04 +10:00
Oliver
e85e27def0 Fix: New translations django.po from Crowdin 2021-05-12 11:18:02 +10:00
Oliver
98d431d774 Fix: New translations django.po from Crowdin 2021-05-12 11:18:00 +10:00
Oliver
4b332aa96b Fix: New translations django.po from Crowdin 2021-05-12 11:17:57 +10:00
Oliver
60fb47ec31 Fix: New translations django.po from Crowdin 2021-05-12 11:17:56 +10:00
Oliver
7fdb0756cf Fix: New translations django.po from Crowdin 2021-05-12 11:17:54 +10:00
Oliver
385fff9c26 Fix: New translations django.po from Crowdin 2021-05-12 11:17:53 +10:00
Oliver
de858e53cc Fix: New translations django.po from Crowdin 2021-05-12 11:17:52 +10:00
github-actions[bot]
8d5996ffca updated translation base 2021-05-12 00:59:47 +00:00
Oliver Walters
3b252b8409 Record the user when updating stock items 2021-05-12 10:42:09 +10:00
Oliver Walters
30ff48d803 Fixes 2021-05-12 10:09:02 +10:00
Oliver Walters
68b53acbf1 remove old fields from the StockItemTracking model 2021-05-12 08:07:03 +10:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
Matthias
169745c11f style fix 2021-05-11 16:23:26 +02:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
Matthias
71c3ff4b9f prefetching related information 2021-05-11 16:15:10 +02:00
Oliver Walters
03a231bffb Updates
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
2021-05-11 23:38:26 +10:00
Oliver Walters
84bfffd5a7 Override 'add_note' when new StockItem is created
- This allows us to prevent the issue of duplicate notes being created
2021-05-11 22:51:29 +10:00
Oliver Walters
0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00
Oliver Walters
93e6eb6dc7 Unit test fixes 2021-05-11 22:26:03 +10:00
Matthias
4156b71c4b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-11 13:32:14 +02:00
Oliver Walters
a1203aa1e5 Fixes for unit testing 2021-05-11 21:22:54 +10:00
Oliver Walters
0020e85397 Refactor add_tracking_entry 2021-05-11 20:56:20 +10:00
Oliver Walters
385131137f Extract stock location from legacy stocktracking entry
- Not 100% accurate - e.g. if the stock location has been altered!
2021-05-11 20:55:14 +10:00
Oliver Walters
ed4da4d338 Improve introspection in migration file 2021-05-11 18:23:29 +10:00
Oliver Walters
725a64c29d Extract more information from legacy tracking data 2021-05-11 18:11:27 +10:00
Oliver Walters
1126e2e110 "Guess" stock history code from recorded title string 2021-05-11 17:41:37 +10:00
Oliver Walters
70ad0ba0de Improve reporting in stock history API 2021-05-11 17:41:17 +10:00
Oliver Walters
af53b341f0 Replace "addTrasactionNote" function with "add_tracking_entry"
- Does not add translated strings to the database
2021-05-11 17:17:48 +10:00
Oliver Walters
82c6d10c33 Add translateable status codes for StockHistory 2021-05-11 17:12:31 +10:00
github-actions[bot]
067deb24f9 updated translation base 2021-05-10 22:40:32 +00:00
Oliver
fbdcefba12
New Crowdin updates (#1570)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-05-11 08:39:53 +10:00
eeintech
c9e77edf04 Almost there? 2021-05-10 17:31:29 -04:00
eeintech
6d8f94619b Improved template render, raised bar for automatic field matching 2021-05-10 12:52:34 -04:00
eeintech
f0932040ee Fixed form validation for previous step, hide tab depending on order status, added purchase_price field 2021-05-10 11:42:22 -04:00
Oliver Walters
6aab704144 Trim content when copying to clipboard 2021-05-10 19:40:54 +10:00
github-actions[bot]
0b5d757470 updated translation base 2021-05-10 07:26:04 +00:00
Oliver
c7d625f23e
Merge pull request #1565 from matmair/clipboard-ui
Clipboard UI
2021-05-10 17:24:31 +10:00
Matthias
fc83458bdb changes as suggested by @SchrodingersGat 2021-05-10 07:53:58 +02:00
Oliver
765ecc443c
New Crowdin updates (#1568)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-05-10 15:33:17 +10:00
github-actions[bot]
3be7cf3b38 updated translation base 2021-05-10 02:57:40 +00:00
Oliver
fb1dce1357
Merge pull request #1567 from SchrodingersGat/login-redirect
Login redirect
2021-05-10 12:56:30 +10:00
github-actions[bot]
b29b668fe5 updated translation base 2021-05-10 02:35:46 +00:00
Oliver Walters
7e55e343e2 PEP fix 2021-05-10 12:35:19 +10:00
Oliver
6a08191595
Merge pull request #1564 from matmair/fix-css
inventree.css cleanup
2021-05-10 12:34:25 +10:00
Oliver Walters
be31154a44 Cleaner implementation 2021-05-10 12:33:49 +10:00
Oliver Walters
d9f621c922 Login redirect fix 2021-05-10 12:29:51 +10:00
Matthias
b0a8477a54 removes unallowed char 2021-05-09 14:35:33 +02:00
Matthias
c148ab9f8e fixed css-comments 2021-05-09 14:34:52 +02:00
Matthias
d38c1f6c0b sample implementation 2021-05-09 14:30:39 +02:00
Matthias
9f6f69a815 rename for shorter inclusion str 2021-05-09 14:29:35 +02:00
Matthias
783b039eb1 initial functionality for #997 2021-05-09 14:28:46 +02:00
github-actions[bot]
30ec056dd6 updated translation base 2021-05-09 00:18:25 +00:00
Matthias
a210b331ce just a small translation 2021-05-09 00:27:00 +02:00
Matthias
f931ba405b style fixes 2021-05-08 21:08:12 +02:00
Matthias
89e0856824 fix for deleting items
in step 2 not working in step 3
2021-05-08 21:05:02 +02:00
Matthias
5622468209 better readable structure 2021-05-08 20:55:01 +02:00
Matthias
e6372fd600 added translations 2021-05-08 20:54:23 +02:00
Matthias
a0d9bf692e simpler code - same function 2021-05-08 20:53:26 +02:00
github-actions[bot]
79904308a5 updated translation base 2021-05-08 10:55:51 +00:00
Matthias
5eb1a1f426 fixed styling 2021-05-08 12:32:19 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
eeintech
9b69980a6c Oopsy forgot to merge PurchaseOrderUpload view 2021-05-07 18:08:11 -04:00
eeintech
88000200b3 Merged master and resolved conflicts 2021-05-07 18:02:40 -04:00
eeintech
ceccdf3909 Now creating PurchaseOrderLineItem instances! 2021-05-07 18:00:30 -04:00
eeintech
fbf24621f3 Getting there... 2021-05-07 16:46:10 -04:00
eeintech
6e269ae41a Now displaying item match table 2021-05-07 13:23:10 -04:00
github-actions[bot]
f0fc21329d updated translation base 2021-05-07 13:56:06 +00:00
Oliver
e47a8d6d5e
Merge pull request #1545 from matmair/issue1425
adds sales order line item price
2021-05-07 23:54:45 +10:00
Matthias
63cf75eefc styling again 2021-05-07 15:37:15 +02:00
Matthias
b6043af7c0 auto-set price if sales-order line is added 2021-05-07 15:35:35 +02:00
github-actions[bot]
84148c3e87 updated translation base 2021-05-07 13:19:30 +00:00
Matthias Mair
bdd61fdb2c
enable live-serving of i18n_static tag in debug (#1560)
* enable live-serving of i18n_static tag in debug

* style repair
2021-05-07 23:18:06 +10:00
Matthias
9e59d41f12 style improvments 2021-05-07 07:46:35 +02:00
Matthias
ae01503a9e handeling data in an inheritable way 2021-05-07 07:20:43 +02:00
Matthias
c775c4611f adding custom action button
save the changes to the db and return success-json
2021-05-07 07:19:43 +02:00
Matthias
f73863ea51 adding in cstm action buttons function 2021-05-07 07:18:13 +02:00
Matthias
09fe9ccf11 sales order item tracking 2021-05-07 07:15:33 +02:00
Matthias
985967fccb save return of part.id 2021-05-07 07:13:23 +02:00
github-actions[bot]
151efdd205 updated translation base 2021-05-06 21:58:39 +00:00
Francois
5ed17022f2
Fixed stock import as it was not validating the serial properly (#1559) 2021-05-07 07:57:16 +10:00
eeintech
4f942fd9f7 Working towards item match form 2021-05-06 17:07:22 -04:00
eeintech
e31452a6ad Match field step is now managed through form 2021-05-06 16:05:58 -04:00
eeintech
f79382d96f Handling part match form but still not creating purchase order items 2021-05-06 12:35:52 -04:00
Matthias
053793288b same spacing for tables
thanks @eeintech
2021-05-06 18:05:43 +02:00
eeintech
005063aad6 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-06 11:30:08 -04:00
Matthias
aac05db6bf style fixing 2021-05-06 17:15:10 +02:00
Matthias
792b2d11c0 cleanup 2021-05-06 16:46:52 +02:00
Matthias
660a3f9410 cleaner get function 2021-05-06 16:46:29 +02:00
Matthias
90c207b935 keeping part id in inherited form 2021-05-06 16:45:39 +02:00
Matthias
4830ff28bf new function for initials 2021-05-06 16:34:37 +02:00
Matthias
c2a5e1fd23 moved the special stuff into the inherited view 2021-05-06 16:29:03 +02:00
github-actions[bot]
e61480242e updated translation base 2021-05-06 14:15:52 +00:00
Matthias Mair
3a1c233bff
Bug/calender (#1558)
* fixes calendar not rendering when toggling view

* same for po

* and builds
2021-05-07 00:11:08 +10:00
Matthias
b09f49aaa5 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 14:54:26 +02:00
Matthias
c1bcc60f0a forgot a py 2021-05-06 14:41:26 +02:00
Matthias
d5b65e6e41 yaml! 2021-05-06 14:38:13 +02:00
Matthias
8c63b53c16 here we go js 2021-05-06 14:35:23 +02:00
Matthias
a77d9d9de7 same treatment for html 2021-05-06 14:33:03 +02:00
github-actions[bot]
c2e00586f3 updated translation base 2021-05-06 10:31:46 +00:00
Matthias Mair
39d4129157
chery picked all fixed trans str from #1438 (#1554) 2021-05-06 20:29:58 +10:00
Matthias
f2b0717d10 removes all lines consisting only of spaces
this really bothers me for some reason - nothing technical
2021-05-06 12:11:38 +02:00
Oliver
0f6515d400
New Crowdin updates (#1552)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-05-06 15:26:44 +10:00
Oliver
224d9c03d0
New Crowdin updates (#1551)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-05-06 11:39:34 +10:00
Oliver Walters
e83b62bd55 Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
2021-05-06 09:06:00 +10:00
github-actions[bot]
172ac9a06f updated translation base 2021-05-05 22:59:50 +00:00
Matthias
1259374822 removes layout-shift due to typo in menubar 2021-05-06 00:37:45 +02:00
Matthias
f9463fa277 fixes navbar-layout shift with narrow dollar-sign 2021-05-06 00:33:34 +02:00
Matthias
66f198baa9 removing duplicate information in pricing table 2021-05-06 00:17:46 +02:00
Matthias
c4d0865f06 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 00:14:33 +02:00
Matthias
efa9da2ce1 removed unused imports 2021-05-06 00:00:13 +02:00
Matthias
030865f8dd sale price in pricing table 2021-05-05 23:49:04 +02:00
Matthias
1b7ade9405 adding in missing parts for full saleprice 2021-05-05 23:47:46 +02:00
Matthias
1a227faec4 abstracting get_price 2021-05-05 23:42:52 +02:00
Matthias
287a05ddc5 clearer spacing in html 2021-05-05 21:48:58 +02:00
eeintech
40e8ed9e5b Match parts view is now populated correctly 2021-05-05 15:28:04 -04:00
Matthias
2cfb9c60a3 space cleanup 2021-05-05 20:57:00 +02:00
Matthias
b392586a08 quantity also for modal 2021-05-05 20:55:37 +02:00
Matthias
dc4fb64987 add in price modal in table 2021-05-05 20:53:53 +02:00
Matthias
ee028ef925 space cleanup 2021-05-05 20:38:27 +02:00
eeintech
2cd1df691b Working towards part matching 2021-05-05 13:16:40 -04:00
eeintech
9773fee50b Validation of matching fields is working 2021-05-05 12:40:48 -04:00
Oliver
a7ca1f4296 Fix: New translations django.po from Crowdin 2021-05-05 18:08:32 +10:00
github-actions[bot]
5267b4e9f4 updated translation base 2021-05-05 07:55:20 +00: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
Oliver
ce0b33e27e Fix: New translations django.po from Crowdin 2021-05-05 10:08:04 +10:00
github-actions[bot]
7a81fc02ed updated translation base 2021-05-04 23:24:01 +00:00
github-actions[bot]
b1d463fc65 updated translation base 2021-05-04 23:20:29 +00:00
eeintech
b4342d6203 Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data 2021-05-04 17:35:27 -04:00
Matthias
7fa235282b sale price in ui 2021-05-04 22:50:04 +02:00
Matthias
294e86cc38 Add in sale price model 2021-05-04 21:56:25 +02:00
Oliver
ac78bb3acf Fix: New translations django.po from Crowdin 2021-05-05 05:47:36 +10:00
Matthias
55cdeef30e adds price-calc to purchase order Fixes #1513 2021-05-04 21:33:00 +02:00
eeintech
64fb492b97 Added match parts step, need to process fields data 2021-05-04 14:45:52 -04:00
eeintech
7cdf0af04a Added upload file step 2021-05-04 12:20:57 -04:00
eeintech
373898d43e Added step description and crispy form tag 2021-05-04 10:28:00 -04:00
Oliver
cf9624c94e Fix: New translations django.po from Crowdin 2021-05-04 19:36:58 +10:00
Matthias
75f487aee9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-04 00:02:15 +02:00
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
github-actions[bot]
d82b370aa5 updated translation base 2021-04-30 23:53:45 +00:00
Oliver
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
github-actions[bot]
53fd046b78 updated translation base 2021-04-30 23:13:52 +00:00
github-actions[bot]
984c32c8ae updated translation base 2021-04-30 22:27:42 +00:00
github-actions[bot]
47d848d5ac updated translation base 2021-04-30 22:26:34 +00:00
Oliver
94ff8829f7
Merge pull request #1536 from eeintech/manufacturer_part_api_fix
API fixes related to ManufacturerPart
2021-05-01 08:26:32 +10:00
Matthias
036c5661ec Link for credits in UI and README Closes #1533 2021-04-30 23:40:52 +02:00
eeintech
4972440dda Fixed API test 2021-04-30 15:27:36 -04:00
eeintech
41962ca23a API fixes related to ManufacturerPart 2021-04-30 13:54:56 -04:00
Oliver Walters
c56261746d Merge remote-tracking branch 'inventree/l10' into l10n_l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
2021-04-30 20:26:14 +10:00
Oliver
e650e6dc7b Fix: New translations django.po from Crowdin 2021-04-30 16:09:15 +10:00
github-actions[bot]
acbd5b8f7e updated translation base 2021-04-30 01:54:54 +00:00
Oliver
c60f4c4f2f
Merge pull request #1529 from matmair/matmair/issue1527
per session user-language settings
2021-04-30 11:53:39 +10:00
eeintech
ad8d95f2f0 Added two more tests with fractional quantities 2021-04-29 14:35:23 -04:00
eeintech
87b38ec992 Added support for fractional part/bom quantity and price 2021-04-29 14:22:07 -04:00
Oliver
0bdd98cae7 Fix: New translations django.po from Crowdin 2021-04-30 01:08:21 +10:00
github-actions[bot]
d455e826e2 updated translation base 2021-04-29 04:57:42 +00:00
Oliver
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
github-actions[bot]
f9f4bfa76c updated translation base 2021-04-28 23:49:41 +00:00
eeintech
d072187bf8 Fixed exception for quantity check 2021-04-28 16:46:42 -04:00
eeintech
a63d5012f0 Purchase order fixes 2021-04-28 13:16:40 -04:00
eeintech
b1ff686395 Fixes to create build output form, added validation on quantity field 2021-04-28 11:18:47 -04:00
Matthias
15eb835ffc explicit redirection url Fixes #1527 2021-04-28 14:38:07 +02:00
Matthias
c5640fe6c6 renamed theme to appearance 2021-04-28 14:37:11 +02:00
Matthias
660f2673ac added in language-change form 2021-04-28 14:26:55 +02:00
github-actions[bot]
ea748e8b49 updated translation base 2021-04-28 12:23:25 +00:00
Matthias
292944179e fixed wrong i18n-code for polish 2021-04-28 13:57:39 +02:00
github-actions[bot]
b4bf98ac9d updated translation base 2021-04-27 23:02:57 +00:00
github-actions[bot]
8e25e4cfab updated translation base 2021-04-27 22:58:39 +00:00
Oliver
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
github-actions[bot]
2701a319b3 updated translation base 2021-04-27 21:53:44 +00:00
Oliver
2e5be35517
Merge pull request #1525 from matmair/matmair/issue1524
[BUG] no attribute MPN
2021-04-28 07:52:17 +10:00
Matthias
fc429708f1 [BUG] no attribute MPN
Fixes #1524
2021-04-27 21:38:06 +02:00
eeintech
f0b44450fb Updated 'Required for Build Orders' API queryset 2021-04-27 12:48:36 -04:00
Matthias
8f40b57121 improvements after code-review by @eeintech 2021-04-27 16:32:43 +02:00
github-actions[bot]
80938193a7 updated translation base 2021-04-27 10:45:00 +00:00
Oliver
4d2e23f701
Merge pull request #1521 from matmair/matmair/issue1519
More syntax for adding serial numbers #1519
2021-04-27 20:43:46 +10:00
Matthias
f4502aecca Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-26 21:48:42 +02:00
Matthias
2de3b892a5 More syntax for adding serial numbers #1519 2021-04-26 21:33:39 +02:00
github-actions[bot]
795d083723 updated translation base 2021-04-25 02:46:09 +00:00
Oliver Walters
80f11290c9 Remove old command 2021-04-25 12:30:59 +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
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
8ad16ceb9c Refactorin' 2021-04-25 11:07:57 +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
github-actions[bot]
c83a7a0480 updated translation base 2021-04-23 08:09:57 +00:00
github-actions[bot]
6cea70d0b7 updated translation base 2021-04-22 23:55:01 +00:00
github-actions[bot]
743ef627f5 updated translation base 2021-04-22 23:08:43 +00:00
Matthias
a11fff0269 man those tests take long 2021-04-22 23:17:27 +02:00
Matthias
83764d5e6c added PO in the fixtures so that should be higher 2021-04-22 22:57:48 +02:00
Matthias
a1237b4a49 always adjust pruchase price if one exists 2021-04-22 22:17:54 +02:00
Matthias
7cb858546e tests for new methods in #1509 2021-04-22 22:16:56 +02:00
Matthias
c14478ed1f automato fill purchase price #1509 2021-04-22 19:31:04 +02:00
github-actions[bot]
8bcdbb7e53 updated translation base 2021-04-22 13:39:06 +00:00
github-actions[bot]
f021a4cf80 updated translation base 2021-04-22 13:24:53 +00:00
Oliver Walters
d6ef9ee212 Adds some more translatable strings
- Mostly just to check the workflow integration
2021-04-22 23:19:11 +10:00
github-actions[bot]
7cd730c6c6 updated translation base 2021-04-22 12:55:06 +00:00
Oliver
2f4e78fe51
Merge pull request #1508 from matmair/use-spaces
use spaces instead of tabs
2021-04-22 21:16:45 +10:00
Matthias
294dd0525f use spaces instead of tabs 2021-04-22 12:53:49 +02:00
Matthias
126c5ca3bf typo 2021-04-22 12:48:42 +02:00
Matthias
f7635fb1c0 reording form 2021-04-22 12:39:48 +02:00
Matthias
80d46fb3ab cleanup; using one currency 2021-04-22 12:30:38 +02:00
Matthias
a0154067d2 added setting -> default false 2021-04-22 12:05:48 +02:00
Oliver Walters
4a522bb05a Allow 'admin' account access to the report models 2021-04-22 14:53:42 +10:00
Oliver
c5b6e22a58
Merge pull request #1505 from eeintech/email_reset
Enabled default email sender setting
2021-04-22 08:50:05 +10:00
Oliver
34341c31f2
Merge pull request #1504 from SchrodingersGat/turkish
Added skeleton for Turkish translation
2021-04-22 08:46:31 +10:00
eeintech
ee3f3c7960 Updated default backend setting and enabled default sender setting 2021-04-21 09:28:30 -04:00
Oliver Walters
d9cf721589 Added skeleton for Turkish translation 2021-04-21 22:36:57 +10:00
Matthias Mair
37953f9926
Merge branch 'master' into l10n_trans 2021-04-21 14:17:19 +02:00
Matthias Mair
41e5a503ac New translations django.po (German)
[ci skip]
2021-04-21 12:42:23 +02:00
Matthias Mair
78bf6237d0 New translations django.po (Chinese Simplified)
[ci skip]
2021-04-21 11:33:38 +02:00
Matthias Mair
6600879ed1 New translations django.po (Russian)
[ci skip]
2021-04-21 11:33:37 +02:00
Matthias Mair
0131340bdf New translations django.po (Polish)
[ci skip]
2021-04-21 11:33:35 +02:00
Matthias Mair
08887d2e78 New translations django.po (Japanese)
[ci skip]
2021-04-21 11:33:34 +02:00
Matthias Mair
c5e5dea904 New translations django.po (Italian)
[ci skip]
2021-04-21 11:33:32 +02:00
Matthias Mair
2019dc1f78 New translations django.po (Spanish)
[ci skip]
2021-04-21 11:33:31 +02:00
Matthias Mair
eccd4762b3 New translations django.po (French)
[ci skip]
2021-04-21 11:33:29 +02:00
Matthias Mair
78cbfcfda7 New translations django.po (German)
[ci skip]
2021-04-21 11:33:28 +02:00
Matthias Mair
227327a687 New translations django.po (Chinese Simplified) 2021-04-21 11:17:46 +02:00
Matthias Mair
39af8d8a94 New translations django.po (Russian) 2021-04-21 11:17:45 +02:00
Matthias Mair
3a23c78202 New translations django.po (Polish) 2021-04-21 11:17:43 +02:00
Matthias Mair
97049a90f5 New translations django.po (Japanese) 2021-04-21 11:17:42 +02:00
Matthias Mair
c8a28c4bfb New translations django.po (Italian) 2021-04-21 11:17:40 +02:00
Matthias Mair
8fbbe4ab8e New translations django.po (Spanish) 2021-04-21 11:17:39 +02:00
Matthias Mair
51994b210d New translations django.po (French) 2021-04-21 11:17:37 +02:00
Matthias
07d68f7fde Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-21 11:12:48 +02:00
Oliver Walters
3e63334125 Change file just to re-run CI 2021-04-21 17:34:56 +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
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
Oliver
4903826be1
Merge pull request #1494 from matmair/feature/js_translation
Translating JS-Files once
2021-04-20 22:58:43 +10:00
Matthias
99dc02e2cb cleaning up names / comments 2021-04-20 14:39:28 +02:00
Matthias
4d439db322 fixing styling issues 2021-04-20 13:48:05 +02:00
Matthias
2943dc6083 initial implementation as in #1485 2021-04-20 13:37:19 +02: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
Oliver
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
eeintech
2dbd61c611 Stock return to customer fix, stock children item table fix 2021-04-19 11:25:39 -04:00
Oliver Walters
252abb920f Do not print EMAIL warning if in TEST mode 2021-04-19 20:49:24 +10:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title
Instance name in title
2021-04-18 21:48:37 +10:00
Matthias Mair
26e12f299d New translations django.po (German) 2021-04-18 13:31:52 +02:00
Matthias Mair
00ddffa59e New translations django.po (German) 2021-04-18 13:04:25 +02:00
Matthias
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
Matthias
e668577d97 fix as noted in #1481 2021-04-18 12:31:17 +02:00
Oliver
26c19dc77d
Merge pull request #1479 from matmair/feature/translations
Feature/translations
2021-04-18 20:23:51 +10:00
Matthias
337f680c89 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 11:58:46 +02:00
Oliver
724ecebb4c
Update version.py 2021-04-18 19:54:16 +10:00
Oliver
0b5557395b
Update version.py 2021-04-18 19:53:15 +10:00
Oliver Walters
1502a07b81 Remove log output which was leaking password into the logs 2021-04-18 16:54:35 +10:00
Matthias
0c4d22623d added german translations 2021-04-18 01:33:35 +02:00
Matthias
c99850abf3 po files for new chnaged translation strings 2021-04-18 01:27:04 +02:00
Matthias
c3319e88f4 typo fix 2021-04-18 01:21:44 +02:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
c233e82919 added translatable strings 2021-04-17 23:54:23 +02:00
Matthias
46822017c6 FIX: multiline trans not possible 2021-04-17 23:52:55 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
20af4c9ba0 template tag for translatable alerts with links 2021-04-17 23:48:47 +02:00
Matthias
7a0a901c2b translations fo true/false yes /no 2021-04-17 23:28:10 +02:00
Matthias Mair
410d6195a8 New translations django.po (German) 2021-04-17 19:00:32 +02:00
Matthias Mair
37b3ac07ff New translations django.po (German) 2021-04-17 17:46:27 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
Matthias Mair
d8d015925b New translations django.po (German) 2021-04-17 11:03:13 +02:00
Matthias Mair
d561186313 New translations django.po (German) 2021-04-17 10:01:03 +02:00
Matthias
3598c36043 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-17 09:59:05 +02:00
Oliver
2be78f5d4c
Merge pull request #1469 from eeintech/stock_item_template_fix
Fixed stock item template for items without manufacturer part
2021-04-17 08:05:21 +10:00
eeintech
2b4723cc32 Hide system alert for non-staff users, introduced orange icon for less severe alert than background workers not running (like missing email config) 2021-04-16 12:22:13 -04:00
eeintech
09ef85ce9d Fixed stock item template for items without manufacturer part 2021-04-16 11:43:21 -04:00
Oliver
d4529ec1c4
Merge pull request #1464 from matmair/translation_improv
Translation improvments
2021-04-16 21:46:07 +10:00
Nigel
6f00c662a1
fix: don't link manufacturer part if it doesn't have one 2021-04-15 16:28:50 -06:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
Matthias
d49977bed3 initial implementation as described in #1463 2021-04-15 14:51:11 +02:00
Matthias
cfae92e22b more translated strings for api-titles and filters 2021-04-15 12:15:02 +02:00
Matthias Mair
ecbab57b3b New translations django.po (German) 2021-04-15 12:14:14 +02:00
Matthias Mair
bc140be0ca New translations django.po (German) 2021-04-15 11:18:25 +02:00
Oliver
3e6429cb13
Merge pull request #1462 from eeintech/stock_label
Added revision and stock item QR code URL for label creation
2021-04-15 13:00:09 +10:00
Matthias Mair
ddf14a8f3b New translations django.po (German) 2021-04-14 22:58:16 +02:00
eeintech
aa41e3e17d Fixed default url barcode setting 2021-04-14 16:24:24 -04:00
eeintech
1bf72ee335 Added revision and stock item URL for label creation 2021-04-14 16:00:28 -04:00
Matthias Mair
50922b1ed4 New translations django.po (German) 2021-04-14 21:59:11 +02:00
Matthias Mair
35c764036c New translations django.po (German) 2021-04-14 21:33:17 +02:00
Matthias
75381cbb7b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-14 21:18:21 +02:00
Matthias Mair
b4003cc3e0 New translations django.po (German) 2021-04-14 16:19:06 +02:00
Matthias Mair
5ff624bf82 New translations django.po (German) 2021-04-14 13:56:23 +02:00
Matthias Mair
a4dfaa9528 New translations django.po (Spanish) 2021-04-14 13:56:22 +02:00
matmair
c8b234362f updated translation-string 2021-04-14 11:13:13 +00:00
Matthias
73bcacc2d8 added tranlation strings 2021-04-14 12:23:51 +02:00
eeintech
1e6c6c678f Split supplier part update migration and added reverse method for manufacturer data 2021-04-13 10:25:53 -04:00
eeintech
42a73576da Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-13 09:48:55 -04:00
Oliver
a8d22dac62
Merge pull request #1458 from matmair/translation_improv
updated translation references
2021-04-13 21:20:32 +10:00
Matthias
75a249da95 Merge branch 'master' of https://github.com/inventree/InvenTree into translation_improv 2021-04-13 13:03:58 +02:00
Matthias
71425d3bc5 updated translation references 2021-04-13 12:56:18 +02:00
Oliver Walters
d5034ece51 typo fix 2021-04-13 20:21:33 +10:00
Oliver Walters
04318c6d70 Adjust default email settings 2021-04-13 20:15:09 +10:00
Oliver Walters
96efb0eb28 Remove "forgot password" link if the email backend is not configured 2021-04-13 20:02:20 +10:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
f902b79d79 And more templates 2021-04-12 20:07:38 +10:00
Oliver Walters
12a4c22a9b Password reset templates 2021-04-12 20:02:05 +10:00
Oliver Walters
a9d490b716 PEP fixes 2021-04-12 19:20:41 +10:00
Oliver Walters
d243ff6b37 Offload email task to background worker 2021-04-12 19:18:47 +10:00
Oliver Walters
fb5a94a778 Support for email settings 2021-04-12 18:50:37 +10:00
Oliver Walters
8a06eaa40d Unit testing 2021-04-11 19:28:39 +10:00
Oliver Walters
85c9bc1b81 Adds detail endpoint for PartParameter model 2021-04-11 18:56:35 +10:00
Oliver
effd547260
Update version.py 2021-04-11 15:39:53 +10:00
Oliver
7c9ad3f406
Update version.py 2021-04-11 15:39:16 +10:00
Oliver Walters
f9449da576 Merge remote-tracking branch 'upstream/master' into django-q
# Conflicts:
#	InvenTree/InvenTree/version.py
2021-04-11 15:03:33 +10:00
Oliver
34e95ab70c
Update version.py 2021-04-11 14:49:41 +10:00
Oliver Walters
f6f3815f31 Include worker status in main API call 2021-04-11 13:58:59 +10:00
Oliver Walters
b74d365529 Merge remote-tracking branch 'upstream/master' into django-q 2021-04-10 22:46:20 +10:00
Oliver Walters
91b6f98f95 Update directory structure to match docker config 2021-04-10 22:08:36 +10:00
Oliver Walters
178715ce61 Auto create config file in specified location if it does not exist 2021-04-10 20:57:56 +10:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Oliver Walters
5e54b0f5cf Auto-generate key file if it does not exist! 2021-04-10 19:01:02 +10:00
Oliver Walters
e6bd91c9e2 Company description is no longer a required field 2021-04-10 15:29:44 +10:00
Oliver Walters
8eb571bddf Update dockerfile 2021-04-10 15:08:10 +10:00
Oliver
c7e1ac5648
Merge pull request #1449 from eeintech/fix_stock_ops
Fixed transfer stock action in template
2021-04-10 09:19:43 +10:00
Oliver
6bf3cc9e01
Merge pull request #1446 from eeintech/bom_yaml_export
Replace normalize with integer wrapper for quantity field
2021-04-10 09:17:23 +10:00
eeintech
6bf4140e5a Fixed transfer stock action in template 2021-04-09 16:55:05 -04:00
eeintech
afddf12339 Changed int to float 2021-04-08 22:04:26 -04:00
eeintech
97e1bc0a67 Added missing part_detail reference 2021-04-08 21:46:11 -04:00
eeintech
cbddda6640 Remove normalize import 2021-04-08 14:41:06 -04:00
eeintech
7491cda313 Replace normalize with integer wrapper for quantity field 2021-04-08 14:35:47 -04:00
eeintech
b5a5f5b409 Simplified stock table view in Part and SupplierPart detail pages 2021-04-08 13:42:35 -04:00
eeintech
f8d1ee8805 Made company description optional 2021-04-08 13:24:17 -04:00
Oliver Walters
47a93bc4cb More environment variables for config.yaml 2021-04-08 21:01:52 +10:00
Oliver Walters
3381945e14 Add newline 2021-04-08 17:10:48 +10:00
eeintech
0bb2507dd6 Added manufacturer part deletion warning when deleting a part 2021-04-07 14:02:50 -04:00
eeintech
1074300ba0 Improved BOM export of combined manufacturer and supplier data 2021-04-07 12:24:32 -04:00
eeintech
ccd35fc4b4 Fixed supplier part list bug and hide manufacturer fields in supplier part edit form 2021-04-07 11:50:11 -04:00
eeintech
c0691c3e9b Decoupled manufacturer and supplier data in BOM export, aggregate data needs more work 2021-04-07 11:43:05 -04:00
eeintech
63ade51c6c Updated migrations after merge with master 2021-04-07 10:49:19 -04:00
Oliver Walters
3926276fd1 Greatly simplified "wait_for_db" command 2021-04-08 00:37:34 +10:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
2db6af2af6 PO table and stock item template improvements 2021-04-07 10:33:31 -04:00
Oliver Walters
71cac6e269 Simplify waiting for db 2021-04-08 00:09:51 +10:00
Oliver Walters
ed304f571a Better configuration of github repo 2021-04-08 00:05:37 +10:00
eeintech
b2264940a3 Dynamic control of information to make cleaner supplier and manufacturer tables 2021-04-07 09:54:20 -04:00
Oliver Walters
d4d9263131 Add option to specify config file via environment variable 2021-04-07 23:46:03 +10:00
Oliver Walters
9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
2021-04-07 22:29:47 +10:00
Oliver Walters
4a3ca4638c Dockerfile updates 2021-04-07 22:27:55 +10:00
Oliver Walters
d91531720b Unit testing for task scheduling 2021-04-07 22:17:24 +10:00
Oliver
5e0e364b6c
Merge pull request #1441 from SchrodingersGat/missing-git
Hide git information if there is an error
2021-04-07 22:09:38 +10:00
Oliver Walters
6412cf1c87 Hide git information if there is an error 2021-04-07 20:55:44 +10:00
eeintech
734985faa9 Made manufacturer part ID dynamic for API supplier part create test 2021-04-06 14:53:35 -04:00
eeintech
52b2b9582d More tests and improved coverage (hopefully) 2021-04-06 14:30:03 -04:00
eeintech
7b4d3a3c07 Added test units for migration and API 2021-04-06 13:16:01 -04:00
Matthias
32eaf48c12 fixed styling 2021-04-06 18:33:57 +02:00
Matthias
f647120cd1 initial showcase implementation 2021-04-06 18:17:09 +02:00
eeintech
76fe535ef9 Improved delete form to show supplier parts deletion 2021-04-06 09:32:59 -04:00
eeintech
bd65a42410 Removed global setting for manufacturer parts (enabled for all users) 2021-04-06 08:49:45 -04:00
eeintech
fd66e8b136 Added MPN link to supplier part list 2021-04-05 15:41:18 -04:00
eeintech
547dcc6e80 Deleted manufacturers tab from supplier detail page 2021-04-05 15:19:34 -04:00
eeintech
58ddc47065 Updated migration files to handle duplicate manufacturer data 2021-04-05 11:21:34 -04:00
Matthias
530b90042a added german(de) translations 2021-04-04 22:51:16 +02:00
Matthias
2c053eae4c added translations 2021-04-04 22:49:47 +02:00
Matthias
ef64d1e61d added label to DatePickerFormField 2021-04-04 22:49:17 +02:00
Matthias
adcb211572 set language in the used js scripts 2021-04-04 22:48:36 +02:00
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
c68220a597 migrations for all the translated models, totally forgot that 2021-04-03 14:11:28 +02:00
Matthias
cd7724d490 added german(de) translations for the new stuff 2021-04-03 13:48:02 +02:00
Matthias
f67210b20f added translation files for changes 2021-04-03 04:11:40 +02:00
Matthias
1854da380b made filters.js dynamic for translation 2021-04-03 04:07:27 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02:00
Matthias
2de6fcbfa4 added missing translation fields #753 2021-04-03 03:59:09 +02:00
Matthias
698b946403 activated translations for settings 2021-04-02 23:03:24 +02:00
eeintech
45ca8d0e93 Fixes to the way ManufacturerPart is saved, manufacturer table filtering and test units 2021-04-02 11:13:57 -04:00
eeintech
bb69e38c1a Simple and View test units 2021-04-01 16:30:06 -04:00
eeintech
94574b37ae Added Manufacturer parts to search, fixed icons, added manufacturer view in supplier part detail page 2021-04-01 10:00:15 -04:00
Oliver Walters
2436b1f2c9 Entrypoint script - start.sh 2021-04-02 00:40:47 +11:00
eeintech
a8b858c824 Fixed serializer 2021-04-01 09:11:47 -04:00
Oliver Walters
8d3b9e2ca4 Updates to settings.py
- Create secret_key.txt if it does not exist
- Copy default settings file if it does not exist
2021-04-02 00:06:17 +11:00
Oliver Walters
be41be3981 Add "wait_for_db" management command 2021-04-02 00:03:56 +11:00
eeintech
8c8b25a0d2 Validating API for SupplierPart, not able to spin-off ManufacturerPart from serialized data 2021-03-31 18:04:28 -04:00
eeintech
9e56bf90c5 More web testing, looks ready 2021-03-31 13:53:55 -04:00
eeintech
2f2e5862a9 Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-31 13:10:33 -04:00
Oliver Walters
c0a0ca4588 PEP fix 2021-03-31 22:35:48 +11:00
Oliver Walters
3f257279ee Specify directories for CI 2021-03-31 22:31:50 +11:00
Oliver Walters
731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
2021-03-31 22:17:38 +11:00
Oliver Walters
82b6c48946 Specify database name 2021-03-31 21:48:54 +11:00
Oliver Walters
566c3af39e Environment variables take preference! 2021-03-31 21:40:19 +11:00
Oliver Walters
5d141e3568 Always print database config 2021-03-31 21:24:14 +11:00
Oliver Walters
c846e2e65a Use env variables rather than custom ci scripts 2021-03-31 20:39:22 +11:00
Oliver Walters
c66dddc03f Force TCP for postgres 2021-03-31 20:14:57 +11:00
Oliver Walters
6b99808c52 Run as root 2021-03-31 20:12:45 +11:00
Oliver Walters
61d14a0eda Database naming fix 2021-03-31 20:07:42 +11:00
Oliver Walters
5aea35f8fa Force TCP 2021-03-31 20:04:18 +11:00
Oliver Walters
70703f8588 Try localhost 2021-03-31 19:48:20 +11:00
Oliver Walters
67a4c5a9a2 Try pointing to different host 2021-03-31 19:45:58 +11:00
Oliver Walters
f8d29b7b3b Typo 2021-03-31 17:36:33 +11:00
Oliver Walters
9e4218d02f Mysql fixes 2021-03-31 17:34:12 +11:00
Oliver Walters
d09483f30c Workflow fixes 2021-03-31 17:28:30 +11:00
Oliver Walters
d1a42f55a2 Fix flake issues 2021-03-31 17:20:12 +11:00
Oliver Walters
bdd5fa96e7 Add tests for mysql and postgresql 2021-03-31 17:18:04 +11:00
Oliver Walters
4f87c848a5 Ensure flake8 fails 2021-03-31 17:17:40 +11:00
eeintech
0b1f22c7fd Almost there, needs some interface testing and tweaking 2021-03-30 18:08:33 -04:00
eeintech
9c8817d73b Fixed serializers and started update of templates 2021-03-30 16:48:16 -04:00
eeintech
811f9333e8 SupplierPart manufacturer data is not serializing 2021-03-30 13:55:20 -04:00
eeintech
a4d098194b New SupplierPart manufacturer_part field
New migration file with database update to manufacturer parts
Removed SourceItem model
2021-03-30 13:14:30 -04:00
eeintech
e78455085f Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-30 11:30:47 -04:00
Oliver Walters
39b2c5f943 Reintroduce default database config 2021-03-30 21:18:09 +11:00
Oliver Walters
3ddbb6a6cd Check for empty values 2021-03-30 20:53:26 +11:00
Oliver
fd01e23245
Merge pull request #1430 from SchrodingersGat/missing-permission-fix
Emit warning rather than raise error
2021-03-30 10:28:54 +11:00
Oliver Walters
1a288168b7 PEP fixes 2021-03-30 10:00:43 +11:00
Oliver
f288b906ad
Merge pull request #1426 from SchrodingersGat/assign-by-sn
Assign by sn
2021-03-30 09:29:49 +11:00
Oliver Walters
58c30f48d5 Remove extra whitespace 2021-03-30 09:28:02 +11:00
Oliver Walters
bfbdd72306 Remove unused import 2021-03-30 08:43:09 +11:00
Oliver Walters
0b78f3d931 Add unit testing for migrations 2021-03-30 08:42:44 +11:00
Oliver Walters
32cfe1b954 Emit warning rather than raise error
- All calling functions check for None anyway
2021-03-30 08:25:51 +11:00
Oliver Walters
408b9d5e5b Fix for unit testing 2021-03-30 08:08:55 +11:00
eeintech
50adb2ac61 SourceItem only for SupplierPart, added logic to templates 2021-03-29 15:39:25 -04:00