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,302 Commits 6 Branches 99 Tags 484 MiB
3641e4465d
Commit Graph

5302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
3641e4465d Merge remote-tracking branch 'inventree/master' 2021-05-08 19:42:05 +10: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
Oliver Walters
eee93b49c2 Merge remote-tracking branch 'inventree/master' 2021-05-07 14:16:15 +10:00
Francois
5ed17022f2
Fixed stock import as it was not validating the serial properly (#1559) 2021-05-07 07:57:16 +10:00
Matthias
053793288b same spacing for tables 
thanks @eeintech
 2021-05-06 18:05:43 +02: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 Mair
39d4129157
chery picked all fixed trans str from #1438 (#1554) 2021-05-06 20:29:58 +10:00
Oliver Walters
33ac3cdd95 Merge remote-tracking branch 'inventree/master' 2021-05-06 09:07:39 +10:00
Oliver
3511b4adda
Merge pull request #1550 from matmair/layout-fix 
Layout fix
 2021-05-06 08:58:08 +10: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
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
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
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
Oliver
6bf4887284
Merge pull request #1544 from matmair/matmair/issue1543 
[BUG] invoke: too many arguments
 2021-05-05 09:18:56 +10:00
Matthias
251603b69b removing temp fix for invoke error 2021-05-04 23:47:21 +02: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
Matthias
55cdeef30e adds price-calc to purchase order Fixes #1513 2021-05-04 21:33:00 +02:00
Oliver Walters
8714d6876a Merge remote-tracking branch 'inventree/master' 2021-05-04 19:39:10 +10:00