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
Oliver
7539bd47fe Fix rendering issues 2021-07-09 12:10:27 +10:00
Oliver
6a995042c9 Fix bug relating no PurchaseOrderLineItem with null Part reference 2021-07-09 12:10:17 +10:00
Oliver
004b36b1df Refactor BuildOrderCreate form 2021-07-09 00:18:03 +10:00
Oliver
1deab0c040 Fix for SalesOrder attachment table 2021-07-08 10:48:08 +10:00
Oliver
939d5838fa Fixes for PurchaseOrder attachment table 2021-07-08 10:45:42 +10:00
eeintech
87a7081185 Fixed supplier part detail handling in stock table 2021-07-06 14:32:16 -04:00
Oliver
3cc9299b41 Refactor SOLineItemCreate view 2021-07-03 21:56:29 +10:00
Oliver
699b21f6fd Remove broken URL 2021-07-03 21:46:08 +10:00
Oliver
889834b693 Refactor POLineItemCreate form 2021-07-03 21:43:22 +10:00
Oliver
c524f754e9 Allow null values for purchase_price and sale_price 2021-07-03 21:27:03 +10:00
Oliver
25a80d2aa7 Fix form filters 2021-07-03 21:21:32 +10:00
Oliver
5c1fddd96d JS bug fix 2021-07-03 16:28:03 +10:00
Oliver
77c3aa5379 Use custom currency choices 2021-07-03 12:45:59 +10:00
Oliver
55f8fefe79 Remove old test 2021-07-03 12:33:28 +10:00
Oliver
8c3a4b60ab Refactoring forms for order line items 
- Required some fixes for money serializer
-
 2021-07-03 01:17:29 +10:00
Oliver
1cdf03ef49 Added MinMoneyValidator to InvenTreeModelMoneyField 
- Refactor edit and delete forms for PurchaseOrderLineItem
 2021-07-03 00:34:41 +10:00
Oliver
993abd9d91 Refactor forms for sales orders 2021-07-03 00:14:36 +10:00
Oliver
984828f3bb Specify 'default' functions for 'reference' field in SalesOrder and PurchaseOrder 
- Refactor CreatePurchaseOrder form
- Some migrations
 2021-07-02 23:59:02 +10:00
Oliver
7e5c9aa043 Refactor PurchaseOrderEdit form 2021-07-02 23:04:53 +10:00
Oliver
5e9372f2d6 Add API endpoints for Owner model 
- Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms
 2021-07-02 22:45:42 +10:00
Oliver
51ebe30754 Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/company/forms.py
 2021-07-02 11:26:09 +10:00
Matthias
3c6c9c59d6 added clean migration steps for all price fields 2021-07-01 07:11:15 +02:00
Oliver
59b794f0e5 Cleanup old forms 2021-07-01 14:25:14 +10:00
Matthias
ea8b102897 style fix 2021-07-01 00:50:50 +02:00
Matthias
fcdefc4f83 removing default_currency in fields 2021-07-01 00:40:26 +02:00
Matthias
3a57093b4e replace MoneyFields with inherited classes 2021-07-01 00:13:38 +02:00
Oliver
30ac5dba55 Display attachment upload date 2021-06-30 17:44:23 +10:00
Oliver
9b4db43232 Refactoring "attachment" tables to use the API 
- Part attachments
- StockItem attachments
- PurchaseOrder attachments
- SalesOrder attachments
- BuildOrder attachments
 2021-06-30 17:40:44 +10:00
Oliver
682b2b4b2f Support rendering / updating of date inputs 2021-06-30 17:04:21 +10:00
Oliver
4e23dbd0af Refactor delete views for SalesOrderAttachment and PurchaseOrderAttachment 2021-06-30 12:54:38 +10:00
Oliver
712c9598d1 Refactor SalesOrderAttachment forms 2021-06-30 10:09:05 +10:00
Oliver
60d599b476 Refactor PurchaseOrderAttachment views 2021-06-30 10:03:54 +10:00
Oliver
6156fffd1d Remove broken URLs 2021-06-29 21:25:20 +10:00
Oliver
170ed37d03 Delete CompanyCreate AJAX view 2021-06-29 21:20:53 +10:00
Oliver
67f76c8bca Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-27 09:26:23 +10:00
Matthias Mair
e760aa172a
Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
Oliver
c5df91efce PEP Fix 2021-06-25 00:38:28 +10:00
Oliver
04374c71c2 Annotate models with their API list view 
- It will make sense, trust me
 2021-06-25 00:17:58 +10:00
