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
13,850 Commits 6 Branches 99 Tags 484 MiB
8cd782dc8f
Commit Graph

949 Commits

Author SHA1 Message Date
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
Oliver Walters
6ab03bd05a Add form for creating a new StockItem allocation 2020-04-22 21:26:38 +10:00
Oliver Walters
2972aec759 Cleverer rendering of sales order allocations 2020-04-22 20:26:05 +10:00
Oliver Walters
b70e79b778 Optionally add all SalesOrderAllocations to the SalesOrderLineItem serializer 2020-04-22 20:10:23 +10:00
Oliver Walters
d9698b10cc PEP fixes 2020-04-22 13:21:45 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model 
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
 2020-04-22 13:11:19 +10:00
Oliver Walters
2cb1b076f6 Create "SalesOrderAllocation" object 
- Links multiple StockItem objects to a single SalesOrderLineItem
 2020-04-22 12:12:48 +10:00
Oliver Walters
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
09ccd6c5e2 PEP style fixes 2020-04-21 22:37:35 +10:00
Oliver Walters
b75c343236 Add action buttons to the sales order page 2020-04-21 22:02:17 +10:00
Oliver Walters
15166c7797 Add a custom "id" to the progress bar 2020-04-21 21:43:04 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00
Oliver Walters
b40234e403 UI tweaks 2020-04-21 20:05:15 +10:00
Oliver Walters
89ede3e103 Fix for SalesOrderLineItem allocation calculation 
Also function to render a progress bar
 2020-04-21 16:45:44 +10:00
Oliver Walters
a1376eeb9e The 'StockItem' model now has a reference to a SalesOrderLineItem 2020-04-21 15:04:21 +10:00
Oliver Walters
8052a1989c Serialize the allocated quantity for a purchase-order line item 2020-04-21 11:41:08 +10:00
Oliver Walters
7385099194 Add a model to map multiple StockItem objects to a single SalesOrderLineItem 2020-04-21 10:14:55 +10:00
Oliver Walters
19cd0707a2 Add / edit / delete attachments for SalesOrder 2020-04-21 09:42:11 +10:00
Oliver Walters
a06595c152 Add line numbering to SalesOrderLineItem table 2020-04-21 09:20:44 +10:00
Oliver Walters
22c96ad2b7 Add ability to filter SalesOrder list by part 2020-04-21 09:17:50 +10:00
Oliver Walters
3d2e907d5e Add a 'sales order' view for each part 2020-04-21 09:15:01 +10:00
Oliver Walters
b204618e79 Button / view / form to create a new SalesOrderLineItem 2020-04-21 09:02:10 +10:00
Oliver Walters
617fbf2f02 Moar stuffs: 
- Expose part_detail and order_detail to SOLineItem serializer
- Update SalesOrder line item table
 2020-04-21 08:57:13 +10:00
Oliver Walters
a2c0c7c76a Add "part" reference to SalesOrderLineItem model 2020-04-21 08:33:32 +10:00
Oliver Walters
0c56079b41 Create missing tabs for sales orders 
- Attachments
- Notes
 2020-04-20 22:33:49 +10:00
Oliver Walters
e12824df2e Add form to edit a SalesOrder 2020-04-20 22:20:03 +10:00
Oliver Walters
ce1dd88129 Form for creating a new SalesOrder 2020-04-20 22:13:07 +10:00
Oliver Walters
ebbcff3c7f Render a table of line items 2020-04-20 21:22:34 +10:00
Oliver Walters
b2569d5cba Expose SalesOrderLineItem objects to the REST API 2020-04-20 21:11:59 +10:00
Oliver Walters
47ada25315 Add detail view for SalesOrder 2020-04-20 20:59:14 +10:00
Oliver Walters
1ebf26ab7c Add page for displaying all sales orders 2020-04-20 20:40:45 +10:00
Oliver Walters
627c50e465 Render a table of sales orders 2020-04-20 20:27:52 +10:00
Oliver Walters
c7fd22924f Register salesorder classes in the admin interface 2020-04-20 20:27:35 +10:00
Oliver Walters
9f97d81e83 API endpoint for serializing SalesOrder objects 2020-04-20 20:11:21 +10:00
Oliver Walters
974c98c95a Add "SalesOrder" concept 
- SalesOrder model
- SalesOrderLineItem
- SalesOrderAttachment
 2020-04-20 19:41:58 +10:00
