inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-02 21:38:48 +00:00
Code
11,864 Commits 10 Branches 119 Tags
Commit Graph

122 Commits

Author SHA1 Message Date
eeintech
7bc925d016 Merge branch 'master' of git://github.com/inventree/InvenTree into unique_email_company 2020-10-20 07:19:48 -05:00
eeintech
dfa4d3f8ed Display IPN and pipe char only if IPN exists 2020-10-18 14:37:35 -05: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
eeintech
ac82640c6c Company: allowed duplicate names, made email field unique, custom migration 2020-10-12 17:51:48 -05:00
Oliver Walters
805e8daa57 Convert SupplierPriceBreak model to use the abstract PriceBreak class 2020-09-17 22:47:31 +10:00
Oliver Walters
3a75682878 Add "pretty" name to the SupplierPart API 
- Quick way to ensure the supplier part objects are printed the same way
- Use the pythonic back-end to render the data
 2020-08-26 23:23:57 +10:00
Oliver Walters
a7ee323035 PEP fix 2020-08-08 16:59:48 +10:00
Oliver Walters
ad977d4d26 Add default ordering for Company model 
- Now will sort by "name" in choice fields, etc
 2020-08-08 16:54:09 +10:00
Oliver Walters
dedc25d681 Update verbose names for some fields 2020-06-13 20:46:19 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
9c7813992d Remove old 'manufacturer_name' field 2020-04-13 20:26:24 +10:00
Oliver Walters
307dd25f87 Fixes for unit testing 
(cherry picked from commit eb3b5308abb0b73ea4e13dba2cd2917ac7fbe2e1)
 2020-04-13 20:21:08 +10:00
Oliver Walters
f88d03db88 Fix "supplier parts" tab for Company display 
Also PEP fixes

(cherry picked from commit a50ecb24c1272d52c8f7746a337dab2ca9ba6750)
 2020-04-13 20:20:51 +10:00
Oliver Walters
2506aa110b API changes 
- Allow SupplierPart to be filtered by 'company' in addition to 'supplier' and 'manufacturer'
- Stock can now also be filtered by 'company'

(cherry picked from commit 1b1cd944be274e48bdd6daa4f57b196ff051508e)
 2020-04-13 20:20:33 +10:00
Oliver Walters
0001b889f0 Update company API 
- option to include manufacturer_detail
- improve company serializer

(cherry picked from commit 2ea1e72c448d97a6563c5a8d77fe8eb9f19c3a92)
 2020-04-13 20:20:23 +10:00
Oliver Walters
00315aa855 Add 'manufacturer' field to SupplierPart object 
- ForeignKey link to Company model

(cherry picked from commit acebe61ac597d3d6ca33ec60b7dfea9da39f8975)
 2020-04-13 20:20:04 +10:00
Oliver Walters
8b366fc4a0 Rename "manufacturer" to "manufacturer_name" 
(cherry picked from commit e9e734acce4d5f2f3bfea2d0557594d54d42ed2d)
 2020-04-13 20:19:59 +10:00
Oliver Walters
094a0fe709 Improvements to company API 
- Filter by is_manufacturer
- Better table display

(cherry picked from commit f427ee4754368da9ce3d23a3fa33747c84e9c858)
 2020-04-13 20:19:10 +10:00
Oliver Walters
906ed7f64d Add "is_manufacturer" field to company model 
(cherry picked from commit fd45db9e2231398144e04efbb6c17705f73ad826)
 2020-04-13 20:19:03 +10:00
Oliver Walters
d06018cbbe PEP fixes 2020-04-07 11:40:10 +10:00
Oliver Walters
95032141ce Toot toot! It's the refactor tractor. 
- Create helper functions to qualify media and static files
 2020-04-07 11:38:57 +10:00
Oliver Walters
ae9ef04013 Use the company thumbnail in the Company API 2020-04-07 11:27:56 +10:00
Oliver Walters
e0655f61d8 Check if Company thumbnails are created on Company app start 2020-04-07 11:23:30 +10:00
Oliver Walters
1a233e7949 Create thumbnails for Company model 2020-04-07 11:17:00 +10:00
Oliver Walters
a306ad0bc3 Alter "URL" to "link" for Company models 2020-04-06 11:36:25 +10:00
Oliver Walters
6731bc1b06 Implement auto-rounding decimal field 
Ref: https://stackoverflow.com/questions/37958130/automatically-round-djangos-decimalfield-according-to-the-max-digits-and-decima
 2020-03-18 22:22:40 +11:00
Oliver Walters
ca9f9e047c Make company notes field markdownable 2020-02-01 23:31:45 +11:00
Oliver Walters
5e9b012031 Bug fix for static lookup of blank image 2019-12-09 20:40:04 +11:00
Oliver Walters
98374ca466 Update to more recent libraries 
- Specify exact module versions
 2019-12-05 14:12:05 +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
70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters
91453094aa Remove lead-time field 2019-09-12 22:37:09 +10:00
Oliver Walters
09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters
c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters
0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +10:00
Oliver Walters
d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters
c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters
9efdd836f4 Tweak the 'on_order' calculation 2019-06-10 21:56:50 +10:00
Oliver Walters
351c5fb7d0 Fix for 'on_order' calculation 
- Handle null results
 2019-06-07 09:54:36 +10:00
Oliver Walters
31ad31365a Calculate parts on order for a Part / SupplierPart 2019-06-07 08:37:25 +10:00
Oliver Walters
67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters
e199ed2281 PEP fixes 2019-06-05 00:21:19 +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
c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters
c3d75deb16 More 'limit_choices_to' limitations for template parts 2019-05-25 23:55:16 +10:00
Oliver Walters
cd7bc6cce5 Include pricing information in part supplier view 
Also some CSS tweaks to secondary modal buttons
 2019-05-22 22:11:27 +10:00
Oliver Walters
6f73c379c2 Remove 'minimum' order from SupplierPart 
- This can be handled using the 'PriceBreak' set
 2019-05-21 13:51:43 +10:00
Oliver Walters
6ae48d07c4 Cleanup pricing algorithms 2019-05-20 23:53:39 +10:00
Oliver Walters
4c82714777 Allow 5 decimal places for pricing info 2019-05-18 23:08:47 +10:00
Oliver Walters
a3d1591929 Display part pricing in Part view 
- Calculate min_price and max_price based on provided supplier information
 2019-05-18 23:08:38 +10:00