Oliver
962badc36d
Merge pull request #1682 from matmair/order-modal-show-price 
Order modal show price
 2021-06-22 21:27:59 +10:00
Oliver
1456868d03 Add default values for line item serializers 
- Once https://github.com/inventree/InvenTree/issues/1687 is fixed, remove default values
 2021-06-22 17:03:21 +10:00
Oliver
4fe6562d29 PEP fixes 2021-06-22 16:43:49 +10:00
Oliver
26dd9c10a4 Fixes for SalesOrder API 2021-06-22 16:43:38 +10:00
Oliver
3fa3ce06a1 Fixes for PurchaseOrder API interface 
- Allow DELETE endpoint for PurchaseOrder
- Remove 'read_only' attribute for 'reference' field
- Add extra functionality to API test class
- Add unit testing
 2021-06-22 16:28:42 +10:00
Oliver
650d31ae32 Remove debug statements 2021-06-22 10:43:00 +10:00
Matthias
b503c62464 Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-22 00:27:56 +02:00
Oliver
e6598b5115 Displays "purchase order" column in StockItem table 2021-06-21 16:58:39 +10:00
Matthias
b4412ef575 also show prices of the value 0 2021-06-20 13:32:52 +02:00
Matthias
452d2004ce added handling for no supplier price 2021-06-19 23:46:31 +02:00
Matthias
7d5aa8189d Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:30:54 +02:00
Matthias
b86793703e Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import 2021-06-18 23:14:48 +02:00
Matthias
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
Matthias
15804f873b Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-18 16:46:11 +02:00
Oliver
e68a4abdf2 Error: wrong error 2021-06-18 19:51:54 +10:00
Oliver
3fb57abe66 Error catching 2021-06-18 19:39:06 +10:00
Oliver
34c34487b5 PEP style fix 2021-06-18 19:21:46 +10:00
Oliver
10ecddf9b4 Fixes after rebase 2021-06-18 17:25:24 +10:00
Oliver Walters
0b8a50cd92 Add 'location_detail' filter 2021-06-18 16:51:34 +10:00
Oliver Walters
caf52c6ce5 Add optional detail elements to SOAllocation API 2021-06-18 16:49:56 +10:00
Oliver Walters
ad8dbb5900 Add API LIST endpoint for SalesOrderAllocations 2021-06-18 16:48:32 +10:00
Matthias
f0dd543ffa render price in oer-modal if enabled in settings 2021-06-17 23:44:22 +02:00
Matthias
a3a623a5ca update-button for modal, repeat 1st step on use 2021-06-17 23:24:32 +02:00
Matthias
2d8b96a6b8 setting to control visibility of price 2021-06-17 23:15:42 +02:00
Matthias Mair
e77e89b16c
Merge branch 'inventree:master' into part-import 2021-06-17 16:42:49 +02:00
Oliver
93e83d0bf9
Merge pull request #1587 from nwns/feature/see_default_location 
feat(purchase orders): show the preferred location for each PO Line
 2021-06-17 17:01:05 +10:00