Oliver Walters
ff3cc96e0e PEP fixes 2020-04-20 09:50:41 +10:00
Oliver Walters
746e9ab983 Fix rendering of PurchaseOrder table 2020-04-20 09:48:33 +10:00
Oliver Walters
99fcbcc646 Consolidation of PurchaseOrder API 2020-04-20 09:41:21 +10:00
Oliver Walters
d19e287cb5 Template rendering improvements 2020-04-15 14:24:59 +10:00
Oliver Walters
610f85597f Expose supplier_reference to external API 2020-04-15 14:18:17 +10:00
Oliver Walters
c12a482e4d Add "supplier_reference" field to PurchaseOrder 
- This is the code that the Supplier uses for the particuarl sales order
 2020-04-15 13:32:14 +10:00
Oliver Walters
c17c014b33 More cleanup 
- Allow user filtering for purchase-order table in part view
- Remove some debug strings

(cherry picked from commit ea466c3588)
 2020-04-13 20:21:13 +10:00
Oliver Walters
7503596ea4 More fixes 
- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing
 2020-04-12 00:10:33 +10:00
Oliver Walters
6a0c5b78ae Refactor the purchase-order table 
- Filter by order status
 2020-04-11 20:56:31 +10:00
Oliver Walters
eeeb04c9f4 Unit testing for Order app API 2020-04-10 08:02:51 +10:00
Oliver Walters
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
535f1994b1 Fix order API reference 2020-04-06 12:02:23 +10:00
Oliver Walters
87a09a7220 Rename Order.URL to Order.link 2020-04-06 11:56:52 +10:00
Oliver Walters
6919eaa1e1 Update translations 2020-03-31 21:33:50 +11:00
Oliver Walters
124967ed31 Remove trailing zeros in part order form 2020-03-31 21:30:34 +11:00
Oliver Walters
570010b99c Change POLineItem quantity to a rounding decimal field 2020-03-31 21:23:57 +11:00
Oliver Walters
f07f3b99cf Remove 'notes' field from PurchaseOrder edit / create form 2020-03-31 20:48:44 +11:00
Oliver Walters
713d7960a8 Fix on_order calculation 
- Take into account the number "received"
- Also fix unit tests
 2020-03-26 17:56:44 +11:00
Oliver Walters
25caec4c53 Fix unit testings 2020-03-22 20:13:38 +11:00
Oliver Walters
82be9db3df Make a fancy badge 2020-03-22 19:57:51 +11:00
Oliver Walters
4a259dc146 Can now successfully edit or delete a purchase-order attachment 2020-03-22 19:55:46 +11:00
Oliver Walters
5af2fae120 Simplify URLs for purchase orders 2020-03-22 19:47:08 +11:00
Oliver Walters
834f80698b Create a new attachment against a PurchaseOrder 2020-03-22 18:41:41 +11:00
Oliver Walters
56a6943438 Add an 'attachment' page for the PurchaseOrder view 2020-03-22 18:13:34 +11:00
Oliver Walters
cc41752f9f Add PurchaseOrderAttachment model 
- File attachment against PurchaseOrder
 2020-03-22 18:02:53 +11:00
Oliver Walters
7dcc94b106 Filter purchaseorder API by supplier part 2020-02-12 12:44:52 +11:00
Oliver Walters
50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters
0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters
7ec194a14a Markdownify the notes field for PurchaseOrder 
- Update model field
- Create tab view for PO page
- Add 'notes' tab
 2020-02-02 11:44:44 +11:00
