Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

QUAL Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989)

Browse Source 
* Update expedition.class.php 

Adapting the query and code to the new table format

* Update llx_expeditiondet.sql

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update llx_expeditiondet.sql

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update expedition.class.php

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update 19.0.0-20.0.0.sql

---------

Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
This commit is contained in:
Zephyriony
2024-04-08 12:44:49 +02:00
committed by GitHub
parent 35908a2aad
commit 6f524405af
14 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/class/commande.class.php
View File

@@ -2231,7 +2231,7 @@ class Commande extends CommonOrder
$sql .= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
$sql .= ' '.MAIN_DB_PREFIX.'commandedet as cd';
$sql .= ' WHERE';
$sql .= ' ed.fk_origin_line = cd.rowid';
$sql .= ' ed.fk_elementdet = cd.rowid';
$sql .= ' AND cd.fk_commande = '.((int) $this->id);
//print $sql;
@@ -2274,7 +2274,7 @@ class Commande extends CommonOrder
if ($filtre_statut >= 0) {
$sql .= ' ed.fk_expedition = e.rowid AND';
}
$sql .= ' ed.fk_origin_line = cd.rowid';
$sql .= ' ed.fk_elementdet = cd.rowid';
$sql .= ' AND cd.fk_commande = '.((int) $this->id);
if ($fk_product > 0) {
$sql .= ' AND cd.fk_product = '.((int) $fk_product);
@@ -4389,7 +4389,7 @@ class OrderLine extends CommonOrderLine
$sqlCheckShipmentLine = "SELECT";
$sqlCheckShipmentLine .= " ed.rowid";
$sqlCheckShipmentLine .= " FROM " . MAIN_DB_PREFIX . "expeditiondet ed";
$sqlCheckShipmentLine .= " WHERE ed.fk_origin_line = " . ((int) $this->id);
$sqlCheckShipmentLine .= " WHERE ed.fk_elementdet = " . ((int) $this->id);
$resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
if (!$resqlCheckShipmentLine) {