Matthias
af2cfe55be missed a translation there 2021-06-17 00:51:53 +02:00
Matthias
ddd84dcd7c Merge branch 'master' of https://github.com/inventree/InvenTree into so-total 2021-06-17 00:50:39 +02:00
Matthias
bbe7edbf82 totals like in #1666 2021-06-17 00:50:10 +02:00
Matthias
5d3360e63b added quantity total 2021-06-17 00:23:08 +02:00
Matthias
dac112d908 added footer total for price 2021-06-17 00:22:32 +02:00
Matthias
2fc185bd71 show footer 2021-06-16 23:57:33 +02:00
Matthias
70e0933336 total price column as per #1660 2021-06-16 23:52:00 +02:00
Nigel
f8e4a5ac2e
test: improve coverage of new get_destination 2021-06-09 11:04:42 -06:00
Nigel
cd07ea835d
feat(purchase orders): show the preferred location for each PO Line 
Adds the ability for the Purchaser to specify where the item is
intentended to go when received.  If the Purchaser does not set a
preferred location, then the default location for the part is displayed.
If the item is received them where it was actually placed is shown.

NOTE: if an item is split when received only one of the resulting
StockItem location is used.

Fixes #1467
Addresses some of the requests in #551
 2021-06-09 09:06:03 -06:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
eeintech
74bd975a0b Revert back to form_list 
Moved OrderMatchItemForm to forms.py
 2021-06-04 13:41:07 -04:00
Matthias
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
Matthias
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Matthias
3c5bb048a1 renaming a few parts 2021-05-22 15:39:54 +02:00
Oliver Walters
7cd345aeb5 Change location of 'banner' messages 
- Place them inside the main panel
- Generally underneath the thumbnail
 2021-05-18 19:19:43 +10:00
Matthias
dd56bc1fa5 setup not realy needed 2021-05-18 11:18:13 +02:00
Matthias
616dd76f8a refactor and doc 2021-05-18 11:10:01 +02:00
Matthias
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
Matthias
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
Matthias
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
Matthias
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00
Matthias
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
Matthias
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02:00
Oliver
980befe0fa
Merge pull request #1586 from nwns/feature/show_poline_items_in_admin 
feat(admin): Show the line items on the PO on the Admin Site
 2021-05-15 07:50:53 +10:00
Oliver
6f10195f8c
Merge pull request #1465 from nwns/feature/po_on_sales_order 
Show PO for Stock Items on Sales Order Detail and stock
 2021-05-15 07:49:59 +10:00
Nigel
30a2194fe1
feat(admin): Show the line items on the PO on the Admin Site 2021-05-14 13:24:13 -06:00
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Nigel
bca2f4a07b
feat(sales_order): Stock Items show the PO number 
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
 2021-05-13 14:18:25 -06:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates 
#1574
 2021-05-12 15:31:35 +02:00
Oliver
9d98ecca92
Merge pull request #1561 from eeintech/multi_part_forms 
Multi-step form framework + Purchase order upload file view
 2021-05-12 22:18:35 +10:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04: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
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
0020e85397 Refactor add_tracking_entry 2021-05-11 20:56:20 +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
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
Matthias
a210b331ce just a small translation 2021-05-09 00:27:00 +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 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
9e59d41f12 style improvments 2021-05-07 07:46:35 +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
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
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
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
90c207b935 keeping part id in inherited form 2021-05-06 16:45:39 +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
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
c4d0865f06 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 00:14:33 +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
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
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
eeintech
64fb492b97 Added match parts step, need to process fields data 2021-05-04 14:45:52 -04:00
eeintech
7cdf0af04a Added upload file step 2021-05-04 12:20:57 -04:00
eeintech
373898d43e Added step description and crispy form tag 2021-05-04 10:28:00 -04:00
Matthias
75f487aee9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-04 00:02:15 +02:00
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
eeintech
d072187bf8 Fixed exception for quantity check 2021-04-28 16:46:42 -04:00
eeintech
a63d5012f0 Purchase order fixes 2021-04-28 13:16:40 -04:00
Matthias
8f40b57121 improvements after code-review by @eeintech 2021-04-27 16:32:43 +02:00
Matthias
a11fff0269 man those tests take long 2021-04-22 23:17:27 +02:00
Matthias
83764d5e6c added PO in the fixtures so that should be higher 2021-04-22 22:57:48 +02:00
Matthias
a1237b4a49 always adjust pruchase price if one exists 2021-04-22 22:17:54 +02:00
Matthias
7cb858546e tests for new methods in #1509 2021-04-22 22:16:56 +02:00
Matthias
c14478ed1f automato fill purchase price #1509 2021-04-22 19:31:04 +02:00
Matthias
07d68f7fde Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-21 11:12:48 +02:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
46822017c6 FIX: multiline trans not possible 2021-04-17 23:52:55 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
Matthias
3598c36043 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-17 09:59:05 +02:00
Nigel
6f00c662a1
fix: don't link manufacturer part if it doesn't have one 2021-04-15 16:28:50 -06:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
Matthias
75381cbb7b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-14 21:18:21 +02:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
2db6af2af6 PO table and stock item template improvements 2021-04-07 10:33:31 -04:00
Matthias
32eaf48c12 fixed styling 2021-04-06 18:33:57 +02:00
Matthias
f647120cd1 initial showcase implementation 2021-04-06 18:17:09 +02:00
Matthias
2c053eae4c added translations 2021-04-04 22:49:47 +02:00
Matthias
adcb211572 set language in the used js scripts 2021-04-04 22:48:36 +02:00
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
c68220a597 migrations for all the translated models, totally forgot that 2021-04-03 14:11:28 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02:00
Oliver
f288b906ad
Merge pull request #1426 from SchrodingersGat/assign-by-sn 
Assign by sn
 2021-03-30 09:29:49 +11:00