Oliver Walters
a064ce13fc PEP fixes 2020-01-06 20:51:12 +11:00
Oliver Walters
e103bd8880 Write unit test for PurchaseOrder receive views 2020-01-06 20:50:16 +11:00
Oliver Walters
067d2be1f0 Bug fix - receiving lines against a PO caused issues due to integer/Decimal conversion 2020-01-06 09:23:13 +11:00
Oliver Walters
fafd0397bc remove defunct file 2019-12-09 21:56:26 +11:00
Oliver Walters
71c1faf9ff Use the client-side PO table in more places 2019-12-09 21:55:00 +11:00
Oliver Walters
a257f94ac0 Use client-side rendering for list of purchase orders 2019-12-09 21:33:27 +11:00
Oliver Walters
25e5a64cee Improve filtering / ordering / sorting for purchase-order API 2019-12-09 21:19:35 +11:00
Oliver Walters
7f2804dff3 Add button to mark a purchase order as complete, even if not all line items are received 2019-12-05 10:29:16 +11:00
Oliver Walters
3f172cb065 Add 'new location' button when receiving parts by individual line 2019-12-05 09:12:37 +11:00
Oliver Walters
64db28be67 Fix __str__ function to get unit tests to pass 2019-11-19 10:31:49 +11:00
Oliver Walters
381becef79 Convert some more fields to decimal 
- purchase order line item quantity
- purchase order line item received
 2019-11-19 10:30:04 +11:00
Oliver Walters
d1c7877713 Add unit test for CompanyIndex 2019-09-30 13:44:19 +10:00
Oliver Walters
52ec213a28 Save user information when creating a new purchase order 2019-09-24 07:43:14 +10:00
Oliver Walters
b1380687e6 PEP 2019-09-23 19:31:50 +10:00
Oliver Walters
8d92960f10 Ability to receive PO lines items individually 2019-09-23 19:31:18 +10:00
Oliver Walters
0d68dbcfa7 Display which lines have been received against a PO 2019-09-23 19:05:22 +10:00
Oliver Walters
21e369e6cc Update ReceivePurchaseOrder form 
- Location field is now a proper MPTT field
- Ability to create a new location
 2019-09-23 19:02:36 +10:00
Oliver Walters
ae2e2f36e4 Update a bunch more tables 2019-09-22 22:18:53 +10:00
Oliver Walters
fcbf0e6e93 Create UI elements to cancel an order 
- View
- Form
- Template
- Button
- Javascript
 2019-09-20 11:52:38 +10:00
Oliver Walters
f90aa1d2cf Make purchase-order table sortable 2019-09-17 11:44:50 +10:00
Oliver Walters
ed20e9d4a1 Simplify code for exporting PurchaseOrder 
- New resource for managing import/export of POLineItem model
 2019-09-15 22:04:52 +10:00
Oliver
0846daf1f6
Merge pull request #524 from SchrodingersGat/import-export 
Customization of django-import-export plugin
 2019-09-13 23:35:57 +10:00
Oliver Walters
28d49bdd47 PEP 2019-09-13 23:19:12 +10:00
Oliver Walters
52eeffc2c4 Change more models to use ImportExportModelAdmin 2019-09-13 23:05:16 +10:00
Oliver Walters
588713467d Fixed unit tests 2019-09-13 21:07:32 +10:00
Oliver Walters
36ec5e41b0 Cleanup 2019-09-13 20:53:04 +10:00
Oliver Walters
59f102af3c Database filtering beats list comprehension! 2019-09-13 20:15:34 +10:00
Oliver Walters
6854190ff9 Simple test for POLineItemedit view 2019-09-13 20:10:17 +10:00
Oliver Walters
d515e2d968 Tests for POLineItem creation form 2019-09-13 20:01:41 +10:00
Oliver Walters
7c6901f445 Tests for purchas order issue form 2019-09-13 18:15:05 +10:00
Oliver Walters
17e91493ea Bug fix for order-parts form 
- Check for parts already existing in PO must filter by the purchase order ID in addition to the part ID
 2019-09-13 15:32:52 +10:00
Oliver Walters
8817b4d692 Icer button rendering for PurchaseOrder page 2019-09-08 23:27:54 +10:00
Oliver Walters
fa8056f4b9 Fill out supplier_part details when receiving a line for a purchase order 2019-09-08 23:15:44 +10:00
Oliver Walters
6106d33732 More span / button fixes 2019-08-14 16:40:14 +10:00
Oliver Walters
335066aef6 Fix buttons for order form 2019-08-14 13:28:06 +10:00
Oliver Walters
e849f62a6a PEP 2019-08-08 23:50:11 +10:00
Oliver Walters
b924265c9a Some tests for views in order app 2019-08-08 23:49:35 +10:00
Oliver Walters
b5f2c9d311 Add API endpoint for purchase orders 
- List and create purchase orders
- List and create purchase order line items
 2019-08-02 21:46:26 +10:00
