diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index 1180ee0d..be89bf12 100644 Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ diff --git a/inventory/__pycache__/mixins.cpython-311.pyc b/inventory/__pycache__/mixins.cpython-311.pyc index 96746b95..83a38ab9 100644 Binary files a/inventory/__pycache__/mixins.cpython-311.pyc and b/inventory/__pycache__/mixins.cpython-311.pyc differ diff --git a/inventory/mixins.py b/inventory/mixins.py index 520decc6..95c215a8 100644 --- a/inventory/mixins.py +++ b/inventory/mixins.py @@ -41,26 +41,3 @@ class LocalizedNameMixin: # return super().form_valid(form) # else: # return form.errors -class BaseDateNavigationUrlMixIn: - BASE_DATE_URL_KWARGS = ( - 'entity_slug', - 'unit_slug', - 'ledger_pk', - 'account_pk', - 'coa_slug' - ) - - def get_context_data(self, **kwargs): - context = super(BaseDateNavigationUrlMixIn, self).get_context_data(**kwargs) - self.get_base_date_nav_url(context) - return context - - def get_base_date_nav_url(self, context, **kwargs): - view_name = context['view'].request.resolver_match.url_name - view_name_base = '-'.join(view_name.split('-')[:2]) - context['date_navigation_url'] = reverse( - view_name_base, - kwargs={ - k: v for k, v in self.kwargs.items() if - k in self.BASE_DATE_URL_KWARGS - }) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b0deca83..c2d803d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,6 +33,7 @@ ctranslate2==4.5.0 cycler==0.12.1 Cython==3.1.0a1 decorator==5.1.1 +defusedxml==0.7.1 desert==2020.11.18 dill==0.3.9 distro==1.9.0 @@ -84,6 +85,8 @@ filelock==3.17.0 fire==0.7.0 Flask==3.1.0 fonttools==4.55.7 +fpdf==1.7.2 +fpdf2==2.8.2 frozenlist==1.5.0 fsspec==2024.12.0 gprof2dot==2024.6.6 @@ -171,6 +174,7 @@ pyobjc-core==11.0 pyobjc-framework-Cocoa==11.0 pyobjc-framework-Quartz==11.0 pyparsing==3.2.1 +pypdf==5.3.0 pyperclip==1.9.0 pyphen==0.17.2 pypng==0.20220715.0 diff --git a/static/.DS_Store b/static/.DS_Store index ef151623..71c17b68 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/static/css/custom.css b/static/css/custom.css index 4a74f6b8..1111ec26 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,4 +1,6 @@ - .color-div { + + +.color-div { width: 64px; height: 16px; padding: 2px 4px; diff --git a/static/css/theme-rtl.css b/static/css/theme-rtl.css index 190a9ce5..e04ec3a9 100644 --- a/static/css/theme-rtl.css +++ b/static/css/theme-rtl.css @@ -76,7 +76,7 @@ --phoenix-dark-border-subtle: #8a94ad; --phoenix-white-rgb: 255, 255, 255; --phoenix-black-rgb: 0, 0, 0; - --phoenix-font-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --phoenix-font-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important; --phoenix-font-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --phoenix-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --phoenix-body-font-family: var(--phoenix-font-sans-serif); diff --git a/static/css/theme.css b/static/css/theme.css index 1f3d1dac..124fd47a 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -76,7 +76,7 @@ --phoenix-dark-border-subtle: #8a94ad; --phoenix-white-rgb: 255, 255, 255; --phoenix-black-rgb: 0, 0, 0; - --phoenix-font-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --phoenix-font-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important; --phoenix-font-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --phoenix-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --phoenix-body-font-family: var(--phoenix-font-sans-serif); diff --git a/static/css/fonts/bootstrap-icons.woff2 b/static/font/bootstrap-icons.woff2 similarity index 100% rename from static/css/fonts/bootstrap-icons.woff2 rename to static/font/bootstrap-icons.woff2 diff --git a/static/images/logos/Logo-all.png b/static/images/logos/Logo-all.png new file mode 100644 index 00000000..ecfd638b Binary files /dev/null and b/static/images/logos/Logo-all.png differ