Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-13 09:54:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for e-invoices

Browse Source
This commit is contained in:
David Bomba 2023-08-06 11:44:52 +10:00
parent 2748df1bce
commit 3766a67ec1
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.25 5.6.26

2
app/Services/Invoice/EInvoice/FacturaEInvoice.php
View File

@ -483,7 +483,7 @@ class FacturaEInvoice extends AbstractService
"website" => substr($company->settings->website, 0, 50), "website" => substr($company->settings->website, 0, 50),
"contactPeople" => substr($company->owner()->present()->name(), 0, 40), "contactPeople" => substr($company->owner()->present()->name(), 0, 40),
"firstName" => $company->owner()->present()->firstName(), "firstName" => $company->owner()->present()->firstName(),
"lastName" => $company->owner()->present()->lastName(); "lastName" => $company->owner()->present()->lastName(),
// 'centres' => $this->setFace(), // 'centres' => $this->setFace(),
// "cnoCnae" => "04647", // Clasif. Nacional de Act. Económicas // "cnoCnae" => "04647", // Clasif. Nacional de Act. Económicas
// "ineTownCode" => "280796" // Cód. de municipio del INE // "ineTownCode" => "280796" // Cód. de municipio del INE

1
app/Services/Invoice/EInvoice/ZugferdEInvoice.php
View File

@ -91,6 +91,7 @@ class ZugferdEInvoice extends AbstractService
//Create line items and calculate taxes //Create line items and calculate taxes
foreach ($this->invoice->line_items as $index => $item) { foreach ($this->invoice->line_items as $index => $item) {
/** @var \App\DataMapper\InvoiceItem $item **/
$xrechnung->addNewPosition($index) $xrechnung->addNewPosition($index)
->setDocumentPositionGrossPrice($item->gross_line_total) ->setDocumentPositionGrossPrice($item->gross_line_total)
->setDocumentPositionNetPrice($item->line_total); ->setDocumentPositionNetPrice($item->line_total);

8
app/Utils/Traits/MakesReminders.php
View File

@ -16,18 +16,18 @@ use Illuminate\Support\Carbon;
/** /**
* Class MakesReminders. * Class MakesReminders.
*
*/ */
trait MakesReminders trait MakesReminders
{ {
/** /**
*
* @param string $schedule_reminder * @param string $schedule_reminder
* @param string $num_days_reminder * @param string $num_days_reminder
* @return ?bool * @return ?bool
*/ */
public function inReminderWindow($schedule_reminder, $num_days_reminder) public function inReminderWindow($schedule_reminder, $num_days_reminder)
{ {
/** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\RecurringInvoice | \App\Models\Credit $this **/
$offset = $this->client->timezone_offset(); $offset = $this->client->timezone_offset();
switch ($schedule_reminder) { switch ($schedule_reminder) {
@ -44,7 +44,9 @@ trait MakesReminders
public function calculateTemplate(string $entity_string): string public function calculateTemplate(string $entity_string): string
{ {
//if invoice is currently a draft, or being marked as sent, this will be the initial email
/** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\RecurringInvoice | \App\Models\Credit $this **/
$client = $this->client; $client = $this->client;
if ($entity_string != 'invoice') { if ($entity_string != 'invoice') {

4
config/ninja.php
View File

@ -15,8 +15,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.6.25'), 'app_version' => env('APP_VERSION','5.6.26'),
'app_tag' => env('APP_TAG','5.6.25'), 'app_tag' => env('APP_TAG','5.6.26'),
'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', ''), 'api_secret' => env('API_SECRET', ''),