mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge branch 'v5-develop' into v5-develop
Signed-off-by: David Bomba <turbo124@gmail.com>
This commit is contained in:
commit
86947b7627
@ -309,10 +309,10 @@ class PdfMock
|
||||
'$invoice.custom2' => 'custom value',
|
||||
'$invoice.custom3' => 'custom value',
|
||||
'$invoice.custom4' => 'custom value',
|
||||
'$company.custom1' => $this->company->custom_value1,
|
||||
'$company.custom2' => $this->company->custom_value2,
|
||||
'$company.custom3' => $this->company->custom_value3,
|
||||
'$company.custom4' => $this->company->custom_value4,
|
||||
'$company.custom1' => $this->company->settings->custom_value1,
|
||||
'$company.custom2' => $this->company->settings->custom_value2,
|
||||
'$company.custom3' => $this->company->settings->custom_value3,
|
||||
'$company.custom4' => $this->company->settings->custom_value4,
|
||||
'$quote.po_number' => 'PO12345',
|
||||
'$company.website' => $this->settings->website,
|
||||
'$balance_due_raw' => '0.00',
|
||||
@ -456,10 +456,10 @@ class PdfMock
|
||||
'$task.tax' => '',
|
||||
'$discount' => '$0.00',
|
||||
'$subtotal' => '$0.00',
|
||||
'$company1' => $this->company->custom_value1,
|
||||
'$company2' => $this->company->custom_value2,
|
||||
'$company3' => $this->company->custom_value3,
|
||||
'$company4' => $this->company->custom_value4,
|
||||
'$company1' => $this->company->settings->custom_value1,
|
||||
'$company2' => $this->company->settings->custom_value2,
|
||||
'$company3' => $this->company->settings->custom_value3,
|
||||
'$company4' => $this->company->settings->custom_value4,
|
||||
'$due_date' => '2022-01-01',
|
||||
'$poNumber' => 'PO-123456',
|
||||
'$quote_no' => '0029',
|
||||
@ -606,10 +606,10 @@ class PdfMock
|
||||
'$task.description_label' => ctrans('texts.description'),
|
||||
'$product.discount_label' => ctrans('texts.discount'),
|
||||
'$product.quantity_label' => ctrans('texts.quantity'),
|
||||
'$entity_issued_to_label' => ctrans('texts.quote_issued_to'),
|
||||
'$entity_issued_to_label' => ctrans("texts.{$this->entity_string}_issued_to") ?: ctrans('texts.quote_issued_to'),
|
||||
'$partial_due_date_label' => ctrans('texts.partial_due_date'),
|
||||
'$invoice.datetime_label' => ctrans('texts.datetime_format_id'),
|
||||
'$invoice.due_date_label' => ctrans('texts.due_date'),
|
||||
'$invoice.due_date_label' => ctrans('texts.invoice_due_date'),
|
||||
'$company.address1_label' => ctrans('texts.address1'),
|
||||
'$company.address2_label' => ctrans('texts.address2'),
|
||||
'$total_tax_labels_label' => ctrans('texts.total_taxes'),
|
||||
@ -704,16 +704,16 @@ class PdfMock
|
||||
'$contact.email_label' => ctrans('texts.email'),
|
||||
'$invoice.taxes_label' => ctrans('texts.taxes'),
|
||||
'$credit_amount_label' => ctrans('texts.credit_amount'),
|
||||
'$invoice.total_label' => ctrans('texts.total'),
|
||||
'$invoice.total_label' => ctrans('texts.invoice_total'),
|
||||
'$product.date_label' => ctrans('texts.date'),
|
||||
'$product.item_label' => ctrans('texts.item'),
|
||||
'$public_notes_label' => ctrans('texts.public_notes'),
|
||||
'$entity.terms_label' => ctrans('texts.terms'),
|
||||
'$task.service_label' => ctrans('texts.service'),
|
||||
'$portalButton_label' => '',
|
||||
'$payment.date_label' => ctrans('texts.date'),
|
||||
'$payment.date_label' => ctrans('texts.payment_date'),
|
||||
'$client.phone_label' => ctrans('texts.phone'),
|
||||
'$invoice.date_label' => ctrans('texts.date'),
|
||||
'$invoice.date_label' => ctrans('texts.invoice_date'),
|
||||
'$client.state_label' => ctrans('texts.state'),
|
||||
'$number_short_label' => '',
|
||||
'$quote.number_label' => ctrans('texts.number'),
|
||||
|
4
public/flutter_service_worker.js
vendored
4
public/flutter_service_worker.js
vendored
@ -19,8 +19,8 @@ const RESOURCES = {"canvaskit/skwasm.worker.js": "bfb704a6c714a75da9ef320991e88b
|
||||
"favicon.png": "dca91c54388f52eded692718d5a98b8b",
|
||||
"version.json": "1592dbbd49cf08963e29ab3a85640d96",
|
||||
"favicon.ico": "51636d3a390451561744c42188ccd628",
|
||||
"/": "4d52b106941ff0bbd6a95ee763d5001e",
|
||||
"main.dart.js": "3c5971d15e707f2ae7d63b1b65afdec5",
|
||||
"/": "acc1cbe71191357e326b4c27b207aeeb",
|
||||
"main.dart.js": "59212a1c026258cab60381abfd8e607b",
|
||||
"assets/AssetManifest.json": "759f9ef9973f7e26c2a51450b55bb9fa",
|
||||
"assets/packages/intl_phone_field/assets/flags/mn.png": "16086e8d89c9067d29fd0f2ea7021a45",
|
||||
"assets/packages/intl_phone_field/assets/flags/vi.png": "3f317c56f31971b3179abd4e03847036",
|
||||
|
91327
public/main.dart.js
vendored
91327
public/main.dart.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
86963
public/main.foss.dart.js
vendored
86963
public/main.foss.dart.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
167
public/main.profile.dart.js
vendored
167
public/main.profile.dart.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user