Oliver Walters
5ab3c386bb Buttons for purchase order table 2019-06-19 19:09:31 +10:00
Oliver Walters
05a5ab222d Some more changes 2019-06-19 08:09:05 +10:00
Oliver Walters
afcbd73026 Consolidate visual style for "Part" tabs 2019-06-19 07:58:14 +10:00
Oliver Walters
3e6cdb15be Clean up display of company pages 
- Add some more buttons
- visual style consolidation
 2019-06-19 07:48:05 +10:00
Oliver Walters
c0e66dd9a0 Added pretty buttons to stock item page 2019-06-18 23:56:00 +10:00
Oliver Walters
fe4bc15c8e Improved button layout for purchase order page 2019-06-18 23:18:48 +10:00
Oliver Walters
08358f6961 Run tests on custom validators 2019-06-17 22:18:00 +10:00
Oliver Walters
b9dc4a0c2f Further tests for order 2019-06-17 22:10:37 +10:00
Oliver Walters
9c29976511 More tests for order module 
- Also fixed some bugs along the way!
 2019-06-17 21:55:51 +10:00
Oliver Walters
0857ec61fd Add a test fixture for orders 2019-06-17 19:47:16 +10:00
Oliver Walters
78bfc0b6a8 Improve the 'creation date' for order 
- Automatically set on first save
 2019-06-17 19:44:36 +10:00
Oliver Walters
93667f942f Add button to remove line items from the 'receive' form 2019-06-15 19:47:16 +10:00
Oliver Walters
3405fb93a9 Peppy fixes 2019-06-15 19:42:09 +10:00
Oliver Walters
1290e7f289 Implement POST for receiving items 
- Create new StockItem in the correct location
 2019-06-15 19:39:57 +10:00
Oliver Walters
c7ca9a3d8f Display table of outstanding line items 2019-06-15 17:29:33 +10:00
Oliver Walters
bbd6b15089 Add a VIew for receiving purchase order 2019-06-15 17:09:25 +10:00
Oliver Walters
11d9312c45 Improve rendering of purchase order table 2019-06-15 15:33:10 +10:00
Oliver Walters
0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +10:00
Oliver Walters
5aac603d63 Satisfying the frog 2019-06-13 22:43:31 +10:00
Oliver Walters
1b06d86f59 Export purchase order to CSV 2019-06-13 22:38:10 +10:00
Oliver Walters
38001b5358 Peppy fixes 2019-06-13 22:16:27 +10:00
Oliver Walters
c9cddd2a19 Add ability to edit and delete a purchase order line item 2019-06-13 22:13:22 +10:00
Oliver Walters
fe5bb23d13 Add notes field to purchase order line item 2019-06-13 21:57:35 +10:00
Oliver Walters
d860336060 Add some pretty buttons to the purchase order detail table 2019-06-13 21:44:09 +10:00
Oliver Walters
2b74a0ed2c Don't show zero-quantity items when ordering against a build 2019-06-13 21:28:01 +10:00
Oliver Walters
771a008e84 Printable string for PurchaseOrderLineItem 2019-06-13 21:21:22 +10:00
Oliver Walters
52b7051060 Automatically add line items to an order 2019-06-13 21:17:06 +10:00
Oliver Walters
f52aa0af21 Create a new purchase order directly from the "Order Parts" form wizard 2019-06-13 20:42:09 +10:00
Oliver Walters
915395e676 Create a new supplier part directly from the order form 2019-06-13 20:35:15 +10:00
Oliver Walters
4be82a31ce Remove rows from order form 2019-06-13 20:26:53 +10:00
Oliver Walters
3bb76060d9 Extract supplier purchase order selection information 2019-06-13 20:17:36 +10:00
Oliver Walters
3f809a9001 List active purchase orders for each selected supplier 2019-06-13 19:35:38 +10:00
Oliver Walters
7049ab1d8c Collate parts by supplier and present a purchase-order form 2019-06-13 19:30:18 +10:00
Oliver Walters
2fffd874a3 Use integer ordering for part quantity 2019-06-13 19:12:34 +10:00
Oliver Walters
15432fd6b7 Handle list of parts sent back to the order-parts form 
- Eliminate parts which are zero quantity
- Display an error message when no supplier is selected
 2019-06-13 19:10:31 +10:00