Oliver Walters
bfbdd72306 Remove unused import 2021-03-30 08:43:09 +11:00
Oliver Walters
408b9d5e5b Fix for unit testing 2021-03-30 08:08:55 +11:00
Oliver Walters
709bfb1bd2 Remove "unique" constraint for part / order relationship 2021-03-30 00:14:47 +11:00
Oliver Walters
217097c9d3 Add custom form template 2021-03-30 00:10:28 +11:00
Oliver Walters
19059ea4cf Tweaks 2021-03-29 23:38:38 +11:00
Oliver Walters
d64dd68403 Agk, working out forms is hard 2021-03-29 23:32:41 +11:00
Oliver Walters
bd87f4c733 Adds form to assign stock item by serial numbers 2021-03-29 23:10:36 +11:00
Oliver Walters
cffe2ba84b Add a separate form for creating a sales order allocation 2021-03-29 16:44:01 +11:00
Oliver Walters
7a4b90649a HTML / CSS fixes 2021-03-29 16:36:27 +11:00
Oliver
ed028aed62
Merge pull request #1397 from SchrodingersGat/order-report 
Order report
 2021-03-12 14:44:10 +11:00
Oliver Walters
7ccd339b5c Print reports for multiple selected sales orders / purchase orders 2021-03-11 14:15:31 +11:00
Oliver Walters
fa95759a00 Enable printing for PO and SO 2021-03-11 14:09:57 +11:00
Oliver Walters
d559d92f58 Display responsible owner for salesorder and purchaseorder 2021-03-10 16:26:20 +11:00
Oliver Walters
39d44ce32f Add "responsible" field to PO and SO models 2021-03-10 16:19:44 +11:00
Oliver Walters
8061669c70 Hacky fix for ordering parts form 2021-03-06 19:49:49 +11:00
Oliver Walters
979f543c3f Add build orders to search results list 2021-03-03 08:44:13 +11:00
Oliver Walters
339a02a6b2 Bug fix for sorting of sales orders 2021-03-03 08:32:57 +11:00
Oliver Walters
558ea98fa1 Add purchase order and sales order to search results 2021-03-03 08:30:20 +11:00
Oliver Walters
0b15b77140 Fix server-side ordering for purchase order table 2021-03-03 08:13:55 +11:00
Oliver
3d4cfcf1b6
Merge pull request #1381 from SchrodingersGat/table-name-fix 
Fixes incorrect table name
 2021-03-02 22:03:51 +11:00
Oliver Walters
cd01bb0ad7 Refactor HTML view permission 
- Introspect database model from View
- Automatically get the permission from the View class
 2021-03-02 21:32:32 +11:00
