diff --git a/templates/403.html b/templates/403.html index 505228d0..c5c3338e 100644 --- a/templates/403.html +++ b/templates/403.html @@ -68,7 +68,7 @@

Access Forbidden!

Halt! Thou art endeavouring to trespass upon a realm not granted unto thee.
granted unto thee. -

Go Home +

Go Home diff --git a/templates/404.html b/templates/404.html index c948fef7..a11ff43f 100644 --- a/templates/404.html +++ b/templates/404.html @@ -66,7 +66,7 @@

Page Missing!

-

But no worries! Our ostrich is looking everywhere
while you wait safely.

Go Home +

But no worries! Our ostrich is looking everywhere
while you wait safely.

Go Home
diff --git a/templates/500.html b/templates/500.html index d9a6763f..963d5151 100644 --- a/templates/500.html +++ b/templates/500.html @@ -66,7 +66,7 @@

Unknow error!

-

But relax! Our cat is here to play you some music.

Go Home +

But relax! Our cat is here to play you some music.

Go Home
diff --git a/templates/admin_management/confirm_activate_account.html b/templates/admin_management/confirm_activate_account.html index ab97bc5c..55c84c24 100644 --- a/templates/admin_management/confirm_activate_account.html +++ b/templates/admin_management/confirm_activate_account.html @@ -9,7 +9,7 @@ {% csrf_token %}
- Cancel + Cancel
diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 4f8f1e58..33d19e37 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -24,15 +24,22 @@ .text-xxs { font-size: 0.6rem; } + +#djl-vendor-card-widget{ + height:30rem; + +} + + {% endblock %} {% block content %}
-
+
-
+
{% include 'bill/includes/card_bill.html' with bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %}
@@ -48,7 +55,7 @@
-
+
{% if bill.is_configured %}
@@ -126,7 +133,7 @@
-
+
{% trans 'Bill Items' %}
@@ -134,49 +141,49 @@
- + - - - - - - + + + + + + {% for bill_item in itemtxs_qs %} - - - - - - {% empty %} diff --git a/templates/sales/orders/purchase_order.html b/templates/sales/orders/purchase_order.html index cd249b42..8208df09 100644 --- a/templates/sales/orders/purchase_order.html +++ b/templates/sales/orders/purchase_order.html @@ -33,7 +33,7 @@ {% endblock %}
-
diff --git a/templates/sales/payments/payment_create.html b/templates/sales/payments/payment_create.html index 28125e16..a5fe1909 100644 --- a/templates/sales/payments/payment_create.html +++ b/templates/sales/payments/payment_create.html @@ -13,7 +13,7 @@
{% csrf_token %} {{ form|crispy }} - +
diff --git a/templates/sales/payments/payment_form.html b/templates/sales/payments/payment_form.html index 14d730e8..78a6fac4 100644 --- a/templates/sales/payments/payment_form.html +++ b/templates/sales/payments/payment_form.html @@ -27,7 +27,7 @@ {% endif %} {% csrf_token %} {{ form|crispy }} - + diff --git a/templates/send-mail.html b/templates/send-mail.html index ca8d9083..3acc1727 100644 --- a/templates/send-mail.html +++ b/templates/send-mail.html @@ -33,7 +33,7 @@
Discard - +
diff --git a/templates/tasks/task_list.html b/templates/tasks/task_list.html index 8b2e3e97..ebb15240 100644 --- a/templates/tasks/task_list.html +++ b/templates/tasks/task_list.html @@ -11,7 +11,7 @@ Total Tasks: {{ page_obj.paginator.count }} @@ -129,7 +129,7 @@
- +
diff --git a/templates/two_factor/_wizard_actions.html b/templates/two_factor/_wizard_actions.html index fac484ed..a5d6db79 100644 --- a/templates/two_factor/_wizard_actions.html +++ b/templates/two_factor/_wizard_actions.html @@ -7,8 +7,8 @@ {% if wizard.steps.prev %} + class="btn btn-phoenix-secondary">{% trans "Back" %} {% else %} {% endif %} - + diff --git a/templates/two_factor/core/backup_tokens.html b/templates/two_factor/core/backup_tokens.html index 6714e96a..a35dca9b 100644 --- a/templates/two_factor/core/backup_tokens.html +++ b/templates/two_factor/core/backup_tokens.html @@ -23,6 +23,6 @@ {% csrf_token %}{{ form.as_p }} {% trans "Back to Account Security" %} - + {% endblock %} diff --git a/templates/two_factor/core/login.html b/templates/two_factor/core/login.html index 1f0f890f..3d4dd12b 100644 --- a/templates/two_factor/core/login.html +++ b/templates/two_factor/core/login.html @@ -32,7 +32,7 @@

{% for other in other_devices %} {% endfor %}

diff --git a/templates/two_factor/core/otp_required.html b/templates/two_factor/core/otp_required.html index 6735bdbc..8f0c913b 100644 --- a/templates/two_factor/core/otp_required.html +++ b/templates/two_factor/core/otp_required.html @@ -14,7 +14,7 @@

