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,447 Commits 6 Branches 99 Tags 484 MiB
0bd0e57f16
Commit Graph

5447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver
efec09e9a7
Merge pull request #1571 from SchrodingersGat/clipboard-tweaks 
Trim content when copying to clipboard
 2021-05-11 08:39:14 +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
Francois
6857964c17
Merge pull request #1 from matmair/fix-eeintech 
Looks good, thanks @matmair !
 2021-05-10 07:55:29 -05: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
Oliver
1f1b0547b0
Merge pull request #1563 from matmair/smal-trans 
just a small translation
 2021-05-09 10:16:57 +10: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
Oliver
e683912561
Merge pull request #1556 from matmair/spaces! 
removes all lines consisting only of spaces
 2021-05-08 20:54:36 +10: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