Merge branch 'bug/presupuestos3' into 'main'

Bug/presupuestos3

See merge request jjimenez/safekat!76
This commit is contained in:
2023-11-28 11:09:29 +00:00
2322 changed files with 1199 additions and 1874 deletions

0
.idea/deployment.xml generated Normal file → Executable file
View File

0
.idea/inspectionProfiles/Project_Default.xml generated Normal file → Executable file
View File

0
.idea/php.xml generated Normal file → Executable file
View File

0
.idea/vcs.xml generated Normal file → Executable file
View File

0
.idea/webServers.xml generated Normal file → Executable file
View File

0
.idea/workspace.xml generated Normal file → Executable file
View File

0
.vscode/settings.json vendored Normal file → Executable file
View File

0
.vscode/sftp.json vendored Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

0
acciones.txt Normal file → Executable file
View File

0
backups_bbdd/04252023_sk_main.sql Normal file → Executable file
View File

0
backups_bbdd/29052023_sk-jjo.sql Normal file → Executable file
View File

0
ci4/.env Normal file → Executable file
View File

0
ci4/.gitignore vendored Normal file → Executable file
View File

0
ci4/.htaccess Normal file → Executable file
View File

0
ci4/app/.htaccess Normal file → Executable file
View File

0
ci4/app/Common.php Normal file → Executable file
View File

0
ci4/app/Config/App.php Normal file → Executable file
View File

0
ci4/app/Config/Autoload.php Normal file → Executable file
View File

0
ci4/app/Config/Basics.php Normal file → Executable file
View File

0
ci4/app/Config/Boot/development.php Normal file → Executable file
View File

0
ci4/app/Config/Boot/production.php Normal file → Executable file
View File

0
ci4/app/Config/Boot/testing.php Normal file → Executable file
View File

0
ci4/app/Config/Cache.php Normal file → Executable file
View File

0
ci4/app/Config/Constants.php Normal file → Executable file
View File

0
ci4/app/Config/ContentSecurityPolicy.php Normal file → Executable file
View File

0
ci4/app/Config/Cookie.php Normal file → Executable file
View File

0
ci4/app/Config/Database.php Normal file → Executable file
View File

0
ci4/app/Config/DocTypes.php Normal file → Executable file
View File

0
ci4/app/Config/Email.php Normal file → Executable file
View File

0
ci4/app/Config/Encryption.php Normal file → Executable file
View File

0
ci4/app/Config/Events.php Normal file → Executable file
View File

0
ci4/app/Config/Exceptions.php Normal file → Executable file
View File

0
ci4/app/Config/Filters.php Normal file → Executable file
View File

0
ci4/app/Config/ForeignCharacters.php Normal file → Executable file
View File

0
ci4/app/Config/Format.php Normal file → Executable file
View File

0
ci4/app/Config/Generators.php Normal file → Executable file
View File

0
ci4/app/Config/Honeypot.php Normal file → Executable file
View File

0
ci4/app/Config/Images.php Normal file → Executable file
View File

0
ci4/app/Config/Kint.php Normal file → Executable file
View File

0
ci4/app/Config/Logger.php Normal file → Executable file
View File

0
ci4/app/Config/Migrations.php Normal file → Executable file
View File

0
ci4/app/Config/Mimes.php Normal file → Executable file
View File

0
ci4/app/Config/Modules.php Normal file → Executable file
View File

0
ci4/app/Config/Pager.php Normal file → Executable file
View File

0
ci4/app/Config/Paths.php Normal file → Executable file
View File

7
ci4/app/Config/Routes.php Normal file → Executable file
View File

