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
12,681 Commits 6 Branches 99 Tags 484 MiB
8cd8581dbf
Commit Graph

822 Commits

Author SHA1 Message Date
Matthias
d086f09771
use more abstract definitions 2022-03-11 00:25:58 +01:00
Matthias
0a1961bc31
Add additionallLineItems for POs 2022-03-11 00:22:11 +01:00
Matthias
84a95aaadb
spelling fix 2022-03-11 00:21:43 +01:00
Matthias
c6d0c03adf
more abstraction 2022-03-11 00:21:33 +01:00
Matthias
72d565d17a
move to abstract model 2022-03-11 00:20:36 +01:00
Matthias
2036164ef1
add po API endpoints 2022-03-11 00:09:07 +01:00
Matthias
c30e8d9b4e
make more generalised 2022-03-11 00:08:39 +01:00
Matthias
df418c503e
reduce duplication 2022-03-11 00:02:18 +01:00
Matthias
6ef7cb82b4
Add admin for PO additional line 2022-03-10 23:57:59 +01:00
Matthias Mair
ec021624cd
Merge branch 'inventree:master' into matmair/issue2694 2022-03-08 21:26:21 +01:00
Oliver
09ff4862ec Unit test fixes 2022-03-07 14:43:55 +11:00
Matthias
174bba90ab
total read only 2022-03-06 23:49:36 +01:00
Matthias
7a54cb4cb8
merge migrations 2022-03-06 23:38:59 +01:00
Matthias
5336d09296
fix api values 2022-03-06 23:34:01 +01:00
Matthias
f0b19e69b8
add total price woth js reload 2022-03-06 23:21:33 +01:00
Matthias
de11b3463e
add API schema 2022-03-06 18:44:05 +01:00
Matthias
3452880d2a
add search to API 2022-03-06 18:43:40 +01:00
Matthias
acec4fa5d5
remove titile 2022-03-06 18:43:27 +01:00
Matthias
ed75970010
ad UI components 2022-03-06 18:42:10 +01:00
Matthias
aed708d339
PEP fix 2022-03-05 23:25:00 +01:00
Matthias
b81d2b8410
cut back on modifications 2022-03-05 23:10:20 +01:00
Matthias
157f0e72a7
[FR] Add delivery cost (excluding unit cost that already exists) in PO 
Fixes #2694
 2022-03-04 01:06:39 +01:00
Oliver
846899fa53 Adds ability to download purchase order line item table 2022-03-04 00:45:30 +11:00
Oliver
0ac86417a7 Adds "duplicate line item" button to purchase order and sales order tables 2022-03-04 00:36:26 +11:00
Oliver
5d37ce9175 Merge remote-tracking branch 'inventree/master' into date-format 2022-03-01 08:18:24 +11:00
Oliver
c4d462b0b4
Merge pull request #2684 from SchrodingersGat/po-target-date 
Order target date improvements
 2022-03-01 08:17:54 +11:00
Oliver
421db61f21 Adding unit testing for new features 2022-02-28 23:09:57 +11:00
Oliver
73484192a5 Add "batch code" and "serial numbers" serializer fields when receiving stock items against a purchase order 2022-02-28 22:47:41 +11:00
Oliver
b00ae67d68 Pass dates in templates through the new template tag 2022-02-28 19:10:33 +11:00
Oliver
7c82857cc7 Remove unique_together requirement for purchaseorderlineitem 
- Allow a single purchase order to specify duplicate lines (e.g. split shipments / order scheduling)
 2022-02-28 15:27:56 +11:00
Oliver
4858787a78 Adds "overdue" field to sales order line item 
- API serializer
- front end / UX tables
 2022-02-28 15:24:01 +11:00
Oliver
b451f3d149 adds target_date field when adding a new line item to a purchase order 2022-02-28 15:11:10 +11:00
Oliver
9e82b28e9d Update PO line item table 2022-02-28 15:03:39 +11:00
Oliver
df7713f6c2 Adds "overdue" annotation field to POLineItem serializer 2022-02-28 15:03:22 +11:00
Oliver
557aa44904 Adds "target_date" field to PurchaseOrderLineItem and SalesOrderLineItem models 
- Allows different target dates to be specified for different line items
- If not set (null) then the base "target_date" parameter for the parent order is used
 2022-02-28 14:26:01 +11:00
Matthias
dbb4c3f407
Merge branch 'master' of https://github.com/inventree/InvenTree into coverage-fixes 2022-02-13 17:46:09 +01:00
Matthias
22bc0b3d90
ignore exception ref 2022-02-13 05:21:43 +01:00
Matthias
a4c6d0e6c5
fix migration coverage for orders 2022-02-13 04:49:08 +01:00
Matthias
bc17536e6d
fix quotes 2022-02-13 03:49:52 +01:00
Matthias
aa3192a106
Merge branch 'master' of https://github.com/inventree/InvenTree into template-reduce-duplication 2022-02-12 00:55:39 +01:00
Oliver
dbf1e1b463 Fix logic for enabling "place order" button 2022-02-08 08:59:42 +11:00
Oliver
64b1523013 Do not hide the "submit order" button 2022-02-07 13:55:25 +11:00
Oliver
f6ffef66e0 Fixes for new "allocation" tab 
- Fix broken link
- Add "description" column
- Add thumbnail images
 2022-01-27 16:25:26 +11:00
