Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Lib/Accounting/VatRegularizationToAccounting.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ protected function addAccountingTaxLines(Asiento $accEntry, RegularizacionImpues

/**
* Comprueba si hay facturas sin asiento contable
* y cuyo importe sea distinto de cero.
*
* @param $reg
*
Expand All @@ -138,6 +139,7 @@ private function checkInvoicesWithoutAccEntry($reg): bool
Where::gte('fecha', $reg->fechainicio),
Where::lte('fecha', $reg->fechafin),
Where::isNull('idasiento'),
Where::notEq('total', 0),
];

$facturasSinAsiento = FacturaCliente::all($where, [], 0, 1);
Expand Down
5 changes: 3 additions & 2 deletions Model/Join/PartidaImpuesto.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ protected function getTables(): array
* Assign the values of the $data array to the model view properties.
*
* @param array $data
* @param array $exclude
*/
protected function loadFromData(array $data): void
public function loadFromData(array $data = [], array $exclude = []): void
{
parent::loadFromData($data);
parent::loadFromData($data, $exclude);

// La cuota es SIEMPRE el importe realmente contabilizado (debe/haber), nunca un
// recálculo base*tipo (que introduce desfases de céntimos). Usamos la misma fórmula
Expand Down
5 changes: 3 additions & 2 deletions Model/Join/PartidaImpuestoResumen.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ protected function getTables(): array
* Assign derived compatibility fields used by existing consumers.
*
* @param array $data
* @param array $exclude
*/
protected function loadFromData(array $data): void
public function loadFromData(array $data = [], array $exclude = []): void
{
parent::loadFromData($data);
parent::loadFromData($data, $exclude);

// El destino (IVA o recargo) lo determina el tipo de recargo de la partida, no la cuenta
// especial: el núcleo contabiliza el recargo de equivalencia en la cuenta de IVA
Expand Down