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

Fix: scrutinizer errors + boxes activation

Browse Source
This commit is contained in:
Lucas Marcouiller 2021-10-22 12:01:46 +02:00
parent e8e63e85f1
commit 33e4d750d7
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
View File

@ -65,6 +65,8 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
public function loadBox($max = 5) public function loadBox($max = 5)
{ {
global $conf, $user, $langs; global $conf, $user, $langs;
$dataseries = "";
$graphtoshow = "";
$badgeStatus0 = '#cbd3d3'; // draft $badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated $badgeStatus1 = '#bc9526'; // validated

1
htdocs/core/class/dolgraph.class.php
View File

@ -1054,6 +1054,7 @@ class DolGraph
} }
$showlegend = $this->showlegend; $showlegend = $this->showlegend;
$bordercolor = "";
$legends = array(); $legends = array();
$nblot = 0; $nblot = 0;

2
htdocs/core/class/html.formticket.class.php
View File

@ -753,6 +753,8 @@ class FormTicket
print ajax_combobox('select'.$htmlname); print ajax_combobox('select'.$htmlname);
} elseif ($htmlname!='') { } elseif ($htmlname!='') {
$selectedgroups = array();
$groupvalue = "";
$groupticket=GETPOST($htmlname, 'aZ09'); $groupticket=GETPOST($htmlname, 'aZ09');
$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0; $child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
if (!empty($groupticket)) { if (!empty($groupticket)) {

5
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
View File

@ -378,3 +378,8 @@ ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_customer varchar(2
ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_supplier varchar(24) AFTER accountancy_code_customer; -- equivalent to code_compta_supplier in llx_societe ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_supplier varchar(24) AFTER accountancy_code_customer; -- equivalent to code_compta_supplier in llx_societe
ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority; ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority;
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_ticket_by_severity.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_ticket_by_severity.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1);

4
htdocs/mrp/class/api_mos.class.php
View File

@ -491,7 +491,7 @@ class Mos extends DolibarrApi
if (!$error && $line->fk_warehouse > 0) { if (!$error && $line->fk_warehouse > 0) {
// Record stock movement // Record stock movement
$id_product_batch = 0; $id_product_batch = 0;
$stockmove->origin = $this->mo; $stockmove->origin = 'mo';
if ($qtytoprocess >= 0) { if ($qtytoprocess >= 0) {
$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement); $idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
} else { } else {
@ -550,7 +550,7 @@ class Mos extends DolibarrApi
if (!$error && $line->fk_warehouse > 0) { if (!$error && $line->fk_warehouse > 0) {
// Record stock movement // Record stock movement
$id_product_batch = 0; $id_product_batch = 0;
$stockmove->origin = $this->mo; $stockmove->origin = 'mo';
if ($qtytoprocess >= 0) { if ($qtytoprocess >= 0) {
$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement); $idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
} else { } else {

1
htdocs/mrp/class/mo.class.php
View File

@ -625,6 +625,7 @@ class Mo extends CommonObject
public function updateProduction(User $user, $notrigger = true) public function updateProduction(User $user, $notrigger = true)
{ {
$error = 0; $error = 0;
$role = "";
if ($this->status != self::STATUS_DRAFT) { if ($this->status != self::STATUS_DRAFT) {
$this->error = 'BadStatus'; $this->error = 'BadStatus';