@ -486,8 +486,11 @@ $routes->group('serviciosacabados', ['namespace' => 'App\Controllers\Presupuesto
});
$routes->group('serviciosencuadernaciones', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {
$routes->post('datatable', 'PresupuestoEncuadernaciones::datatable', ['as' => 'dataTableOfPresupuestoEncuadernaciones']);
$routes->post('datatable_editor', 'PresupuestoEncuadernaciones::datatable_editor', ['as' => 'editorOfPresupuestoEncuadernaciones']);
$routes->post('datatable', 'Presupuestoencuadernaciones::datatable', ['as' => 'dataTableOfPresupuestoEncuadernaciones']);
$routes->post('menuitems', 'Presupuestoencuadernaciones::menuItems', ['as' => 'menuItemsOfPresupuestoEncuadernaciones']);
$routes->get('delete/(:num)', 'Presupuestoencuadernaciones::delete/$1', ['as' => 'deletePresupuestoencuadernaciones']);
$routes->post('edit/(:num)', 'Presupuestoencuadernaciones::edit/$1', ['as' => 'updateCosidotapablanda']);
});
$routes->group('serviciosmanipulados', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) {

0
ci4/app/Config/Security.php Normal file → Executable file
View File

0
ci4/app/Config/Services.php Normal file → Executable file
View File

0
ci4/app/Config/Toolbar.php Normal file → Executable file
View File

0
ci4/app/Config/UserAgents.php Normal file → Executable file
View File

0
ci4/app/Config/Validation.php Normal file → Executable file
View File

0
ci4/app/Config/View.php Normal file → Executable file
View File

0
ci4/app/Controllers/Activity.php Normal file → Executable file
View File

0
ci4/app/Controllers/Ajax.php Normal file → Executable file
View File

0
ci4/app/Controllers/Api.php Normal file → Executable file
View File

0
ci4/app/Controllers/BaseController.php Normal file → Executable file
View File

0
ci4/app/Controllers/Catalogo/Catalogo.php Normal file → Executable file
View File

0
ci4/app/Controllers/Clientes/Cliente.php Normal file → Executable file
View File

0
ci4/app/Controllers/Clientes/Clientecontactos.php Normal file → Executable file
View File

0
ci4/app/Controllers/Clientes/Clientedistribuidores.php Normal file → Executable file
View File

0
ci4/app/Controllers/Compras/Proveedores.php Normal file → Executable file
View File

0
ci4/app/Controllers/Compras/ProveedoresTipos.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Calendario.php Normal file → Executable file
View File

View File

0
ci4/app/Controllers/Configuracion/Formaspagos.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Group.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Imposiciones.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Maquinas.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Maquinascalles.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Maquinasdefecto.php Normal file → Executable file
View File

View File

View File

0
ci4/app/Controllers/Configuracion/Paises.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Papelesgenericos.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Papelesimpresion.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Papelformato.php Normal file → Executable file
View File

View File

View File

0
ci4/app/Controllers/Configuracion/Provincias.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Seriefactura.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Serviciocliente.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Tamanioformatos.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Tamaniolibros.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Tareaservicio.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Tipologias.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Tiposimpresion.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Trabajo.php Normal file → Executable file
View File

0
ci4/app/Controllers/Configuracion/Users.php Normal file → Executable file
View File

0
ci4/app/Controllers/Cron.php Normal file → Executable file
View File

0
ci4/app/Controllers/Envioslogistica/Logistica.php Normal file → Executable file
View File

0
ci4/app/Controllers/Facturacion/Albaran.php Normal file → Executable file
View File

0
ci4/app/Controllers/Facturacion/Factura.php Normal file → Executable file
View File

0
ci4/app/Controllers/GoBaseController.php Normal file → Executable file
View File

0
ci4/app/Controllers/GoBaseResourceController.php Normal file → Executable file
View File

0
ci4/app/Controllers/Home.php Normal file → Executable file
View File

0
ci4/app/Controllers/Importacion/Importar.php Normal file → Executable file
View File

0
ci4/app/Controllers/Informes/Informe.php Normal file → Executable file
View File

0
ci4/app/Controllers/Integration.php Normal file → Executable file
View File

0
ci4/app/Controllers/Js_loader.php Normal file → Executable file
View File

Some files were not shown because too many files have changed in this diff Show More