Merge remote-tracking branch 'inventree/master' into 0.4.x

inventree · Aug 5, 2021 · 599c53e · 599c53e
2 parents 96b5f70 + a45437d
commit 599c53e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/InvenTree/report/templates/report/inventree_build_order_base.html b/InvenTree/report/templates/report/inventree_build_order_base.html
@@ -79,7 +79,7 @@
 
 {% block header_content %}
     <!-- TODO - Make the company logo asset generic -->
-    <img class='logo' src="{% asset 'company_logo.png' %}" alt="hello" width="150">
+    <img class='logo' src="{% asset 'company_logo.png' %}" alt="logo" width="150">
 
     <div class='header-right'>
         <h3>

diff --git a/requirements.txt b/requirements.txt
@@ -21,7 +21,8 @@ coverage==5.3                   # Unit test coverage
 coveralls==2.1.2                # Coveralls linking (for Travis)
 rapidfuzz==0.7.6                # Fuzzy string matching
 django-stdimage==5.1.1          # Advanced ImageField management
-django-weasyprint==1.0.1        # HTML PDF export
+weasyprint==52.5                # PDF generation library (Note: in the future need to update to 53)
+django-weasyprint==1.0.1        # django weasyprint integration
 django-debug-toolbar==2.2       # Debug / profiling toolbar
 django-admin-shell==0.1.2       # Python shell for the admin interface
 py-moneyed==0.8.0               # Specific version requirement for py-moneyed