Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10782 from turbo124/v5-develop 

v5.11.59
This commit is contained in:
David Bomba 2025-03-18 04:05:11 +11:00 committed by GitHub
parent f411ff9f68 da3a5aae4b
commit 34993ecc34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.11.58 5.11.59

6
app/Export/CSV/InvoiceItemExport.php
View File

@ -169,9 +169,9 @@ class InvoiceItemExport extends BaseExport
$tmp_key = str_replace("item.", "", $key); $tmp_key = str_replace("item.", "", $key);
if ($tmp_key == 'type_id') { // if ($tmp_key == 'type_id') {
$tmp_key = 'type'; // $tmp_key = 'type';
} // }
if ($tmp_key == 'tax_id') { if ($tmp_key == 'tax_id') {
$tmp_key = 'tax_category'; $tmp_key = 'tax_category';

6
app/Export/CSV/PurchaseOrderItemExport.php
View File

@ -155,9 +155,9 @@ class PurchaseOrderItemExport extends BaseExport
$tmp_key = str_replace("item.", "", $key); $tmp_key = str_replace("item.", "", $key);
if ($tmp_key == 'type_id') { // if ($tmp_key == 'type_id') {
$tmp_key = 'type'; // $tmp_key = 'type';
} // }
if ($tmp_key == 'tax_id') { if ($tmp_key == 'tax_id') {
$tmp_key = 'tax_category'; $tmp_key = 'tax_category';

6
app/Export/CSV/QuoteItemExport.php
View File

@ -163,9 +163,9 @@ class QuoteItemExport extends BaseExport
$tmp_key = str_replace("item.", "", $key); $tmp_key = str_replace("item.", "", $key);
if ($tmp_key == 'type_id') { // if ($tmp_key == 'type_id') {
$tmp_key = 'type'; // $tmp_key = 'type';
} // }
if ($tmp_key == 'tax_id') { if ($tmp_key == 'tax_id') {
$tmp_key = 'tax_category'; $tmp_key = 'tax_category';

5
app/Services/EDocument/Standards/Peppol.php
View File

@ -215,7 +215,10 @@ class Peppol extends AbstractService
} }
/** Auto switch between Invoice / Credit based on the amount value */ /** Auto switch between Invoice / Credit based on the amount value */
$this->p_invoice->InvoiceTypeCode = ($this->invoice->amount >= 0) ? 380 : 381;
// $this->p_invoice->InvoiceTypeCode = ($this->invoice->amount >= 0) ? 380 : 381;
$this->p_invoice->InvoiceTypeCode = 380;
$this->p_invoice->AccountingSupplierParty = $this->getAccountingSupplierParty(); $this->p_invoice->AccountingSupplierParty = $this->getAccountingSupplierParty();
$this->p_invoice->AccountingCustomerParty = $this->getAccountingCustomerParty(); $this->p_invoice->AccountingCustomerParty = $this->getAccountingCustomerParty();

2
app/Services/Email/Email.php
View File

@ -966,7 +966,7 @@ class Email implements ShouldQueue
*/ */
private function entityEmailFailed(string $message = ''): void private function entityEmailFailed(string $message = ''): void
{ {
$class = get_class($this->email_object->entity); $class = $this->email_object->entity ? get_class($this->email_object->entity) : false;
switch ($class) { switch ($class) {
case Invoice::class: case Invoice::class:

2
app/Services/Pdf/PdfBuilder.php
View File

@ -471,6 +471,8 @@ class PdfBuilder
$tbody = []; $tbody = [];
$this->payment_amount_total = 0;
foreach ($this->service->options['invoices'] as $invoice) { foreach ($this->service->options['invoices'] as $invoice) {
foreach ($invoice->payments as $payment) { foreach ($invoice->payments as $payment) {
if ($payment->is_deleted) { if ($payment->is_deleted) {

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.11.58'), 'app_version' => env('APP_VERSION', '5.11.59'),
'app_tag' => env('APP_TAG', '5.11.58'), 'app_tag' => env('APP_TAG', '5.11.59'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),