{% trans "Go back" %} - + {% trans "Enable Two-Factor Authentication" %}

{% endblock %} diff --git a/templates/two_factor/core/setup_complete.html b/templates/two_factor/core/setup_complete.html index 8f1ff467..e676d11a 100644 --- a/templates/two_factor/core/setup_complete.html +++ b/templates/two_factor/core/setup_complete.html @@ -9,7 +9,7 @@ {% if not phone_methods %}

{% trans "Back to Account Security" %}

+ class="btn btn-block btn-phoenix-secondary">{% trans "Back to Account Security" %}

{% else %}

{% blocktrans trimmed %}However, it might happen that you don't have access to your primary token device. To enable account recovery, add a phone @@ -18,7 +18,7 @@ {% trans "Back to Account Security" %}

{% trans "Add Phone Number" %}

+ class="btn btn-phoenix-success">{% trans "Add Phone Number" %}

{% endif %} {% endblock %} diff --git a/templates/two_factor/profile/disable.html b/templates/two_factor/profile/disable.html index 4c4d0db4..6db5fed1 100644 --- a/templates/two_factor/profile/disable.html +++ b/templates/two_factor/profile/disable.html @@ -8,7 +8,7 @@ {% csrf_token %}
{% trans 'Item' %}{% trans 'Entity Unit' %}{% trans 'Unit Cost' %}{% trans 'Quantity' %}{% trans 'Total' %}{% trans 'PO' %}{% trans 'Item' %}{% trans 'Entity Unit' %}{% trans 'Unit Cost' %}{% trans 'Quantity' %}{% trans 'Total' %}{% trans 'PO' %}
+
{{ bill_item.item_model }}
 + {% if bill_item.entity_unit %} {{ bill_item.entity_unit }} {% endif %} + {% currency_symbol %}{{ bill_item.unit_cost | currency_format }} + {{ bill_item.quantity }} + {% currency_symbol %}{{ bill_item.total_amount | currency_format }} + {% if bill_item.po_model_id %} - {% trans 'View PO' %} @@ -245,7 +252,7 @@
-
+
{% trans 'Bill Transactions' %}
@@ -256,9 +263,9 @@
-
+
-
+
{% trans 'Bill Notes' %}
diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index dcc5b67b..4c408885 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -1,11 +1,11 @@ {% load django_ledger %} {% load i18n %} -
+
{% if not create_bill %} {% if style == 'dashboard' %}
-
+
{% trans 'Bill' %} @@ -199,12 +199,11 @@ {% endif %}
-
+
- - {% trans 'Update' %} - + + {% trans 'Update' %} + {% if bill.can_draft %} @@ -235,14 +234,14 @@ {% endif %} {% if bill.can_void %} - {% endif %} {% if bill.can_cancel %} - diff --git a/templates/bill/includes/card_markdown.html b/templates/bill/includes/card_markdown.html index 7c28046e..1b3d8ae8 100644 --- a/templates/bill/includes/card_markdown.html +++ b/templates/bill/includes/card_markdown.html @@ -2,7 +2,7 @@ {% load django_ledger %} {% if style == 'card_1' %} -
+

{% if title %}{{ title }}{% else %} diff --git a/templates/bill/includes/card_vendor.html b/templates/bill/includes/card_vendor.html index 32d2315b..713ba74d 100644 --- a/templates/bill/includes/card_vendor.html +++ b/templates/bill/includes/card_vendor.html @@ -1,7 +1,7 @@ {% load i18n %} {% load django_ledger %} -
+

@@ -24,7 +24,5 @@

-
- -
+
\ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 16d52a4a..71db02bf 100644 --- a/templates/header.html +++ b/templates/header.html @@ -456,7 +456,7 @@
- {% trans 'Sign Out' %} + {% trans 'Sign Out' %}
Privacy policy•Terms•Cookies diff --git a/templates/ledger/bills/bill_detail.html b/templates/ledger/bills/bill_detail.html index f556144e..f67ed3e9 100644 --- a/templates/ledger/bills/bill_detail.html +++ b/templates/ledger/bills/bill_detail.html @@ -243,7 +243,7 @@

-
+ {% endblock %} {% block customJS %} diff --git a/templates/login_test.html b/templates/login_test.html index 032d2570..0ea44d13 100644 --- a/templates/login_test.html +++ b/templates/login_test.html @@ -13,13 +13,13 @@
- +
- +
- +
@@ -28,13 +28,13 @@
- +
- +
- +
@@ -47,10 +47,10 @@

Modal

- -
- +
@@ -120,7 +120,7 @@

If you have more questions, don't hesitate to contact us or send us a tweet @creativetim. We're here to help!

- +
diff --git a/templates/payment_failed.html b/templates/payment_failed.html index a69a03a0..1bc286de 100644 --- a/templates/payment_failed.html +++ b/templates/payment_failed.html @@ -28,7 +28,7 @@ {% else %}

{% trans "We couldn't process your payment. Please try again"%}.

