From b5cc24418c899a8dc2db8c8d5f8cd16ed9907572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20S=C3=A1nchez?= <estebansm85@gmail.com>
Date: Mon, 8 Jun 2026 14:21:07 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adir=20funcionalidad=20de=20edici=C3=B3n?=
 =?UTF-8?q?=20de=20asientos=20y=20vista=20de=20entrada=20contable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Arregla el bug que no aparece el campo para vincular proyectos en asientos
- Se ha añadido la clase EditAsiento para gestionar la edición de asientos.
- Se ha creado la clase Asiento para manejar la lógica de inserción y actualización de datos.
- Se ha añadido la vista AccountingEntry.html.twig para la interfaz de usuario de entrada contable.
- Se ha modificado Init.php para cargar las nuevas extensiones EditAsiento y Asiento.
---
 Extension/Controller/EditAsiento.php |  47 +++++
 Extension/Model/Asiento.php          |  49 ++++++
 Extension/XMLView/EditAsiento.xml    |  12 --
 Init.php                             |   2 +
 View/Tab/AccountingEntry.html.twig   | 250 +++++++++++++++++++++++++++
 5 files changed, 348 insertions(+), 12 deletions(-)
 create mode 100644 Extension/Controller/EditAsiento.php
 create mode 100644 Extension/Model/Asiento.php
 delete mode 100644 Extension/XMLView/EditAsiento.xml
 create mode 100644 View/Tab/AccountingEntry.html.twig

