mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #8087 from turbo124/v5-develop
Minor fixes for tax currencies - vendor vs client
This commit is contained in:
commit
2244da8947
@ -386,7 +386,7 @@ trait MakesInvoiceValues
|
|||||||
private function makeLineTaxes() :string
|
private function makeLineTaxes() :string
|
||||||
{
|
{
|
||||||
$tax_map = $this->calc()->getTaxMap();
|
$tax_map = $this->calc()->getTaxMap();
|
||||||
$entity = $this->client ? $this->client : $this->company;
|
$entity = $this->client ? $this->client : $this->vendor;
|
||||||
|
|
||||||
$data = '';
|
$data = '';
|
||||||
|
|
||||||
@ -406,7 +406,7 @@ trait MakesInvoiceValues
|
|||||||
private function makeTotalTaxes() :string
|
private function makeTotalTaxes() :string
|
||||||
{
|
{
|
||||||
$data = '';
|
$data = '';
|
||||||
$entity = $this->client ? $this->client : $this->company;
|
$entity = $this->client ? $this->client : $this->vendor;
|
||||||
|
|
||||||
if (! $this->calc()->getTotalTaxMap()) {
|
if (! $this->calc()->getTotalTaxMap()) {
|
||||||
return $data;
|
return $data;
|
||||||
@ -439,7 +439,7 @@ trait MakesInvoiceValues
|
|||||||
private function totalTaxValues() :string
|
private function totalTaxValues() :string
|
||||||
{
|
{
|
||||||
$data = '';
|
$data = '';
|
||||||
$entity = $this->client ? $this->client : $this->company;
|
$entity = $this->client ? $this->client : $this->vendor;
|
||||||
|
|
||||||
if (! $this->calc()->getTotalTaxMap()) {
|
if (! $this->calc()->getTotalTaxMap()) {
|
||||||
return $data;
|
return $data;
|
||||||
@ -468,7 +468,7 @@ trait MakesInvoiceValues
|
|||||||
private function lineTaxValues() :string
|
private function lineTaxValues() :string
|
||||||
{
|
{
|
||||||
$tax_map = $this->calc()->getTaxMap();
|
$tax_map = $this->calc()->getTaxMap();
|
||||||
$entity = $this->client ? $this->client : $this->company;
|
$entity = $this->client ? $this->client : $this->vendor;
|
||||||
|
|
||||||
$data = '';
|
$data = '';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user