Commit Graph

2719 Commits

Author SHA1 Message Date
Oliver
48c51151c8
Merge pull request #756 from SchrodingersGat/moar-migration-fixes-plz
Remove the problematic migration entirely
2020-04-26 09:00:23 +10:00
Oliver Walters
ae4717401f Add "sudo" to makefile 2020-04-26 08:56:36 +10:00
Oliver Walters
1f4bd95d75 Remove the problematic migration entirely
- The thumbnail check code is run every time the server is started anyway!
2020-04-26 08:50:37 +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
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00
Oliver Walters
81f789d857 Add link to parent build 2020-04-25 23:26:56 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
77361bd0a2 Update templates 2020-04-25 23:20:55 +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
181d1d6b91 Factor out function to calculate total allocations 2020-04-25 21:31:58 +10:00
Oliver Walters
912a3c4b99 Update progress bar based on sum of allocated quantities 2020-04-25 21:21:52 +10:00
Oliver Walters
b0891c921c Working towards better build allocation:
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
2020-04-25 21:13:38 +10:00
Oliver Walters
c11b433d94 Make Build object into a MPTT tree model
- Builds can have child builds
2020-04-25 15:25:17 +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
c5b93e2392 Update pillow version
- Addresses a security patch requirement
2020-04-24 20:40:56 +10:00
Oliver Walters
41a4033427 Selective display of sales order ilne buttons 2020-04-24 17:18:18 +10:00
Oliver Walters
429bb688d0 Template fixes 2020-04-24 13:03:38 +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
1a0f091e0c Improve progress bar rendering 2020-04-23 09:20:18 +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
5d1754ec32 Better display of where a StockItem is allocated 2020-04-22 17:39:59 +10:00
Oliver Walters
eb7b49784b StockItem serializer now includes the allocated quantity 2020-04-22 15:24:11 +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
3a71a4f63a Fix for StockItem model
- Allow sales_order_line to be blank
2020-04-22 10:16:54 +10:00