Oliver
5ec1d5aab8 Display allocations for individual stock items 2022-01-27 15:21:04 +11:00
Oliver Walters
9a2d47cd53 style fixes 2022-01-26 23:17:58 +11:00
Oliver Walters
681e007092 Add clean() function for PurchaseOrderLineItem 
Also adds renderer for purchaseorder model
 2022-01-26 22:56:00 +11:00
Matthias
2e0198e7cd
refactor field matching 2022-01-21 01:20:32 +01:00
Matthias
3c02c918b2
reduce code in wizard templates 2022-01-21 01:12:11 +01:00
Matthias
ff897ccc41
remove dead code 2022-01-21 00:30:51 +01:00
eeintech
391836689d Allow decimal for quantity received on PO 2022-01-17 09:04:14 -05:00
Oliver
1243923944 Event refactoring 2022-01-10 17:28:44 +11:00
Oliver
886b1f1d72 Simplify event triggering 
- add generic receivers for database actions
- exclude django_q tables, otherwise we get an infinite loop!

Ref: https://stackoverflow.com/questions/17507784/consolidating-multiple-post-save-signals-with-one-receiver/32230933#32230933
 2022-01-10 17:24:53 +11:00
Oliver
13d8bf437a PEP fixes 2022-01-10 09:02:11 +11:00
Oliver
2370e41961 Add multiple triggered events for the "order" app 2022-01-10 09:01:17 +11:00
Matthias
95ee4f908f
Merge branch 'master' of https://github.com/inventree/InvenTree into sn-append 2021-12-29 23:45:19 +01:00
Matthias
2ec41b02f8
append information about next serial numbe to fnc call 
Fixes #2484
 2021-12-29 03:01:52 +01:00
Oliver
943b27e195 Adds "items" list to API endpoint 2021-12-20 19:29:08 +11:00
Oliver
463192e0b9 Improved table filtering for "purchase order" table (as seen from "part" view) 2021-12-07 10:33:09 +11:00
Oliver
120870712a
Merge pull request #2420 from SchrodingersGat/assigned-to-me 
Assigned to me
 2021-12-04 23:08:08 +11:00
Oliver
66462d0a68 Fix for APIFilter 2021-12-04 22:07:55 +11:00
Oliver
20dac08158 PEP fixes 2021-12-04 21:31:39 +11:00
Oliver
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Oliver
1667af4c07 Add autocomplete fields to "order" admin pages 2021-12-04 20:09:39 +11:00
Oliver
9e35c52b1d unit testing fixes 2021-12-04 17:30:13 +11:00
Oliver
31398b4c10 Sales order can now be completed via the API 2021-12-04 13:50:11 +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
9ba6ac423d Add shipment status to sales order page 2021-12-04 10:16:51 +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
43ee4e390a API updates 
- Allow filtering of POLineItem list endpoint by base part instance
- Include "order detail" in POLineItem serializer
 2021-12-03 20:53:59 +11:00
Oliver
c93009876d UI changes 2021-12-03 20:14:09 +11:00
Oliver
88fce1e813 Unit test fixes 2021-12-03 18:42:36 +11:00
Oliver
6b29e60494 Fixes for migration tests 2021-12-03 11:12:49 +11:00
Oliver
3c3dd9368d Do not auto-complete salesorder when shipment is done 
- User might want to add more line items?
 2021-12-03 00:45:44 +11:00
Oliver
732034d9e5 Merge conflicting migrations 2021-12-03 00:43:10 +11:00
Oliver
80b615bfb7 Import fix 2021-12-03 00:08:05 +11:00
Oliver
93173ef1ee Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-12-02 23:58:52 +11:00
Oliver
ecf70b6d4d Some PEP fixes 2021-12-02 23:58:02 +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
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
c2a6a8a30c
PEP fix 2021-12-02 10:01:20 +01:00
Matthias
970cec590b
only values starting with int possible -> only positive values 2021-12-02 09:06:58 +01:00
Matthias
c4f1a81c9c
fix permissions for test 2021-12-02 01:18:45 +01:00
Matthias
fc6f1b4acc
unittests to show the fix works 2021-12-01 23:45:16 +01:00
Matthias
dc65634abc
use mixin on all serializers whos models use ReferenceIndexingMixin 2021-12-01 23:36:21 +01:00
Matthias
3b5e9d3283
use BigIntegerField for a hugher range ;-) 2021-12-01 22:39:53 +01:00
Oliver
fd02197851 Refactor purchase order page 2021-11-30 20:39:28 +11:00
Oliver
7b43e3e585 Refactor sales order page 2021-11-30 20:33:41 +11:00
Oliver
bce69b7733 Removes ship_order function 2021-11-30 00:45:40 +11:00
Oliver
6963503d02 Delete old SalesOrderShip view 2021-11-30 00:44:42 +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
c6b11b5e38 New logic for completing a SalesOrderShipment 2021-11-29 23:11:21 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Oliver
32be39774f PEP fixes 2021-11-28 22:36:47 +11:00
Oliver
4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Oliver
0949bac175 serializer fixes 2021-11-28 14:21:09 +11:00
Oliver
6582fd3d04 Add 'link' field to attachment serializer 2021-11-28 12:57:37 +11:00