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
5,357 Commits 6 Branches 99 Tags 484 MiB
79374c5dfd
Commit Graph

4202 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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 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
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
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
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04: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
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
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
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
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
Matthias
292944179e fixed wrong i18n-code for polish 2021-04-28 13:57:39 +02: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
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
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
2de3b892a5 More syntax for adding serial numbers #1519 2021-04-26 21:33:39 +02: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
Oliver Walters
d6ef9ee212 Adds some more translatable strings 
- Mostly just to check the workflow integration
 2021-04-22 23:19:11 +10: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
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
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