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,853 Commits 6 Branches 99 Tags 484 MiB
1456868d03
Commit Graph

5853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ecc9eec084
Merge pull request #1547 from SchrodingersGat/no-wrap 
Disable wrapping for translation files
 2021-05-05 17:54:01 +10: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
Oliver
54fb96f239
Merge pull request #1542 from matmair/matmair/issue1513 
adds auto price-update from price-brake to purchase order lines
 2021-05-05 09:22:59 +10:00
github-actions[bot]
b1d463fc65 updated translation base 2021-05-04 23:20:29 +00:00
Oliver
6bf4887284
Merge pull request #1544 from matmair/matmair/issue1543 
[BUG] invoke: too many arguments
 2021-05-05 09:18:56 +10:00
Oliver
d42506becb
Merge pull request #1541 from inventree/l10_crowdin 
New Crowdin updates
 2021-05-05 08:49:45 +10:00
Matthias
251603b69b removing temp fix for invoke error 2021-05-04 23:47:21 +02: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
28a67828e3 [BUG] invoke: too many arguments 
Fixes #1543
 2021-05-04 22:04:05 +02:00
Matthias
a6fc5d2ebe Merge branch 'issue1425' of https://github.com/matmair/InvenTree into issue1425 2021-05-04 21:57:44 +02:00
Matthias
294e86cc38 Add in sale price model 2021-05-04 21:56:25 +02:00
Matthias
1614c6e08a Add in sale price model 2021-05-04 21:51:42 +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
Oliver
706f3a913d
Update README.md 2021-05-01 09:12:36 +10: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
Oliver
ecbea8ca30
Merge pull request #1537 from matmair/credits 
Link for credits in UI and README Closes #1533
 2021-05-01 08:25:17 +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