mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-20 14:50:32 +00:00
Compare commits
1 Commits
v0.7.1
...
BIG-378-ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1e7720bd9 |
@@ -85,9 +85,6 @@ function getClientEnvironment(publicUrl) {
|
||||
WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
|
||||
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
|
||||
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
|
||||
|
||||
// Application version.
|
||||
VERSION: paths.appVersion
|
||||
}
|
||||
);
|
||||
// Stringify all values so we can feed into webpack DefinePlugin
|
||||
|
||||
@@ -48,8 +48,6 @@ const resolveModule = (resolveFn, filePath) => {
|
||||
return resolveFn(`${filePath}.js`);
|
||||
};
|
||||
|
||||
const appVersion = require(resolveApp('package.json')).version;
|
||||
|
||||
// config after eject: we're in ./config/
|
||||
module.exports = {
|
||||
dotenv: resolveApp('.env'),
|
||||
@@ -67,7 +65,6 @@ module.exports = {
|
||||
proxySetup: resolveApp('src/setupProxy.js'),
|
||||
appNodeModules: resolveApp('node_modules'),
|
||||
publicUrlOrPath,
|
||||
appVersion
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ export default function Sidebar({ dashboardContentRef }) {
|
||||
* @returns {React.JSX}
|
||||
*/
|
||||
function SidebarFooterVersion() {
|
||||
const { VERSION } = process.env;
|
||||
const { REACT_APP_VERSION: VERSION } = process.env;
|
||||
|
||||
if (!VERSION) {
|
||||
return null;
|
||||
|
||||
@@ -57,7 +57,9 @@ function BillTransactionDeleteAlert({
|
||||
loading={isLoading}
|
||||
>
|
||||
<p>
|
||||
<T id={`landed_cost.once_your_delete_this_located_landed_cost`} />
|
||||
<T
|
||||
id={`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?`}
|
||||
/>
|
||||
</p>
|
||||
</Alert>
|
||||
);
|
||||
|
||||
@@ -79,10 +79,6 @@ 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', {
|
||||
|
||||
@@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({
|
||||
<DialogFooterActions alignment={'left'}>
|
||||
{costTransactionEntry && (
|
||||
<UnallocatedAmount>
|
||||
<T id={'landed_cost.dialog.label_unallocated_cost_amount'}/>
|
||||
Unallocated cost Amount:{' '}
|
||||
<strong>{formattedUnallocatedCostAmount}</strong>
|
||||
</UnallocatedAmount>
|
||||
)}
|
||||
|
||||
@@ -42,10 +42,7 @@ function AllocateLandedCostForm({
|
||||
.map((entry) => transformToForm(entry, defaultInitialValues.items[0]));
|
||||
|
||||
if (entries.length <= 0) {
|
||||
AppToaster.show({
|
||||
message: intl.get('something_wrong'),
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER });
|
||||
return;
|
||||
}
|
||||
const form = {
|
||||
@@ -72,14 +69,13 @@ function AllocateLandedCostForm({
|
||||
)
|
||||
) {
|
||||
AppToaster.show({
|
||||
message: intl.get(
|
||||
'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
|
||||
),
|
||||
message:
|
||||
'The total located cost is bigger than the transaction line.',
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
} else {
|
||||
AppToaster.show({
|
||||
message: intl.get('something_went_wrong'),
|
||||
message: 'Something went wrong!',
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -43,7 +43,10 @@ export function ActionsCellRenderer({
|
||||
|
||||
const exampleMenu = (
|
||||
<Menu>
|
||||
<MenuItem onClick={onRemoveRole} text={'item_entries.remove_row'} />
|
||||
<MenuItem
|
||||
onClick={onRemoveRole}
|
||||
text={<T id={'item_entries.remove_row'} />}
|
||||
/>
|
||||
</Menu>
|
||||
);
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ function InvoiceFormHeaderFields({
|
||||
</FastField>
|
||||
</Col>
|
||||
|
||||
<Col className={'col--due-date'}>
|
||||
<Col xs={6}>
|
||||
{/* ----------- Due date ----------- */}
|
||||
<FastField name={'due_date'}>
|
||||
{({ form, field: { value }, meta: { error, touched } }) => (
|
||||
|
||||
@@ -1173,6 +1173,7 @@
|
||||
"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": "تفاصيل الفاتورة",
|
||||
@@ -1389,7 +1390,7 @@
|
||||
"filter.value": "قيمة",
|
||||
"payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.",
|
||||
"estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.",
|
||||
"landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ",
|
||||
"landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
|
||||
"items.option.only_active": "Only active",
|
||||
"items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.",
|
||||
"items.option_with_transactions": "الاصناف مع معاملات",
|
||||
@@ -1593,9 +1594,6 @@
|
||||
"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": "تاريخ الاسترجاع",
|
||||
@@ -1962,6 +1960,7 @@
|
||||
"invoice_form.label.payment_amount": "مبلغ المدفوع",
|
||||
"invoice_form.label.invoice_message": "رسالة الفاتورة",
|
||||
"invoice_form.invoice_message.placeholder": "Thanks for your business and have a great day!",
|
||||
"invoice_form.label.terms_conditions": "الشروط والأحكام",
|
||||
"invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
|
||||
"receipt_form.label.total": "إجمالي",
|
||||
"receipt_form.label.subtotal": "المجموع",
|
||||
|
||||
@@ -1147,6 +1147,7 @@
|
||||
"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",
|
||||
@@ -1292,11 +1293,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_opening_balance": "Edit Opening Balance",
|
||||
"customer.drawer.action.edit": "Edit",
|
||||
"customer.drawer.label.outstanding_receivable": "Outstanding receivable",
|
||||
@@ -1323,9 +1324,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",
|
||||
"vendor.drawer.action.edit_opening_balance": "Edit Opening Balance",
|
||||
"manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.",
|
||||
@@ -1584,9 +1585,6 @@
|
||||
"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",
|
||||
|
||||
Reference in New Issue
Block a user