QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 06:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: BIG-352 Add terms and conditions/notes field to a warehouse transfer.

Browse Source
This commit is contained in:
a.bouhuolia
2022-03-28 19:25:06 +02:00
parent 767d807490
commit 10af33f1dc
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
View File

@@ -20,7 +20,7 @@ export function PaymentReceiveFormFootetLeft() {
{/* --------- Internal Note--------- */}
<TermsConditsFormGroup
name={'internal_note'}
label={<T id={'payment_receive_form.label.internal_note'} />}
label={<T id={'payment_receive_form.label.note'} />}
>
<FEditableText
name={'internal_note'}

18
src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js
View File

@@ -18,16 +18,18 @@ export function ReceiptFormFooterLeft() {
/>
</ReceiptMsgFormGroup>
{/* --------- Statement--------- */}
<StatementFormGroup
label={<T id={'receipt_form.label.statement'} />}
name={'statement'}
{/* --------- Terms and conditions --------- */}
<TermsConditsFormGroup
label={<T id={'receipt_form.label.terms_conditions'} />}
name={'terms_conditions'}
>
<FEditableText
name={'statement'}
placeholder={intl.get('receipt_form.statement.placeholder')}
name={'terms_conditions'}
placeholder={intl.get(
'receipt_form.terms_and_conditions.placeholder',
)}
/>
</StatementFormGroup>
</TermsConditsFormGroup>
</React.Fragment>
);
}
@@ -46,7 +48,7 @@ const ReceiptMsgFormGroup = styled(FFormGroup)`
}
`;
const StatementFormGroup = styled(FFormGroup)`
const TermsConditsFormGroup = styled(FFormGroup)`
&.bp3-form-group {
.bp3-label {
font-size: 12px;

25
src/lang/en/index.json
View File

@@ -1164,7 +1164,7 @@
"sorry_about_that_something_went_wrong": "Sorry about that! Something went wrong",
"if_the_problem_stuck_please_contact_us_as_soon_as_possible": "If the problem stuck, please contact us as soon as possible.",
"non-inventory": "Non-Inventory",
"terms_conditions": "Terms conditions",
"terms_conditions": "Terms & Conditions",
"inventory_adjustment.publish.success_message": "The inventory adjustment has been published successfully.",
"inventory_adjustment.publish.alert_message": "Are you sure you want to publish this inventory adjustment?",
"the_contact_has_been_activated_successfully": "The contact has been inactivated successfully.",
@@ -1527,8 +1527,8 @@
"credit_note.label_credit_note_details": "Credit Note details",
"credit_note.label_customer_note": "Customer Note",
"credit_note.label_terms_conditions": "Terms & Conditions",
"credit_note.label_customer_note.placeholder": "The customer note will be displayed on the credit note.",
"credit_note.label_terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"credit_note.label_customer_note.placeholder": "This message will be displayed on the credit note.",
"credit_note.label_terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed on the credit note.",
"credit_note.label_total": "TOTAL",
"credit_note.label_subtotal": "Subtotal",
"credit_note.once_delete_this_credit_note": "Once you delete this credit note, you won't be able to restore it later. Are you sure you want to delete this credit note?",
@@ -1950,7 +1950,7 @@
"estimate_form.label.customer_note": "Customer Note",
"estimate_form.label.terms_conditions": "Terms & Conditions",
"estimate_form.customer_note.placeholder": "This message will be displayed on the estimate.",
"estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed on the estimate.",
"invoice_form.label.total": "TOTAL",
"invoice_form.label.subtotal": "Subtotal",
"invoice_form.label.due_amount": "Due amount",
@@ -1958,18 +1958,19 @@
"invoice_form.label.invoice_message": "Invoice Message",
"invoice_form.label.terms_conditions": "Terms & Conditions",
"invoice_form.invoice_message.placeholder": "This message will be displayed on the invoice.",
"invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction.",
"invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed on the invoice.",
"receipt_form.label.total": "TOTAL",
"receipt_form.label.subtotal": "Subtotal",
"receipt_form.label.due_amount": "Due amount",
"receipt_form.label.payment_amount": "Payment amount",
"receipt_form.label.receipt_message": "Receipt Message",
"receipt_form.receipt_message.placeholder": "This message will be displayed on the receipt.",
"receipt_form.label.statement": "Statement",
"receipt_form.statement.placeholder": "Thanks for your business and have a great day!",
"payment_receive_form.label.internal_note": "Internal Note",
"payment_receive_form.internal_note.placeholder": "Internal notes, Not visible to the customer.",
"receipt_form.label.terms_conditions": "Terms & Conditions",
"receipt_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed on the receipt.",
"payment_receive_form.label.note": "Note",
"payment_receive_form.internal_note.placeholder": "Internal notes (Not visible to the customer).",
"payment_receive_form.message.label": "Payment Message",
"payment_receive_form.message.placeholder": "This message will be displayed on the payment receipt.",
@@ -1978,13 +1979,13 @@
"payment_receive_form.label.total": "TOTAL",
"bill_form.label.note": "Note",
"bill_form.label.note.placeholder": "Internal note. Not visible to the vendor.",
"bill_form.label.note.placeholder": "Internal note (Not visible to the vendor).",
"bill_form.label.subtotal": "Subtotal",
"bill_form.label.total": "TOTAL",
"bill_form.label.due_amount": "Due amount",
"bill_form.label.payment_amount": "Payment amount",
"vendor_credit_form.label.note": "Note",
"vendor_credit_form.note.placeholder": "Internal note. Not visible to the vendor.",
"vendor_credit_form.note.placeholder": "Internal note (Not visible to the vendor).",
"vendor_credit_form.label.subtotal": "Subtotal",
"vendor_credit_form.label.total": "TOTAL",
"payment_made_form.label.statement": "Statement",
@@ -1992,7 +1993,7 @@
"payment_made_form.label.subtotal": "Subtotal",
"payment_made_form.label.total": "TOTAL",
"payment_made.form.internal_note.label": "Note",
"payment_made.form.internal_note.placeholder": "Internal note. Not visible to the vendor.",
"payment_made.form.internal_note.placeholder": "Internal note (Not visible to the vendor).",
"make_journal.label.subtotal": "Subtotal",
"make_journal.label.total": "TOTAL",
"expense.label.subtotal": "Subtotal",