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
4,665 Commits 6 Branches 99 Tags 484 MiB
c6e154f996
Commit Graph

332 Commits

Author SHA1 Message Date
Oliver Walters
d8ada930c8 More template updates 
- Add icons to more action buttons
 2020-10-28 22:37:58 +11:00
Oliver Walters
d0b7d91ca4 Update multiple templates with fontawesome icons 2020-10-28 18:30:38 +11:00
Oliver
5e63ccc9f6
Merge pull request #1043 from eeintech/unique_email_company 
[Company] Allow duplicate names - Unique name/email pair
 2020-10-23 13:23:48 +11:00
eeintech
9131edc43d Company index: swapped 'title' for 'pagetype' for adding company button 2020-10-21 09:34:49 -05:00
eeintech
46b889c572 Assigned all user permissions for company tests 2020-10-20 14:52:34 -05:00
eeintech
de65e1631d Updated company templates permissions 2020-10-20 14:46:10 -05:00
eeintech
39eddc7203 Added user permissions on company views 2020-10-20 14:11:40 -05:00
eeintech
5793839a01 Added UniqueConstraint on name/email pair, renamed migration file 2020-10-20 07:37:07 -05:00
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
70a3b7f891 Improved migration, still fails if email duplicates exist in current DB 2020-10-13 07:43:57 -05:00
eeintech
ac82640c6c Company: allowed duplicate names, made email field unique, custom migration 2020-10-12 17:51:48 -05:00
Oliver Walters
ab454e5ba4 More template changes: perms -> roles 2020-10-06 16:46:13 +11:00
Oliver Walters
3f59ce3f93 Update unit tests 
- requires the user to actually have the necessary permissions!
 2020-10-06 01:30:36 +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
2039100d3e Add some unit testing 2020-10-04 00:24:48 +10:00
Oliver Walters
27656633df Update admin links to require specific permissions 2020-09-30 23:57:23 +10:00
Oliver Walters
d1cce7df94 Add direct admin links if the user is staff 2020-09-30 00:02:10 +10:00
Oliver Walters
0e5f10c020 Add some more search terms to the admin interface 2020-09-29 23:41:50 +10:00
Oliver Walters
ff7570aea4 VIews / forms / etc 2020-09-18 21:49:56 +10:00
Oliver Walters
e51fee081b SupplierPart price break table now uses API rather than django template 2020-09-17 23:19:50 +10:00
Oliver Walters
805e8daa57 Convert SupplierPriceBreak model to use the abstract PriceBreak class 2020-09-17 22:47:31 +10:00
Oliver Walters
32cde5d8f1 Fixx css for multiple button groups 2020-09-13 20:56:05 +10:00
Oliver Walters
f7ad38dad5 Add unit tests for new aggregation annotation approach 2020-09-05 23:28:54 +10:00
Oliver Walters
598e15af46 Fix annotations for Company serializers 2020-09-05 23:03:38 +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 Walters
146dae6d43 Toot toot - it's the refactor tractor! 
- New function for launching a CreateStockItem form
- Wraps up the previous code improvements into a single function
- Oh, the ease!
 2020-08-27 00:08:02 +10:00
Oliver Walters
4be1b2928b PEP fix 2020-08-26 23:50:49 +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
6ab34c3d0e SupplierPart - Improve API 
- The default DRF behaviour throws errors if the supplied query params do not conform to the limit_choices_to field
- This is non optimum! Don't want to have to handle these cases
- Do the filtering ourselves!
 2020-08-26 22:44:22 +10:00
Oliver Walters
e1a8772af6 Update serializers for SupplierPart 2020-08-15 21:24:01 +10:00
Oliver
bb6b3b965d
Merge pull request #896 from SchrodingersGat/company-ordering 
Add default ordering for Company model
 2020-08-08 17:21:21 +10:00
Oliver Walters
19c036f50a Add migration files 2020-08-08 17:16:04 +10:00
Oliver Walters
ad11681369 Custom filter tag for company stock listing 2020-08-08 17:15:08 +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
0152ae79ef Adds table filters for stock assigned to a particular customer 2020-07-14 15:54:03 +10:00
Oliver Walters
dedc25d681 Update verbose names for some fields 2020-06-13 20:46:19 +10:00
Oliver Walters
126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
Oliver Walters
544e217347 Add page to show stock which is assigned to a customer 2020-06-05 11:52:07 +10:00
Oliver Walters
4cb97b1340 Add some more form candy 2020-05-16 11:55:10 +10:00
Oliver Walters
6175c5408c Javascript indent cleanup 2020-05-14 15:10:48 +10:00
Oliver Walters
d3758981b4 Fix "New Sales Order" button in Customer detail view 2020-05-14 15:09:31 +10:00
Oliver Walters
b89002a450 Add button to order a supplier part 2020-05-02 20:10:00 +10:00
Oliver Walters
b0f4475a83 Fixes 2020-05-02 15:36:48 +10:00
Oliver Walters
a8e3a3f1ac Reduce company list from 100 queries to 4 queries 2020-05-02 15:23:28 +10:00
Oliver Walters
af00d88555 Bug fix for custom migration 
Ref: https://stackoverflow.com/questions/13410982/attributeerror-long-object-has-no-attribute-fetchall#13411358
 2020-05-01 15:57:10 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +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