Oliver Walters
628e87cb28 search field fixes 2021-03-02 13:08:12 +11:00
Oliver Walters
6f4178acdb Improve server-side pagination for POLineItem 2021-03-02 12:38:37 +11:00
Oliver Walters
1c3b017283 Improve server-side pagination of SalesOrderLineItem 2021-03-02 12:33:41 +11:00
Oliver Walters
b315b958b0 PEP fixes 2021-02-27 07:56:38 +11:00
Oliver Walters
5a536be22d More test refactoring 2021-02-26 22:08:06 +11:00
Oliver Walters
26e80fa0ab Fancify all the menubars 2021-02-25 09:10:20 +11:00
Oliver Walters
3210af31b4 Sales order now uses menubar 2021-02-24 20:17:25 +11:00
Oliver Walters
213851e8aa Purchase Order now uses menu bar 2021-02-24 20:01:05 +11:00
Oliver Walters
0f60482e09 Add secondary dialog for creating new supplier 2021-02-18 14:59:13 +11:00
Oliver Walters
228349bea6 Add 'location_detail' filter 2021-02-18 00:36:51 +11:00
Oliver Walters
77df82c46d Add optional detail elements to SOAllocation API 2021-02-18 00:07:44 +11:00
Oliver Walters
4ea4456517 Add API LIST endpoint for SalesOrderAllocations 2021-02-17 23:56:47 +11:00
Oliver Walters
4ef6a6dc62 Translations for stock transaction notes 2021-01-29 12:23:22 +11:00
Oliver Walters
82e6b87e1c Adds unit testing for order overdue status 2021-01-20 07:49:14 +11:00
Daniel Pervan
0d462389b9 Fix misspelled query filter method name 2021-01-19 12:00:30 +01:00
Oliver Walters
4fd0d7d8b5 Unit test fix 2021-01-14 23:06:49 +11:00
Oliver Walters
959914c78c Display overdue purchase orders in the calendar view 2021-01-14 22:19:32 +11:00
Oliver Walters
fef5b7548e Increase unit testing for order API 2021-01-14 22:06:53 +11:00
Oliver Walters
e8fd597f29 Adds ability to edit target_date in purchaseorder form 2021-01-14 17:44:21 +11:00
Oliver Walters
21e8ddd1e6 Display overdue status on PurcahseOrder page 2021-01-14 17:42:38 +11:00
Oliver Walters
a8e6d0a89f Display overdue status in purchase order table 
- Allow table to be filtered by "overdue" status
 2021-01-14 17:37:10 +11:00
Oliver Walters
4d73aab090 Add "overdue" flag to serializer 
- Also allow filtering by overdue status in the API
 2021-01-14 17:33:24 +11:00
Oliver Walters
834d9ec9a1 Add "target_date" field to PurchaseOrder 2021-01-14 17:28:57 +11:00
Oliver Walters
be41741b1e Bug fix for cancelling purchase orders 2021-01-14 14:37:49 +11:00
Oliver Walters
47b0f40e97 Calendar view for build orders 2021-01-07 23:41:54 +11:00
Oliver Walters
76c86e7b2f Calendar view for purchase orders 2021-01-07 23:04:00 +11:00
Oliver Walters
38b6367453 PEP fixes 2021-01-07 22:34:17 +11:00
Oliver Walters
b7203f0ebb Switch between calendar and list view for sales orders 2021-01-07 22:32:17 +11:00
Oliver Walters
5f6442ba6b Render sales orders to a calendar view 2021-01-07 18:47:29 +11:00
Oliver Walters
580e7599a0 Prevent expired stock from being added to a sales order 2021-01-06 20:22:56 +11:00
Oliver Walters
d1ce0f062e Improve unit testing for StockItem API 2021-01-04 01:22:43 +11:00
Oliver Walters
725a70327a Add some unit testing 2021-01-02 22:21:37 +11:00
Oliver Walters
b2a732197b Fix target date form field for SalesOrder 2021-01-02 21:54:07 +11:00
Oliver Walters
08a8556fe7 Fix unit testing 2020-12-18 19:46:02 +11:00
Oliver Walters
c34196538b Filter API by overdue status 2020-12-18 12:40:47 +11:00
Oliver Walters
c6134b54ab Add "overdue" status to SalesOrder serializer 2020-12-18 12:26:58 +11:00
Oliver Walters
000348f70f Add 'target_date' field to SalesOrder model 2020-12-18 12:19:16 +11:00
Oliver Walters
7068f70811 Fixes for 'order parts' form 
- Sometimes the part pk was not being retrieved properly
 2020-11-27 11:18:45 +11:00
