Skip to content

Añadir columna de método de pago en el informe de impuestos #89

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

Merged
NeoRazorX merged 1 commit into from
May 7, 2026
Merged

Añadir columna de método de pago en el informe de impuestos #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions Controller/ReportTaxes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ protected function exportAction(): void
Tools::trans('date') => $hide ? '' : Tools::date($row['fecha']),
Tools::trans('name') => $hide ? '' : Tools::fixHtml($row['nombre']),
Tools::trans('cifnif') => $hide ? '' : $row['cifnif'],
Tools::trans('payment-method') => $hide ? '' : $row['codpago'] ?? '',
Tools::trans('subaccount') => $hide ? '' : $row['codsubcuenta'] ?? '',
Tools::trans('city') => $hide ? '' : $row['ciudad'] ?? '',
Tools::trans('province') => $hide ? '' : $row['provincia'] ?? '',
Expand Down Expand Up @@ -244,7 +245,7 @@ protected function getReportData(): array
switch ($this->source) {
case 'purchases':
$sql .= 'SELECT f.codserie, f.codigo, f.numproveedor, f.fecha, f.fechadevengo, f.nombre, f.cifnif, l.pvptotal,'
. ' l.iva, l.recargo, l.irpf, l.suplido, f.dtopor1, f.dtopor2, f.total, f.operacion, pr.codsubcuenta,'
. ' l.iva, l.recargo, l.irpf, l.suplido, f.dtopor1, f.dtopor2, f.total, f.operacion, f.codpago, pr.codsubcuenta,'
. ' c.ciudad, c.provincia, c.codpostal, c.codpais'
. ' FROM lineasfacturasprov AS l'
. ' LEFT JOIN facturasprov AS f ON l.idfactura = f.idfactura '
Expand All @@ -259,7 +260,7 @@ protected function getReportData(): array

case 'sales':
$sql .= 'SELECT f.codserie, f.codigo, f.numero2, f.fecha, f.fechadevengo, f.nombrecliente AS nombre, f.cifnif, l.pvptotal,'
. ' l.iva, l.recargo, l.irpf, l.suplido, f.dtopor1, f.dtopor2, f.total, f.operacion, f.codpais, cl.codsubcuenta,'
. ' l.iva, l.recargo, l.irpf, l.suplido, f.dtopor1, f.dtopor2, f.total, f.operacion, f.codpago, f.codpais, cl.codsubcuenta,'
. ' f.ciudad, f.provincia, f.codpostal'
. ' FROM lineasfacturascli AS l'
. ' LEFT JOIN facturascli AS f ON l.idfactura = f.idfactura '
Expand Down Expand Up @@ -312,6 +313,7 @@ protected function getReportData(): array
'nombre' => $row['nombre'],
'codsubcuenta' => $row['codsubcuenta'],
'cifnif' => $row['cifnif'],
'codpago' => $row['codpago'] ?? null,
'neto' => $row['suplido'] ? 0 : $pvpTotal,
'iva' => $row['suplido'] ? 0 : (float)$row['iva'],
'totaliva' => $row['suplido'] || $row['operacion'] === InvoiceOperation::INTRA_COMMUNITY ? 0 : (float)$row['iva'] * $pvpTotal / 100,
Expand Down
9 changes: 9 additions & 0 deletions View/ReportTaxes.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,15 @@
</label>
</div>
</div>
<div class="col-sm-4 col-md-3 col-lg-2">
<div class="form-check">
<input class="form-check-input" type="checkbox" value="1"
name="column_payment_method" id="column_payment_method">
<label class="form-check-label" for="column_payment_method">
{{ trans('payment-method') }}
</label>
</div>
</div>
</div>
</div>
<div class="card-footer d-flex gap-2">
Expand Down