2c9b112562 PEP fixes 2020-04-23 21:48:39 +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
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
808a636484 Move "Company" view to new two-column template 2020-04-22 09:01:52 +10:00
Oliver Walters
79ea744280 Supplier part rendering fix 2020-04-21 22:39:47 +10:00
Oliver Walters
b40234e403 UI tweaks 2020-04-21 20:05:15 +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
5901b21e78 UI elements 
- Add a "sales order" menu item to the main navbar
- Add a "sales order" tab to customer detail page
 2020-04-20 19:47:29 +10:00
Oliver Walters
37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
Oliver
cf5af4dc77
Merge pull request #722 from SchrodingersGat/barcode 
Create simple endpoint for barcode decode
 2020-04-16 21:55:24 +10:00
Oliver Walters
d19e287cb5 Template rendering improvements 2020-04-15 14:24:59 +10:00
Oliver Walters
653d502a73 Fix the manufacturer migration so it reverses properly 2020-04-13 23:58:10 +10:00
Oliver Walters
3b08b962c1 Fix order of operations 2020-04-13 23:19:23 +10:00
Oliver Walters
fb8c0e5180 Fix buggy migration 
- Need to use raw SQL queries as the database model does not match the python model
 2020-04-13 22:53:14 +10:00
Oliver Walters
47530b7d2a Improvements for "SupplierPartCreate" form 2020-04-13 22:21:20 +10:00
Oliver Walters
80fa40694c Unit testing fixes 
- For some reason the builds were passing locally?
 2020-04-13 20:36:51 +10:00
Oliver Walters
9c7813992d Remove old 'manufacturer_name' field 2020-04-13 20:26:24 +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
307dd25f87 Fixes for unit testing 
(cherry picked from commit eb3b5308ab)
 2020-04-13 20:21:08 +10:00
Oliver Walters
8fa3d77416 Short-circuit the custom migration if there are no SupplierPart objects 
- This allows the unit testing to run!

(cherry picked from commit f243b567fd)
 2020-04-13 20:21:04 +10:00
Oliver Walters
7c892263f8 More API fixes 
- Allow searching supplier parts by manufacturer name
- Better rendering of supplier part table

(cherry picked from commit 62199aedf5)
 2020-04-13 20:20:55 +10:00
Oliver Walters
f88d03db88 Fix "supplier parts" tab for Company display 
Also PEP fixes

(cherry picked from commit a50ecb24c1)
 2020-04-13 20:20:51 +10:00
Oliver Walters
bced189c64 Cleanup display of "SupplierPart" page 
(cherry picked from commit f067eae7d2)
 2020-04-13 20:20:43 +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 1b1cd944be)
 2020-04-13 20:20:33 +10:00
Oliver Walters
696c101628 Change related name for SuppleirPart.supplier 
(cherry picked from commit 635c4339e0)
 2020-04-13 20:20:28 +10:00
Oliver Walters
0001b889f0 Update company API 
- option to include manufacturer_detail
- improve company serializer

(cherry picked from commit 2ea1e72c44)
 2020-04-13 20:20:23 +10:00
Oliver Walters
4e3825682a Doc fix for mgiration 
(cherry picked from commit 6ef32dfa2d)
 2020-04-13 20:20:18 +10:00
Oliver Walters
04097791bb Custom migration for walking user through the process of mapping supplierpart to manufacturer 
(cherry picked from commit 290002fe9d)
 2020-04-13 20:20:13 +10:00
Oliver Walters
2695368651 Add migration to create a 'manufacturer' field to the SupplierPart model 
(cherry picked from commit 890e938662)
 2020-04-13 20:20:08 +10:00
Oliver Walters
00315aa855 Add 'manufacturer' field to SupplierPart object 
- ForeignKey link to Company model

(cherry picked from commit acebe61ac5)
 2020-04-13 20:20:04 +10:00
Oliver Walters
8b366fc4a0 Rename "manufacturer" to "manufacturer_name" 
(cherry picked from commit e9e734acce)
 2020-04-13 20:19:59 +10:00
Oliver Walters
d05ba9ee1a Customize "CompanyCreate" form based on calling url 
(cherry picked from commit 8adc83b650)
 2020-04-13 20:19:48 +10:00
Oliver Walters
67d9d2bb04 Separate views for customer / supplier / manufacturer 
(cherry picked from commit 9e9e29679d)
 2020-04-13 20:19:21 +10:00
Oliver Walters
edfb19db13 Company table now in separate javascript file 
(cherry picked from commit 95354f09da)
 2020-04-13 20:19:16 +10:00
Oliver Walters
094a0fe709 Improvements to company API 
- Filter by is_manufacturer
- Better table display

(cherry picked from commit f427ee4754)
 2020-04-13 20:19:10 +10:00
Oliver Walters
906ed7f64d Add "is_manufacturer" field to company model 
(cherry picked from commit fd45db9e22)
 2020-04-13 20:19:03 +10:00
Oliver Walters
3c46e12839 Further work on decimal rounding 
- Prevent numbers from being represented in scientific notation
 2020-04-12 00:56:15 +10:00
Oliver Walters
04cee99791 Update for supplier part list table rendering 2020-04-12 00:46:29 +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
e69f6c5b9d table fixes 2020-04-11 21:08:27 +10:00
Oliver Walters
0fc353ebac Filter purchase-order table for 2020-04-11 20:59:57 +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
1356718bb7 Improver company website icon 2020-04-07 00:19:43 +10:00