diff --git a/Extension/Controller/EditAsiento.php b/Extension/Controller/EditAsiento.php
new file mode 100644
index 0000000..4ec25f5
--- /dev/null
+++ b/Extension/Controller/EditAsiento.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * This file is part of Proyectos plugin for FacturaScripts
+ * Copyright (C) 2020-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
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FacturaScripts\Plugins\Proyectos\Extension\Controller;
+
+use Closure;
+use FacturaScripts\Dinamic\Model\Proyecto;
+use FacturaScripts\Plugins\Proyectos\Extension\Traits\ProjectControllerSalesPurchases;
+
+/**
+ * @author Esteban Sánchez Martínez <esteban@factura.city>
+ */
+
+class EditAsiento
+{
+    use ProjectControllerSalesPurchases;
+
+    public function createViews(): Closure
+    {
+        return function () {
+            $this->views['main']->template = '@PluginProyectos/Tab/AccountingEntry.html.twig';
+        };
+    }
+
+    public function getProyectos(): Closure
+    {
+        return function () {
+            return Proyecto::all([], ['nombre' => 'ASC'], 0, 0);
+        };
+    }
+}
diff --git a/Extension/Model/Asiento.php b/Extension/Model/Asiento.php
new file mode 100644
index 0000000..4b77742
--- /dev/null
+++ b/Extension/Model/Asiento.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * This file is part of Proyectos plugin for FacturaScripts
+ * Copyright (C) 2020-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
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FacturaScripts\Plugins\Proyectos\Extension\Model;
+
+use Closure;
+
+/**
+ * @author Esteban Sánchez Martínez <esteban@factura.city>
+ */
+
+class Asiento
+{
+    public function saveInsertBefore(): Closure
+    {
+        return function () {
+            $data = json_decode($_POST['data'] ?? '{}', true);
+            if (array_key_exists('idproyecto', $data)) {
+                $this->idproyecto = empty($data['idproyecto']) ? null : (int)$data['idproyecto'];
+            }
+        };
+    }
+
+    public function saveUpdateBefore(): Closure
+    {
+        return function () {
+            $data = json_decode($_POST['data'] ?? '{}', true);
+            if (array_key_exists('idproyecto', $data)) {
+                $this->idproyecto = empty($data['idproyecto']) ? null : (int)$data['idproyecto'];
+            }
+        };
+    }
+}
diff --git a/Extension/XMLView/EditAsiento.xml b/Extension/XMLView/EditAsiento.xml
deleted file mode 100644
index 1c63766..0000000
--- a/Extension/XMLView/EditAsiento.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<view>
-    <columns>
-        <group name="data" numcolumns="12">
-            <column name="project" titleurl="ListProyecto" order="105">
-                <widget type="autocomplete" fieldname="idproyecto" onclick="EditProyecto">
-                    <values source="proyectos" fieldcode="idproyecto" fieldtitle="nombre"/>
-                </widget>
-            </column>
-        </group>
-    </columns>
-</view>
\ No newline at end of file
diff --git a/Init.php b/Init.php
index 226bb91..6b37716 100644
--- a/Init.php
+++ b/Init.php
@@ -51,6 +51,7 @@ final class Init extends InitClass
     public function init(): void
     {
         $this->loadExtension(new Extension\Controller\DocumentStitcher());
+        $this->loadExtension(new Extension\Controller\EditAsiento());
         $this->loadExtension(new Extension\Controller\EditAlbaranCliente());
         $this->loadExtension(new Extension\Controller\EditAlbaranProveedor());
         $this->loadExtension(new Extension\Controller\EditCliente());
@@ -71,6 +72,7 @@ public function init(): void
         $this->loadExtension(new Extension\Controller\ListPresupuestoCliente());
         $this->loadExtension(new Extension\Controller\ListPresupuestoProveedor());
         $this->loadExtension(new Extension\Controller\NewServicioAT());
+        $this->loadExtension(new Extension\Model\Asiento());
         $this->loadExtension(new Extension\Model\Base\BusinessDocument());
         $this->loadExtension(new Extension\Model\Stock());
         $this->loadExtension(new Extension\Model\FacturaProgramada());
diff --git a/View/Tab/AccountingEntry.html.twig b/View/Tab/AccountingEntry.html.twig
new file mode 100644
index 0000000..37d9599
--- /dev/null
+++ b/View/Tab/AccountingEntry.html.twig
@@ -0,0 +1,250 @@
+{% set model = fsc.getCurrentView().model %}
+
+<script>
+    let editLine = 0;
+    findSubaccount = 0;
+
+    function findSubaccountSearch(action, id, input) {
+        findSubaccount++;
+        return setTimeout(function () {
+            accEntryFormAction(action, id, $(input).parent().find('button'));
+        }, 500);
+    }
+
+    function newLineAction(code) {
+        if (!document.forms['accEntryForm']['concepto'].value.trim()) {
+            alert('{{ trans("acc-concept-required") }}');
+            document.forms['accEntryForm']['concepto'].focus();
+            return false;
+        }
+        document.getElementById("new_subaccount").value = code;
+        return accEntryFormAction('new-line', '0');
+    }
+
+    function recalculateLine(recalculate, idlinea) {
+        editLine++;
+        return setTimeout(function () {
+            accEntryFormAction(recalculate, idlinea);
+        }, 500);
+    }
+
+    function restructureHeader() {
+        const row = document.querySelector('#accEntryFormHeader .row');
+        if (!row) return;
+
+        // eliminar inserciones previas
+        row.querySelectorAll('.proyecto-col, .header-row-break').forEach(function (el) {
+            el.remove();
+        });
+
+        // insertar w-100 break después del campo concepto (col-lg sin col-lg-2)
+        const cols = row.querySelectorAll('.col-sm-6');
+        cols.forEach(function (col) {
+            if (col.classList.contains('col-lg') && !col.classList.contains('col-lg-2')) {
+                const breakDiv = document.createElement('div');
+                breakDiv.className = 'w-100 header-row-break';
+                col.insertAdjacentElement('afterend', breakDiv);
+            }
+        });
+
+        // clonar el campo proyecto y añadirlo al row
+        const template = document.getElementById('proyecto-field-template');
+        if (!template) return;
+        const clone = template.firstElementChild.cloneNode(true);
+
+        // restaurar el valor seleccionado desde el input hidden
+        const hiddenInput = document.getElementById('idproyecto-value');
+        const select = clone.querySelector('select');
+        if (select && hiddenInput) {
+            select.value = hiddenInput.value;
+            select.addEventListener('change', function () {
+                hiddenInput.value = this.value;
+            });
+        }
+
+        row.appendChild(clone);
+    }
+
+    function accEntryFormAction(action, selectedLine) {
+        animateSpinner('add');
+
+        if (editLine > 1) {
+            editLine--;
+            return false;
+        }
+
+        if (findSubaccount > 1) {
+            findSubaccount--;
+            return false;
+        }
+
+        editLine = 0;
+        findSubaccount = 0;
+        document.forms['accEntryForm']['action'].value = action;
+        document.forms['accEntryForm']['selectedLine'].value = selectedLine;
+
+        const formData = new FormData(document.forms['accEntryForm']);
+        const plainFormData = Object.fromEntries(formData.entries());
+        const formDataJsonString = JSON.stringify(plainFormData);
+
+        let data = new FormData();
+        data.append('action', action);
+        data.append('code', document.forms['accEntryForm']['code'].value);
+        data.append('multireqtoken', document.forms['accEntryForm']['multireqtoken'].value);
+        data.append('selectedLine', document.forms['accEntryForm']['selectedLine'].value);
+        data.append('idasiento', document.forms['accEntryForm']['idasiento'].value);
+        data.append('data', formDataJsonString);
+
+        fetch('{{ fsc.url() }}', {
+            method: 'POST',
+            body: data
+        }).then(function (response) {
+            if (response.ok) {
+                animateSpinner('remove', true);
+                return response.json();
+            }
+            animateSpinner('remove', false);
+            return Promise.reject(response);
+        }).then(function (data) {
+            if (data.header !== '') {
+                document.getElementById("accEntryFormHeader").innerHTML = data.header;
+                restructureHeader();
+            }
+            if (data.lines !== '') {
+                document.getElementById("accEntryFormLines").innerHTML = data.lines;
+            }
+            if (data.footer !== '') {
+                document.getElementById("accEntryFormFooter").innerHTML = data.footer;
+            }
+            if (data.list !== '') {
+                document.getElementById("findSubaccountList").innerHTML = data.list;
+            }
+            if (Array.isArray(data.messages) && data.messages.length > 0) {
+                data.messages.forEach(item => alert(item.message));
+                $("#new_subaccount").focus();
+            } else if (document.forms['accEntryForm']['action'].value === 'new-line') {
+                $(".line-debit:last").focus().select();
+            }
+        }).catch(function (error) {
+            alert('error');
+            console.warn(error);
+        });
+
+        return false;
+    };
+
+    function accEntryFormSave(action, selectedLine) {
+        animateSpinner('add');
+        setOrdenLines();
+
+        document.forms['accEntryForm']['action'].value = action;
+        document.forms['accEntryForm']['selectedLine'].value = selectedLine;
+
+        const formData = new FormData(document.forms['accEntryForm']);
+        const plainFormData = Object.fromEntries(formData.entries());
+        const formDataJsonString = JSON.stringify(plainFormData);
+
+        let data = new FormData();
+        data.append('action', action);
+        data.append('code', document.forms['accEntryForm']['code'].value);
+        data.append('multireqtoken', document.forms['accEntryForm']['multireqtoken'].value);
+        data.append('selectedLine', document.forms['accEntryForm']['selectedLine'].value);
+        data.append('idasiento', document.forms['accEntryForm']['idasiento'].value);
+        data.append('data', formDataJsonString);
+
+        fetch('{{ fsc.url() }}', {
+            method: 'POST',
+            body: data
+        }).then(function (response) {
+            if (response.ok) {
+                return response.json();
+            }
+            animateSpinner('remove', false);
+            return Promise.reject(response);
+        }).then(function (data) {
+            if (Array.isArray(data.messages)) {
+                data.messages.forEach(item => alert(item.message));
+            }
+            if (data.ok) {
+                window.location.replace(data.newurl);
+            } else {
+                animateSpinner('remove', true);
+            }
+        }).catch(function (error) {
+            alert('error');
+            console.warn(error);
+        });
+
+        return false;
+    };
+
+    function setOrdenLines() {
+        let orderInputs = $("input[name^='orden_']");
+        let count = orderInputs.length * 10;
+        orderInputs.each(function (index) {
+            $(this).val(count - (index * 10));
+        });
+    }
+
+    function sortableEnable() {
+        $("#accEntryFormLines").sortable({
+            update: function (event, ui) {
+                setOrdenLines();
+            }
+        });
+        $("#accEntryFormLines").sortable("option", "disabled", false);
+        $("#accEntryFormLines").disableSelection();
+    }
+
+    function sortableDisable() {
+        $("#accEntryFormLines").sortable("disable");
+    }
+
+    $(document).ready(function () {
+        restructureHeader();
+
+        {% if model.editable %}
+        let sortable = false;
+
+        $(document).on('click', '#sortableBtn', function () {
+            if (sortable) {
+                sortableDisable();
+                sortable = false;
+                $(this).removeClass('btn-secondary').addClass('btn-light');
+            } else {
+                sortableEnable();
+                sortable = true;
+                $(this).removeClass('btn-light').addClass('btn-secondary');
+            }
+        });
+        {% endif %}
+    });
+</script>
+
+{# Template oculto del campo proyecto, clonado en el header via JS #}
+<div id="proyecto-field-template" style="display:none">
+    <div class="col-sm-6 col-md-4 col-lg-2 proyecto-col">
+        <div class="mb-2">
+            {{ trans('project') }}
+            <select class="form-select"{% if not model.editable %} disabled{% endif %}>
+                <option value="">{{ trans('optional') }}</option>
+                <option value="">------</option>
+                {% for proyecto in fsc.getProyectos() %}
+                    <option value="{{ proyecto.idproyecto }}"{% if model.idproyecto == proyecto.idproyecto %} selected{% endif %}>
+                        {{ proyecto.nombre | e }}
+                    </option>
+                {% endfor %}
+            </select>
+        </div>
+    </div>
+</div>
+
+<form name="accEntryForm" method="post">
+    {{ formToken() }}
+    <input type="hidden" name="action"/>
+    <input type="hidden" name="code" value="{{ model.primaryColumnValue() }}"/>
+    <input type="hidden" name="{{ model.primaryColumn() }}" value="{{ model.primaryColumnValue() }}"/>
+    <input type="hidden" name="selectedLine"/>
+    <input type="hidden" name="idproyecto" id="idproyecto-value" value="{{ model.idproyecto ?: '' }}"/>
+    {{ fsc.renderAccEntryForm(model, model.getLines()) | raw }}
+</form>