diff --git a/static/js/tours/help-button.js b/static/js/tours/help-button.js index 9081f7a7..0a8c323a 100644 --- a/static/js/tours/help-button.js +++ b/static/js/tours/help-button.js @@ -30,10 +30,11 @@ class HelpButton { const button = document.createElement('div'); button.className = `help-button ${this.options.position}`; button.innerHTML = ` - `; 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/account/confirm_login_code..html b/templates/account/confirm_login_code..html index 5b2a4f46..06e3d6a0 100644 --- a/templates/account/confirm_login_code..html +++ b/templates/account/confirm_login_code..html @@ -32,7 +32,7 @@ {% csrf_token %} {{ redirect_field }} {{ form|crispy }} - + {% element button type="submit" form="logout-from-stage" tags="link" %} {% translate "Cancel" %} diff --git a/templates/account/email.html b/templates/account/email.html index 7db0aa33..3ce0b144 100644 --- a/templates/account/email.html +++ b/templates/account/email.html @@ -46,9 +46,9 @@ {% endfor %}
- - - + + +
@@ -65,7 +65,7 @@
{% csrf_token %} {{ form|crispy }} -
diff --git a/templates/account/lock-screen.html b/templates/account/lock-screen.html index bfa017df..d5af2f12 100644 --- a/templates/account/lock-screen.html +++ b/templates/account/lock-screen.html @@ -74,7 +74,7 @@
-
Sign In + Sign In diff --git a/templates/account/login.html b/templates/account/login.html index 1396da40..8a394e09 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -43,7 +43,7 @@ - +
{{ _("Forgot Password?")}}
diff --git a/templates/account/logout.html b/templates/account/logout.html index 2e56c0a7..0ce5cc60 100644 --- a/templates/account/logout.html +++ b/templates/account/logout.html @@ -16,7 +16,7 @@ {% csrf_token %} {{ redirect_field }}
-
diff --git a/templates/account/otp_verification.html b/templates/account/otp_verification.html index 923f4e5a..c67bbe60 100644 --- a/templates/account/otp_verification.html +++ b/templates/account/otp_verification.html @@ -25,9 +25,9 @@
- + {{ _("Didn’t receive the code") }} diff --git a/templates/account/password_change.html b/templates/account/password_change.html index 6b123eed..fed9a6ee 100644 --- a/templates/account/password_change.html +++ b/templates/account/password_change.html @@ -23,7 +23,7 @@ {% csrf_token %} {{ redirect_field }} {{ form|crispy }} - +
{{ _("Forgot Password?")}}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html index a7c3041f..0cabde26 100644 --- a/templates/account/password_reset.html +++ b/templates/account/password_reset.html @@ -30,7 +30,7 @@
{% csrf_token %} {{ form|crispy }} - +

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %} diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html index 20870747..dbbce8af 100644 --- a/templates/account/password_reset_from_key.html +++ b/templates/account/password_reset_from_key.html @@ -37,7 +37,7 @@ {% csrf_token %} {{ redirect_field }} {{ form|crispy }} - + {% endif %} diff --git a/templates/account/signup.html b/templates/account/signup.html index bffc7f4e..391ad7b3 100644 --- a/templates/account/signup.html +++ b/templates/account/signup.html @@ -76,7 +76,7 @@ - +

{% trans 'Already have an account?' %} {{ _("Sign In") }}
{% endif %} diff --git a/templates/account/user_settings.html b/templates/account/user_settings.html index 4bb3c987..366114f2 100644 --- a/templates/account/user_settings.html +++ b/templates/account/user_settings.html @@ -42,7 +42,7 @@
- +
diff --git a/templates/admin_management/auth_logs.html b/templates/admin_management/auth_logs.html index 26a2643c..8a153232 100644 --- a/templates/admin_management/auth_logs.html +++ b/templates/admin_management/auth_logs.html @@ -49,14 +49,13 @@ -
-
- {% if is_paginated %} - {% include 'partials/pagination.html' %} - {% endif %} -
-
- {% include 'partials/pagination_audit.html' with q='loginEvents' %} + + +
+
+ {% include 'partials/pagination.html' with q='loginEvents' %} +
+
{% else %}

No authentication audit events found.

diff --git a/templates/admin_management/confirm_activate_account.html b/templates/admin_management/confirm_activate_account.html index 63d7ea14..55c84c24 100644 --- a/templates/admin_management/confirm_activate_account.html +++ b/templates/admin_management/confirm_activate_account.html @@ -8,8 +8,8 @@
{% csrf_token %}
- - Cancel + + Cancel
diff --git a/templates/admin_management/model_logs.html b/templates/admin_management/model_logs.html index 3362cb52..545665b2 100644 --- a/templates/admin_management/model_logs.html +++ b/templates/admin_management/model_logs.html @@ -110,7 +110,12 @@ -{% include 'partials/pagination_audit.html' with q='userActions' %} + +
+
+ {% include 'partials/pagination.html' with q='userActions' %} +
+
{% else %}

{% trans "No model change audit events found." %}

diff --git a/templates/admin_management/permenant_delete_account.html b/templates/admin_management/permenant_delete_account.html index 8bea3f05..fa362359 100644 --- a/templates/admin_management/permenant_delete_account.html +++ b/templates/admin_management/permenant_delete_account.html @@ -8,8 +8,8 @@
{% csrf_token %}
- - Cancel + + Cancel
diff --git a/templates/admin_management/request_logs.html b/templates/admin_management/request_logs.html index 1168c676..8dd913aa 100644 --- a/templates/admin_management/request_logs.html +++ b/templates/admin_management/request_logs.html @@ -48,7 +48,12 @@ - {% include 'partials/pagination_audit.html' with q='userRequests' %} + +
+
+ {% include 'partials/pagination.html' with q='userRequests' %} +
+
{% else %}

No request audit events found.

