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
11,249 Commits 6 Branches 99 Tags 484 MiB
8aec055e6c
Commit Graph

1765 Commits

Author SHA1 Message Date
Matthias
67b3c339b9
add back button to setup screen 2021-12-11 22:10:05 +01:00
Matthias Mair
89758f28b2
Merge branch 'inventree:master' into matmair/issue2201 2021-12-11 00:08:29 +01:00
Oliver
dfd7a439a6
Merge pull request #2445 from SchrodingersGat/issue2250 
Issue2250
 2021-12-11 09:15:37 +11:00
Oliver
e1a5192604 Calculate how many items to assign to sales order 
- Do not over-allocate by default
 2021-12-11 00:45:53 +11:00
Oliver
b908aa2467 fix js linting issues 2021-12-11 00:33:16 +11:00
Oliver
e9ae3eb01d Revert to bootstrap-treeview 
- More "bootstrappy" design
- Already in code base
- Cleaner API
 2021-12-11 00:25:44 +11:00
Oliver
7dcd166d50 Change "sidetree" to "breadcrumb-tree" 2021-12-10 22:53:19 +11:00
Oliver
ffe970d139 Move "sidetree" to underneath breadcrumbs 2021-12-10 22:31:11 +11:00
Matthias Mair
75aeab48b8
Merge branch 'inventree:master' into matmair/issue2250 2021-12-09 23:56:08 +01:00
Matthias
869324249e
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-09 23:54:55 +01:00
Oliver
c1163b9f6b Adds missing semicolon 2021-12-09 09:07:36 +11:00
Matthias
3a3f8ba4ef
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-08 18:31:33 +01:00
Oliver
4a453b0a35 Assign multiple stock items to a customer at one 2021-12-09 00:33:45 +11:00
Oliver
96a885e4e1 client side form for assigning stock items to customers 2021-12-09 00:20:45 +11:00
Matthias
2725a2eb87
disable icons 2021-12-08 02:01:26 +01:00
Matthias
79a60ff895
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 2021-12-08 01:11:35 +01:00
Matthias
12afb19dfa
move toggle 2021-12-08 01:11:21 +01:00
Matthias
45181904af
fix icon 2021-12-08 00:26:56 +01:00
Matthias
5ed163dd71
add new toggler 2021-12-08 00:22:00 +01:00
Matthias
596532f312
only one api call 2021-12-08 00:05:34 +01:00
Matthias
948270bbcb
add stuff to mark starting endpoint 2021-12-07 23:54:45 +01:00
Matthias
fbc4cfe166
remove always show 2021-12-07 00:52:14 +01:00
Matthias
46279c8172
fix design refs 2021-12-07 00:51:44 +01:00
Matthias
2fa67707bd
Add text 2021-12-07 00:51:27 +01:00
Matthias
99a62b2934
move border on right side to items 2021-12-07 00:41:37 +01:00
Oliver
463192e0b9 Improved table filtering for "purchase order" table (as seen from "part" view) 2021-12-07 10:33:09 +11:00
Matthias
61bdf8937c
style fix 2021-12-07 00:30:50 +01:00
Matthias
388b42a407
use sidebar-wrapper for styleing 2021-12-07 00:26:36 +01:00
Matthias
f375ba96ae
add sidetree toggler function 2021-12-07 00:21:33 +01:00
Matthias
b5ae9edc2e
style fixes 2021-12-06 23:48:21 +01:00
Matthias
c703f9993f
make url simpler 2021-12-06 22:37:42 +01:00
Matthias
8e425e67a1
reduce 2021-12-06 22:37:17 +01:00
Matthias
70939a0cf9
first working example 2021-12-06 22:35:14 +01:00
Matthias
de4d057b93
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 2021-12-06 01:37:48 +01:00
Matthias
9ebbf8190c
add tree to replication 2021-12-06 01:35:14 +01:00
Matthias
49f9cc7edc
modifiy sidebar code 2021-12-06 01:33:41 +01:00
Matthias
bb2ad7c2cb
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-04 18:04:47 +01:00
Matthias Mair
2a0e07abe0
Merge branch 'inventree:master' into matmair/issue2201 2021-12-04 17:53:13 +01:00
Oliver
9e1251d78d Adds "assigned_to_me" filtering to build orders 2021-12-04 21:30:11 +11:00
Oliver
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Oliver
9ec5e39c50 js tweaks 2021-12-04 17:50:25 +11:00
Oliver
008c52ef39 Allocation by serial number now moved to the API 2021-12-04 13:08:00 +11:00
Oliver
e9796676c0 Add a progress spinner to modal forms 2021-12-04 10:44:48 +11:00
Oliver
921ef5ae9e Tweaks to PO and SO tables 2021-12-04 10:11:18 +11:00
Oliver
1215ef520d Further JS linting 2021-12-04 09:44:23 +11:00
Oliver
35b3bc73cc Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/order/api.py
 2021-12-04 09:35:54 +11:00
Oliver
3abad2f73d js linting 2021-12-04 09:33:42 +11:00
Oliver
f6e1de42f5 JS linting 2021-12-03 21:16:58 +11:00
Oliver
acfafe22c5 order lines can be received directly from the new table 2021-12-03 21:07:09 +11:00
Oliver
6d90ded27f First pass at a part-purchase-order table 2021-12-03 20:54:21 +11:00
Oliver
c93009876d UI changes 2021-12-03 20:14:09 +11:00
Matthias
daebae81c1
fix spelling 
using c instead of k does not make it Englisch
 2021-12-03 08:00:04 +01:00
