2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-18 13:47:44 +00:00

Commit Graph

  • f931ba405b style fixes Matthias 2021-05-08 21:08:12 +02:00
  • 89e0856824 fix for deleting items in step 2 not working in step 3 Matthias 2021-05-08 21:05:02 +02:00
  • 5622468209 better readable structure Matthias 2021-05-08 20:55:01 +02:00
  • e6372fd600 added translations Matthias 2021-05-08 20:54:23 +02:00
  • a0d9bf692e simpler code - same function Matthias 2021-05-08 20:53:26 +02:00
  • 446c9176e1 Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-08 21:06:50 +10:00
  • 79904308a5 updated translation base github-actions[bot] 2021-05-08 10:55:51 +00:00
  • e683912561 Merge pull request #1556 from matmair/spaces! Oliver 2021-05-08 20:54:36 +10:00
  • 5eb1a1f426 fixed styling #1556 Matthias 2021-05-08 12:32:19 +02:00
  • e59f467c79 Merge branch 'master' into spaces! Matthias Mair 2021-05-08 12:27:19 +02:00
  • 3641e4465d Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-08 19:42:05 +10:00
  • 9b69980a6c Oopsy forgot to merge PurchaseOrderUpload view eeintech 2021-05-07 18:08:11 -04:00
  • 88000200b3 Merged master and resolved conflicts eeintech 2021-05-07 18:02:40 -04:00
  • ceccdf3909 Now creating PurchaseOrderLineItem instances! eeintech 2021-05-07 18:00:30 -04:00
  • fbf24621f3 Getting there... eeintech 2021-05-07 16:46:10 -04:00
  • 6e269ae41a Now displaying item match table eeintech 2021-05-07 13:23:10 -04:00
  • f0fc21329d updated translation base github-actions[bot] 2021-05-07 13:56:06 +00:00
  • e47a8d6d5e Merge pull request #1545 from matmair/issue1425 Oliver 2021-05-07 23:54:45 +10:00
  • 63cf75eefc styling again #1545 Matthias 2021-05-07 15:37:15 +02:00
  • b6043af7c0 auto-set price if sales-order line is added Matthias 2021-05-07 15:35:35 +02:00
  • 84148c3e87 updated translation base github-actions[bot] 2021-05-07 13:19:30 +00:00
  • bdd61fdb2c enable live-serving of i18n_static tag in debug (#1560) Matthias Mair 2021-05-07 15:18:06 +02:00
  • 9e59d41f12 style improvments Matthias 2021-05-07 07:46:35 +02:00
  • ae01503a9e handeling data in an inheritable way Matthias 2021-05-07 07:20:43 +02:00
  • c775c4611f adding custom action button save the changes to the db and return success-json Matthias 2021-05-07 07:19:43 +02:00
  • f73863ea51 adding in cstm action buttons function Matthias 2021-05-07 07:18:13 +02:00
  • 09fe9ccf11 sales order item tracking Matthias 2021-05-07 07:15:33 +02:00
  • 985967fccb save return of part.id Matthias 2021-05-07 07:13:23 +02:00
  • eee93b49c2 Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-07 14:16:15 +10:00
  • 151efdd205 updated translation base github-actions[bot] 2021-05-06 21:58:39 +00:00
  • 5ed17022f2 Fixed stock import as it was not validating the serial properly (#1559) Francois 2021-05-06 16:57:16 -05:00
  • 4f942fd9f7 Working towards item match form eeintech 2021-05-06 17:07:22 -04:00
  • e31452a6ad Match field step is now managed through form eeintech 2021-05-06 16:05:58 -04:00
  • f79382d96f Handling part match form but still not creating purchase order items eeintech 2021-05-06 12:35:52 -04:00
  • 053793288b same spacing for tables thanks @eeintech Matthias 2021-05-06 18:05:43 +02:00
  • 005063aad6 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms eeintech 2021-05-06 11:30:08 -04:00
  • aac05db6bf style fixing Matthias 2021-05-06 17:15:10 +02:00
  • 792b2d11c0 cleanup Matthias 2021-05-06 16:46:52 +02:00
  • 660a3f9410 cleaner get function Matthias 2021-05-06 16:46:29 +02:00
  • 90c207b935 keeping part id in inherited form Matthias 2021-05-06 16:45:39 +02:00
  • 4830ff28bf new function for initials Matthias 2021-05-06 16:34:37 +02:00
  • c2a5e1fd23 moved the special stuff into the inherited view Matthias 2021-05-06 16:29:03 +02:00
  • e61480242e updated translation base github-actions[bot] 2021-05-06 14:15:52 +00:00
  • 3a1c233bff Bug/calender (#1558) Matthias Mair 2021-05-06 16:11:08 +02:00
  • b09f49aaa5 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 Matthias 2021-05-06 14:54:26 +02:00
  • d8769748f5 config Matthias 2021-05-06 14:46:32 +02:00
  • c1bcc60f0a forgot a py Matthias 2021-05-06 14:41:26 +02:00
  • d5b65e6e41 yaml! Matthias 2021-05-06 14:38:13 +02:00
  • 8c63b53c16 here we go js Matthias 2021-05-06 14:35:23 +02:00
  • a77d9d9de7 same treatment for html Matthias 2021-05-06 14:33:03 +02:00
  • c2e00586f3 updated translation base github-actions[bot] 2021-05-06 10:31:46 +00:00
  • 39d4129157 chery picked all fixed trans str from #1438 (#1554) Matthias Mair 2021-05-06 12:29:58 +02:00
  • f2b0717d10 removes all lines consisting only of spaces this really bothers me for some reason - nothing technical Matthias 2021-05-06 12:11:38 +02:00
  • 0f6515d400 New Crowdin updates (#1552) Oliver 2021-05-06 15:26:44 +10:00
  • 224d9c03d0 New Crowdin updates (#1551) Oliver 2021-05-06 11:39:34 +10:00
  • 33ac3cdd95 Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-06 09:07:39 +10:00
  • e83b62bd55 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 Oliver Walters 2021-05-06 09:06:00 +10:00
  • 172ac9a06f updated translation base github-actions[bot] 2021-05-05 22:59:50 +00:00
  • 3511b4adda Merge pull request #1550 from matmair/layout-fix Oliver 2021-05-06 08:58:08 +10:00
  • 1259374822 removes layout-shift due to typo in menubar #1550 Matthias 2021-05-06 00:37:45 +02:00
  • f9463fa277 fixes navbar-layout shift with narrow dollar-sign Matthias 2021-05-06 00:33:34 +02:00
  • 66f198baa9 removing duplicate information in pricing table Matthias 2021-05-06 00:17:46 +02:00
  • c4d0865f06 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 Matthias 2021-05-06 00:14:33 +02:00
  • efa9da2ce1 removed unused imports Matthias 2021-05-06 00:00:13 +02:00
  • 030865f8dd sale price in pricing table Matthias 2021-05-05 23:49:04 +02:00
  • 1b7ade9405 adding in missing parts for full saleprice Matthias 2021-05-05 23:47:46 +02:00
  • 1a227faec4 abstracting get_price Matthias 2021-05-05 23:42:52 +02:00
  • 287a05ddc5 clearer spacing in html Matthias 2021-05-05 21:48:58 +02:00
  • 40e8ed9e5b Match parts view is now populated correctly eeintech 2021-05-05 15:28:04 -04:00
  • 2cfb9c60a3 space cleanup Matthias 2021-05-05 20:57:00 +02:00
  • b392586a08 quantity also for modal Matthias 2021-05-05 20:55:37 +02:00
  • dc4fb64987 add in price modal in table Matthias 2021-05-05 20:53:53 +02:00
  • ee028ef925 space cleanup Matthias 2021-05-05 20:38:27 +02:00
  • 2cd1df691b Working towards part matching eeintech 2021-05-05 13:16:40 -04:00
  • 9773fee50b Validation of matching fields is working eeintech 2021-05-05 12:40:48 -04:00
  • a7ca1f4296 Fix: New translations django.po from Crowdin #1546 Oliver 2021-05-05 18:08:32 +10:00
  • 5267b4e9f4 updated translation base github-actions[bot] 2021-05-05 07:55:20 +00:00
  • ecc9eec084 Merge pull request #1547 from SchrodingersGat/no-wrap Oliver 2021-05-05 17:54:01 +10:00
  • 7a19145be1 Disable wrapping for translation files #1547 Oliver Walters 2021-05-05 17:34:35 +10:00
  • ce0b33e27e Fix: New translations django.po from Crowdin Oliver 2021-05-05 10:08:04 +10:00
  • 7a81fc02ed updated translation base github-actions[bot] 2021-05-04 23:24:01 +00:00
  • 54fb96f239 Merge pull request #1542 from matmair/matmair/issue1513 Oliver 2021-05-05 09:22:59 +10:00
  • b1d463fc65 updated translation base github-actions[bot] 2021-05-04 23:20:29 +00:00
  • 6bf4887284 Merge pull request #1544 from matmair/matmair/issue1543 Oliver 2021-05-05 09:18:56 +10:00
  • d42506becb Merge pull request #1541 from inventree/l10_crowdin Oliver 2021-05-05 08:49:45 +10:00
  • 251603b69b removing temp fix for invoke error Matthias 2021-05-04 23:47:21 +02:00
  • b4342d6203 Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data eeintech 2021-05-04 17:35:27 -04:00
  • 7fa235282b sale price in ui Matthias 2021-05-04 22:50:04 +02:00
  • 28a67828e3 [BUG] invoke: too many arguments Fixes #1543 #1544 Matthias 2021-05-04 22:04:05 +02:00
  • a6fc5d2ebe Merge branch 'issue1425' of https://github.com/matmair/InvenTree into issue1425 Matthias 2021-05-04 21:57:44 +02:00
  • 294e86cc38 Add in sale price model Matthias 2021-05-04 21:56:25 +02:00
  • 1614c6e08a Add in sale price model Matthias 2021-05-04 21:51:42 +02:00
  • ac78bb3acf Fix: New translations django.po from Crowdin #1541 Oliver 2021-05-05 05:47:36 +10:00
  • 55cdeef30e adds price-calc to purchase order Fixes #1513 #1542 Matthias 2021-05-04 21:33:00 +02:00
  • 64fb492b97 Added match parts step, need to process fields data eeintech 2021-05-04 14:45:52 -04:00
  • 7cdf0af04a Added upload file step eeintech 2021-05-04 12:20:57 -04:00
  • 373898d43e Added step description and crispy form tag eeintech 2021-05-04 10:28:00 -04:00
  • 8714d6876a Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-04 19:39:10 +10:00
  • cf9624c94e Fix: New translations django.po from Crowdin Oliver 2021-05-04 19:36:58 +10:00
  • 75f487aee9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history Matthias 2021-05-04 00:02:15 +02:00