Oliver Walters
f239c8f8c8 Add missing migration file 2020-11-12 22:04:50 +11:00
Oliver Walters
ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters
fd79f1ea0e Fixes for 'single pricing' for SupplierPart 2020-11-12 19:46:19 +11:00
Oliver Walters
6e7224ee7c Add "purchase price" field to PurchaseOrderLineItem table 2020-11-12 18:05:24 +11:00
Oliver Walters
b7187c5e06 Fixes for purchase order table displays 2020-11-12 12:27:01 +11:00
Oliver Walters
e4f2eecb3b Remove defunct 'build_order' field from StockItem model 
- This is now handled by the new-and-improved build system, no longer required
 2020-11-10 20:12:39 +11:00
eeintech
5b3dd63b89 Fixed saving of purchase and sales order forms 2020-11-05 14:38:54 -05:00
Oliver Walters
ac03dab8de Tweaks 2020-11-03 20:37:33 +11:00
Oliver Walters
500da8099b Add forms / views for creating a new build output, and completing the build 
- Also some refactoring of how forms are handled and saved
 2020-11-02 22:56:26 +11:00
Oliver Walters
3a702266e6 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js
 2020-10-30 22:44:25 +11:00
Oliver Walters
1caa341f8e Fixes for unit tests 2020-10-30 21:34:56 +11:00
Oliver Walters
e049ca1a85 More refactoring 2020-10-30 16:54:05 +11:00
Oliver Walters
c533f59405 Refactor how form errors are handled 
- Use form.add_error (as the django gods intended)
 2020-10-30 16:04:56 +11:00
Oliver Walters
5c5641d884 Update calls to post_save 2020-10-30 10:12:42 +11:00
Oliver Walters
544b63cac5 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-10-29 00:01:10 +11:00
Oliver Walters
091a9d9803 Refactor how form errors are handled 
- When in doubt, refer to the django docs
- There was a *much* better way (thanks, form.add_error)!
- The anti-pattern was deleted, and lo, there was much rejoicing
- Some other refactoring too
 2020-10-28 23:33:33 +11:00
Oliver Walters
d8ada930c8 More template updates 
- Add icons to more action buttons
 2020-10-28 22:37:58 +11:00
Oliver Walters
d06b4d7c9f Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/urls.py
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/part/templates/part/bom.html
#	InvenTree/templates/js/build.js
#	InvenTree/templates/js/table_filters.js
#	InvenTree/templates/stock_table.html
#	tasks.py
 2020-10-28 22:25:14 +11:00
Oliver Walters
d0b7d91ca4 Update multiple templates with fontawesome icons 2020-10-28 18:30:38 +11:00
Oliver Walters
a4f6efc05d Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/build.html
 2020-10-26 22:38:43 +11:00
Oliver Walters
5e0d1fe25a Allocate "non tracked" parts separately from tracked ones 2020-10-26 18:21:45 +11:00
eeintech
de65e1631d Updated company templates permissions 2020-10-20 14:46:10 -05:00
Oliver Walters
9b7a9a3ee0 Update formatting of order pages 2020-10-19 23:23:16 +11:00
Oliver Walters
0b7cf9e7f3 Add "reference" to build order forms 2020-10-19 22:49:28 +11:00
Oliver Walters
634410294b Display table of items received against a particular purchase order 
- Adds new tab to "Purchase Order" view
- Adds ability to filter StockList API by purchase_order ID
 2020-10-19 11:40:57 +11:00