Oliver Walters
a41a6c52ca Peppy fixes 2019-06-12 00:39:33 +10:00
Oliver Walters
b138a4bd5f Order parts directly from a build 2019-06-12 00:21:18 +10:00
Oliver Walters
74327d3094 Order from supplier 'parts list' page 2019-06-12 00:10:39 +10:00
Oliver Walters
e4f5cc8ccd Order from a part page 2019-06-12 00:04:20 +10:00
Oliver Walters
3460a48b63 Extra form info 2019-06-11 23:58:00 +10:00
Oliver Walters
1cb6c67086 Launch order dialog from the 'Parts' table 2019-06-11 23:55:20 +10:00
Oliver Walters
0ca01fb0e7 Template improvements 2019-06-11 23:47:09 +10:00
Oliver Walters
0bc8190e8c Style supplier-part selection as 'select2' 2019-06-11 23:41:15 +10:00
Oliver Walters
bc05146e72 First pass at 'order parts' fom 
- Select parts in modal form window
 2019-06-11 23:37:32 +10:00
Oliver Walters
d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters
3954b33fb7 Use 'on_order' count in calculation for parts we need to order 2019-06-10 23:05:14 +10:00
Oliver Walters
04a9b1a980 Create a new purchase order from a company page 2019-06-10 22:56:34 +10:00
Oliver Walters
c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters
228bf4e1da Business logic 2019-06-10 22:17:19 +10:00
Oliver Walters
ec669dd670 Ability to 'issue' a purchase order 2019-06-10 22:14:23 +10:00
Oliver Walters
4af1f6ca9f Update a TODO comment 2019-06-06 21:56:20 +10:00
Oliver Walters
4048091c2b Prevent user from inputting a 'blank' supplier part into a line item 2019-06-06 21:55:02 +10:00
Oliver Walters
7b139a7f05 Form / view for creating a new purchase order 2019-06-06 21:39:04 +10:00
Oliver Walters
96eb4086cf Add form / view to edit purchase order details 
- Cannot edit the COMPANY if there are line items already
 2019-06-05 22:24:18 +10:00
Oliver Walters
eced012ece PEP fixes 2019-06-05 21:56:52 +10:00
Oliver Walters
67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters
9b2b2841d9 Hide 'order' input 2019-06-05 21:19:41 +10:00
Oliver Walters
8aa5452dd4 Add secondary modal to create a new supplier part 2019-06-05 21:17:29 +10:00
Oliver Walters
aee1ea9e35 Limit queryset 
- Only parts from the supplier
- Exclude parts already in the order
 2019-06-05 21:13:08 +10:00
Oliver Walters
f4abfc158f Improve rendering of purchase order list 2019-06-05 21:02:51 +10:00
Oliver Walters
be6b1ae2f8 Updates for purchase order line items 
- Display list of line items
- Add a form to create a new line item
 2019-06-05 20:59:30 +10:00
Oliver Walters
e199ed2281 PEP fixes 2019-06-05 00:21:19 +10:00
Oliver Walters
c82d5482aa Add a detail view for purchase orders 2019-06-05 00:17:25 +10:00
Oliver Walters
7bca9cc7af Improve display of list of purchase orders 2019-06-05 00:02:34 +10:00
Oliver Walters
c49b8546f0 Index page for showing all purchase orders 2019-06-04 23:59:15 +10:00
Oliver Walters
8d70d2f28a Fix rendering of purchase order status codes 2019-06-04 23:14:57 +10:00
Oliver Walters
76a72be926 Add order status field 
- Display status field in PurchaseOrder list view
 2019-06-04 23:09:51 +10:00
Oliver Walters
0e29f9b88c Fix related name 2019-06-04 22:26:40 +10:00
Oliver Walters
54b1ccd585 Allow blank PO description and add URL field 2019-06-04 22:26:19 +10:00
Oliver Walters
68d514d478 Limit choices for supplier in PurchaseOrder 2019-06-04 22:20:49 +10:00
Oliver Walters
d840b44f7a Create initial models for 'Order' 
- PurchaseOrder
- PurchaseOrderLineItem

(These are based on some abstract model classes)
 2019-06-04 22:19:04 +10:00