lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-21 11:27:48 +02:00
parent 3024919cd6
commit be3f0471ff
3 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/accountancy/supplier/index.php
View File

@ -140,13 +140,13 @@ if ($action == 'validatehistory') {
setEventMessages($db->lasterror(), null, 'errors');
} else {
$num_lines = $db->num_rows($result);
$isSellerInEEC = isInEEC($mysoc);
$i = 0;
while ($i < min($num_lines, 10000)) { // No more than 10000 at once
$objp = $db->fetch_object($result);
// Search suggested account for product/service
$suggestedaccountingaccountfor = '';
if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
@ -168,13 +168,13 @@ if ($action == 'validatehistory') {
$suggestedaccountingaccountfor = 'export';
}
}
if ($objp->aarowid_suggest > 0)
{
$sqlupdate = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
$sqlupdate.= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
$sqlupdate.= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
$resqlupdate = $db->query($sqlupdate);
if (! $resqlupdate)
{
@ -183,11 +183,11 @@ if ($action == 'validatehistory') {
break;
}
}
$i++;
}
}
if ($error)
{
$db->rollback();

53
htdocs/mrp/ajax/ajax_bom.php Normal file
View File

@ -0,0 +1,53 @@
<?php
/* Copyright (C) 2019 Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/mrp/ajax/ajax.php
* \brief Ajax search component for Mrp. It get BOM content.
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
require '../../main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
$idbom = GETPOST('idbom', 'alpha');
$action = GETPOST('action', 'alpha');
/*
* View
*/
$object = new BOM($db);
$result=$object->fetch($idbom);
if ($result)
{
echo json_encode($result);
}
else
{
echo 'Failed to load category with id='.$idbom;
}

11
htdocs/takepos/ajax/ajax.php
View File

@ -45,9 +45,18 @@ $term = GETPOST('term', 'alpha');
if ($action=="getProducts") {
$object = new Categorie($db);
$result=$object->fetch($category);
if ($result)
if ($result > 0)
{
$prods = $object->getObjectsInCateg("product");
// Removed properties we don't need
if (is_array($prods) && count($prods) > 0)
{
foreach($prods as $prod)
{
unset($prod->fields);
unset($prod->db);
}
}
echo json_encode($prods);
}
else