From 430ab95dc3cc403bb0865f5078c4c033e9512179 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 3 Jan 2022 13:38:22 +0200
Subject: [PATCH 1/2] landed cost localiztion.
---
.../Alerts/Bills/BillLocatedLandedCostDeleteAlert.js | 4 +---
.../AllocateLandedCostFloatingActions.js | 2 +-
.../AllocateLandedCostForm.js | 12 ++++++++----
src/lang/ar/index.json | 6 ++++--
src/lang/en/index.json | 4 +++-
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js
index 4dee8f29c..1f72e8cad 100644
--- a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js
+++ b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js
@@ -57,9 +57,7 @@ function BillTransactionDeleteAlert({
loading={isLoading}
>
-
+
);
diff --git a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js
index 121f86aa5..0f3fee4a8 100644
--- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js
+++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js
@@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({
{costTransactionEntry && (
- Unallocated cost Amount:{' '}
+
{formattedUnallocatedCostAmount}
)}
diff --git a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js
index e4ac664cd..12d755051 100644
--- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js
+++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js
@@ -42,7 +42,10 @@ function AllocateLandedCostForm({
.map((entry) => transformToForm(entry, defaultInitialValues.items[0]));
if (entries.length <= 0) {
- AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER });
+ AppToaster.show({
+ message: intl.get('something_wrong'),
+ intent: Intent.DANGER,
+ });
return;
}
const form = {
@@ -69,13 +72,14 @@ function AllocateLandedCostForm({
)
) {
AppToaster.show({
- message:
- 'The total located cost is bigger than the transaction line.',
+ message: intl.get(
+ 'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
+ ),
intent: Intent.DANGER,
});
} else {
AppToaster.show({
- message: 'Something went wrong!',
+ message: intl.get('something_went_wrong'),
intent: Intent.DANGER,
});
}
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 97c82f290..5f3a31f54 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1173,7 +1173,6 @@
"From transaction": "من معاملة",
"Landed": "Landed",
"This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "يتيح لك هذا الخيار إمكانية إضافة تكلفة إضافية على سبيل المثال اضافة تكلفة الشحن ومن ثم تخصيص التكلفة لفواتير الشراء.",
- "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
"journal_entries": "القيود",
"contact": "جهة الاتصال",
"invoice_details": "تفاصيل الفاتورة",
@@ -1384,7 +1383,7 @@
"filter.value": "قيمة",
"payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.",
"estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.",
- "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
+ "landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ",
"items.option.only_active": "Only active",
"items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.",
"items.option_with_transactions": "الاصناف مع معاملات",
@@ -1583,6 +1582,9 @@
"refund": "استرجاع",
"landed_cost.dialog.label_select_transaction": "حدد المعاملة ",
"landed_cost.dialog.label_select_transaction_entry": "حدد سطر المعاملة ",
+ "landed_cost.dialog.label_unallocated_cost_amount":"قيمة التكلفة غير المحملة:",
+ "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line":"إجمالي قيمة التكلفة المحملة أكبر من قيمة سطر المعاملة.",
+ "landed_cost.once_your_delete_this_located_landed_cost": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
"refund_credit_note.dialog.label": "استرجاع اموال",
"refund_credit_note.dialog.success_message": "تم انشاء معاملة استرجاع الاموال لإشعار الدائن بنجاح.",
"refund_credit_note.dialog.refund_date": "تاريخ الاسترجاع",
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 14a6cca5b..61895a2be 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1145,7 +1145,6 @@
"From transaction": "From transaction",
"landed": "Landed",
"This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.",
- "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
"journal_entries": "Journal Entries",
"contact": "Contact",
"invoice_details": "Invoice details",
@@ -1568,6 +1567,9 @@
"refund": "Refund",
"landed_cost.dialog.label_select_transaction": "Select transaction",
"landed_cost.dialog.label_select_transaction_entry": "Select transaction entry",
+ "landed_cost.dialog.label_unallocated_cost_amount": "Unallocated cost Amount:",
+ "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line": "The total located cost is bigger than the transaction line.",
+ "landed_cost.once_your_delete_this_located_landed_cost": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
"refund_credit_note.dialog.label": "Refund Credit Note",
"refund_credit_note.dialog.success_message": "The customer credit note refund has been created successfully.",
"refund_credit_note.dialog.refund_date": "Refund date",
From c31e9dcd29a7580111e28299643e91c80fa56373 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 3 Jan 2022 14:35:50 +0200
Subject: [PATCH 2/2] fix: inventory adjustment & contacts drawer.
---
.../CashFlow/AccountTransactions/utils.js | 4 ++++
src/lang/en/index.json | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/containers/CashFlow/AccountTransactions/utils.js b/src/containers/CashFlow/AccountTransactions/utils.js
index 567422ea6..94a830925 100644
--- a/src/containers/CashFlow/AccountTransactions/utils.js
+++ b/src/containers/CashFlow/AccountTransactions/utils.js
@@ -79,6 +79,10 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => {
return openDrawer('refund-vendor-detail-drawer', {
refundTransactionId: reference.reference_id,
});
+ case 'InventoryAdjustment':
+ return openDrawer('inventory-adjustment-drawer', {
+ inventoryId: reference.reference_id,
+ });
default:
return openDrawer('cashflow-transaction-drawer', {
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 61895a2be..769032578 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1287,11 +1287,11 @@
"inventory_adjustment.details_drawer.title": "Inventory adjustment details",
"setup.organization.location": "Location",
"preferences.general.success_message": "The general preferences has been saved.",
- "customer.drawer.action.new_invoice": "New invoice",
- "customer.drawer.action.new_estimate": "New estimate",
- "customer.drawer.action.new_payment": "New payment",
- "customer.drawer.action.new_receipt": "New receipt",
- "customer.drawer.action.new_transaction": "New transaction",
+ "customer.drawer.action.new_invoice": "New Invoice",
+ "customer.drawer.action.new_estimate": "New Estimate",
+ "customer.drawer.action.new_payment": "New Payment",
+ "customer.drawer.action.new_receipt": "New Receipt",
+ "customer.drawer.action.new_transaction": "New Transaction",
"customer.drawer.action.edit": "Edit",
"customer.drawer.label.outstanding_receivable": "Outstanding receivable",
"customer.drawer.label.customer_name": "Customer name",
@@ -1317,9 +1317,9 @@
"vendor.drawer.label.note": "Note",
"vendor.drawer.action.edit_vendor": "Edit vendor",
"vendor.drawer.action.delete": "Delete",
- "vendor.drawer.action.new_transaction": "New transaction",
- "vendor.drawer.action.new_payment": "New payment",
- "vendor.drawer.action.new_invoice": "New purchase invoice",
+ "vendor.drawer.action.new_transaction": "New Transaction",
+ "vendor.drawer.action.new_payment": "New Payment",
+ "vendor.drawer.action.new_invoice": "New Purchase Invoice",
"vendor.drawer.action.edit": "Edit",
"manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.",
"manual_journals.empty_status.title": "Create your first journal entries on accounts chart.",