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,367 Commits 6 Branches 99 Tags 484 MiB
fe8e03c666
Commit Graph

4209 Commits

Author SHA1 Message Date
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
Matthias
169745c11f style fix 2021-05-11 16:23:26 +02:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
Matthias
71c3ff4b9f prefetching related information 2021-05-11 16:15:10 +02:00
Oliver Walters
03a231bffb Updates 
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
 2021-05-11 23:38:26 +10:00
Oliver Walters
84bfffd5a7 Override 'add_note' when new StockItem is created 
- This allows us to prevent the issue of duplicate notes being created
 2021-05-11 22:51:29 +10:00
Oliver Walters
0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00
Oliver Walters
93e6eb6dc7 Unit test fixes 2021-05-11 22:26:03 +10:00
Matthias
4156b71c4b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-11 13:32:14 +02:00
Oliver Walters
a1203aa1e5 Fixes for unit testing 2021-05-11 21:22:54 +10:00
Oliver Walters
0020e85397 Refactor add_tracking_entry 2021-05-11 20:56:20 +10:00
Oliver Walters
385131137f Extract stock location from legacy stocktracking entry 
- Not 100% accurate - e.g. if the stock location has been altered!
 2021-05-11 20:55:14 +10:00
Oliver Walters
ed4da4d338 Improve introspection in migration file 2021-05-11 18:23:29 +10:00
Oliver Walters
725a64c29d Extract more information from legacy tracking data 2021-05-11 18:11:27 +10:00
Oliver Walters
1126e2e110 "Guess" stock history code from recorded title string 2021-05-11 17:41:37 +10:00
Oliver Walters
70ad0ba0de Improve reporting in stock history API 2021-05-11 17:41:17 +10:00
Oliver Walters
af53b341f0 Replace "addTrasactionNote" function with "add_tracking_entry" 
- Does not add translated strings to the database
 2021-05-11 17:17:48 +10:00
Oliver Walters
82c6d10c33 Add translateable status codes for StockHistory 2021-05-11 17:12:31 +10:00
eeintech
c9e77edf04 Almost there? 2021-05-10 17:31:29 -04:00
eeintech
6d8f94619b Improved template render, raised bar for automatic field matching 2021-05-10 12:52:34 -04:00
eeintech
f0932040ee Fixed form validation for previous step, hide tab depending on order status, added purchase_price field 2021-05-10 11:42:22 -04:00
Oliver Walters
6aab704144 Trim content when copying to clipboard 2021-05-10 19:40:54 +10:00
Oliver
c7d625f23e
Merge pull request #1565 from matmair/clipboard-ui 
Clipboard UI
 2021-05-10 17:24:31 +10:00
Matthias
fc83458bdb changes as suggested by @SchrodingersGat 2021-05-10 07:53:58 +02:00
Oliver
fb1dce1357
Merge pull request #1567 from SchrodingersGat/login-redirect 
Login redirect
 2021-05-10 12:56:30 +10:00
Oliver Walters
7e55e343e2 PEP fix 2021-05-10 12:35:19 +10:00
Oliver
6a08191595
Merge pull request #1564 from matmair/fix-css 
inventree.css cleanup
 2021-05-10 12:34:25 +10:00
Oliver Walters
be31154a44 Cleaner implementation 2021-05-10 12:33:49 +10:00
Oliver Walters
d9f621c922 Login redirect fix 2021-05-10 12:29:51 +10:00
Matthias
b0a8477a54 removes unallowed char 2021-05-09 14:35:33 +02:00
Matthias
c148ab9f8e fixed css-comments 2021-05-09 14:34:52 +02:00
Matthias
d38c1f6c0b sample implementation 2021-05-09 14:30:39 +02:00
Matthias
9f6f69a815 rename for shorter inclusion str 2021-05-09 14:29:35 +02:00
Matthias
783b039eb1 initial functionality for #997 2021-05-09 14:28:46 +02:00
Matthias
a210b331ce just a small translation 2021-05-09 00:27:00 +02:00
Matthias
f931ba405b style fixes 2021-05-08 21:08:12 +02:00
Matthias
89e0856824 fix for deleting items 
in step 2 not working in step 3
 2021-05-08 21:05:02 +02:00
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