eeintech
af6b30eaca Added IPN to Supplier Part string representation 
Improved Supplier Part templates and fixed 'Order Part' button in supplier_part_orders
 2020-10-15 13:09:00 -05:00
Oliver Walters
2325b1e4ba Unit test fixes 2020-10-06 20:10:14 +11:00
Oliver Walters
9abb211cdf Update template permissions 2020-10-06 20:09:55 +11:00
Oliver Walters
1c97aaf87a Set permissions for order views 2020-10-06 19:46:53 +11:00
Oliver Walters
ab454e5ba4 More template changes: perms -> roles 2020-10-06 16:46:13 +11:00
Oliver Walters
16d720b62c Update permission requirements for API 
- Automatically use model permissions by default!
-
 2020-10-06 00:36:55 +11:00
Oliver Walters
27656633df Update admin links to require specific permissions 2020-09-30 23:57:23 +10:00
Oliver Walters
0e5f10c020 Add some more search terms to the admin interface 2020-09-29 23:41:50 +10:00
Oliver Walters
d348d90fbe Cleanup errors in unit testing 2020-09-28 22:08:38 +10:00
Oliver Walters
5f2e4c3790 Update serializers for Order model 2020-09-05 23:08:59 +10:00
Oliver Walters
36955d6d4f pep fixes 2020-09-02 20:16:46 +10:00
Oliver Walters
911727f7b7 Update test fixtures 
- Can't assume that pk values will be assigned sensibly!
- Need to hard-code them in
 2020-09-02 19:47:07 +10:00
Oliver
baaabd00d6
Merge pull request #939 from SchrodingersGat/column-remembering 
Make checkbox field non-switchable for stock table
 2020-08-31 22:08:56 +10:00
Oliver Walters
672936e2d4 Update many tables 2020-08-31 21:55:01 +10:00
Oliver Walters
5c4781b5b4 Order: Improve help text(s) 2020-08-31 19:13:24 +10:00
Oliver Walters
fcd588cb01 Filter SalesOrder by status 2020-06-05 12:08:47 +10:00
Oliver Walters
6ebce2b2fd Add ability to filter purchase orders by "outstanding" status 2020-06-05 12:06:28 +10:00
Oliver Walters
80019a3ed8 Add forms/views for manually assigning a stock item to a customer 2020-06-04 19:45:41 +10:00
Oliver Walters
e128410d54 Update 'required' status for new serializers 
(cherry picked from commit 2306e29743eb25266c78bec5357d1194e0778c58)
 2020-05-26 20:29:09 +10:00
Oliver Walters
81e38eeb14 Add some more custom FileField serializers 
(cherry picked from commit 7b9ff27baefacc977fef7852e99d8a9bb46a062a)
 2020-05-26 20:29:04 +10:00
Oliver Walters
82fe497787 Add buttons to edit / delete a Test result 
- Don't do nuthin yet!
 2020-05-17 00:04:45 +10:00
Oliver Walters
8a99062704 PEP fixes 2020-05-16 17:52:25 +10:00
Oliver Walters
498ad4162c Bugfix: Turns out 'prefix' and 'suffix' were protected fields! 2020-05-16 11:05:45 +10:00
Oliver Walters
08d177e55f Update refactor for editing PO and SO forms 2020-05-16 09:36:43 +10:00
Oliver Walters
007d2d4054 Add prepended text to order references for forms 2020-05-14 21:51:44 +10:00
Oliver Walters
5167f54268 Fix unit tests 2020-05-14 15:20:40 +10:00
Oliver Walters
b619f26074 Auto-increment sales order reference number 2020-05-14 15:05:55 +10:00
Oliver Walters
08903f357e Auto-increment the purchase-order number when creating a new one 2020-05-14 15:02:46 +10:00
Oliver Walters
cebfe9a30f Function to predict the next purchase order number 2020-05-14 15:00:00 +10:00
Oliver Walters
30b5f7d507 Drag and drop for order attachments 2020-05-13 11:28:45 +10:00
Oliver Walters
f5b97da5d2 Refactor "attachment" table into template 2020-05-12 22:05:38 +10:00
Oliver Walters
366d4b2143 Add new attechment functionality to new models 
- Giving the ol' refactor tractor a fresh coat of paint
 2020-05-12 21:40:42 +10:00
