Fix phpcs
This commit is contained in:
parent
f472ff4fd9
commit
16f1210e8a
@ -223,7 +223,7 @@ if ($resql) {
|
|||||||
|
|
||||||
if (empty($cacheinvoiceid[$objp->facid])) {
|
if (empty($cacheinvoiceid[$objp->facid])) {
|
||||||
$cacheinvoiceid[$objp->facid] = $objp->facid; // First time this invoice is found into list of invoice x payments
|
$cacheinvoiceid[$objp->facid] = $objp->facid; // First time this invoice is found into list of invoice x payments
|
||||||
foreach($invoicetmp->lines as $line) {
|
foreach ($invoicetmp->lines as $line) {
|
||||||
$totalqty += $line->qty;
|
$totalqty += $line->qty;
|
||||||
$totalvat += $line->total_tva;
|
$totalvat += $line->total_tva;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -354,8 +354,8 @@ class Partnership extends CommonObject
|
|||||||
*
|
*
|
||||||
* @param int $id Id of object to load
|
* @param int $id Id of object to load
|
||||||
* @param string $ref Ref of object
|
* @param string $ref Ref of object
|
||||||
* @param int $fk_soc fk_soc
|
|
||||||
* @param int $fk_member fk_member
|
* @param int $fk_member fk_member
|
||||||
|
* @param int $fk_soc fk_soc
|
||||||
* @return int >0 if OK, <0 if KO, 0 if not found
|
* @return int >0 if OK, <0 if KO, 0 if not found
|
||||||
*/
|
*/
|
||||||
public function fetch($id, $ref = null, $fk_member = null, $fk_soc = null)
|
public function fetch($id, $ref = null, $fk_member = null, $fk_soc = null)
|
||||||
|
|||||||
@ -2050,10 +2050,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
|
if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
|
||||||
|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
|
|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
|
||||||
print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
|
print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
|
||||||
print $object->batch_mask;
|
print $object->batch_mask;
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1702,7 +1702,7 @@ if ($action == 'create') {
|
|||||||
$sql .= " AND obj.fk_commande = ".((int) $origin_id);
|
$sql .= " AND obj.fk_commande = ".((int) $origin_id);
|
||||||
$sql .= " AND obj.rowid = ed.fk_commandefourndet";
|
$sql .= " AND obj.rowid = ed.fk_commandefourndet";
|
||||||
$sql .= " AND ed.fk_reception = e.rowid";
|
$sql .= " AND ed.fk_reception = e.rowid";
|
||||||
$sql .= " AND ed.fk_reception !=".(int) $object->id);
|
$sql .= " AND ed.fk_reception !=".((int) $object->id);
|
||||||
//if ($filter) $sql.= $filter;
|
//if ($filter) $sql.= $filter;
|
||||||
$sql .= " ORDER BY obj.fk_product";
|
$sql .= " ORDER BY obj.fk_product";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user