Fixes for BE => BE tax free transactions
This commit is contained in:
parent
8208db23d2
commit
5b5222b4d3
|
|
@ -1 +1 @@
|
|||
5.12.14
|
||||
5.12.15
|
||||
|
|
@ -94,7 +94,6 @@ class ChartService
|
|||
$data[$key]['expenses'] = $this->getExpenseChartQuery($start_date, $end_date, $key);
|
||||
}
|
||||
|
||||
|
||||
$data[999]['invoices'] = $this->getAggregateInvoiceChartQuery($start_date, $end_date);
|
||||
$data[999]['outstanding'] = $this->getAggregateOutstandingChartQuery($start_date, $end_date);
|
||||
$data[999]['payments'] = $this->getAggregatePaymentChartQuery($start_date, $end_date);
|
||||
|
|
|
|||
|
|
@ -250,11 +250,11 @@ class SendEDocument implements ShouldQueue
|
|||
nlog($exception->getMessage());
|
||||
}
|
||||
|
||||
config(['queue.failed.driver' => null]);
|
||||
// config(['queue.failed.driver' => null]);
|
||||
}
|
||||
|
||||
public function middleware()
|
||||
{
|
||||
return [new WithoutOverlapping($this->entity.$this->id.$this->db)];
|
||||
return [(new WithoutOverlapping($this->entity.$this->id.$this->db))->releaseAfter(60)->expireAfter(60)];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -717,6 +717,10 @@ class Peppol extends AbstractService
|
|||
$tax_type = 'G'; //Free export item, VAT not charged
|
||||
$reason_code = 'vatex-eu-g';
|
||||
$reason = 'Export outside the EU';
|
||||
} elseif($this->invoice->client->country->iso_3166_2 == $this->company->country()->iso_3166_2) {
|
||||
$tax_type = 'E';
|
||||
$reason_code = "vatex-eu-o";
|
||||
$reason = 'Services outside scope of tax';
|
||||
} else {
|
||||
$tax_type = 'O';
|
||||
$reason_code = "vatex-eu-o";
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ return [
|
|||
'require_https' => env('REQUIRE_HTTPS', true),
|
||||
'app_url' => rtrim(env('APP_URL', ''), '/'),
|
||||
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
|
||||
'app_version' => env('APP_VERSION', '5.12.14'),
|
||||
'app_tag' => env('APP_TAG', '5.12.14'),
|
||||
'app_version' => env('APP_VERSION', '5.12.15'),
|
||||
'app_tag' => env('APP_TAG', '5.12.15'),
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', false),
|
||||
|
|
|
|||
Loading…
Reference in New Issue