Oliver Walters
5d716d0cdd Add "upload date" field to fileattachment base class 2020-05-12 20:57:41 +10:00
Oliver Walters
d4fa7d936e Add 'user' field to attachment 2020-05-12 20:50:03 +10:00
Oliver Walters
3151612962 PEP fix 2020-05-12 00:07:08 +10:00
Oliver Walters
cfc0145180 Add some unit tests 2020-05-11 23:44:22 +10:00
Oliver Walters
a7e5a79f4c Expose salesorder and purchaseorder attachments to the API 2020-05-11 23:41:57 +10:00
Oliver Walters
7430abc237 Add ability to set stock status when receiving goods 2020-05-03 09:50:00 +10:00
Oliver Walters
fe87bba577 Link fix for purchase order table 2020-05-03 09:46:42 +10:00
Oliver Walters
26f0338f1d Auto-select a purchase order when ordering parts 2020-05-02 20:25:47 +10:00
Oliver Walters
bbecc8c900 Reverse URL bug fix 2020-04-28 09:35:24 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters
2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters
3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver Walters
0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields 
- Improve methods for different models
 2020-04-25 23:17:07 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation 
- Larger style available
 2020-04-25 15:13:55 +10:00
Oliver Walters
4e40d92db7 PEP fix 2020-04-25 13:31:42 +10:00
Oliver Walters
66b6036827 Add two new "build orders" tab to the "sales order" view 2020-04-25 13:29:18 +10:00
Oliver Walters
d5f3498238 Add a "sales_order" reference to the Build model 
- If a build order is made to fulfil a sales order
- Add sales_order filtering to the Build API
- Pass initial information through to the BuildCreate view
 2020-04-25 13:15:45 +10:00
Oliver Walters
b351976ae9 Mark a SalesOrder as "shipped" 
- Option to hide non-stock items from stock list
- Update models with new feature
 2020-04-25 08:46:28 +10:00
Oliver Walters
41a4033427 Selective display of sales order ilne buttons 2020-04-24 17:18:18 +10:00
Oliver Walters
9d25ed335c Rebuild the "PurchaseOrder" detail 
- Use AJAX and bootstrap-table
- Display progress bar
 2020-04-24 12:52:08 +10:00
Oliver Walters
ba1d2063af Remove some debug messages and fix PIP 2020-04-24 10:22:33 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder 
- Returns "False" for now
 2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
2c9b112562 PEP fixes 2020-04-23 21:48:39 +10:00
Oliver Walters
e5fa94b4f8 Add functionality to cancel a sales order 2020-04-23 21:38:40 +10:00
Oliver Walters
e384f9e94c Order date adjustment 
Sales order now has a "shipment date"
 2020-04-23 20:42:59 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
426aa9258c URL cleanup 2020-04-23 17:37:53 +10:00
Oliver Walters
5d71cf85cc Add separate 'quantity' and 'allocated' columns in sales order view 2020-04-23 16:00:09 +10:00
Oliver Walters
c9ea33e22e Fix order of javascript table events 2020-04-23 10:58:26 +10:00
Oliver Walters
d59c6711bb Update translations 2020-04-23 09:20:25 +10:00
Oliver Walters
a803f21e0c Add buttons to create new builds or orders for sales order parts 
- Need to pre-fill the forms a bit better
 2020-04-22 23:34:27 +10:00
Oliver Walters
6112be2df0 Add forms for editing and deleting a SalesOrderAllocation item 2020-04-22 23:21:54 +10:00
Oliver Walters
2a4e903785 Add button to delete a SalesOrderLineItem 2020-04-22 22:36:55 +10:00
Oliver Walters
26d1a25f31 PEP style fixes 2020-04-22 22:24:06 +10:00
Oliver Walters
fd42149f67 More stuff 2020-04-22 22:22:22 +10:00