Matthias
86014dd4c9
fix panel headings 2021-12-03 07:58:47 +01:00
Oliver
d7c87300c6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-12-03 17:31:27 +11:00
Matthias
0f0460f8ea
merge 2021-12-02 17:24:07 +01:00
Matthias
329b00ae07
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-02 17:16:26 +01:00
Oliver
96c1f74cd8
Merge pull request #2408 from SchrodingersGat/initial-stock-when-duplicating 
Add option for creating initial stock quantity when duplicating a part
 2021-12-03 00:29:37 +11:00
Oliver
9ca6204d4b Add option for creating initial stock quantity when duplicating a part 
Fixes https://github.com/inventree/InvenTree/issues/2407
 2021-12-03 00:05:55 +11:00
Oliver
e1668c8662 More stuffs: 
- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped
 2021-12-02 23:52:53 +11:00
Oliver
e74e7138a9 More stuff: 
- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock
 2021-12-02 21:59:59 +11:00
Oliver
d5ace1a8da Differentiate between "fully allocated" and "partially allocated" in stock item table 2021-12-02 21:46:05 +11:00
Oliver
586d38fb61 Add item count to shipment table 2021-12-02 21:40:21 +11:00
Oliver
123aab89bc Adds an "available" filter for stock item API 2021-12-02 21:40:03 +11:00
Oliver
6ec0cfc641 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html
 2021-12-02 20:49:13 +11:00
Matthias Mair
cf3d2d0df9
Merge branch 'inventree:master' into load-minified-fa 2021-12-02 09:23:13 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Oliver
8c6b82d2c0
Merge pull request #2405 from SchrodingersGat/jump-to-sn 
Jump to sn
 2021-12-02 16:26:21 +11:00
Oliver
98bbee8159 Adds function to lookup stock item by serial number 2021-12-02 15:55:00 +11:00
Matthias
8c3b4badfb
and cleanup again 2021-12-02 00:08:46 +01:00
Matthias
7273ed74c6
clean up PR 2021-12-01 23:38:24 +01:00
Matthias
4683672d91
load minified fontawesome css 2021-12-01 22:32:40 +01:00
Matthias
53b57cfa70
laod minified fontawesome js 2021-12-01 22:31:16 +01:00
Matthias
413968a979
load minified js 2021-12-01 22:28:43 +01:00
Oliver
84115b3a8e Reduce width of thumbnail div 2021-12-01 08:07:09 +11:00
Oliver
a2a436ea69 Column improvements 2021-12-01 08:05:30 +11:00
Oliver
b34b3c6d85 Place part details below main part display tab 2021-11-30 19:38:48 +11:00
Oliver
6e9937e0e9 Don't be dull, check for null 2021-11-30 15:24:19 +11:00
Oliver
3f9b280e17 Allow shipment numbers to be non-unique for different sales orders 
- must be unique for a given sales order
 2021-11-30 00:42:30 +11:00
Oliver
f3f3030b37 Adds API endpoint to "ship" a sales order shipment 2021-11-30 00:02:03 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Oliver
7b339b35cc Small UI tweaks for "sessions" view 2021-11-29 07:46:37 +11:00
Matthias Mair
b687659ddd
Merge branch 'inventree:master' into matmair/issue2327 2021-11-28 17:26:19 +01:00
Matthias Mair
baf19c2021
Merge branch 'inventree:master' into plugin-2037 2021-11-28 17:26:09 +01:00
Oliver
32be39774f PEP fixes 2021-11-28 22:36:47 +11:00
Oliver
78309c1915 Move validation to the model class 2021-11-28 22:29:01 +11:00
Oliver
4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Matthias
84f0966e4f
movelanguage to display settings 2021-11-27 00:02:39 +01:00
Matthias
db1a434f81
[FR] User sessions 
Fixes #2327
 2021-11-26 23:56:24 +01:00
Oliver
ad6e34953b Update placeholders for serial numbers when creating a new stock item 2021-11-27 00:17:31 +11:00
Oliver
ef7a9b5152 Adds a simple endpoint for accessing serial number information for a Part instance 
- This is not included by default in the "part detail" endpoint as it must be calculated!
 2021-11-27 00:11:18 +11:00
Oliver
0b997dc784 Display both 'allocated' and 'fulfilled' quantity values in salesorder table 2021-11-26 23:30:34 +11:00
Oliver
c943b320e6 shipment table tweaks 2021-11-26 23:02:29 +11:00
Oliver
8eb5e79070
Merge pull request #2368 from SchrodingersGat/responsible-column 
Adds "responsible" row to purchase order table
 2021-11-26 22:31:39 +11:00
Oliver
d5e7489623 Table filters 2021-11-26 22:31:25 +11:00
Oliver
760c80dbb6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-26 22:08:17 +11:00
Oliver
ac645b1fc7 Adds "responsible" row to purchase order table 2021-11-26 22:05:27 +11:00
Oliver
268bfda065 Layout tweaks for settings page 2021-11-26 21:02:06 +11:00
Oliver
68e2b0850b Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/serializers.py
#	InvenTree/order/templates/order/so_sidebar.html
 2021-11-26 08:25:51 +11:00
Oliver
6a948a1a20 javascript linting 2021-11-25 15:14:16 +11:00
Oliver
e6dfe27c57 Add a "related parts table" function 2021-11-25 14:54:21 +11:00