Skip to content

corregido el bug de las casillas 12 - 13 y 28 - 29 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pabloferrandezroca wants to merge 2 commits into
base: master
Choose a base branch
from
Open

corregido el bug de las casillas 12 - 13 y 28 - 29 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ae4064
corregido el bug de las casillas 12 - 13 y 28 - 29
Pabloferrandezroca Apr 24, 2026
5014fe8
arreglado error en los tests
Pabloferrandezroca Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions Lib/Modelo303.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

use FacturaScripts\Core\Base\DataBase;
use FacturaScripts\Core\Tools;
use FacturaScripts\Dinamic\Lib\InvoiceOperation;
use FacturaScripts\Dinamic\Model\Ejercicio;
use FacturaScripts\Dinamic\Model\Join\PartidaImpuestoResumen;

Expand Down Expand Up @@ -61,8 +62,6 @@ class Modelo303
// Adquisiciones intracomunitarias
'IVARUE' => ['21' => ['base' => '10', 'cuota' => '11']],

// Operaciones con inversión del sujeto pasivo
// TODO: 'xxxxx' => ['21' => ['base' => '12', 'cuota' => '13']],

// Recargo de equivalencia
'IVARRE' => [
Expand Down Expand Up @@ -154,6 +153,7 @@ public function loadFromResumen(array $resumen): void
foreach ($resumen as $item) {
$this->addMovimiento(
$item->codcuentaesp ?? '',
$item->operacion ?? '',
(float) $item->iva,
(float) $item->recargo,
(float) $item->baseimponible,
Expand Down Expand Up @@ -182,20 +182,23 @@ public static function treasury(string $codejercicio, string $period): array
];
}

/**
* Add a tax movement to the model (base + quota by type and rate)
* - Determine the correct square based on the type and tax rate.
* - Update the base and quota squares accordingly.
*
* @param string $tipo
* @param float $iva
* @param float $recargo
* @param float $base
* @param float $cuota
* @return void
*/
private function addMovimiento(string $tipo, float $iva, float $recargo, float $base, float $cuota): void
private function addMovimiento(string $tipo, string $operacion, float $iva, float $recargo, float $base, float $cuota): void
{
// ISP: inversión del sujeto pasivo (no-UE, servicios intracomunitarios B2B, doméstico art. 84)
// Devengado → casillas 12-13 / deducible → casillas 28-29
if (in_array($operacion, [InvoiceOperation::REVERSE_CHARGE, InvoiceOperation::INTRA_COMMUNITY_SERVICES])) {
if (in_array($tipo, ['IVAREP', 'IVARUE'])) {
$this->square['12'] += $base;
$this->square['13'] += $cuota;
return;
}
if (in_array($tipo, ['IVASOP', 'IVASUE'])) {
$this->square['28'] += $base;
$this->square['29'] += $cuota;
return;
}
}

if (false === isset($this->casillaMap[$tipo])) {
return;
}
Expand Down
12 changes: 9 additions & 3 deletions Model/Join/PartidaImpuestoResumen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* This file is part of Modelo303 plugin for FacturaScripts
* Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
* Copyright (C) 2017-2026 Carlos Garcia Gomez <carlos@facturascripts.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand Down Expand Up @@ -44,6 +44,7 @@ protected function getFields(): array

'codcuentaesp' => 'COALESCE(subcuentas.codcuentaesp, cuentas.codcuentaesp)',
'tipo_desc' => 'cuentasesp.descripcion',
'operacion' => 'COALESCE(facturasprov.operacion, facturascli.operacion)',

'baseimponible' => $this->sqlForRoundedSum('partidas.baseimponible'),
'debe' => $this->sqlForRoundedSum('partidas.debe'),
Expand All @@ -65,7 +66,8 @@ protected function getGroupFields(): string
. ', partidas.recargo'
. ', subcuentas.descripcion'
. ', COALESCE(subcuentas.codcuentaesp, cuentas.codcuentaesp)'
. ', cuentasesp.descripcion';
. ', cuentasesp.descripcion'
. ', COALESCE(facturasprov.operacion, facturascli.operacion)';
}

/**
Expand All @@ -80,7 +82,9 @@ protected function getSQLFrom(): string
. ' INNER JOIN subcuentas on subcuentas.idsubcuenta = partidas.idsubcuenta'
. ' INNER JOIN cuentas on cuentas.idcuenta = subcuentas.idcuenta'
. ' LEFT JOIN cuentasesp on cuentasesp.codcuentaesp = coalesce(subcuentas.codcuentaesp, cuentas.codcuentaesp)'
. ' LEFT JOIN series on series.codserie = partidas.codserie';
. ' LEFT JOIN series on series.codserie = partidas.codserie'
. ' LEFT JOIN (SELECT codigo, operacion FROM facturasprov) facturasprov on facturasprov.codigo = asientos.documento'
. ' LEFT JOIN (SELECT codigo, operacion FROM facturascli) facturascli on facturascli.codigo = asientos.documento';
}

/**
Expand All @@ -97,6 +101,8 @@ protected function getTables(): array
'cuentas',
'cuentasesp',
'series',
'facturasprov',
'facturascli',
];
}

Expand Down
6 changes: 3 additions & 3 deletions Test/main/ComprobarFechaDevengoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function testComprobarFechaDevengo()
$partidaImpuestoResumen = new PartidaImpuestoResumen();
$partida = $partidaImpuestoResumen->all([
new DataBaseWhere('COALESCE(subcuentas.codcuentaesp, cuentas.codcuentaesp)', 'IVAREP'),
new DataBaseWhere('fecha', Tools::date()),
new DataBaseWhere('asientos.fecha', Tools::date()),
])[0];
$this->assertEquals($invoiceFechaHoy->totaliva, $partida->cuotaiva);
$this->assertEquals($invoiceFechaHoy->totaliva, $partida->haber);
Expand All @@ -77,7 +77,7 @@ public function testComprobarFechaDevengo()
$partidaImpuestoResumen = new PartidaImpuestoResumen();
$partida = $partidaImpuestoResumen->all([
new DataBaseWhere('COALESCE(subcuentas.codcuentaesp, cuentas.codcuentaesp)', 'IVAREP'),
new DataBaseWhere('fecha', Tools::date('-1 month')),
new DataBaseWhere('asientos.fecha', Tools::date('-1 month')),
])[0];
$this->assertEquals($invoiceFechaDevengoAnterior->totaliva, $partida->cuotaiva);
$this->assertEquals($invoiceFechaDevengoAnterior->totaliva, $partida->haber);
Expand All @@ -86,7 +86,7 @@ public function testComprobarFechaDevengo()
$partidaImpuestoResumen = new PartidaImpuestoResumen();
$partida = $partidaImpuestoResumen->all([
new DataBaseWhere('COALESCE(subcuentas.codcuentaesp, cuentas.codcuentaesp)', 'IVAREP'),
new DataBaseWhere('fecha', Tools::date('+1 month')),
new DataBaseWhere('asientos.fecha', Tools::date('+1 month')),
])[0];
$this->assertEquals($invoiceFechaDevengoPosterior->totaliva, $partida->cuotaiva);
$this->assertEquals($invoiceFechaDevengoPosterior->totaliva, $partida->haber);
Expand Down