{% endif %} diff --git a/templates/administration/email_change_verification_code.html b/templates/administration/email_change_verification_code.html index 62de14d6..3ff7ff26 100644 --- a/templates/administration/email_change_verification_code.html +++ b/templates/administration/email_change_verification_code.html @@ -22,7 +22,7 @@ - + diff --git a/templates/administration/manage_day_off.html b/templates/administration/manage_day_off.html index 0e8c7411..7e79b42d 100644 --- a/templates/administration/manage_day_off.html +++ b/templates/administration/manage_day_off.html @@ -66,7 +66,7 @@ - +
{% if days_off_form.errors %} diff --git a/templates/administration/manage_staff_member.html b/templates/administration/manage_staff_member.html index 2d57373e..0bd7266e 100644 --- a/templates/administration/manage_staff_member.html +++ b/templates/administration/manage_staff_member.html @@ -67,7 +67,7 @@ {{ form.work_on_sunday.label_tag }}
- +
{% if messages %} diff --git a/templates/appointment/appointment_client_information.html b/templates/appointment/appointment_client_information.html index 02202c6e..8d7d8b4f 100644 --- a/templates/appointment/appointment_client_information.html +++ b/templates/appointment/appointment_client_information.html @@ -97,12 +97,12 @@
${{ ar.get_service_price }}
- {% if ar.accepts_down_payment %} -
{% else %} - {% endif %} {% else %} - diff --git a/templates/bill/bill_create.html b/templates/bill/bill_create.html index 9984d13f..0aeabe45 100644 --- a/templates/bill/bill_create.html +++ b/templates/bill/bill_create.html @@ -36,11 +36,11 @@
{% trans 'Cancel' %} + class="btn btn-phoenix-secondary">{% trans 'Cancel' %}
diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 2c5ad097..66055386 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -24,23 +24,29 @@ .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' %}
{% include 'django_ledger/vendor/includes/card_vendor.html' with vendor=bill.vendor %}
+ class="btn btn-phoenix-primary"> {% trans 'Bill List' %}
@@ -49,7 +55,7 @@
-
+
{% if bill.is_configured %}
@@ -127,7 +133,7 @@
-
+
{% trans 'Bill Items' %}
@@ -135,49 +141,49 @@
- + - - - - - - + + + + + + {% for bill_item in itemtxs_qs %} - - - - - - {% endfor %} diff --git a/templates/inventory/car_list.html b/templates/inventory/car_list.html index 32858e3e..4fa5743e 100644 --- a/templates/inventory/car_list.html +++ b/templates/inventory/car_list.html @@ -77,7 +77,7 @@ class="form-control form-control-sm" placeholder="{% trans 'VIN'|capfirst %}" maxlength="17"> - + @@ -222,18 +222,18 @@
- +
@@ -302,12 +302,12 @@ equipmentBg.classList.add('bg-danger-subtle'); showOptionsButton.disabled = true; - showOptionsButton.classList.add('btn-danger'); - showOptionsButton.classList.remove('btn-success'); + showOptionsButton.classList.add('btn-phoenix-danger'); + showOptionsButton.classList.remove('btn-phoenix-success'); showSpecificationButton.disabled = true; - showSpecificationButton.classList.add('btn-danger'); - showSpecificationButton.classList.remove('btn-success'); + showSpecificationButton.classList.add('btn-phoenix-danger'); + showSpecificationButton.classList.remove('btn-phoenix-success'); } function checkFormCompletion() { @@ -497,11 +497,11 @@ checkFormCompletion(); showSpecificationButton.disabled = !this.value; if (this.value) { - showSpecificationButton.classList.remove('btn-danger'); - showSpecificationButton.classList.add('btn-success'); + showSpecificationButton.classList.remove('btn-phoenix-danger'); + showSpecificationButton.classList.add('btn-phoenix-success'); } else { - showSpecificationButton.classList.add('btn-danger'); - showSpecificationButton.classList.remove('btn-success'); + showSpecificationButton.classList.add('btn-phoenix-danger'); + showSpecificationButton.classList.remove('btn-phoenix-success'); } checkFormCompletion(); @@ -559,11 +559,11 @@ checkFormCompletion(); equipmentSelect.addEventListener('change', function() { showOptionsButton.disabled = !this.value; if (this.value) { - showOptionsButton.classList.remove('btn-danger'); - showOptionsButton.classList.add('btn-success'); + showOptionsButton.classList.remove('btn-phoenix-danger'); + showOptionsButton.classList.add('btn-phoenix-success'); } else { - showOptionsButton.classList.add('btn-danger'); - showOptionsButton.classList.remove('btn-success'); + showOptionsButton.classList.add('btn-phoenix-danger'); + showOptionsButton.classList.remove('btn-phoenix-success'); } }); diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html index e639f829..0a71c589 100644 --- a/templates/inventory/car_list_view.html +++ b/templates/inventory/car_list_view.html @@ -58,7 +58,7 @@
    • diff --git a/templates/inventory/car_registration_form.html b/templates/inventory/car_registration_form.html index 2119b4f6..944d47cf 100644 --- a/templates/inventory/car_registration_form.html +++ b/templates/inventory/car_registration_form.html @@ -8,13 +8,13 @@ {{ form|crispy }}
    diff --git a/templates/inventory/color_palette.html b/templates/inventory/color_palette.html index 2b51ffcd..c5cd9d16 100644 --- a/templates/inventory/color_palette.html +++ b/templates/inventory/color_palette.html @@ -103,9 +103,9 @@
    - + {% trans "Cancel" %} + class="btn btn-sm btn-phoenix-danger me-1">{% trans "Cancel" %}
    diff --git a/templates/inventory/reserve_car.html b/templates/inventory/reserve_car.html index e5c5266e..2f8efd76 100644 --- a/templates/inventory/reserve_car.html +++ b/templates/inventory/reserve_car.html @@ -19,7 +19,7 @@ {{ form.reservation_end }} {% for error in form.reservation_end.errors %}
    {{ error }}
    {% endfor %} - - {% trans "Cancel" %} + + {% trans "Cancel" %} {% endblock %} diff --git a/templates/inventory/scan_vin.html b/templates/inventory/scan_vin.html index 99e38a9a..f611a341 100644 --- a/templates/inventory/scan_vin.html +++ b/templates/inventory/scan_vin.html @@ -9,16 +9,16 @@
    - - + +
    diff --git a/templates/inventory/transfer_car.html b/templates/inventory/transfer_car.html index 1d1b0b55..cf1bc792 100644 --- a/templates/inventory/transfer_car.html +++ b/templates/inventory/transfer_car.html @@ -15,6 +15,6 @@ {% if field.help_text %}{{ field.help_text|safe }}{% endif %} {% endfor %} - + {% endblock %} diff --git a/templates/inventory/transfer_details.html b/templates/inventory/transfer_details.html index 22251cf8..f1c8d829 100644 --- a/templates/inventory/transfer_details.html +++ b/templates/inventory/transfer_details.html @@ -55,11 +55,11 @@
    {% trans 'Are you sure' %}?
    - + {% trans 'Yes' %} + class="btn btn-phoenix-success btn-sm">{% trans 'Yes' %}
    @@ -125,12 +125,12 @@
    {% if not action == 'cancel' %} {% endif %}
    diff --git a/templates/inventory/transfer_preview.html b/templates/inventory/transfer_preview.html index 9d18aa06..7e3fa95a 100644 --- a/templates/inventory/transfer_preview.html +++ b/templates/inventory/transfer_preview.html @@ -186,17 +186,17 @@ {% else %}
    -
    {% trans 'Are you sure you want to accept this transfer?' %}
    - - {% trans 'Cancel' %} + Confirm
    @@ -243,8 +243,8 @@
    {% trans 'Are you sure you want to reject this transfer?' %}
    - - {% trans 'Cancel' %} + Confirm
    diff --git a/templates/items/expenses/expense_create.html b/templates/items/expenses/expense_create.html index 3f79e271..d598a127 100644 --- a/templates/items/expenses/expense_create.html +++ b/templates/items/expenses/expense_create.html @@ -8,7 +8,7 @@
    -
    {{ _("Add Expense") }}
    +

    {{ _("Add Expense") }}

    {% csrf_token %} @@ -17,8 +17,8 @@ {% comment %} {% endcomment %}
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/items/expenses/expense_update.html b/templates/items/expenses/expense_update.html index db7a1343..0789786b 100644 --- a/templates/items/expenses/expense_update.html +++ b/templates/items/expenses/expense_update.html @@ -13,7 +13,7 @@
    {% csrf_token %} {{ form|crispy }} - +
    diff --git a/templates/items/service/service_create.html b/templates/items/service/service_create.html index 44d58317..1e2febfa 100644 --- a/templates/items/service/service_create.html +++ b/templates/items/service/service_create.html @@ -19,9 +19,9 @@
    {% if service.pk %} - {{ _("Update Service") }} +

    {{ _("Update Service") }}

    {% else %} - {{ _("Add Service") }} +

    {{ _("Add Service") }}

    {% endif %}
    @@ -29,8 +29,8 @@ {% csrf_token %} {{ form|crispy }}
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/ledger/bank_accounts/bank_account_detail.html b/templates/ledger/bank_accounts/bank_account_detail.html index 4d21028d..eea3f093 100644 --- a/templates/ledger/bank_accounts/bank_account_detail.html +++ b/templates/ledger/bank_accounts/bank_account_detail.html @@ -21,12 +21,12 @@
    {% trans 'Yes' %} @@ -52,17 +52,17 @@
    - + {{ _("Edit") }} - {{ _("Delete") }} - {% trans "Back to List" %} diff --git a/templates/ledger/bank_accounts/bank_account_form.html b/templates/ledger/bank_accounts/bank_account_form.html index 54324645..40acc42b 100644 --- a/templates/ledger/bank_accounts/bank_account_form.html +++ b/templates/ledger/bank_accounts/bank_account_form.html @@ -35,11 +35,11 @@
    {{ error }}
    {% endfor %}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/ledger/bills/bill_detail.html b/templates/ledger/bills/bill_detail.html index 063aec5d..f67ed3e9 100644 --- a/templates/ledger/bills/bill_detail.html +++ b/templates/ledger/bills/bill_detail.html @@ -15,13 +15,13 @@ {% trans 'Are you sure' %}
    {% csrf_token %} - +
    @@ -34,19 +34,19 @@
    {% trans 'Confirm' %}
    - +
    {% trans 'Are you sure' %}
    {% csrf_token %} - +
    @@ -243,7 +243,7 @@
    - + {% endblock %} {% block customJS %} diff --git a/templates/ledger/bills/bill_form-copy.html b/templates/ledger/bills/bill_form-copy.html index 1ef7d1c5..0953eea2 100644 --- a/templates/ledger/bills/bill_form-copy.html +++ b/templates/ledger/bills/bill_form-copy.html @@ -26,12 +26,12 @@
    - +
    - +
    @@ -39,8 +39,8 @@
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/ledger/bills/bill_form.html b/templates/ledger/bills/bill_form.html index 33068b02..14108d70 100644 --- a/templates/ledger/bills/bill_form.html +++ b/templates/ledger/bills/bill_form.html @@ -14,8 +14,8 @@
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html index 2d1aafe8..296ae300 100644 --- a/templates/ledger/bills/bill_list.html +++ b/templates/ledger/bills/bill_list.html @@ -20,7 +20,7 @@
    - {% if request.GET.q %} + class="btn btn-sm btn-phoenix-danger ms-1 rounded"> {% endif %} diff --git a/templates/ledger/bills/bill_update_form.html b/templates/ledger/bills/bill_update_form.html index a63348d1..35168e22 100644 --- a/templates/ledger/bills/bill_update_form.html +++ b/templates/ledger/bills/bill_update_form.html @@ -8,14 +8,14 @@ {% csrf_token %} {{ form|crispy }} - - {% trans "Cancel" %} + {% trans "Cancel" %}
    {% endblock %} \ No newline at end of file diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html index 36f9c5fd..8c5a5f99 100644 --- a/templates/ledger/coa_accounts/account_detail.html +++ b/templates/ledger/coa_accounts/account_detail.html @@ -15,11 +15,11 @@ {% trans 'Are you sure you want to delete this account?' %}
    - -
    + +
    {% csrf_token %} - +
    diff --git a/templates/ledger/coa_accounts/account_form.html b/templates/ledger/coa_accounts/account_form.html index 7a6fea3b..3429cebe 100644 --- a/templates/ledger/coa_accounts/account_form.html +++ b/templates/ledger/coa_accounts/account_form.html @@ -35,12 +35,12 @@ {% endfor %}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/ledger/journal_entry/includes/card_journal_entry.html b/templates/ledger/journal_entry/includes/card_journal_entry.html index 227d882c..aeaf801f 100644 --- a/templates/ledger/journal_entry/includes/card_journal_entry.html +++ b/templates/ledger/journal_entry/includes/card_journal_entry.html @@ -39,19 +39,19 @@
    {% if journal_entry.can_lock %} {% trans 'Lock' %} + class="btn btn-phoenix-success font-weight-bold">{% trans 'Lock' %} {% endif %} {% if journal_entry.can_unlock %} {% trans 'UnLock' %} + class="btn btn-phoenix-warning font-weight-bold">{% trans 'UnLock' %} {% endif %} {% if journal_entry.can_post %} {% trans 'Post' %} + class="btn btn-phoenix-success font-weight-bold">{% trans 'Post' %} {% endif %} {% if journal_entry.can_unpost %} {% trans 'UnPost' %} + class="btn btn-phoenix-danger font-weight-bold">{% trans 'UnPost' %} {% endif %}
    diff --git a/templates/ledger/journal_entry/journal_entry_delete.html b/templates/ledger/journal_entry/journal_entry_delete.html index 3b2e41bd..1af8e724 100644 --- a/templates/ledger/journal_entry/journal_entry_delete.html +++ b/templates/ledger/journal_entry/journal_entry_delete.html @@ -15,8 +15,8 @@
    {% trans 'Go Back' %} - + class="btn btn-phoenix-primary me-2">{% trans 'Go Back' %} +
    diff --git a/templates/ledger/journal_entry/journal_entry_form.html b/templates/ledger/journal_entry/journal_entry_form.html index cc9eeb62..6f7d3920 100644 --- a/templates/ledger/journal_entry/journal_entry_form.html +++ b/templates/ledger/journal_entry/journal_entry_form.html @@ -13,8 +13,8 @@ {{ form|crispy }}
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/ledger/journal_entry/journal_entry_list.html b/templates/ledger/journal_entry/journal_entry_list.html index 12159875..e1eb51f2 100644 --- a/templates/ledger/journal_entry/journal_entry_list.html +++ b/templates/ledger/journal_entry/journal_entry_list.html @@ -21,8 +21,8 @@ {% csrf_token %}
    - - + +
    diff --git a/templates/ledger/journal_entry/journal_entry_txs.html b/templates/ledger/journal_entry/journal_entry_txs.html index f9cd4ef6..9157cf74 100644 --- a/templates/ledger/journal_entry/journal_entry_txs.html +++ b/templates/ledger/journal_entry/journal_entry_txs.html @@ -58,33 +58,33 @@
    {% 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' %} @@ -209,15 +215,15 @@
    + class="btn btn-phoenix-info"> {% trans 'Balance Sheet' %} + class="btn btn-phoenix-info"> {% trans 'Income Statement' %} + class="btn btn-phoenix-info"> {% trans 'Cash Flow Statement' %}
    @@ -227,15 +233,15 @@
    + class="btn btn-phoenix-success"> {% trans 'Balance Sheet PDF' %} + class="btn btn-phoenix-success"> {% trans 'Income Statement PDF' %} + class="btn btn-phoenix-success"> {% trans 'Cash Flow Statement PDF' %}
    @@ -246,7 +252,7 @@
    -
    +
    {% trans 'Bill Transactions' %}
    @@ -257,9 +263,9 @@
    -
    +
    -
    +
    {% trans 'Bill Notes' %}
    diff --git a/templates/bill/bill_update.html b/templates/bill/bill_update.html index b82dbe55..6ec96e58 100644 --- a/templates/bill/bill_update.html +++ b/templates/bill/bill_update.html @@ -26,17 +26,17 @@ {{ form|crispy }}
    - + class="btn btn-phoenix-secondary w-100 mb-2"> {% trans 'Back to Bill Detail' %} + class="btn btn-phoenix-info w-100 mb-2"> {% trans 'Bill List' %} diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index 2ae2c3ce..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' %} @@ -60,23 +60,23 @@
    + class="btn btn-sm btn-phoenix-primary me-md-2"> {% trans 'View' %} + class="btn btn-sm btn-phoenix-warning me-md-2"> {% trans 'Update' %} {% if bill.can_pay %} {% endif %} {% if bill.can_cancel %} {% endif %} @@ -199,50 +199,49 @@ {% endif %}
    -
    +
    - - {% trans 'Update' %} - + + {% trans 'Update' %} + {% if bill.can_draft %} - {% endif %} {% if bill.can_review %} - {% endif %} {% if bill.can_approve %} - {% endif %} {% if bill.can_pay %} - {% endif %} {% if bill.can_void %} - {% endif %} {% if bill.can_cancel %} - @@ -292,10 +291,10 @@ document.addEventListener('DOMContentLoaded', function() { document.getElementById('POModalBody').innerHTML = `
    - + ${buttonText} -
    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 9a1d2fc9..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/bill/tags/bill_item_formset.html b/templates/bill/tags/bill_item_formset.html index 0cd853f0..be82d32b 100644 --- a/templates/bill/tags/bill_item_formset.html +++ b/templates/bill/tags/bill_item_formset.html @@ -71,7 +71,7 @@ {% currency_symbol %}{{ f.instance.po_total_amount | currency_format }} - {% trans 'View PO' %} @@ -143,12 +143,12 @@
    {% if not item_formset.has_po %} + class="btn btn-phoenix-primary"> {% trans 'New Item' %} {% endif %} - diff --git a/templates/components/activity_modal.html b/templates/components/activity_modal.html index 4e9c15cb..cd677fc6 100644 --- a/templates/components/activity_modal.html +++ b/templates/components/activity_modal.html @@ -22,7 +22,7 @@
    - +
    diff --git a/templates/components/task_modal.html b/templates/components/task_modal.html index 58fe158d..623544b3 100644 --- a/templates/components/task_modal.html +++ b/templates/components/task_modal.html @@ -13,7 +13,7 @@
    {% csrf_token %} {{ staff_task_form|crispy }} - +

    diff --git a/templates/crm/leads/lead_detail.html b/templates/crm/leads/lead_detail.html index 324b275d..33be4707 100644 --- a/templates/crm/leads/lead_detail.html +++ b/templates/crm/leads/lead_detail.html @@ -173,8 +173,8 @@
    - - + +
    @@ -538,7 +538,7 @@
    {% csrf_token %} {{ staff_task_form|crispy }} - +
    @@ -558,7 +558,7 @@
    {% csrf_token %} {{ note_form|crispy }} - +
    diff --git a/templates/crm/leads/lead_form.html b/templates/crm/leads/lead_form.html index 26e8e432..91b2ac8a 100644 --- a/templates/crm/leads/lead_form.html +++ b/templates/crm/leads/lead_form.html @@ -33,11 +33,11 @@ {% csrf_token %} {{ form|crispy }}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html index 8631f6ab..5f87ca8d 100644 --- a/templates/crm/leads/lead_list.html +++ b/templates/crm/leads/lead_list.html @@ -93,7 +93,7 @@

    {% trans "Are you sure you want to delete this lead?" %}

    - + {% trans "Yes" %}
    diff --git a/templates/crm/leads/lead_send.html b/templates/crm/leads/lead_send.html index 0b41104f..af1be556 100644 --- a/templates/crm/leads/lead_send.html +++ b/templates/crm/leads/lead_send.html @@ -19,16 +19,16 @@
    - +
    - Discard - Save as Draft - + Discard + Save as Draft +
    diff --git a/templates/crm/leads/lead_view.html b/templates/crm/leads/lead_view.html index b32c028c..5bd5f7ed 100644 --- a/templates/crm/leads/lead_view.html +++ b/templates/crm/leads/lead_view.html @@ -28,7 +28,7 @@
    مرحبًا ismail mosa
    - +
    diff --git a/templates/crm/leads/partials/update_action.html b/templates/crm/leads/partials/update_action.html index ef825ad6..2d70ce9f 100644 --- a/templates/crm/leads/partials/update_action.html +++ b/templates/crm/leads/partials/update_action.html @@ -44,8 +44,8 @@
    - - + +
    diff --git a/templates/crm/note_form.html b/templates/crm/note_form.html index 89283ed7..767e42c0 100644 --- a/templates/crm/note_form.html +++ b/templates/crm/note_form.html @@ -10,8 +10,8 @@ {{ form|crispy }} {% if form.instance.pk %} - + {% else %} - + {% endif %} diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html index 7eb7ee29..b08acf33 100644 --- a/templates/crm/opportunities/opportunity_detail.html +++ b/templates/crm/opportunities/opportunity_detail.html @@ -395,7 +395,7 @@
    {% csrf_token %} - +
    @@ -428,7 +428,7 @@
    - Add Meeting + Add Meeting
    @@ -456,7 +456,7 @@
    - Add Call + Add Call 
    {{opportunity.get_all_notes}}
    diff --git a/templates/crm/opportunities/opportunity_list copy.html b/templates/crm/opportunities/opportunity_list copy.html index 94775287..d631e7ac 100644 --- a/templates/crm/opportunities/opportunity_list copy.html +++ b/templates/crm/opportunities/opportunity_list copy.html @@ -8,7 +8,7 @@

    {{ _("Opportunities") }}

    - {{ _("Add Opportunity") }} + {{ _("Add Opportunity") }}
    @@ -151,10 +151,10 @@

    {% trans "Are you sure you want to delete this opportunity?" %}

    - - + {% trans "Yes" %}
    @@ -489,7 +489,7 @@
    - +
    diff --git a/templates/customers/customer_form.html b/templates/customers/customer_form.html index b4560dc2..a2199733 100644 --- a/templates/customers/customer_form.html +++ b/templates/customers/customer_form.html @@ -32,11 +32,11 @@ {% csrf_token %} {{ form|crispy }}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/customers/note_form.html b/templates/customers/note_form.html index 633389ca..130d6c02 100644 --- a/templates/customers/note_form.html +++ b/templates/customers/note_form.html @@ -3,5 +3,5 @@
    {% csrf_token %} {{ form|crispy }} - +
    \ No newline at end of file diff --git a/templates/dealers/assign_car_makes.html b/templates/dealers/assign_car_makes.html index ad4a521f..0cef6b58 100644 --- a/templates/dealers/assign_car_makes.html +++ b/templates/dealers/assign_car_makes.html @@ -85,7 +85,7 @@ {% endfor %}
    - +
    {% endblock %} \ No newline at end of file diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html index da23e00f..85a87571 100644 --- a/templates/dealers/dealer_detail.html +++ b/templates/dealers/dealer_detail.html @@ -19,7 +19,7 @@ {{ _("Change Password") }}
    - {{ _("Edit") }} + {{ _("Edit") }}
    diff --git a/templates/dealers/dealer_form.html b/templates/dealers/dealer_form.html index e282ef27..0a7d18df 100644 --- a/templates/dealers/dealer_form.html +++ b/templates/dealers/dealer_form.html @@ -15,10 +15,10 @@ {% csrf_token %} {{ form|crispy }}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/errors/403.html b/templates/errors/403.html index bffc7d91..bee0847c 100644 --- a/templates/errors/403.html +++ b/templates/errors/403.html @@ -3,6 +3,6 @@

    Access Forbidden!

    -

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

    Go Home +

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

    Go Home
    \ No newline at end of file diff --git a/templates/errors/404.html b/templates/errors/404.html index a295663b..dab67131 100644 --- a/templates/errors/404.html +++ b/templates/errors/404.html @@ -70,7 +70,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
    @@ -137,6 +137,7 @@ +
    diff --git a/templates/errors/500.html b/templates/errors/500.html index 8652ba28..653e9821 100644 --- a/templates/errors/500.html +++ b/templates/errors/500.html @@ -70,7 +70,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/footer.html b/templates/footer.html index 6b1b355f..c4fbb04d 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -6,7 +6,7 @@ Haikal | هيكل -
    +
    {{ _("Powered by")}} TENHAL | تنحل diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html index 7553b96e..841c9714 100644 --- a/templates/groups/group_detail.html +++ b/templates/groups/group_detail.html @@ -22,12 +22,12 @@
    {% trans 'Yes' %} @@ -74,7 +74,7 @@

    Permissions

    - Manage Permissions + Manage Permissions @@ -98,17 +98,17 @@
    - + {{ _("Edit") }} - {{ _("Delete") }} - {% trans "Back to List" %} diff --git a/templates/groups/group_form.html b/templates/groups/group_form.html index 28451559..5caba679 100644 --- a/templates/groups/group_form.html +++ b/templates/groups/group_form.html @@ -39,8 +39,8 @@
    {{ error }}
    {% endfor %}
    - {% trans "Cancel"|capfirst %} - diff --git a/templates/groups/group_permission_form.html b/templates/groups/group_permission_form.html index ac71ddd3..7e54d7ca 100644 --- a/templates/groups/group_permission_form.html +++ b/templates/groups/group_permission_form.html @@ -33,7 +33,7 @@ {% endfor %}
    {% trans "Cancel"|capfirst %} - diff --git a/templates/haikalbot/chat.html b/templates/haikalbot/chat.html index 818c9c52..62d5e4c7 100644 --- a/templates/haikalbot/chat.html +++ b/templates/haikalbot/chat.html @@ -12,7 +12,7 @@
    {% trans "HaikalBot" %}
    -
    @@ -22,7 +22,7 @@
    - +
    @@ -284,7 +284,7 @@
    - +
    diff --git a/templates/inventory/car_form_qabl alfalsafa.html b/templates/inventory/car_form_qabl alfalsafa.html index 13e269eb..c223dfb8 100644 --- a/templates/inventory/car_form_qabl alfalsafa.html +++ b/templates/inventory/car_form_qabl alfalsafa.html @@ -189,13 +189,13 @@
    + class="btn btn-sm btn-phoenix-success me-1">{% trans "Save and Add Another" %} + class="btn btn-sm btn-phoenix-primary">{% trans "Save and Go to Inventory" %}
    @@ -267,7 +267,7 @@
    - +
    @@ -290,7 +290,7 @@

    {{ _("VIN will appear here.") }}

    - + diff --git a/templates/inventory/car_inventory.html b/templates/inventory/car_inventory.html index d750fac7..8334bc53 100644 --- a/templates/inventory/car_inventory.html +++ b/templates/inventory/car_inventory.html @@ -154,7 +154,7 @@

    {% trans "No cars available." %}

    - {% trans "Add a Car" %} + {% trans "Add a Car" %}
    - - {% trans 'Done' %} {% if journal_entry.can_lock %} - {% trans 'Lock' %} {% endif %} {% if journal_entry.can_unlock %} - {% trans 'UnLock' %} {% endif %} {% if journal_entry.can_post %} - {% trans 'Post' %} {% endif %} {% if journal_entry.can_unpost %} - {% trans 'UnPost' %} diff --git a/templates/ledger/ledger/ledger_delete.html b/templates/ledger/ledger/ledger_delete.html index 02ce2ee3..b0dd7b32 100644 --- a/templates/ledger/ledger/ledger_delete.html +++ b/templates/ledger/ledger/ledger_delete.html @@ -15,8 +15,8 @@
    {% trans 'Go Back' %} - + class="btn btn-phoenix-primary me-2">{% trans 'Go Back' %} +
    diff --git a/templates/ledger/ledger/ledger_detail.html b/templates/ledger/ledger/ledger_detail.html index 4918517d..269cbacd 100644 --- a/templates/ledger/ledger/ledger_detail.html +++ b/templates/ledger/ledger/ledger_detail.html @@ -13,7 +13,7 @@
    - {% trans 'Invoice List' %} @@ -112,22 +112,22 @@
    {% trans 'Balance Sheet' %} + class="btn btn-phoenix-info">{% trans 'Balance Sheet' %} {% trans 'Income Statement' %} + class="btn btn-phoenix-info">{% trans 'Income Statement' %} {% trans 'Cash Flow Statement' %} + class="btn btn-phoenix-info">{% trans 'Cash Flow Statement' %}
    + class="btn btn-phoenix-success"> {% trans 'Balance Sheet PDF' %}{% icon 'bytesize:download' 24 %} + class="btn btn-phoenix-success"> {% trans 'Income Statement PDF' %}{% icon 'bytesize:download' 24 %} + class="btn btn-phoenix-success"> {% trans 'Cash Flow Statement PDF' %}{% icon 'bytesize:download' 24 %}
    diff --git a/templates/ledger/ledger/ledger_form.html b/templates/ledger/ledger/ledger_form.html index 503d624c..f0d758b7 100644 --- a/templates/ledger/ledger/ledger_form.html +++ b/templates/ledger/ledger/ledger_form.html @@ -18,8 +18,8 @@
    {% endcomment %}
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html index a03ade5b..f1715de2 100644 --- a/templates/ledger/ledger/ledger_list.html +++ b/templates/ledger/ledger/ledger_list.html @@ -40,7 +40,7 @@ {% endif %} - diff --git a/templates/ledger/reports/cash_flow_statement.html b/templates/ledger/reports/cash_flow_statement.html index 9ad1f5e8..c0de2bc6 100644 --- a/templates/ledger/reports/cash_flow_statement.html +++ b/templates/ledger/reports/cash_flow_statement.html @@ -45,8 +45,8 @@
    {% cash_flow_statement io_model=object %} - {% trans 'Download PDF' %} + {% trans 'Download PDF' %}
    {% endblock %} \ No newline at end of file diff --git a/templates/ledger/reports/dashboard.html b/templates/ledger/reports/dashboard.html index 759e563e..b763ca7e 100644 --- a/templates/ledger/reports/dashboard.html +++ b/templates/ledger/reports/dashboard.html @@ -148,7 +148,7 @@
    - +
    diff --git a/templates/ledger/reports/income_statement.html b/templates/ledger/reports/income_statement.html index 398befec..50aa5e3b 100644 --- a/templates/ledger/reports/income_statement.html +++ b/templates/ledger/reports/income_statement.html @@ -43,8 +43,8 @@ {% income_statement_table io_model=object %} - {% trans 'Download PDF' %} + {% trans 'Download PDF' %}
    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/modal/delete_modal.html b/templates/modal/delete_modal.html index 805d9f6a..4cb68e29 100644 --- a/templates/modal/delete_modal.html +++ b/templates/modal/delete_modal.html @@ -22,7 +22,7 @@

    - + {{ _("Delete") }}
    diff --git a/templates/modal/event_details_modal.html b/templates/modal/event_details_modal.html index 3a5eb760..36912460 100644 --- a/templates/modal/event_details_modal.html +++ b/templates/modal/event_details_modal.html @@ -25,7 +25,7 @@ - - {% trans "Cancel" %} + + {% trans "Cancel" %} diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html index 90a747ed..e3a1bb68 100644 --- a/templates/organizations/organization_list.html +++ b/templates/organizations/organization_list.html @@ -30,7 +30,7 @@ {% if request.GET.q %} - + {% endif %} @@ -92,8 +92,8 @@

    {% trans 'Are you sure you want to delete this Organization?' %}

    - - {% trans 'Yes' %} + + {% trans 'Yes' %} diff --git a/templates/otp/verify_otp.html b/templates/otp/verify_otp.html index 13735026..4dac1200 100644 --- a/templates/otp/verify_otp.html +++ b/templates/otp/verify_otp.html @@ -27,7 +27,7 @@ - + {{ _("Didn’t receive the code")}}? diff --git a/templates/partials/pagination.html b/templates/partials/pagination.html index 67cebdf1..9bf0e938 100644 --- a/templates/partials/pagination.html +++ b/templates/partials/pagination.html @@ -1,39 +1,90 @@ {% load i18n static %} -
    -
    +
    -
    \ No newline at end of file + + {# Last Page Link #} + {% if page_obj.has_next %} +
  • + + + {% trans 'Last' %} + +
    • + {% else %} +
  • + + + {% trans 'Last' %} + +
    • + {% endif %} + + diff --git a/templates/partials/pagination_audit.html b/templates/partials/pagination_audit.html deleted file mode 100644 index ff544e2f..00000000 --- a/templates/partials/pagination_audit.html +++ /dev/null @@ -1,32 +0,0 @@ -{% load i18n static %} - -
    -
    - {# Previous Button #} - {% if page_obj.has_previous %} - - - {% trans "Previous" %} - - {% else %} - - - {% trans "Previous" %} - - {% endif %} - - - {# Next Button #} - {% if page_obj.has_next %} - - {% trans "Next" %} - - - {% else %} - - {% trans "Next" %} - - - {% endif %} -
    -
    \ No newline at end of file diff --git a/templates/partials/scanner_modal.html b/templates/partials/scanner_modal.html index 0f99bc21..fcbdf05b 100644 --- a/templates/partials/scanner_modal.html +++ b/templates/partials/scanner_modal.html @@ -8,7 +8,7 @@

    {{ _("VIN will appear here.") }}

    - +
    diff --git a/templates/partials/vehicle_dropdowns.html b/templates/partials/vehicle_dropdowns.html index e4494c10..2a04063b 100644 --- a/templates/partials/vehicle_dropdowns.html +++ b/templates/partials/vehicle_dropdowns.html @@ -46,17 +46,17 @@ {{ form.expected_cost }}
    - +
    {% endfor %} - +
    - - Cancel + + Cancel
    @@ -127,7 +127,7 @@ document.addEventListener('DOMContentLoaded', function () {
    - +
    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/plans/billing_info_create_or_update.html b/templates/plans/billing_info_create_or_update.html index c1aadfa0..3c81084b 100644 --- a/templates/plans/billing_info_create_or_update.html +++ b/templates/plans/billing_info_create_or_update.html @@ -11,11 +11,13 @@ {% csrf_token %} {{ form|crispy }} {% if object %} - {{ _("Delete") }} + {{ _("Delete") }} {% endif %} - + + diff --git a/templates/plans/billing_info_delete.html b/templates/plans/billing_info_delete.html index 5bdde294..bf26f882 100644 --- a/templates/plans/billing_info_delete.html +++ b/templates/plans/billing_info_delete.html @@ -10,7 +10,7 @@ {% csrf_token %} {% trans "Are you sure to delete billing info?" %}

    - + diff --git a/templates/plans/create_order.html b/templates/plans/create_order.html index ace45179..5313116b 100644 --- a/templates/plans/create_order.html +++ b/templates/plans/create_order.html @@ -63,7 +63,7 @@ {% endif %} {% endwith %} - + {{ form|crispy }} {% csrf_token %} diff --git a/templates/plans/current.html b/templates/plans/current.html index 3d3d9f8e..432fc99d 100644 --- a/templates/plans/current.html +++ b/templates/plans/current.html @@ -42,7 +42,7 @@ {% trans "Plan" %}

    {{ userplan.plan }} - + {% trans "Upgrade" %}
    diff --git a/templates/plans/fake_payments.html b/templates/plans/fake_payments.html index aa906660..b7f472e2 100644 --- a/templates/plans/fake_payments.html +++ b/templates/plans/fake_payments.html @@ -9,7 +9,7 @@
    {% csrf_token %} {{ form.as_p }} -
    diff --git a/templates/plans/order_detail.html b/templates/plans/order_detail.html index e0835a75..1f3c9caf 100644 --- a/templates/plans/order_detail.html +++ b/templates/plans/order_detail.html @@ -56,7 +56,7 @@ Use a fake payment below to simulate paying for an order:

    - Pay using + Pay using FakePayments™ ;) {# An example code snippet for accepting payments using django-getpaid #} diff --git a/templates/plans/plan_table.html b/templates/plans/plan_table.html index 80244e5d..8fcf025c 100644 --- a/templates/plans/plan_table.html +++ b/templates/plans/plan_table.html @@ -70,7 +70,7 @@ {% for plan in plan_list %} {% if plan != userplan.plan and not userplan.is_expired and not userplan.plan.is_free %} - + {% trans "Change" %} {% endif %} @@ -98,7 +98,7 @@
    {{ plan_pricing.price }} {% if plan_pricing.plan == userplan.plan or userplan.is_expired or userplan.plan.is_free %} - + {% trans "Buy" %} {% endif %} @@ -115,7 +115,7 @@
    0 {% if plan != userplan.plan or userplan.is_expired %} - + {% if userplan.is_expired %} {% trans "Select" %} {% else %} 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/purchase_orders/car_inventory_item_form.html b/templates/purchase_orders/car_inventory_item_form.html index 89b4648c..8b531be9 100644 --- a/templates/purchase_orders/car_inventory_item_form.html +++ b/templates/purchase_orders/car_inventory_item_form.html @@ -106,6 +106,9 @@ {% endfor %}
    +<<<<<<< HEAD + +=======

    {% trans 'Exterior Colors' %}

    @@ -140,5 +143,6 @@
    +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff {% endblock content %} \ No newline at end of file diff --git a/templates/purchase_orders/includes/card_po.html b/templates/purchase_orders/includes/card_po.html index 4be5c10f..ff27515c 100644 --- a/templates/purchase_orders/includes/card_po.html +++ b/templates/purchase_orders/includes/card_po.html @@ -15,10 +15,10 @@ document.addEventListener('DOMContentLoaded', function() { document.getElementById('POModalBody').innerHTML = `
    - + ${buttonText} -
    @@ -58,8 +58,13 @@ document.addEventListener('DOMContentLoaded', function() {

    {% trans 'Contract' %}

    {{ po_model.ce_model.estimate_number }}

    +<<<<<<< HEAD + +======= +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff {% trans 'View Contract' %} @@ -160,38 +165,67 @@ document.addEventListener('DOMContentLoaded', function() {
    + class="btn btn-phoenix-primary"> {% trans 'Update' %}
    {# Status Action Buttons #} {% if po_model.can_draft %} - {% endif %} {% if po_model.can_review %} - {% endif %} {% if po_model.can_approve %} - {% endif %} {% if po_model.can_fulfill %} - +<<<<<<< HEAD + + {% endif %} + + {# Danger Action Buttons #} + {% if po_model.can_delete %} + + {% trans 'Delete' %} + + {% endif %} + + {% if po_model.can_void %} + + {% modal_action_v2 bill po_model.get_mark_as_void_url po_model.get_mark_as_void_message po_model.get_mark_as_void_html_id %} + {% endif %} + + {% if po_model.can_cancel %} + + {% modal_action_v2 bill po_model.get_mark_as_canceled_url po_model.get_mark_as_canceled_message po_model.get_mark_as_canceled_html_id %} +======= {% endif %} {# Danger Action Buttons #} @@ -214,6 +248,7 @@ document.addEventListener('DOMContentLoaded', function() { onclick="showPOModal('Cancel PO', '{% url 'po-action-mark-as-canceled' entity_slug po_model.pk %}', 'Mark As Cancelled')"> {% trans 'Cancel' %} +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff {% endif %}
    diff --git a/templates/purchase_orders/includes/inventory_item_form.html b/templates/purchase_orders/includes/inventory_item_form.html index 0aeb9f5d..f2ab0fd8 100644 --- a/templates/purchase_orders/includes/inventory_item_form.html +++ b/templates/purchase_orders/includes/inventory_item_form.html @@ -21,7 +21,7 @@
    - + {% endblock content %} \ No newline at end of file diff --git a/templates/purchase_orders/includes/po_item_formset.html b/templates/purchase_orders/includes/po_item_formset.html index 5aa8289d..23e9218f 100644 --- a/templates/purchase_orders/includes/po_item_formset.html +++ b/templates/purchase_orders/includes/po_item_formset.html @@ -57,7 +57,7 @@ {% if f.instance.can_create_bill %} {{ f.create_bill|add_class:"form-check-input" }} {% elif f.instance.bill_model %} - {% trans 'View Bill' %} @@ -95,7 +95,7 @@
    - +
    \ No newline at end of file diff --git a/templates/purchase_orders/inventory_item_form.html b/templates/purchase_orders/inventory_item_form.html index 05e18f09..d40aa26d 100644 --- a/templates/purchase_orders/inventory_item_form.html +++ b/templates/purchase_orders/inventory_item_form.html @@ -17,7 +17,7 @@ {% endfor %} - + {% endblock content %} \ No newline at end of file diff --git a/templates/purchase_orders/po_confirm_delete.html b/templates/purchase_orders/po_confirm_delete.html index c27c10c7..bc05aeb2 100644 --- a/templates/purchase_orders/po_confirm_delete.html +++ b/templates/purchase_orders/po_confirm_delete.html @@ -12,8 +12,8 @@
    {% csrf_token %} - - Cancel + + Cancel
    {% endblock %} \ No newline at end of file diff --git a/templates/purchase_orders/po_delete.html b/templates/purchase_orders/po_delete.html index d89c5726..09ce8cdd 100644 --- a/templates/purchase_orders/po_delete.html +++ b/templates/purchase_orders/po_delete.html @@ -19,8 +19,8 @@
    {% trans 'Go Back' %} - + class="btn btn-phoenix-primary px-4">{% trans 'Go Back' %} +
    diff --git a/templates/purchase_orders/po_detail.html b/templates/purchase_orders/po_detail.html index 7674201c..702f8841 100644 --- a/templates/purchase_orders/po_detail.html +++ b/templates/purchase_orders/po_detail.html @@ -18,7 +18,7 @@ - {% trans 'PO List' %} @@ -84,10 +84,10 @@ document.addEventListener('DOMContentLoaded', function() { document.getElementById('POModalBody').innerHTML = `
    - + ${buttonText} -
    diff --git a/templates/purchase_orders/po_detail_backup.html b/templates/purchase_orders/po_detail_backup.html index 41e53dfb..c3079a52 100644 --- a/templates/purchase_orders/po_detail_backup.html +++ b/templates/purchase_orders/po_detail_backup.html @@ -57,7 +57,7 @@ - Back to List + Back to List @@ -87,7 +87,7 @@ - + diff --git a/templates/purchase_orders/po_form.html b/templates/purchase_orders/po_form.html index 485f43e4..89bbc8b3 100644 --- a/templates/purchase_orders/po_form.html +++ b/templates/purchase_orders/po_form.html @@ -39,11 +39,11 @@
    {{ error }}
    {% endfor %}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    diff --git a/templates/purchase_orders/po_update.html b/templates/purchase_orders/po_update.html index d5e841fa..89bfd539 100644 --- a/templates/purchase_orders/po_update.html +++ b/templates/purchase_orders/po_update.html @@ -24,12 +24,12 @@ {% csrf_token %} {{ form|crispy }} {% trans 'Back to PO Detail' %} + class="btn btn-phoenix-secondary w-100 my-2">{% trans 'Back to PO Detail' %} {% trans 'PO List' %} @@ -100,7 +100,7 @@ function showPOModal(title, actionUrl, buttonText) { // Set the modal body content document.getElementById('POModalBody').innerHTML = ` - + ${buttonText} `; diff --git a/templates/representatives/representative_detail.html b/templates/representatives/representative_detail.html index 0e3f32c4..2cf6b84c 100644 --- a/templates/representatives/representative_detail.html +++ b/templates/representatives/representative_detail.html @@ -10,10 +10,10 @@
  • {% trans "Address" %}: {{ representative.address }}
    • - {% trans "Edit" %} + {% trans "Edit" %}
    {% csrf_token %} - +
    diff --git a/templates/representatives/representative_form.html b/templates/representatives/representative_form.html index e19869be..6674d46d 100644 --- a/templates/representatives/representative_form.html +++ b/templates/representatives/representative_form.html @@ -8,8 +8,8 @@
    {% csrf_token %} {{ form|crispy }} - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    {% endblock %} \ No newline at end of file diff --git a/templates/representatives/representative_list.html b/templates/representatives/representative_list.html index 212fa3e1..fd654299 100644 --- a/templates/representatives/representative_list.html +++ b/templates/representatives/representative_list.html @@ -7,9 +7,9 @@
    - +
    - {% trans "Add Representative" %} + {% trans "Add Representative" %}
    @@ -27,7 +27,7 @@ {% empty %} diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html index 05ebfca5..e669ed7d 100644 --- a/templates/sales/estimates/estimate_detail.html +++ b/templates/sales/estimates/estimate_detail.html @@ -33,7 +33,7 @@

    {% trans "Are you sure you want to Cancel this Estimate?" %}

    - + {% trans "Yes" %}
    @@ -60,8 +60,8 @@ {% csrf_token %}
    - - + +
    @@ -93,7 +93,7 @@
    {% if estimate.invoicemodel_set.first %} - + {{ _("View Invoice")}} {% endif %} diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html index 32b5d42f..f1fb36f1 100644 --- a/templates/sales/estimates/estimate_form.html +++ b/templates/sales/estimates/estimate_form.html @@ -50,12 +50,12 @@
    - +
    - +
    @@ -68,12 +68,12 @@ {% endcomment %}
    - - {% trans "Cancel" %} + {% trans "Cancel" %}
    @@ -113,7 +113,7 @@
    - +
    `; formrow.appendChild(newForm); diff --git a/templates/sales/estimates/estimate_preview.html b/templates/sales/estimates/estimate_preview.html index 8d79a652..6c2840b6 100644 --- a/templates/sales/estimates/estimate_preview.html +++ b/templates/sales/estimates/estimate_preview.html @@ -78,10 +78,10 @@
    - +
    - +
    diff --git a/templates/sales/estimates/sale_order_form.html b/templates/sales/estimates/sale_order_form.html index 56debf10..e731056b 100644 --- a/templates/sales/estimates/sale_order_form.html +++ b/templates/sales/estimates/sale_order_form.html @@ -190,7 +190,7 @@
    - +
    diff --git a/templates/sales/estimates/sale_order_form1.html b/templates/sales/estimates/sale_order_form1.html index 7204ef65..614788e4 100644 --- a/templates/sales/estimates/sale_order_form1.html +++ b/templates/sales/estimates/sale_order_form1.html @@ -192,12 +192,12 @@
    - + Cancel
    -
    diff --git a/templates/sales/estimates/sale_order_preview.html b/templates/sales/estimates/sale_order_preview.html index 2f3af590..17508e1d 100644 --- a/templates/sales/estimates/sale_order_preview.html +++ b/templates/sales/estimates/sale_order_preview.html @@ -142,10 +142,10 @@ {% else%}
    - +
    - +
    diff --git a/templates/sales/invoices/approved_invoice_update.html b/templates/sales/invoices/approved_invoice_update.html index 141311ff..4211b879 100644 --- a/templates/sales/invoices/approved_invoice_update.html +++ b/templates/sales/invoices/approved_invoice_update.html @@ -13,7 +13,7 @@
    {% csrf_token %} {{ form|crispy }} - +
    diff --git a/templates/sales/invoices/draft_invoice_update.html b/templates/sales/invoices/draft_invoice_update.html index 141311ff..4211b879 100644 --- a/templates/sales/invoices/draft_invoice_update.html +++ b/templates/sales/invoices/draft_invoice_update.html @@ -13,7 +13,7 @@ {% csrf_token %} {{ form|crispy }} - + diff --git a/templates/sales/invoices/invoice_create.html b/templates/sales/invoices/invoice_create.html index eadb97ae..07a59801 100644 --- a/templates/sales/invoices/invoice_create.html +++ b/templates/sales/invoices/invoice_create.html @@ -13,7 +13,7 @@ {% csrf_token %} {{ form|crispy }} - + diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html index fd8c6b1d..510072f3 100644 --- a/templates/sales/invoices/invoice_detail.html +++ b/templates/sales/invoices/invoice_detail.html @@ -23,12 +23,12 @@ {% trans 'Are you sure ?' %}
    {% csrf_token %} - +
    @@ -47,13 +47,13 @@ {% trans 'Are you sure ?' %}
    {% csrf_token %} - +
    diff --git a/templates/sales/invoices/invoice_preview.html b/templates/sales/invoices/invoice_preview.html index 66cc5193..cdd57f2f 100644 --- a/templates/sales/invoices/invoice_preview.html +++ b/templates/sales/invoices/invoice_preview.html @@ -83,10 +83,10 @@
    - +
    - +
    diff --git a/templates/sales/invoices/paid_invoice_update.html b/templates/sales/invoices/paid_invoice_update.html index 141311ff..4211b879 100644 --- a/templates/sales/invoices/paid_invoice_update.html +++ b/templates/sales/invoices/paid_invoice_update.html @@ -13,7 +13,7 @@ {% csrf_token %} {{ form|crispy }} - + diff --git a/templates/sales/journals/journal_form.html b/templates/sales/journals/journal_form.html index 265de16a..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 %} @@ -15,8 +17,8 @@
    - - {% trans "Cancel" %} + + {% trans "Cancel" %}
    diff --git a/templates/sales/journals/journal_list.html b/templates/sales/journals/journal_list.html index 59345109..c5665d23 100644 --- a/templates/sales/journals/journal_list.html +++ b/templates/sales/journals/journal_list.html @@ -30,7 +30,7 @@ diff --git a/templates/sales/orders/order_details.html b/templates/sales/orders/order_details.html index c1d2cf1a..a7e59e3d 100644 --- a/templates/sales/orders/order_details.html +++ b/templates/sales/orders/order_details.html @@ -84,11 +84,19 @@ {{ _("Sale Order")}} #{{ saleorder.formatted_order_id }}
    +<<<<<<< HEAD + +
    @@ -274,9 +282,15 @@
    +<<<<<<< HEAD +
    Documents
    +
    @@ -321,7 +335,11 @@
    +<<<<<<< HEAD + +======= +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
    @@ -358,32 +376,52 @@
    {% if saleorder.status == 'pending_approval' %} - {% endif %} {% comment %} {% endcomment %} +<<<<<<< HEAD + + Edit Order +======= {{ _("Edit Order")}} +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff {% if not saleorder.invoice %} {% comment %} {% endcomment %} +<<<<<<< HEAD + + Create Invoice +======= {{ _("Create Invoice")}} +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff {% endif %} {% if saleorder.status == 'approved' and not saleorder.actual_delivery_date %} +<<<<<<< HEAD + {% endif %} {% if saleorder.status != 'cancelled' %} +<<<<<<< HEAD + {% endif %}
    @@ -535,8 +573,13 @@
    +<<<<<<< HEAD + + +======= +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
    @@ -565,8 +608,13 @@
    +<<<<<<< HEAD + + +======= +>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
    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 @@ {% 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 }}
    - + Refresh
    @@ -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 %}
    {{ rep.id_number }} {{ rep.phone_number }} - {% trans "view" %} + {% trans "view" %}
    {{ journal. }} + class="btn btn-sm btn-phoenix-success"> {% trans "view" %} {{ 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' %}