jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/eliminar_tencuadernacion' into 'main'

Browse Source 
Solventado el bug que no dejaba eliminar tarifas de tiradas (modelo mal referenciado

See merge request jjimenez/safekat!186
This commit is contained in:
Ignacio Martinez Navajas
2024-03-12 21:32:52 +00:00
parent 73e10df6c9 a50c7e1be2
commit feb2e7ffeb
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/deployment.xml generated
View File

@ -3,6 +3,13 @@
<component name="PublishConfigData" autoUpload="Always" serverName="SK-IMN" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
<option name="confirmBeforeUploading" value="false" />
<serverData>
<paths name="ERP-DEMO">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="SK-DEV">
<serverdata>
<mappings>

7
.idea/webServers.xml generated
View File

@ -30,6 +30,13 @@
</advancedOptions>
</fileTransfer>
</webServer>
<webServer id="94314164-bdb5-40a0-a28a-8d8dc3915eed" name="ERP-DEMO" url="http://erp.safekat.es">
<fileTransfer host="erp.safekat.es" port="21">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
</fileTransfer>
</webServer>
</option>
<groups>
<group>

4
ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
View File

@ -7,6 +7,7 @@ use App\Models\Collection;
use App\Entities\Tarifas\TarifaEncuadernacionTirada;
use App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel;
use App\Models\Tarifas\TarifaEncuadernacionTiradaModel;
use App\Models\Tarifas\TarifaEncuadernacionLineaModel;
use App\Models\Compras\ProveedorModel;
@ -67,8 +68,9 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl
$datetime = (new \CodeIgniter\I18n\Time("now"));
$lineaModel = new TarifaEncuadernacionLineaModel();
$lineaHorasModel = new TarifaEncuadernacionLineaHorasModel();
$lineaResult = $lineaModel->removeAllEncuadernacionLineas($id, $datetime, $this->delete_flag);
$lineaResult2 = $lineaModel->removeAllEncuadernacionLineasHoras($id, $datetime, $this->delete_flag);
$lineaResult2 = $lineaHorasModel->removeAllEncuadernacionLineasHoras($id, $datetime, $this->delete_flag);
$rawResult = $this->model->where('id',$id)
->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),