{% endif %} - + {% trans "Back to Home"%}
diff --git a/templates/pricing_page.html b/templates/pricing_page.html index db373789..cdfcb939 100644 --- a/templates/pricing_page.html +++ b/templates/pricing_page.html @@ -197,9 +197,9 @@
- - - + + +
diff --git a/templates/sales/journals/journal_form.html b/templates/sales/journals/journal_form.html index b0e74a08..9492d444 100644 --- a/templates/sales/journals/journal_form.html +++ b/templates/sales/journals/journal_form.html @@ -1,3 +1,5 @@ + + {% extends "base.html" %} {% load crispy_forms_filters %} {% load i18n static %} diff --git a/templates/sales/orders/order_details.html b/templates/sales/orders/order_details.html index c1f48912..41b65f78 100644 --- a/templates/sales/orders/order_details.html +++ b/templates/sales/orders/order_details.html @@ -84,10 +84,10 @@ Sale Order #{{ saleorder.formatted_order_id }}
- -
@@ -275,7 +275,7 @@
Documents
-
@@ -321,7 +321,7 @@
- +
@@ -358,31 +358,31 @@
{% if saleorder.status == 'pending_approval' %} - {% endif %} {% comment %} {% endcomment %} - + Edit Order {% if not saleorder.invoice %} {% comment %} {% endcomment %} - + Create Invoice {% endif %} {% if saleorder.status == 'approved' and not saleorder.actual_delivery_date %} - {% endif %} {% if saleorder.status != 'cancelled' %} - {% endif %} @@ -535,8 +535,8 @@
- - + +
@@ -565,8 +565,8 @@
- - + +
diff --git a/templates/sales/orders/order_list.html b/templates/sales/orders/order_list.html index 81ba605b..52112c66 100644 --- a/templates/sales/orders/order_list.html +++ b/templates/sales/orders/order_list.html @@ -41,7 +41,7 @@
{{ order.status }} {{ order.expected_delivery_date|naturalday|capfirst }} - View + View
{{ form.as_table }}
- {% endblock %} diff --git a/templates/two_factor/profile/profile.html b/templates/two_factor/profile/profile.html index c2a707a6..ecd4b2e5 100644 --- a/templates/two_factor/profile/profile.html +++ b/templates/two_factor/profile/profile.html @@ -20,7 +20,7 @@
{% csrf_token %} -
@@ -28,7 +28,7 @@ {% endif %}

{% trans "Add Phone Number" %}

+ class="btn btn-phoenix-info">{% trans "Add Phone Number" %}

{% endif %}

{% trans "Backup Tokens" %}

@@ -42,18 +42,18 @@ {% endblocktrans %}

{% trans "Show Codes" %}

+ class="btn btn-phoenix-info">{% trans "Show Codes" %}

{% trans "Disable Two-Factor Authentication" %}

{% blocktrans trimmed %}However we strongly discourage you to do so, you can also disable two-factor authentication for your account.{% endblocktrans %}

-

+

{% trans "Disable Two-Factor Authentication" %}

{% else %}

{% blocktrans trimmed %}Two-factor authentication is not enabled for your account. Enable two-factor authentication for enhanced account security.{% endblocktrans %}

-

+

{% trans "Enable Two-Factor Authentication" %}

{% endif %} diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html index 04172a68..ff4325b3 100644 --- a/templates/users/user_detail.html +++ b/templates/users/user_detail.html @@ -27,7 +27,7 @@

Groups

- Manage Groups + Manage Groups diff --git a/templates/users/user_form.html b/templates/users/user_form.html index 4c868370..e6e0a5a8 100644 --- a/templates/users/user_form.html +++ b/templates/users/user_form.html @@ -45,8 +45,8 @@
{{ error }}
{% endfor %}
- {% trans "Cancel"|capfirst %} - diff --git a/templates/users/user_group_form.html b/templates/users/user_group_form.html index cb072171..7fed75c5 100644 --- a/templates/users/user_group_form.html +++ b/templates/users/user_group_form.html @@ -22,7 +22,7 @@ {% endfor %}
{% trans "Cancel" %} - diff --git a/templates/vendors/vendor_form.html b/templates/vendors/vendor_form.html index d728606a..96380f04 100644 --- a/templates/vendors/vendor_form.html +++ b/templates/vendors/vendor_form.html @@ -43,11 +43,11 @@
{{ error }}
{% endfor %}
- - {% trans "Cancel" %} + {% trans "Cancel" %}
diff --git a/templates/welcome-temp.html b/templates/welcome-temp.html index f87c98a2..bf2ac329 100644 --- a/templates/welcome-temp.html +++ b/templates/welcome-temp.html @@ -95,7 +95,7 @@

{{ _("Because Inventory Needs Order") }}.

{% trans 'Manage inventory, sales, transfers, and accounting seamlessly with Haikal.' %}

- {% trans 'Get Started' %} + {% trans 'Get Started' %} {% trans 'Learn More' %} {% if LANGUAGE_CODE == 'ar' %}