2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-03 22:08:49 +00:00

2069 Commits

Author SHA1 Message Date
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02: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 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
9e59d41f12 style improvments 2021-05-07 07:46:35 +02:00
ae01503a9e handeling data in an inheritable way 2021-05-07 07:20:43 +02:00
053793288b same spacing for tables
thanks @eeintech
2021-05-06 18:05:43 +02:00
792b2d11c0 cleanup 2021-05-06 16:46:52 +02:00
660a3f9410 cleaner get function 2021-05-06 16:46:29 +02:00
4830ff28bf new function for initials 2021-05-06 16:34:37 +02:00
c2a5e1fd23 moved the special stuff into the inherited view 2021-05-06 16:29:03 +02:00
b09f49aaa5 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 14:54:26 +02:00
d5b65e6e41 yaml! 2021-05-06 14:38:13 +02:00
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
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
1259374822 removes layout-shift due to typo in menubar 2021-05-06 00:37:45 +02:00
f9463fa277 fixes navbar-layout shift with narrow dollar-sign 2021-05-06 00:33:34 +02:00
66f198baa9 removing duplicate information in pricing table 2021-05-06 00:17:46 +02:00
030865f8dd sale price in pricing table 2021-05-05 23:49:04 +02:00
1b7ade9405 adding in missing parts for full saleprice 2021-05-05 23:47:46 +02:00
287a05ddc5 clearer spacing in html 2021-05-05 21:48:58 +02:00
b392586a08 quantity also for modal 2021-05-05 20:55:37 +02:00
ee028ef925 space cleanup 2021-05-05 20:38:27 +02:00
75f487aee9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-04 00:02:15 +02: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
036c5661ec Link for credits in UI and README Closes #1533 2021-04-30 23:40:52 +02:00
eeintech
87b38ec992 Added support for fractional part/bom quantity and price 2021-04-29 14:22:07 -04:00
eeintech
f0b44450fb Updated 'Required for Build Orders' API queryset 2021-04-27 12:48:36 -04:00
f4502aecca Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-26 21:48:42 +02:00
Oliver Walters
06afd4d726 Refactor "ready" state into a function 2021-04-25 10:52:31 +10:00
294dd0525f use spaces instead of tabs 2021-04-22 12:53:49 +02:00
126c5ca3bf typo 2021-04-22 12:48:42 +02:00
f7635fb1c0 reording form 2021-04-22 12:39:48 +02:00
80d46fb3ab cleanup; using one currency 2021-04-22 12:30:38 +02:00
a0154067d2 added setting -> default false 2021-04-22 12:05:48 +02:00
07d68f7fde Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-21 11:12:48 +02:00
Oliver
4903826be1
Merge pull request #1494 from matmair/feature/js_translation
Translating JS-Files once
2021-04-20 22:58:43 +10:00
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
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters
f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +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
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title
Instance name in title
2021-04-18 21:48:37 +10:00
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
c3319e88f4 typo fix 2021-04-18 01:21:44 +02:00
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
20af4c9ba0 template tag for translatable alerts with links 2021-04-17 23:48:47 +02:00