diff --git a/Controller/Modelo347.php b/Controller/Modelo347.php index 8690010..18c63e1 100644 --- a/Controller/Modelo347.php +++ b/Controller/Modelo347.php @@ -323,7 +323,7 @@ protected function getCustomersDataAccounting(): array // buscamos el cliente de la subcuenta $cliente = new Cliente(); $where = [new DataBaseWhere('codsubcuenta', $row['codsubcuenta'])]; - if (false === $cliente->loadFromCode('', $where)) { + if (false === $cliente->loadWhere($where)) { // no se ha encontrado el cliente, saltamos continue; } @@ -389,7 +389,7 @@ protected function getCustomersDataInvoices(): array ]; $cliente = new Cliente(); - if ($cliente->loadFromCode($codcliente)) { + if ($cliente->load($codcliente)) { $dir = $cliente->getDefaultAddress(); $items[$codcliente]['cifnif'] = $cliente->cifnif; $items[$codcliente]['cliente'] = $cliente->razonsocial; @@ -457,7 +457,7 @@ protected function getSuppliersDataAccounting(): array // buscamos el proveedor de la subcuenta $proveedor = new Proveedor(); $where = [new DataBaseWhere('codsubcuenta', $row['codsubcuenta'])]; - if (false === $proveedor->loadFromCode('', $where)) { + if (false === $proveedor->loadWhere($where)) { // no existe, saltamos continue; } @@ -524,7 +524,7 @@ protected function getSuppliersDataInvoices(): array ]; $proveedor = new Proveedor(); - if ($proveedor->loadFromCode($codproveedor)) { + if ($proveedor->load($codproveedor)) { $dir = $proveedor->getDefaultAddress(); $items[$codproveedor]['cifnif'] = $proveedor->cifnif; $items[$codproveedor]['proveedor'] = $proveedor->razonsocial; diff --git a/Extension/Model/Cliente.php b/Extension/Model/Cliente.php index 22b7486..d28a300 100644 --- a/Extension/Model/Cliente.php +++ b/Extension/Model/Cliente.php @@ -18,6 +18,9 @@ */ namespace FacturaScripts\Plugins\Modelo347\Extension\Model; +use FacturaScripts\Core\Tools; + + use Closure; /** diff --git a/Extension/Model/FacturaCliente.php b/Extension/Model/FacturaCliente.php index 79dbfd5..c1a1d34 100644 --- a/Extension/Model/FacturaCliente.php +++ b/Extension/Model/FacturaCliente.php @@ -18,6 +18,9 @@ */ namespace FacturaScripts\Plugins\Modelo347\Extension\Model; +use FacturaScripts\Core\Tools; + + use Closure; /** diff --git a/Extension/Model/FacturaProveedor.php b/Extension/Model/FacturaProveedor.php index ba85fab..e1d145c 100644 --- a/Extension/Model/FacturaProveedor.php +++ b/Extension/Model/FacturaProveedor.php @@ -18,6 +18,9 @@ */ namespace FacturaScripts\Plugins\Modelo347\Extension\Model; +use FacturaScripts\Core\Tools; + + use Closure; /** diff --git a/Extension/Model/Proveedor.php b/Extension/Model/Proveedor.php index 312446e..65af1c6 100644 --- a/Extension/Model/Proveedor.php +++ b/Extension/Model/Proveedor.php @@ -18,6 +18,9 @@ */ namespace FacturaScripts\Plugins\Modelo347\Extension\Model; +use FacturaScripts\Core\Tools; + + use Closure; /** diff --git a/Init.php b/Init.php index 0a310cf..786caf5 100644 --- a/Init.php +++ b/Init.php @@ -19,9 +19,11 @@ namespace FacturaScripts\Plugins\Modelo347; -use FacturaScripts\Core\Base\AjaxForms\PurchasesHeaderHTML; -use FacturaScripts\Core\Base\AjaxForms\SalesHeaderHTML; +use FacturaScripts\Core\Lib\AjaxForms\PurchasesHeaderHTML; +use FacturaScripts\Core\Lib\AjaxForms\SalesHeaderHTML; use FacturaScripts\Core\Template\InitClass; +use FacturaScripts\Core\Tools; + use FacturaScripts\Dinamic\Model\FacturaCliente; use FacturaScripts\Dinamic\Model\FacturaProveedor; use FacturaScripts\Dinamic\Model\User; diff --git a/Lib/Txt347Export.php b/Lib/Txt347Export.php index 85beb70..522d9dc 100644 --- a/Lib/Txt347Export.php +++ b/Lib/Txt347Export.php @@ -98,7 +98,7 @@ protected static function formatString(string $string, int $length, string $char protected static function loadCompany(): void { self::$company = new Empresa(); - self::$company->loadFromCode(self::$exercise->idempresa); + self::$company->load(self::$exercise->idempresa); } protected static function getCompanyData(): string @@ -175,13 +175,13 @@ protected static function getDecimal($number): int protected static function loadExercise(string $codejercicio): void { self::$exercise = new Ejercicio(); - self::$exercise->loadFromCode($codejercicio); + self::$exercise->load($codejercicio); } protected static function getPais(string $codpais): string { $paisModel = new Pais(); - if ($paisModel->loadFromCode($codpais) && $paisModel->codiso !== 'ES') { + if ($paisModel->load($codpais) && $paisModel->codiso !== 'ES') { return self::formatString($paisModel->codiso, 2, '', STR_PAD_LEFT); } diff --git a/Mod/PurchasesHeaderHTMLMod.php b/Mod/PurchasesHeaderHTMLMod.php index f018b29..8ca30a2 100644 --- a/Mod/PurchasesHeaderHTMLMod.php +++ b/Mod/PurchasesHeaderHTMLMod.php @@ -19,10 +19,12 @@ namespace FacturaScripts\Plugins\Modelo347\Mod; -use FacturaScripts\Core\Base\Contract\PurchasesModInterface; -use FacturaScripts\Core\Base\Translator; +use FacturaScripts\Core\Contract\PurchasesModInterface; +use FacturaScripts\Core\Translator; use FacturaScripts\Core\Model\Base\PurchaseDocument; use FacturaScripts\Core\Model\User; +use FacturaScripts\Core\Tools; + /** * Add new fields in the modal window of the document header @@ -33,14 +35,14 @@ */ class PurchasesHeaderHTMLMod implements PurchasesModInterface { - public function apply(PurchaseDocument &$model, array $formData, User $user) + public function apply(PurchaseDocument &$model, array $formData):void { if (property_exists($model, 'excluir347')) { $model->excluir347 = ($formData['excluir347'] ?? '') === 'true'; } } - public function applyBefore(PurchaseDocument &$model, array $formData, User $user) + public function applyBefore(PurchaseDocument &$model, array $formData): void { } @@ -58,9 +60,10 @@ public function newFields(): array return []; } - public function renderField(Translator $i18n, PurchaseDocument $model, string $field): ?string + public function renderField(PurchaseDocument $model, string $field): ?string { if ($field == 'excluir347') { + $i18n = new Translator(); return $this->excluir347($i18n, $model); } @@ -88,8 +91,8 @@ private static function excluir347(Translator $i18n, PurchaseDocument $model): s $attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""'; return '
' - . '
' . $i18n->trans('exclude-347') - . '' + . '
' . $i18n->trans('exclude-347') + . '' . '
' . '
'; } diff --git a/Mod/SalesHeaderHTMLMod.php b/Mod/SalesHeaderHTMLMod.php index 254c92d..4e71ba2 100644 --- a/Mod/SalesHeaderHTMLMod.php +++ b/Mod/SalesHeaderHTMLMod.php @@ -19,10 +19,12 @@ namespace FacturaScripts\Plugins\Modelo347\Mod; -use FacturaScripts\Core\Base\Contract\SalesModInterface; -use FacturaScripts\Core\Base\Translator; +use FacturaScripts\Core\Contract\SalesModInterface; +use FacturaScripts\Core\Translator; use FacturaScripts\Core\Model\Base\SalesDocument; use FacturaScripts\Core\Model\User; +use FacturaScripts\Core\Tools; + /** * Add new fields in the modal window of the document header @@ -33,14 +35,14 @@ */ class SalesHeaderHTMLMod implements SalesModInterface { - public function apply(SalesDocument &$model, array $formData, User $user) + public function apply(SalesDocument &$model, array $formData): void { if (property_exists($model, 'excluir347')) { $model->excluir347 = ($formData['excluir347'] ?? '') === 'true'; } } - public function applyBefore(SalesDocument &$model, array $formData, User $user) + public function applyBefore(SalesDocument &$model, array $formData): void { } @@ -63,9 +65,10 @@ public function newModalFields(): array return ['excluir347']; } - public function renderField(Translator $i18n, SalesDocument $model, string $field): ?string + public function renderField(SalesDocument $model, string $field): ?string { if ($field == 'excluir347') { + $i18n = new Translator(); return $this->excluir347($i18n, $model); } @@ -88,8 +91,8 @@ private static function excluir347(Translator $i18n, SalesDocument $model): stri $attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""'; return '
' - . '
' . $i18n->trans('exclude-347') - . '' + . '
' . $i18n->trans('exclude-347') + . '' . '
' . '
'; } diff --git a/Test/main/Extension/Table/FacturasTest.php b/Test/main/Extension/Table/FacturasTest.php index d239fe6..e9e84a8 100644 --- a/Test/main/Extension/Table/FacturasTest.php +++ b/Test/main/Extension/Table/FacturasTest.php @@ -63,12 +63,12 @@ public function testExistsPropertyFacturaCliente() $this->assertTrue($invoice->exists(), 'invoice-not-exists'); // comprobar el campo - $this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load'); + $this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load'); $this->assertTrue($invoice->excluir347, 'value-not-saved'); $invoice->excluir347 = false; $this->assertTrue($invoice->save(), 'cant-create-invoice'); - $this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load'); + $this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load'); $this->assertFalse($invoice->excluir347, 'value-not-saved'); // eliminar la factura @@ -97,12 +97,12 @@ public function testExistsPropertyFacturaProveedor() $this->assertTrue($invoice->exists(), 'invoice-not-exists'); // comprobar el campo - $this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load'); + $this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load'); $this->assertTrue($invoice->excluir347, 'value-not-saved'); $invoice->excluir347 = false; $this->assertTrue($invoice->save(), 'cant-create-invoice'); - $this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load'); + $this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load'); $this->assertFalse($invoice->excluir347, 'value-not-saved'); // eliminar la factura diff --git a/View/Modelo347.html.twig b/View/Modelo347.html.twig index bb65883..d12a4bc 100644 --- a/View/Modelo347.html.twig +++ b/View/Modelo347.html.twig @@ -24,11 +24,11 @@
-
+
-
+
{{ trans('exercise') }} - {% for company in fsc.empresa.all() %} {% for exercise in fsc.allExercises(company.idempresa) %} @@ -45,9 +45,9 @@
{# Examine Input #}
-
+
{{ trans('examine') }} - {% for type in fsc.allExamine() %} {% if type == fsc.examine %} @@ -60,7 +60,7 @@
{# Amount Input #}
-
+
{{ trans('amount') }} @@ -68,9 +68,9 @@
{# Grouping Type Input #}
-
+
{{ trans('grouping-type') }} - {% for groupby in fsc.allGroupBy() %} {% if groupby == fsc.grouping %} @@ -83,7 +83,7 @@
{# Exclude IRPF Input #}
-
+
{% if fsc.excludeIrpf %} @@ -101,16 +101,16 @@ {{ trans('preview') }}
-
@@ -123,14 +123,14 @@
  • {{ trans('customers') }}
  • {{ trans('suppliers') }} @@ -161,11 +161,11 @@ {{ trans('zip-code') }} {{ trans('city') }} {{ trans('province') }} - {{ trans('first-trimester') }} - {{ trans('second-trimester') }} - {{ trans('third-trimester') }} - {{ trans('fourth-trimester') }} - {{ trans('total') }} + {{ trans('first-trimester') }} + {{ trans('second-trimester') }} + {{ trans('third-trimester') }} + {{ trans('fourth-trimester') }} + {{ trans('total') }} @@ -176,20 +176,20 @@ {{ row.codpostal }} {{ row.ciudad | raw }} {{ row.provincia | raw }} - {{ money(row.t1) }} - {{ money(row.t2) }} - {{ money(row.t3) }} - {{ money(row.t4) }} - {{ money(row.total) }} + {{ money(row.t1) }} + {{ money(row.t2) }} + {{ money(row.t3) }} + {{ money(row.t4) }} + {{ money(row.total) }} {% endfor %} - {{ money(fsc.customersTotals.t1) }} - {{ money(fsc.customersTotals.t2) }} - {{ money(fsc.customersTotals.t3) }} - {{ money(fsc.customersTotals.t4) }} - {{ money(fsc.customersTotals.total) }} + {{ money(fsc.customersTotals.t1) }} + {{ money(fsc.customersTotals.t2) }} + {{ money(fsc.customersTotals.t3) }} + {{ money(fsc.customersTotals.t4) }} + {{ money(fsc.customersTotals.total) }} @@ -206,11 +206,11 @@ {{ trans('zip-code') }} {{ trans('city') }} {{ trans('province') }} - {{ trans('first-trimester') }} - {{ trans('second-trimester') }} - {{ trans('third-trimester') }} - {{ trans('fourth-trimester') }} - {{ trans('total') }} + {{ trans('first-trimester') }} + {{ trans('second-trimester') }} + {{ trans('third-trimester') }} + {{ trans('fourth-trimester') }} + {{ trans('total') }} @@ -221,20 +221,20 @@ {{ row.codpostal }} {{ row.ciudad | raw }} {{ row.provincia | raw }} - {{ money(row.t1) }} - {{ money(row.t2) }} - {{ money(row.t3) }} - {{ money(row.t4) }} - {{ money(row.total) }} + {{ money(row.t1) }} + {{ money(row.t2) }} + {{ money(row.t3) }} + {{ money(row.t4) }} + {{ money(row.total) }} {% endfor %} - {{ money(fsc.suppliersTotals.t1) }} - {{ money(fsc.suppliersTotals.t2) }} - {{ money(fsc.suppliersTotals.t3) }} - {{ money(fsc.suppliersTotals.t4) }} - {{ money(fsc.suppliersTotals.total) }} + {{ money(fsc.suppliersTotals.t1) }} + {{ money(fsc.suppliersTotals.t2) }} + {{ money(fsc.suppliersTotals.t3) }} + {{ money(fsc.suppliersTotals.t4) }} + {{ money(fsc.suppliersTotals.total) }} diff --git a/facturascripts.ini b/facturascripts.ini index d9bad28..feefde4 100644 --- a/facturascripts.ini +++ b/facturascripts.ini @@ -1,4 +1,4 @@ name = 'Modelo347' description = 'Permite obtener los datos necesarios para el modelo 347 de la hacienda española.' version = 3.1 -min_version = 2024.5 \ No newline at end of file +min_version = 2025 \ No newline at end of file