Date: Thu, 8 Apr 2021 11:44:24 +0000
Subject: [PATCH 0002/1231] Fixing style errors.
---
htdocs/admin/notification.php | 2 +-
htdocs/core/class/notify.class.php | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 6609021cc2a..d467b6bb62d 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -208,7 +208,7 @@ $langs->trans('notiftouser'),
$langs->trans('notiftofixedemail'),
$langs->trans('notiftouserandtofixedemail')
);
-var_dump($arrayofnotifto,$conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE);
+var_dump($arrayofnotifto, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE);
print '';
print $langs->trans("NotificationDisableConfirmMessage").' ';
print '';
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 92555da891a..695a17a75d8 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -112,18 +112,18 @@ class Notify
$langs->load("mails");
$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
- if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE)){
- if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 1 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3){
- foreach($listofnotiftodo as $val){
- if ($val['type'] == 'touser'){
+ if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE)) {
+ if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 1 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3) {
+ foreach ($listofnotiftodo as $val) {
+ if ($val['type'] == 'touser') {
unset($listofnotiftodo[$val['email']]);
$listofnotiftodo = array_merge($listofnotiftodo);
}
}
}
- if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 2 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3){
- foreach($listofnotiftodo as $val){
- if ($val['type'] == 'tofixedemail'){
+ if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 2 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3) {
+ foreach ($listofnotiftodo as $val) {
+ if ($val['type'] == 'tofixedemail') {
unset($listofnotiftodo[$val['email']]);
$listofnotiftodo = array_merge($listofnotiftodo);
}
From 822d9b227bdd2eb7e8b304f8fa501fe1d03adfb7 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 8 Apr 2021 13:50:55 +0200
Subject: [PATCH 0003/1231] Update notification.php
---
htdocs/admin/notification.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 6609021cc2a..85e097dceb3 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -202,13 +202,14 @@ if (!empty($conf->global->NOTIFICATION_EMAIL_FROM) && !isValidEmail($conf->globa
}
print ' ';
print '';
print $langs->trans("NotificationDisableConfirmMessage").' ';
print '';
From d3053c0c1b8ffaac71253bc12d6f3f0f249280f0 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 28 Apr 2021 23:35:47 +0200
Subject: [PATCH 0004/1231] delete_fr_lang
---
htdocs/langs/fr_FR/admin.lang | 1 -
htdocs/langs/fr_FR/other.lang | 3 ---
2 files changed, 4 deletions(-)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 02e0b27af5d..ef48fc0a82d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1662,7 +1662,6 @@ MailingDelay=Temps d'attente, en seconde, avant d'envoyer le prochain message
NotificationSetup=Configuration du module Notification par email
NotificationEMailFrom=Adresse émettrice (From) des emails envoyés lors des notifications
FixedEmailTarget=Email fixe cible destinataires
-NotificationDisableConfirmMessage=Notifications desactivé dans les messages de confirmation
##### Sendings #####
SendingsSetup=Configuration du module Expédition/Livraison
SendingsReceiptModel=Modèles de bordereau d'expédition
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 4e228ed50bd..a8078129464 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -35,9 +35,6 @@ OnlyOneFieldForXAxisIsPossible=1 seul champ est actuellement possible en tant qu
AtLeastOneMeasureIsRequired=Au moins 1 champ de mesure est requis
AtLeastOneXAxisIsRequired=Au moins 1 champ pour l'axe X est requis
LatestBlogPosts=Derniers articles du Blog
-notiftouser=Aux utilisateurs
-notiftofixedemail=Vers les courriers fixe
-notiftouserandtofixedemail=Aux utilisateurs et les courriers fixe
Notify_ORDER_VALIDATE=Validation commande client
Notify_ORDER_SENTBYMAIL=Envoi commande client par email
Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
From c1e6109c4bfecda86c9ae06be638196729b2b616 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 29 Apr 2021 00:03:16 +0200
Subject: [PATCH 0005/1231] Update
---
htdocs/admin/notification.php | 28 ++++++++++++++++++++++------
htdocs/core/class/notify.class.php | 24 +++++++++++-------------
htdocs/langs/en_US/admin.lang | 3 ++-
3 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 85e097dceb3..93263998cbe 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -204,16 +204,32 @@ print ' ';
print '';
-print $langs->trans("NotificationDisableConfirmMessage").' ';
+print $langs->trans("NotificationDisableConfirmMessageUser").'';
print '';
-print $form->selectarray("notif_disable", $arrayofnotifto, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER", $arrval, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER);
+}
+print ' ';
+print '';
+print $langs->trans("NotificationDisableConfirmMessageFix").' ';
+print '';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX", $arrval, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX);
+}
print ' ';
print '';
print $langs->trans("NotificationDisableConfirmMessageUser").' ';
print '';
From 1d81322120391fc8337fee12e4ec4907c851c051 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 6 May 2021 22:54:32 +0200
Subject: [PATCH 0007/1231] Update pdf.php
---
htdocs/admin/pdf.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 7d7b5e36a40..256038d356c 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2012-2107 Juanjo Menent
* Copyright (C) 2019 Ferran Marcet
+ * Copyright (C) 2021 Anthony Berton
*
* 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
@@ -329,6 +330,11 @@ print ''.$langs->trans("MAIN_DOCUMENTS_LOGO_HEIGHT").'global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT : 20).'">';
print ' '.$langs->trans("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH").' ';
+print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdate' && $usercancreate) {
+ if ($action == 'editdate' && $usercancreate) {
print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editecheance' && $usercancreate) {
+ if ($action == 'editecheance' && $usercancreate) {
print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editconditions' && $usercancreate) {
+ if ($action == 'editconditions' && $usercancreate) {
$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
} else {
$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
@@ -2140,12 +2140,12 @@ if ($action == 'create') {
print '';
print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editmode' && $usercancreate) {
+ if ($action == 'editmode' && $usercancreate) {
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
} else {
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -2169,12 +2169,12 @@ if ($action == 'create') {
print ' ('.$langs->trans('AfterOrder').')';
}
print ' ';
- if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
+ if ($action != 'editavailability' && $usercancreate) {
print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editavailability' && $usercancreate) {
+ if ($action == 'editavailability' && $usercancreate) {
$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
} else {
$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
@@ -2226,12 +2226,12 @@ if ($action == 'create') {
print '';
print ' ';
- if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdemandreason' && $usercancreate) {
+ if ($action == 'editdemandreason' && $usercancreate) {
$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
} else {
$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c544f5f7fe9..500f7b14380 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1974,7 +1974,7 @@ class Propal extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
- $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -2030,7 +2030,7 @@ class Propal extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite != '' ? "'".$this->db->idate($date_fin_validite)."'" : 'null');
- $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql);
From ba7b6a8d5146ba0d7f077701a8e8aae1b3acba2b Mon Sep 17 00:00:00 2001
From: kamel
Date: Mon, 21 Jun 2021 16:38:36 +0200
Subject: [PATCH 0009/1231] FIX: Reload values of the specified entity when
change entity in the execution of cron job
---
htdocs/core/class/conf.class.php | 67 +++++++++++++++++++++++++++++
htdocs/cron/class/cronjob.class.php | 16 +++----
2 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 8766d68c25b..ed919be568c 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -151,6 +151,19 @@ class Conf
$this->productbatch = new stdClass();
}
+ /**
+ * Load setup values into conf object (read llx_const) for a specified entity
+ * Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setValues is called.
+ *
+ * @param DoliDB $db Database handler
+ * @param int $entity Entity to get
+ * @return int < 0 if KO, >= 0 if OK
+ */
+ function setEntityValues($db, $entity)
+ {
+ $this->entity = $entity;
+ $this->setValues($db);
+ }
/**
* Load setup values into conf object (read llx_const)
@@ -161,6 +174,60 @@ class Conf
*/
public function setValues($db)
{
+ global $conf;
+
+ // Unset all old modules values
+ if (!empty($this->modules)) {
+ foreach ($this->modules as $m) {
+ if (isset($this->$m)) unset($this->$m);
+ }
+ }
+
+ // Properly declare multi-modules objects.
+ $this->global = new stdClass();
+ $this->multicompany = new stdClass();
+
+ // First level object
+ // TODO Remove this part.
+ $this->expedition_bon = new stdClass();
+ $this->delivery_note = new stdClass();
+ $this->fournisseur = new stdClass();
+ $this->product = new stdClass();
+ $this->service = new stdClass();
+ $this->contrat = new stdClass();
+ $this->actions = new stdClass();
+ $this->agenda = new stdClass();
+ $this->commande = new stdClass();
+ $this->propal = new stdClass();
+ $this->facture = new stdClass();
+ $this->contrat = new stdClass();
+ $this->usergroup = new stdClass();
+ $this->adherent = new stdClass();
+ $this->bank = new stdClass();
+ $this->notification = new stdClass();
+ $this->mailing = new stdClass();
+ $this->expensereport = new stdClass();
+ $this->productbatch = new stdClass();
+ $this->modules = array();;
+ $this->modules_parts = array(
+ 'css' => array(),
+ 'js' => array(),
+ 'tabs' => array(),
+ 'triggers' => array(),
+ 'login' => array(),
+ 'substitutions' => array(),
+ 'menus' => array(),
+ 'theme' => array(),
+ 'sms' => array(),
+ 'tpl' => array(),
+ 'barcode' => array(),
+ 'models' => array(),
+ 'societe' => array(),
+ 'hooks' => array(),
+ 'dir' => array(),
+ 'syslog' => array(),
+ );
+
dol_syslog(get_class($this)."::setValues");
//Define all global constants into $this->global->key=value
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 2ffce20a924..e2b7c2da47b 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1081,7 +1081,7 @@ class Cronjob extends CommonObject
dol_syslog("We try to run a job in entity ".$this->entity." when we are in entity ".$conf->entity, LOG_WARNING);
}
$savcurrententity = $conf->entity;
- $conf->entity = $this->entity;
+ $conf->setEntityValues($this->db, $this->entity);
dol_syslog(get_class($this)."::run_jobs entity for running job is ".$conf->entity);
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1090,13 +1090,13 @@ class Cronjob extends CommonObject
if ($result < 0) {
$this->error = "User Error:".$user->error;
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
} else {
if (empty($user->id)) {
$this->error = " User user login:".$userlogin." do not exists";
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
}
}
@@ -1126,7 +1126,7 @@ class Cronjob extends CommonObject
$result = $this->update($user); // This include begin/commit
if ($result < 0) {
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
}
@@ -1241,7 +1241,7 @@ class Cronjob extends CommonObject
if ($ret === false) {
$this->error = $langs->trans('CronCannotLoadLib').': '.$libpath;
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
}
@@ -1250,7 +1250,7 @@ class Cronjob extends CommonObject
$result = $langs->load($this->module_name.'@'.$this->module_name); // If this->module_name was an existing language file, this will make nothing
if ($result < 0) { // If technical error
dol_syslog(get_class($this)."::run_jobs Cannot load module langs".$langs->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
}
@@ -1316,11 +1316,11 @@ class Cronjob extends CommonObject
$result = $this->update($user); // This include begin/commit
if ($result < 0) {
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return -1;
}
- $conf->entity = $savcurrententity;
+ $conf->setEntityValues($this->db, $savcurrententity);
return $error ?-1 : 1;
}
From dd61c497228aac8685dcd5774d7531a21c5fcf0f Mon Sep 17 00:00:00 2001
From: kamel
Date: Mon, 21 Jun 2021 16:44:31 +0200
Subject: [PATCH 0010/1231] Correction
---
htdocs/core/class/conf.class.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index ed919be568c..bc953faab2e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -174,8 +174,6 @@ class Conf
*/
public function setValues($db)
{
- global $conf;
-
// Unset all old modules values
if (!empty($this->modules)) {
foreach ($this->modules as $m) {
From 488d875854b29791e3a66dcddb372a506ffc0655 Mon Sep 17 00:00:00 2001
From: kamel
Date: Mon, 21 Jun 2021 16:51:54 +0200
Subject: [PATCH 0011/1231] Correction
---
htdocs/core/class/conf.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bc953faab2e..4000dc4d6f1 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -159,7 +159,7 @@ class Conf
* @param int $entity Entity to get
* @return int < 0 if KO, >= 0 if OK
*/
- function setEntityValues($db, $entity)
+ public function setEntityValues($db, $entity)
{
$this->entity = $entity;
$this->setValues($db);
From 68130ec274c6c3bc3690d8f696e0ab2ea0183a5d Mon Sep 17 00:00:00 2001
From: atm-florian
Date: Fri, 16 Jul 2021 19:24:34 +0200
Subject: [PATCH 0012/1231] FIX: line extrafields are inoperative in dispatch
cards even when they exist
---
htdocs/reception/card.php | 68 ++++++++++++++++++++++++++-------------
1 file changed, 46 insertions(+), 22 deletions(-)
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 8a4d5edc611..70dfd7f28b0 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -876,7 +876,14 @@ if ($action == 'create')
// Reception lines
$numAsked = 0;
+
+ /**
+ * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that
+ * extrafields from HTTP query can be assigned to the correct dispatch line
+ */
+ $suffix2numAsked = array();
$dispatchLines = array();
+
foreach ($_POST as $key => $value) {
// If create form is coming from the button "Create Reception" of previous page
@@ -884,14 +891,16 @@ if ($action == 'create')
$reg = array();
if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
$numAsked++;
+ $paramSuffix = $reg[1] . '_' . $reg[2];
+ $suffix2numAsked[$paramSuffix] = $numAsked;
// $numline=$reg[2] + 1; // line of product
$numline = $numAsked;
- $prod = "product_".$reg[1].'_'.$reg[2];
- $qty = "qty_".$reg[1].'_'.$reg[2];
- $ent = "entrepot_".$reg[1].'_'.$reg[2];
- $pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
- $fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
+ $prod = "product_" . $paramSuffix;
+ $qty = "qty_" . $paramSuffix;
+ $ent = "entrepot_" . $paramSuffix;
+ $pu = "pu_" . $paramSuffix; // This is unit price including discount
+ $fk_commandefourndet = "fk_commandefourndet_" . $paramSuffix;
$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
}
@@ -899,41 +908,51 @@ if ($action == 'create')
if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg))
{
$numAsked++;
+ $paramSuffix = $reg[1] . '_' . $reg[2];
+ $suffix2numAsked[$paramSuffix] = $numAsked;
// eat-by date dispatch
// $numline=$reg[2] + 1; // line of product
$numline = $numAsked;
- $prod = 'product_batch_'.$reg[1].'_'.$reg[2];
- $qty = 'qty_'.$reg[1].'_'.$reg[2];
- $ent = 'entrepot_'.$reg[1].'_'.$reg[2];
- $pu = 'pu_'.$reg[1].'_'.$reg[2];
- $lot = 'lot_number_'.$reg[1].'_'.$reg[2];
- $dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1].'_'.$reg[2].'month'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'day'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'year']);
- $dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1].'_'.$reg[2].'month'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'day'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'year']);
- $fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
+ $prod = 'product_batch_' . $paramSuffix;
+ $qty = 'qty_' . $paramSuffix;
+ $ent = 'entrepot_' . $paramSuffix;
+ $pu = 'pu_' . $paramSuffix;
+ $lot = 'lot_number_' . $paramSuffix;
+ $dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$paramSuffix.'month'], $_POST['dluo_'.$paramSuffix.'day'], $_POST['dluo_'.$paramSuffix.'year']);
+ $dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$paramSuffix.'month'], $_POST['dlc_'.$paramSuffix.'day'], $_POST['dlc_'.$paramSuffix.'year']);
+ $fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix;
$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
}
// If create form is coming from same page post was sent but an error occured
if (preg_match('/^productid([0-9]+)$/i', $key, $reg)) {
$numAsked++;
+ $paramSuffix = $reg[1];
+ $suffix2numAsked[$paramSuffix] = $numAsked;
// eat-by date dispatch
// $numline=$reg[2] + 1; // line of product
$numline = $numAsked;
- $prod = 'productid'.$reg[1];
- $comment = 'comment'.$reg[1];
- $qty = 'qtyl'.$reg[1];
- $ent = 'entl'.$reg[1];
- $pu = 'pul'.$reg[1];
- $lot = 'batch'.$reg[1];
- $dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$reg[1].'month', 'int'), GETPOST('dluo'.$reg[1].'day', 'int'), GETPOST('dluo'.$reg[1].'year', 'int'));
- $dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$reg[1].'month', 'int'), GETPOST('dlc'.$reg[1].'day', 'int'), GETPOST('dlc'.$reg[1].'year', 'int'));
- $fk_commandefourndet = 'fk_commandefournisseurdet'.$reg[1];
+ $prod = 'productid'.$paramSuffix;
+ $comment = 'comment'.$paramSuffix;
+ $qty = 'qtyl'.$paramSuffix;
+ $ent = 'entl'.$paramSuffix;
+ $pu = 'pul'.$paramSuffix;
+ $lot = 'batch'.$paramSuffix;
+ $dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$paramSuffix.'month', 'int'), GETPOST('dluo'.$paramSuffix.'day', 'int'), GETPOST('dluo'.$paramSuffix.'year', 'int'));
+ $dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$paramSuffix.'month', 'int'), GETPOST('dlc'.$paramSuffix.'day', 'int'), GETPOST('dlc'.$paramSuffix.'year', 'int'));
+ $fk_commandefourndet = 'fk_commandefournisseurdet'.$paramSuffix;
$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
}
}
+ // If extrafield values are passed in the HTTP query, assign them to the correct dispatch line
+ // Note that if an extrafield with the same name exists in the origin supplier order line, the value
+ // from the HTTP query will be ignored
+ foreach ($suffix2numAsked as $suffix => $n) {
+ $dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('commande_fournisseur_dispatch', '_' . $suffix, '');
+ }
print '';
+ protected $dumpSuffix = '';
protected $dumpId = 'sf-dump';
protected $colors = true;
protected $headerIsDumped = false;
protected $lastDepth = -1;
protected $styles = array(
- 'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000; word-break: normal',
+ 'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:99999; word-break: normal',
'num' => 'font-weight:bold; color:#1299DA',
'const' => 'font-weight:bold',
'str' => 'font-weight:bold; color:#56DB3A',
@@ -43,27 +43,24 @@ class HtmlDumper extends CliDumper
'meta' => 'color:#B729D9',
'key' => 'color:#56DB3A',
'index' => 'color:#1299DA',
+ 'ellipsis' => 'color:#FF8400',
);
+ private $displayOptions = array(
+ 'maxDepth' => 1,
+ 'maxStringLength' => 160,
+ 'fileLinkFormat' => null,
+ );
+ private $extraDisplayOptions = array();
+
/**
* {@inheritdoc}
*/
- public function __construct($output = null, $charset = null)
+ public function __construct($output = null, $charset = null, $flags = 0)
{
- AbstractDumper::__construct($output, $charset);
+ AbstractDumper::__construct($output, $charset, $flags);
$this->dumpId = 'sf-dump-'.mt_rand();
- }
-
- /**
- * {@inheritdoc}
- */
- public function setOutput($output)
- {
- if ($output !== $prev = parent::setOutput($output)) {
- $this->headerIsDumped = false;
- }
-
- return $prev;
+ $this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
}
/**
@@ -75,10 +72,21 @@ class HtmlDumper extends CliDumper
$this->styles = $styles + $this->styles;
}
+ /**
+ * Configures display options.
+ *
+ * @param array $displayOptions A map of display options to customize the behavior
+ */
+ public function setDisplayOptions(array $displayOptions)
+ {
+ $this->headerIsDumped = false;
+ $this->displayOptions = $displayOptions + $this->displayOptions;
+ }
+
/**
* Sets an HTML header that will be dumped once in the output stream.
*
- * @param string $header An HTML string.
+ * @param string $header An HTML string
*/
public function setDumpHeader($header)
{
@@ -88,8 +96,8 @@ class HtmlDumper extends CliDumper
/**
* Sets an HTML prefix and suffix that will encapse every single dump.
*
- * @param string $prefix The prepended HTML string.
- * @param string $suffix The appended HTML string.
+ * @param string $prefix The prepended HTML string
+ * @param string $suffix The appended HTML string
*/
public function setDumpBoundaries($prefix, $suffix)
{
@@ -100,10 +108,13 @@ class HtmlDumper extends CliDumper
/**
* {@inheritdoc}
*/
- public function dump(Data $data, $output = null)
+ public function dump(Data $data, $output = null, array $extraDisplayOptions = array())
{
- parent::dump($data, $output);
+ $this->extraDisplayOptions = $extraDisplayOptions;
+ $result = parent::dump($data, $output);
$this->dumpId = 'sf-dump-'.mt_rand();
+
+ return $result;
}
/**
@@ -111,13 +122,13 @@ class HtmlDumper extends CliDumper
*/
protected function getDumpHeader()
{
- $this->headerIsDumped = true;
+ $this->headerIsDumped = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
if (null !== $this->dumpHeader) {
return $this->dumpHeader;
}
- $line = <<<'EOHTML'
+ $line = str_replace('{$options}', json_encode($this->displayOptions, JSON_FORCE_OBJECT), <<<'EOHTML'
-'.$this->dumpHeader;
@@ -374,7 +448,7 @@ EOHTML;
return '';
}
- $v = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+ $v = esc($value);
if ('ref' === $style) {
if (empty($attr['count'])) {
@@ -385,41 +459,47 @@ EOHTML;
return sprintf('%s ', $this->dumpId, $r, 1 + $attr['count'], $v);
}
- if ('const' === $style && array_key_exists('value', $attr)) {
- $style .= sprintf(' title="%s"', htmlspecialchars(json_encode($attr['value']), ENT_QUOTES, 'UTF-8'));
+ if ('const' === $style && isset($attr['value'])) {
+ $style .= sprintf(' title="%s"', esc(is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
} elseif ('public' === $style) {
$style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
} elseif ('str' === $style && 1 < $attr['length']) {
- $style .= sprintf(' title="%s%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
+ $style .= sprintf(' title="%d%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
} elseif ('note' === $style && false !== $c = strrpos($v, '\\')) {
return sprintf('%s ', $v, $style, substr($v, $c + 1));
} elseif ('protected' === $style) {
$style .= ' title="Protected property"';
+ } elseif ('meta' === $style && isset($attr['title'])) {
+ $style .= sprintf(' title="%s"', esc($this->utf8Encode($attr['title'])));
} elseif ('private' === $style) {
- $style .= sprintf(' title="Private property defined in class:
`%s`"', $attr['class']);
+ $style .= sprintf(' title="Private property defined in class:
`%s`"', esc($this->utf8Encode($attr['class'])));
+ }
+ $map = static::$controlCharsMap;
+
+ if (isset($attr['ellipsis'])) {
+ $label = esc(substr($value, -$attr['ellipsis']));
+ $style = str_replace(' title="', " title=\"$v\n", $style);
+ $v = sprintf('%s %s', substr($v, 0, -strlen($label)), $label);
}
- $map = static::$controlCharsMap;
- $style = "";
- $v = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $style) {
- $s = ' ';
+ $v = "".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
+ $s = '';
$c = $c[$i = 0];
do {
$s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
} while (isset($c[++$i]));
- return $s.$style;
- }, $v, -1, $cchrCount);
+ return $s.' ';
+ }, $v).' ';
- if ($cchrCount && '<' === $v[0]) {
- $v = substr($v, 7);
- } else {
- $v = $style.$v;
+ if (isset($attr['file']) && $href = $this->getSourceLink($attr['file'], isset($attr['line']) ? $attr['line'] : 0)) {
+ $attr['href'] = $href;
}
- if ($cchrCount && '>' === substr($v, -1)) {
- $v = substr($v, 0, -strlen($style));
- } else {
- $v .= '';
+ if (isset($attr['href'])) {
+ $v = sprintf('%s ', esc($this->utf8Encode($attr['href'])), $v);
+ }
+ if (isset($attr['lang'])) {
+ $v = sprintf('%s', esc($attr['lang']), $v);
}
return $v;
@@ -433,12 +513,17 @@ EOHTML;
if (-1 === $this->lastDepth) {
$this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
}
- if (!$this->headerIsDumped) {
+ if ($this->headerIsDumped !== (null !== $this->outputStream ? $this->outputStream : $this->lineDumper)) {
$this->line = $this->getDumpHeader().$this->line;
}
if (-1 === $depth) {
- $this->line .= sprintf($this->dumpSuffix, $this->dumpId);
+ $args = array('"'.$this->dumpId.'"');
+ if ($this->extraDisplayOptions) {
+ $args[] = json_encode($this->extraDisplayOptions, JSON_FORCE_OBJECT);
+ }
+ // Replace is for BC
+ $this->line .= sprintf(str_replace('"%s"', '%s', $this->dumpSuffix), implode(', ', $args));
}
$this->lastDepth = $depth;
@@ -449,4 +534,20 @@ EOHTML;
}
AbstractDumper::dumpLine($depth);
}
+
+ private function getSourceLink($file, $line)
+ {
+ $options = $this->extraDisplayOptions + $this->displayOptions;
+
+ if ($fmt = $options['fileLinkFormat']) {
+ return is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+ }
+
+ return false;
+ }
+}
+
+function esc($str)
+{
+ return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
}
diff --git a/htdocs/includes/symfony/var-dumper/LICENSE b/htdocs/includes/symfony/var-dumper/LICENSE
index ef1cde91a61..207646a052d 100644
--- a/htdocs/includes/symfony/var-dumper/LICENSE
+++ b/htdocs/includes/symfony/var-dumper/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/htdocs/includes/symfony/var-dumper/README.md b/htdocs/includes/symfony/var-dumper/README.md
index 71bff335a70..3b5d55f5f5b 100644
--- a/htdocs/includes/symfony/var-dumper/README.md
+++ b/htdocs/includes/symfony/var-dumper/README.md
@@ -1,14 +1,15 @@
-Symfony mechanism for exploring and dumping PHP variables
-=========================================================
+VarDumper Component
+===================
-This component provides a mechanism that allows exploring then dumping
-any PHP variable.
+The VarDumper component provides mechanisms for walking through any arbitrary
+PHP variable. Built on top, it provides a better `dump()` function that you
+can use instead of `var_dump`.
-It handles scalars, objects and resources properly, taking hard and soft
-references into account. More than being immune to infinite recursion
-problems, it allows dumping where references link to each other.
-It explores recursive structures using a breadth-first algorithm.
+Resources
+---------
-The component exposes all the parts involved in the different steps of
-cloning then dumping a PHP variable, while applying size limits and having
-specialized output formats and methods.
+ * [Documentation](https://symfony.com/doc/current/components/var_dumper/introduction.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+ [send Pull Requests](https://github.com/symfony/symfony/pulls)
+ in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
index e5f6bf5b98e..40ec83d1322 100644
--- a/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
+++ b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -29,17 +29,20 @@ trait VarDumperTestTrait
$this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);
}
- protected function getDump($data)
+ protected function getDump($data, $key = null)
{
- $h = fopen('php://memory', 'r+b');
+ $flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;
+ $flags |= getenv('DUMP_STRING_LENGTH') ? CliDumper::DUMP_STRING_LENGTH : 0;
+
$cloner = new VarCloner();
$cloner->setMaxItems(-1);
- $dumper = new CliDumper($h);
+ $dumper = new CliDumper(null, null, $flags);
$dumper->setColors(false);
- $dumper->dump($cloner->cloneVar($data)->withRefHandles(false));
- $data = stream_get_contents($h, -1, 0);
- fclose($h);
+ $data = $cloner->cloneVar($data)->withRefHandles(false);
+ if (null !== $key && null === $data = $data->seek($key)) {
+ return;
+ }
- return rtrim($data);
+ return rtrim($dumper->dump($data, true));
}
}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
index 43d389ce1c0..105d5638ee1 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -11,13 +11,14 @@
namespace Symfony\Component\VarDumper\Tests\Caster;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Caster\Caster;
use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
/**
* @author Nicolas Grekas
*/
-class CasterTest extends \PHPUnit_Framework_TestCase
+class CasterTest extends TestCase
{
use VarDumperTestTrait;
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
new file mode 100644
index 00000000000..e0fb177b4bb
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
@@ -0,0 +1,225 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ExceptionCaster;
+use Symfony\Component\VarDumper\Caster\FrameStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class ExceptionCasterTest extends TestCase
+{
+ use VarDumperTestTrait;
+
+ private function getTestException($msg, &$ref = null)
+ {
+ return new \Exception(''.$msg);
+ }
+
+ protected function tearDown()
+ {
+ ExceptionCaster::$srcContext = 1;
+ ExceptionCaster::$traceArgs = true;
+ }
+
+ public function testDefaultSettings()
+ {
+ $ref = array('foo');
+ $e = $this->getTestException('foo', $ref);
+
+ $expectedDump = <<<'EODUMP'
+Exception {
+ #message: "foo"
+ #code: 0
+ #file: "%sExceptionCasterTest.php"
+ #line: 27
+ -trace: {
+ %sExceptionCasterTest.php:27: {
+ : {
+ : return new \Exception(''.$msg);
+ : }
+ }
+ %sExceptionCasterTest.php:%d: {
+ : $ref = array('foo');
+ : $e = $this->getTestException('foo', $ref);
+ :
+ arguments: {
+ $msg: "foo"
+ &$ref: array:1 [ …1]
+ }
+ }
+%A
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $e);
+ $this->assertSame(array('foo'), $ref);
+ }
+
+ public function testSeek()
+ {
+ $e = $this->getTestException(2);
+
+ $expectedDump = <<<'EODUMP'
+{
+ %sExceptionCasterTest.php:27: {
+ : {
+ : return new \Exception(''.$msg);
+ : }
+ }
+ %sExceptionCasterTest.php:%d: {
+ : {
+ : $e = $this->getTestException(2);
+ :
+ arguments: {
+ $msg: 2
+ }
+ }
+%A
+EODUMP;
+
+ $this->assertStringMatchesFormat($expectedDump, $this->getDump($e, 'trace'));
+ }
+
+ public function testNoArgs()
+ {
+ $e = $this->getTestException(1);
+ ExceptionCaster::$traceArgs = false;
+
+ $expectedDump = <<<'EODUMP'
+Exception {
+ #message: "1"
+ #code: 0
+ #file: "%sExceptionCasterTest.php"
+ #line: 27
+ -trace: {
+ %sExceptionCasterTest.php:27: {
+ : {
+ : return new \Exception(''.$msg);
+ : }
+ }
+ %sExceptionCasterTest.php:%d: {
+ : {
+ : $e = $this->getTestException(1);
+ : ExceptionCaster::$traceArgs = false;
+ }
+%A
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $e);
+ }
+
+ public function testNoSrcContext()
+ {
+ $e = $this->getTestException(1);
+ ExceptionCaster::$srcContext = -1;
+
+ $expectedDump = <<<'EODUMP'
+Exception {
+ #message: "1"
+ #code: 0
+ #file: "%sExceptionCasterTest.php"
+ #line: 27
+ -trace: {
+ %sExceptionCasterTest.php: 27
+ %sExceptionCasterTest.php: %d
+%A
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $e);
+ }
+
+ public function testHtmlDump()
+ {
+ $e = $this->getTestException(1);
+ ExceptionCaster::$srcContext = -1;
+
+ $cloner = new VarCloner();
+ $cloner->setMaxItems(1);
+ $dumper = new HtmlDumper();
+ $dumper->setDumpHeader('', ' ');
+ $dump = $dumper->dump($cloner->cloneVar($e)->withRefHandles(false), true);
+
+ $expectedDump = <<<'EODUMP'
+Exception {
+ #message : "1 "
+ #code : 0
+ #file : "%sTests %eCaster%eExceptionCasterTest.phpline : 27
+ -trace : {
+ %sVarDumper%eTests %eCaster%eExceptionCasterTest.php27
+ …%d
+ }
+ }
+
*/
-class PdoCasterTest extends \PHPUnit_Framework_TestCase
+class PdoCasterTest extends TestCase
{
+ use VarDumperTestTrait;
+
/**
* @requires extension pdo_sqlite
*/
@@ -36,22 +40,25 @@ class PdoCasterTest extends \PHPUnit_Framework_TestCase
$this->assertSame('NATURAL', $attr['CASE']->class);
$this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
- $xCast = array(
- "\0~\0inTransaction" => $pdo->inTransaction(),
- "\0~\0attributes" => array(
- 'CASE' => $attr['CASE'],
- 'ERRMODE' => $attr['ERRMODE'],
- 'PERSISTENT' => false,
- 'DRIVER_NAME' => 'sqlite',
- 'ORACLE_NULLS' => $attr['ORACLE_NULLS'],
- 'CLIENT_VERSION' => $pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION),
- 'SERVER_VERSION' => $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION),
- 'STATEMENT_CLASS' => array('PDOStatement'),
- 'DEFAULT_FETCH_MODE' => $attr['DEFAULT_FETCH_MODE'],
- ),
- );
- unset($cast["\0~\0attributes"]['STATEMENT_CLASS'][1]);
+ $xDump = <<<'EODUMP'
+array:2 [
+ "\x00~\x00inTransaction" => false
+ "\x00~\x00attributes" => array:9 [
+ "CASE" => NATURAL
+ "ERRMODE" => SILENT
+ "PERSISTENT" => false
+ "DRIVER_NAME" => "sqlite"
+ "ORACLE_NULLS" => NATURAL
+ "CLIENT_VERSION" => "%s"
+ "SERVER_VERSION" => "%s"
+ "STATEMENT_CLASS" => array:%d [
+ 0 => "PDOStatement"%A
+ ]
+ "DEFAULT_FETCH_MODE" => BOTH
+ ]
+]
+EODUMP;
- $this->assertSame($xCast, $cast);
+ $this->assertDumpMatchesFormat($xDump, $cast);
}
}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
new file mode 100644
index 00000000000..af038192f5c
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
@@ -0,0 +1,85 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas
+ * @requires extension redis
+ */
+class RedisCasterTest extends TestCase
+{
+ use VarDumperTestTrait;
+
+ public function testNotConnected()
+ {
+ $redis = new \Redis();
+
+ if (defined('HHVM_VERSION_ID')) {
+ $xCast = <<<'EODUMP'
+Redis {
+ #host: ""
+%A
+}
+EODUMP;
+ } else {
+ $xCast = <<<'EODUMP'
+Redis {
+ isConnected: false
+}
+EODUMP;
+ }
+
+ $this->assertDumpMatchesFormat($xCast, $redis);
+ }
+
+ public function testConnected()
+ {
+ $redis = new \Redis();
+ if (!@$redis->connect('127.0.0.1')) {
+ $e = error_get_last();
+ self::markTestSkipped($e['message']);
+ }
+
+ if (defined('HHVM_VERSION_ID')) {
+ $xCast = <<<'EODUMP'
+Redis {
+ #host: "127.0.0.1"
+%A
+}
+EODUMP;
+ } else {
+ $xCast = <<<'EODUMP'
+Redis {
+ +"socket": Redis Socket Buffer resource
+ isConnected: true
+ host: "127.0.0.1"
+ port: 6379
+ auth: null
+ dbNum: 0
+ timeout: 0.0
+ persistentId: null
+ options: {
+ READ_TIMEOUT: 0.0
+ SERIALIZER: NONE
+ PREFIX: null
+ SCAN: NORETRY
+ }
+}
+EODUMP;
+ }
+
+ $this->assertDumpMatchesFormat($xCast, $redis);
+ }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
index 0d7147fbcd2..5495a78e40f 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
@@ -11,13 +11,15 @@
namespace Symfony\Component\VarDumper\Tests\Caster;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
+use Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass;
/**
* @author Nicolas Grekas
*/
-class ReflectionCasterTest extends \PHPUnit_Framework_TestCase
+class ReflectionCasterTest extends TestCase
{
use VarDumperTestTrait;
@@ -49,7 +51,7 @@ ReflectionClass {
"export" => ReflectionMethod {
+name: "export"
+class: "ReflectionClass"
- parameters: {
+%A parameters: {
$%s: ReflectionParameter {
%A position: 0
%A
@@ -75,7 +77,7 @@ Closure {
\$b: & 123
}
file: "%sReflectionCasterTest.php"
- line: "65 to 65"
+ line: "67 to 67"
}
EOTXT
, $var
@@ -91,7 +93,7 @@ EOTXT
ReflectionParameter {
+name: "arg1"
position: 0
- typeHint: "Symfony\Component\VarDumper\Tests\Caster\NotExistingClass"
+ typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
default: null
}
EOTXT
@@ -146,83 +148,88 @@ EOTXT
*/
public function testGenerator()
{
- $g = new GeneratorDemo();
- $g = $g->baz();
- $r = new \ReflectionGenerator($g);
+ if (extension_loaded('xdebug')) {
+ $this->markTestSkipped('xdebug is active');
+ }
- $xDump = <<<'EODUMP'
+ $generator = new GeneratorDemo();
+ $generator = $generator->baz();
+
+ $expectedDump = <<<'EODUMP'
Generator {
this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
executing: {
Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz(): {
- %sGeneratorDemo.php:14: """
- {\n
- yield from bar();\n
- }\n
- """
+ %sGeneratorDemo.php:14: {
+ : {
+ : yield from bar();
+ : }
+ }
}
}
+ closed: false
}
EODUMP;
- $this->assertDumpMatchesFormat($xDump, $g);
+ $this->assertDumpMatchesFormat($expectedDump, $generator);
- foreach ($g as $v) {
+ foreach ($generator as $v) {
break;
}
- $xDump = <<<'EODUMP'
+ $expectedDump = <<<'EODUMP'
array:2 [
0 => ReflectionGenerator {
this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
trace: {
- 3. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() ==> yield(): {
- src: {
- %sGeneratorDemo.php:9: """
- {\n
- yield 1;\n
- }\n
- """
- }
+ %sGeneratorDemo.php:9: {
+ : {
+ : yield 1;
+ : }
}
- 2. Symfony\Component\VarDumper\Tests\Fixtures\bar() ==> Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
- src: {
- %sGeneratorDemo.php:20: """
- {\n
- yield from GeneratorDemo::foo();\n
- }\n
- """
- }
+ %sGeneratorDemo.php:20: {
+ : {
+ : yield from GeneratorDemo::foo();
+ : }
}
- 1. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() ==> Symfony\Component\VarDumper\Tests\Fixtures\bar(): {
- src: {
- %sGeneratorDemo.php:14: """
- {\n
- yield from bar();\n
- }\n
- """
- }
+ %sGeneratorDemo.php:14: {
+ : {
+ : yield from bar();
+ : }
}
}
+ closed: false
}
1 => Generator {
executing: {
Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
- %sGeneratorDemo.php:10: """
- yield 1;\n
- }\n
- \n
- """
+ %sGeneratorDemo.php:10: {
+ : yield 1;
+ : }
+ :
+ }
}
}
+ closed: false
}
]
EODUMP;
- $this->assertDumpMatchesFormat($xDump, array($r, $r->getExecutingGenerator()));
+ $r = new \ReflectionGenerator($generator);
+ $this->assertDumpMatchesFormat($expectedDump, array($r, $r->getExecutingGenerator()));
+
+ foreach ($generator as $v) {
+ }
+
+ $expectedDump = <<<'EODUMP'
+Generator {
+ closed: true
+}
+EODUMP;
+ $this->assertDumpMatchesFormat($expectedDump, $generator);
}
}
-function reflectionParameterFixture(NotExistingClass $arg1 = null, $arg2)
+function reflectionParameterFixture(NotLoadableClass $arg1 = null, $arg2)
{
}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
index 5d71e8d379d..e2181d90b5b 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -11,12 +11,13 @@
namespace Symfony\Component\VarDumper\Tests\Caster;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
/**
* @author Grégoire Pineau
*/
-class SplCasterTest extends \PHPUnit_Framework_TestCase
+class SplCasterTest extends TestCase
{
use VarDumperTestTrait;
@@ -57,12 +58,6 @@ SplFileInfo {
pathname: "https://google.com/about"
extension: ""
realPath: false
- writable: false
- readable: false
- executable: false
- file: false
- dir: false
- link: false
%A}
EOTXT
),
@@ -102,10 +97,10 @@ SplFileObject {
file: true
dir: false
link: false
-%AcsvControl: array:2 [
+%AcsvControl: array:%d [
0 => ","
1 => """
- ]
+%A]
flags: DROP_NEW_LINE|SKIP_EMPTY
maxLineLen: 0
fstat: array:26 [
@@ -123,4 +118,30 @@ SplFileObject {
EOTXT;
$this->assertDumpMatchesFormat($dump, $var);
}
+
+ /**
+ * @dataProvider provideCastSplDoublyLinkedList
+ */
+ public function testCastSplDoublyLinkedList($modeValue, $modeDump)
+ {
+ $var = new \SplDoublyLinkedList();
+ $var->setIteratorMode($modeValue);
+ $dump = <<assertDumpMatchesFormat($dump, $var);
+ }
+
+ public function provideCastSplDoublyLinkedList()
+ {
+ return array(
+ array(\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'),
+ array(\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'),
+ array(\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'),
+ array(\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'),
+ );
+ }
}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php
new file mode 100644
index 00000000000..c626b595f83
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php
@@ -0,0 +1,171 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ArgsStub;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Caster\LinkStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarDumper\Tests\Fixtures\FooInterface;
+
+class StubCasterTest extends TestCase
+{
+ use VarDumperTestTrait;
+
+ public function testArgsStubWithDefaults($foo = 234, $bar = 456)
+ {
+ $args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => {
+ $foo: 123
+ }
+]
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $args);
+ }
+
+ public function testArgsStubWithExtraArgs($foo = 234)
+ {
+ $args = array(new ArgsStub(array(123, 456), __FUNCTION__, __CLASS__));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => {
+ $foo: 123
+ ...: {
+ 456
+ }
+ }
+]
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $args);
+ }
+
+ public function testArgsStubNoParamWithExtraArgs()
+ {
+ $args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => {
+ 123
+ }
+]
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $args);
+ }
+
+ public function testArgsStubWithClosure()
+ {
+ $args = array(new ArgsStub(array(123), '{closure}', null));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => {
+ 123
+ }
+]
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $args);
+ }
+
+ public function testLinkStub()
+ {
+ $var = array(new LinkStub(__CLASS__, 0, __FILE__));
+
+ $cloner = new VarCloner();
+ $dumper = new HtmlDumper();
+ $dumper->setDumpHeader('', ' ');
+ $dumper->setDisplayOptions(array('fileLinkFormat' => '%f:%l'));
+ $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => "Symfony\Component\VarDumper\Tests\Caster\StubCasterTest ]
+', ' ');
+ $dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => "hello ]
+', ' ');
+ $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => "Symfony\Component\VarDumper\Tests\Caster \NotExisting ]
+', ' ');
+ $dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+
+ $expectedDump = <<<'EODUMP'
+array:1 [
+ 0 => "hello ]
+
+ */
+class XmlReaderCasterTest extends TestCase
+{
+ use VarDumperTestTrait;
+
+ /** @var \XmlReader */
+ private $reader;
+
+ protected function setUp()
+ {
+ $this->reader = new \XmlReader();
+ $this->reader->open(__DIR__.'/../Fixtures/xml_reader.xml');
+ }
+
+ protected function tearDown()
+ {
+ $this->reader->close();
+ }
+
+ public function testParserProperty()
+ {
+ $this->reader->setParserProperty(\XMLReader::SUBST_ENTITIES, true);
+
+ $expectedDump = <<<'EODUMP'
+XMLReader {
+ +nodeType: NONE
+ parserProperties: {
+ SUBST_ENTITIES: true
+ …3
+ }
+ …12
+}
+EODUMP;
+
+ $this->assertDumpMatchesFormat($expectedDump, $this->reader);
+ }
+
+ /**
+ * @dataProvider provideNodes
+ */
+ public function testNodes($seek, $expectedDump)
+ {
+ while ($seek--) {
+ $this->reader->read();
+ }
+ $this->assertDumpMatchesFormat($expectedDump, $this->reader);
+ }
+
+ public function provideNodes()
+ {
+ return array(
+ array(0, <<<'EODUMP'
+XMLReader {
+ +nodeType: NONE
+ …13
+}
+EODUMP
+ ),
+ array(1, <<<'EODUMP'
+XMLReader {
+ +localName: "foo"
+ +nodeType: ELEMENT
+ +baseURI: "%sxml_reader.xml"
+ …11
+}
+EODUMP
+ ),
+ array(2, <<<'EODUMP'
+XMLReader {
+ +localName: "#text"
+ +nodeType: SIGNIFICANT_WHITESPACE
+ +depth: 1
+ +value: """
+ \n
+
+ """
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(3, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: ELEMENT
+ +depth: 1
+ +baseURI: "%sxml_reader.xml"
+ …10
+}
+EODUMP
+ ),
+ array(4, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: END_ELEMENT
+ +depth: 1
+ +baseURI: "%sxml_reader.xml"
+ …10
+}
+EODUMP
+ ),
+ array(6, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: ELEMENT
+ +depth: 1
+ +isEmptyElement: true
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(9, <<<'EODUMP'
+XMLReader {
+ +localName: "#text"
+ +nodeType: TEXT
+ +depth: 2
+ +value: "With text"
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(12, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: ELEMENT
+ +depth: 1
+ +attributeCount: 2
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(13, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: END_ELEMENT
+ +depth: 1
+ +baseURI: "%sxml_reader.xml"
+ …10
+}
+EODUMP
+ ),
+ array(15, <<<'EODUMP'
+XMLReader {
+ +localName: "bar"
+ +nodeType: ELEMENT
+ +depth: 1
+ +attributeCount: 1
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(16, <<<'EODUMP'
+XMLReader {
+ +localName: "#text"
+ +nodeType: SIGNIFICANT_WHITESPACE
+ +depth: 2
+ +value: """
+ \n
+
+ """
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(17, <<<'EODUMP'
+XMLReader {
+ +localName: "baz"
+ +prefix: "baz"
+ +nodeType: ELEMENT
+ +depth: 2
+ +namespaceURI: "http://symfony.com"
+ +baseURI: "%sxml_reader.xml"
+ …8
+}
+EODUMP
+ ),
+ array(18, <<<'EODUMP'
+XMLReader {
+ +localName: "baz"
+ +prefix: "baz"
+ +nodeType: END_ELEMENT
+ +depth: 2
+ +namespaceURI: "http://symfony.com"
+ +baseURI: "%sxml_reader.xml"
+ …8
+}
+EODUMP
+ ),
+ array(19, <<<'EODUMP'
+XMLReader {
+ +localName: "#text"
+ +nodeType: SIGNIFICANT_WHITESPACE
+ +depth: 2
+ +value: """
+ \n
+
+ """
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(21, <<<'EODUMP'
+XMLReader {
+ +localName: "#text"
+ +nodeType: SIGNIFICANT_WHITESPACE
+ +depth: 1
+ +value: "\n"
+ +baseURI: "%sxml_reader.xml"
+ …9
+}
+EODUMP
+ ),
+ array(22, <<<'EODUMP'
+XMLReader {
+ +localName: "foo"
+ +nodeType: END_ELEMENT
+ +baseURI: "%sxml_reader.xml"
+ …11
+}
+EODUMP
+ ),
+ );
+ }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
index cd6d64d1c03..1e0809c1fbd 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
@@ -11,14 +11,17 @@
namespace Symfony\Component\VarDumper\Tests;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Cloner\VarCloner;
use Symfony\Component\VarDumper\Dumper\CliDumper;
use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
/**
* @author Nicolas Grekas
*/
-class CliDumperTest extends \PHPUnit_Framework_TestCase
+class CliDumperTest extends TestCase
{
use VarDumperTestTrait;
@@ -62,15 +65,12 @@ array:24 [
7 => b"é\\x00"
"[]" => []
"res" => stream resource {@{$res}
- wrapper_type: "plainfile"
+%A wrapper_type: "plainfile"
stream_type: "STDIO"
mode: "r"
unread_bytes: 0
seekable: true
- timed_out: false
- blocked: true
- eof: false
- options: []
+%A options: []
}
"obj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d
+foo: "foo"
@@ -118,7 +118,7 @@ EOTXT
$var = xml_parser_create();
$this->assertDumpMatchesFormat(
- <<= 70200) {
+ $this->assertDumpMatchesFormat(
+ <<<'EOTXT'
+array:4 [
+ 0 => {}
+ 1 => &1 null
+ 2 => &1 null
+ "" => 2
+]
+EOTXT
+ ,
+ $var
+ );
+ } else {
+ $this->assertDumpMatchesFormat(
+ <<<'EOTXT'
+array:4 [
+ "0" => {}
+ "1" => &1 null
+ 0 => &1 null
+ "" => 2
+]
+EOTXT
+ ,
+ $var
+ );
+ }
+ }
+
+ public function testObjectCast()
+ {
+ $var = (object) array(1 => 1);
+ $var->{1} = 2;
+
+ if (\PHP_VERSION_ID >= 70200) {
+ $this->assertDumpMatchesFormat(
+ <<<'EOTXT'
+{
+ +"1": 2
+}
+EOTXT
+ ,
+ $var
+ );
+ } else {
+ $this->assertDumpMatchesFormat(
+ <<<'EOTXT'
+{
+ +1: 1
+ +"1": 2
+}
+EOTXT
+ ,
+ $var
+ );
+ }
+ }
+
public function testClosedResource()
{
if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
@@ -152,7 +218,7 @@ EOTXT
$this->assertStringMatchesFormat(
<< 'bar'),
+ );
+
+ $this->assertDumpEquals(
+ << (3) "foo"
+ 2 => (3) "bar"
+ ]
+]
+EOTXT
+ ,
+ $var
+ );
+
+ putenv('DUMP_LIGHT_ARRAY=');
+ putenv('DUMP_STRING_LENGTH=');
+ }
+
+ /**
+ * @requires function Twig\Template::getSourceContext
+ */
public function testThrowingCaster()
{
$out = fopen('php://memory', 'r+b');
require_once __DIR__.'/Fixtures/Twig.php';
- $twig = new \__TwigTemplate_VarDumperFixture_u75a09(new \Twig_Environment(new \Twig_Loader_Filesystem()));
+ $twig = new \__TwigTemplate_VarDumperFixture_u75a09(new Environment(new FilesystemLoader()));
$dumper = new CliDumper();
$dumper->setColors(false);
@@ -181,96 +282,56 @@ EOTXT
':stream' => eval('return function () use ($twig) {
try {
$twig->render(array());
- } catch (\Twig_Error_Runtime $e) {
+ } catch (\Twig\Error\RuntimeError $e) {
throw $e->getPrevious();
}
};'),
));
- $line = __LINE__ - 2;
$ref = (int) $out;
$data = $cloner->cloneVar($out);
$dumper->dump($data, $out);
- rewind($out);
- $out = stream_get_contents($out);
-
- if (method_exists($twig, 'getSource')) {
- $twig = <<assertStringMatchesFormat(
<<doDisplay(\$context, \$blocks);
+ : } catch (Twig%sError \$e) {
+ }
+ %sTemplate.php:%d: {
+ : {
+ : \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));
+ : }
+ }
+ %sTemplate.php:%d: {
+ : try {
+ : \$this->display(\$context);
+ : } catch (%s \$e) {
+ }
+ %sCliDumperTest.php:%d: {
+%A
+ }
+ }
+ }
+%Awrapper_type: "PHP"
stream_type: "MEMORY"
mode: "%s+b"
unread_bytes: 0
seekable: true
uri: "php://memory"
- timed_out: false
- blocked: true
- eof: false
- options: []
- ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
- #message: "Unexpected Exception thrown from a caster: Foobar"
- -trace: {
- %d. __TwigTemplate_VarDumperFixture_u75a09->doDisplay() ==> new Exception(): {
- src: {
- %sTwig.php:19: """
- // line 2\\n
- throw new \Exception('Foobar');\\n
- }\\n
- """
-{$twig} }
- }
- %d. Twig_Template->displayWithErrorHandling() ==> __TwigTemplate_VarDumperFixture_u75a09->doDisplay(): {
- src: {
- %sTemplate.php:%d: """
- try {\\n
- \$this->doDisplay(\$context, \$blocks);\\n
- } catch (Twig_Error \$e) {\\n
- """
- }
- }
- %d. Twig_Template->display() ==> Twig_Template->displayWithErrorHandling(): {
- src: {
- %sTemplate.php:%d: """
- {\\n
- \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));\\n
- }\\n
- """
- }
- }
- %d. Twig_Template->render() ==> Twig_Template->display(): {
- src: {
- %sTemplate.php:%d: """
- try {\\n
- \$this->display(\$context);\\n
- } catch (Exception \$e) {\\n
- """
- }
- }
- %d. %slosure%s() ==> Twig_Template->render(): {
- src: {
- %sCliDumperTest.php:{$line}: """
- }\\n
- };'),\\n
- ));\\n
- """
- }
- }
- }
- }
+%Aoptions: []
}
EOTXT
@@ -288,11 +349,8 @@ EOTXT
$dumper->setColors(false);
$cloner = new VarCloner();
- $out = fopen('php://memory', 'r+b');
$data = $cloner->cloneVar($var);
- $dumper->dump($data, $out);
- rewind($out);
- $out = stream_get_contents($out);
+ $out = $dumper->dump($data, true);
$r = defined('HHVM_VERSION') ? '' : '#%d';
$this->assertStringMatchesFormat(
@@ -318,7 +376,7 @@ EOTXT
$var = $this->getSpecialVars();
$this->assertDumpEquals(
- << array:1 [
0 => &1 array:1 [
@@ -364,7 +422,7 @@ EOTXT
$dumper->dump($data);
$this->assertSame(
- << array:1 [
"GLOBALS" => &1 array:1 [
@@ -386,7 +444,7 @@ EOTXT
*/
public function testBuggyRefs()
{
- if (PHP_VERSION_ID >= 50600) {
+ if (\PHP_VERSION_ID >= 50600) {
$this->markTestSkipped('PHP 5.6 fixed refs counting');
}
@@ -406,7 +464,7 @@ EOTXT
});
$this->assertSame(
- << array:1 [
0 => array:1 [
@@ -421,6 +479,21 @@ EOTXT
);
}
+ public function testIncompleteClass()
+ {
+ $unserializeCallbackHandler = ini_set('unserialize_callback_func', null);
+ $var = unserialize('O:8:"Foo\Buzz":0:{}');
+ ini_set('unserialize_callback_func', $unserializeCallbackHandler);
+
+ $this->assertDumpMatchesFormat(
+ <<parent = false;
-
- $this->blocks = array(
- );
+ $this->blocks = array();
+ $this->path = $path;
}
protected function doDisplay(array $context, array $blocks = array())
@@ -26,9 +28,11 @@ class __TwigTemplate_VarDumperFixture_u75a09 extends Twig_Template
public function getDebugInfo()
{
- return array (19 => 2);
+ return array(20 => 1, 21 => 2);
+ }
+
+ public function getSourceContext()
+ {
+ return new Twig\Source(" foo bar\n twig source\n\n", 'foo.twig', $this->path ?: __FILE__);
}
}
-/* foo bar*/
-/* twig source*/
-/* */
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
new file mode 100644
index 00000000000..740c399fc44
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
@@ -0,0 +1,10 @@
+
+
+ With text
+
+
+
diff --git a/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
index 3090435c5d4..24b4bf6d283 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
@@ -11,13 +11,14 @@
namespace Symfony\Component\VarDumper\Tests;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Cloner\VarCloner;
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
/**
* @author Nicolas Grekas
*/
-class HtmlDumperTest extends \PHPUnit_Framework_TestCase
+class HtmlDumperTest extends TestCase
{
public function testGet()
{
@@ -59,26 +60,24 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
4 => INF
5 => -INF
6 => {$intMax}
- "str " => "d&%s;j&%s; \\n"
- 7 => b"&%s; \\x00"
+ "str " => "d&%s;j&%s;\\n "
+ 7 => b"&%s;\\x00 "
"[] " => []
"res " => stream resource @{$res}
- wrapper_type : "plainfile "
+%A wrapper_type : "plainfile "
stream_type : "STDIO "
mode : "r "
unread_bytes : 0
seekable : true
- timed_out : false
- blocked : true
- eof : false
- options : []
+%A options : []
}
"obj " => DumbFoo {#%d
+foo : "foo "
+"bar ": "bar "
}
"closure " => Closure {{$r}
- class : "Symfony\Component\VarDumper\Tests\HtmlDumperTest "
+ class : "Symfony\Component\VarDumper\Tests \HtmlDumperTestthis : HtmlDumperTest {{$r} &%s;}
parameters : {
\$a : {}
@@ -87,7 +86,8 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
default : null
}
}
- file : "{$var['file']} "
+ file : "%sTests %eFixtures%edumb-var.phpline : "{$var['line']} to {$var['line']} "
}
"line " => {$var['line']}
@@ -123,19 +123,41 @@ EOTXT
$cloner = new VarCloner();
$data = $cloner->cloneVar($var);
- $out = fopen('php://memory', 'r+b');
- $dumper->dump($data, $out);
- rewind($out);
- $out = stream_get_contents($out);
+ $out = $dumper->dump($data, true);
$this->assertStringMatchesFormat(
- <<b"Словарь "
EOTXT
,
+ $out
+ );
+ }
+ public function testAppend()
+ {
+ $out = fopen('php://memory', 'r+b');
+
+ $dumper = new HtmlDumper();
+ $dumper->setDumpHeader('', ' ');
+ $cloner = new VarCloner();
+
+ $dumper->dump($cloner->cloneVar(123), $out);
+ $dumper->dump($cloner->cloneVar(456), $out);
+
+ $out = stream_get_contents($out, -1, 0);
+
+ $this->assertSame(<<<'EOTXT'
+123
+456
+
*/
-class VarClonerTest extends \PHPUnit_Framework_TestCase
+class VarClonerTest extends TestCase
{
public function testMaxIntBoundary()
{
@@ -41,6 +42,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
[handle] => 0
[refCount] => 0
[position] => 1
+ [attr] => Array
+ (
+ )
+
)
)
@@ -52,6 +57,8 @@ Symfony\Component\VarDumper\Cloner\Data Object
)
+ [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+ [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
@@ -84,6 +91,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
[handle] => %i
[refCount] => 0
[position] => 1
+ [attr] => Array
+ (
+ )
+
)
)
@@ -99,6 +110,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
[handle] => %i
[refCount] => 0
[position] => 2
+ [attr] => Array
+ (
+ )
+
)
[\000+\0002] => Symfony\Component\VarDumper\Cloner\Stub Object
@@ -110,6 +125,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
[handle] => %i
[refCount] => 0
[position] => 3
+ [attr] => Array
+ (
+ )
+
)
)
@@ -126,6 +145,8 @@ Symfony\Component\VarDumper\Cloner\Data Object
)
+ [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+ [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
@@ -135,6 +156,86 @@ EOTXT;
$this->assertStringMatchesFormat($expected, print_r($clone, true));
}
+ public function testJsonCast()
+ {
+ if (ini_get('xdebug.overload_var_dump') == 2) {
+ $this->markTestSkipped('xdebug is active');
+ }
+
+ $data = (array) json_decode('{"1":{}}');
+
+ $cloner = new VarCloner();
+ $clone = $cloner->cloneVar($data);
+
+ $expected = <<<'EOTXT'
+object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
+ ["data":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
+ ["type"]=>
+ string(5) "array"
+ ["class"]=>
+ string(5) "assoc"
+ ["value"]=>
+ int(1)
+ ["cut"]=>
+ int(0)
+ ["handle"]=>
+ int(0)
+ ["refCount"]=>
+ int(0)
+ ["position"]=>
+ int(1)
+ ["attr"]=>
+ array(0) {
+ }
+ }
+ }
+ [1]=>
+ array(1) {
+ ["1"]=>
+ object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
+ ["type"]=>
+ string(6) "object"
+ ["class"]=>
+ string(8) "stdClass"
+ ["value"]=>
+ NULL
+ ["cut"]=>
+ int(0)
+ ["handle"]=>
+ int(%i)
+ ["refCount"]=>
+ int(0)
+ ["position"]=>
+ int(0)
+ ["attr"]=>
+ array(0) {
+ }
+ }
+ }
+ }
+ ["position":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ int(0)
+ ["key":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ int(0)
+ ["maxDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ int(20)
+ ["maxItemsPerDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ int(-1)
+ ["useRefHandles":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+ int(-1)
+}
+
+EOTXT;
+ ob_start();
+ var_dump($clone);
+ $this->assertStringMatchesFormat(\PHP_VERSION_ID >= 70200 ? str_replace('"1"', '1', $expected) : $expected, ob_get_clean());
+ }
+
public function testCaster()
{
$cloner = new VarCloner(array(
@@ -165,6 +266,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
[handle] => %i
[refCount] => 0
[position] => 1
+ [attr] => Array
+ (
+ )
+
)
)
@@ -176,6 +281,8 @@ Symfony\Component\VarDumper\Cloner\Data Object
)
+ [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+ [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json
index 05955f69430..44dbdebcce2 100644
--- a/htdocs/includes/symfony/var-dumper/composer.json
+++ b/htdocs/includes/symfony/var-dumper/composer.json
@@ -20,9 +20,14 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
- "twig/twig": "~1.20|~2.0"
+ "ext-iconv": "*",
+ "twig/twig": "~1.34|~2.4"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
"suggest": {
+ "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
"ext-symfony_debug": ""
},
"autoload": {
@@ -35,7 +40,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
}
}
diff --git a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
index bb16a3a4ec0..4a25f42db82 100644
--- a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
+++ b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
@@ -5,9 +5,13 @@
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"
+ failOnRisky="true"
+ failOnWarning="true"
>
From 9d234a854158f979f88b4e5119569dc8ca6c9ff3 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 3 Aug 2021 18:32:22 +0200
Subject: [PATCH 0015/1231] FIX: multicurrency: fields in discount unitialized
when creating deposit
---
htdocs/compta/facture/card.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index fe5d5c3ab0a..9501d34277e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1668,6 +1668,11 @@ if (empty($reshook))
$discount->tva_tx = $lines[$i]->tva_tx;
$discount->fk_user = $user->id;
$discount->description = $desc;
+ $discount->multicurrency_subprice = abs($lines[$i]->multicurrency_subprice);
+ $discount->multicurrency_amount_ht = abs($lines[$i]->multicurrency_total_ht);
+ $discount->multicurrency_amount_tva = abs($lines[$i]->multicurrency_total_tva);
+ $discount->multicurrency_amount_ttc = abs($lines[$i]->multicurrency_total_ttc);
+
$discountid = $discount->create($user);
if ($discountid > 0) {
$result = $object->insert_discount($discountid); // This include link_to_invoice
From 52a255e0cb9a9ed95e8781849b2aff827d4986d8 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 12 Aug 2021 10:10:57 +0200
Subject: [PATCH 0016/1231] move at bottom of pdf_other.php page
---
htdocs/admin/pdf.php | 5 ----
htdocs/admin/pdf_other.php | 59 +++++++++++++++++++++-----------------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 256038d356c..540d8318dd1 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -330,11 +330,6 @@ print ''.$langs->trans("MAIN_DOCUMENTS_LOGO_HEIGHT").'global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT : 20).'">';
print ' '.$langs->trans("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH").' ';
-print ' '.$form->textwithpicto($langs->trans("PDFOtherDesc"), $s)." ';
+
+print '';
$coldisplay++;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 2414a92cefb..8aaf345feed 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -101,3 +101,4 @@ HumanMachine=Human / Machine
WorkstationArea=Workstation area
Machines=Machines
THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+BOM=Nomenclature
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index e0a2e73365e..2db57d53bfb 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -101,3 +101,4 @@ HumanMachine=Humain/machine
WorkstationArea=Espace Poste de travail
Machines=Machines
THMEstimatedHelp=Ce taux permet de définir un coût prévisionnel de l'article
+BOM=Nomenclature
From 6de7d9b0af679fd56f68cebd8d604bbb31e598f3 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Fri, 20 Aug 2021 13:37:28 +0200
Subject: [PATCH 0022/1231] NEW : Add sub-BOM lines on BOM card
---
htdocs/bom/bom_card.php | 11 ++++-
htdocs/bom/class/bom.class.php | 6 +++
htdocs/bom/tpl/objectline_view.tpl.php | 56 +++++++++++++++++++++++++-
3 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 7bcbcc19e46..1126e04785e 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -140,6 +140,7 @@ if (empty($reshook)) {
// Set if we used free entry or predefined product
$idprod = (int) GETPOST('idprod', 'int');
+ $bom_child = (int) GETPOST('bom_select', 'int');
$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
$disable_stock_change = GETPOST('disable_stock_change', 'int');
@@ -163,6 +164,7 @@ if (empty($reshook)) {
$bomline = new BOMLine($db);
$bomline->fk_bom = $id;
$bomline->fk_product = $idprod;
+ $bomline->fk_bom_child = $bom_child;
$bomline->qty = $qty;
$bomline->qty_frozen = (int) $qty_frozen;
$bomline->disable_stock_change = (int) $disable_stock_change;
@@ -574,18 +576,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
+
+ ';
*/
$coldisplay++;
+// For BOM
+print '';
if (($line->info_bits & 2) != 2) {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 623fdab1474..c869a617b2a 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -81,9 +81,9 @@ $coldisplay++;
$tmpproduct = new Product($object->db);
$tmpproduct->fetch($line->fk_product);
$tmpbom = new BOM($object->db);
-$res = $tmpbom->fetch($line->fk_bom_child);
+$tmpbom->fetch($line->fk_bom_child);
if (!empty($tmpbom->id)){
- print '' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . ' ';
+ print '' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . ' ';
}
print $tmpproduct->getNomUrl(1);
print ' - '.$tmpproduct->label;
@@ -193,15 +193,15 @@ if ($resql){
$sub_bom_line = new BOMLine($object->db);
$sub_bom_line->fetch($obj->rowid);
- print ' ';
+ print ' ';
- print ''.$sub_bom_product->getNomUrl(1).' ';
+ print ' '.$sub_bom_product->getNomUrl(1).' ';
if ($sub_bom_line->fk_bom_child > 0) {
print ''.$sub_bom->getNomUrl(1).' ';
} else {
print ' ';
}
- print ''.price($sub_bom_line->qty, 0, '', 0, 0).' ';
+ print ''.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).' ';
if ($sub_bom_line->qty_frozen > 0) {
print ''.$sub_bom_line->qty_frozen.' ';
} else {
@@ -215,7 +215,7 @@ if ($resql){
}
print ''.$sub_bom_line->efficiency.' ';
- print ''.price($sub_bom_line->total_cost).' ';
+ print ''.price($sub_bom_line->total_cost * $line->qty).' ';
print '
Date: Mon, 23 Aug 2021 11:58:15 +0200
Subject: [PATCH 0024/1231] NEW : ShowAll/HideAll Options
---
htdocs/bom/bom_card.php | 9 ++++-----
htdocs/bom/tpl/objectline_title.tpl.php | 2 ++
htdocs/bom/tpl/objectline_view.tpl.php | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 2df4278ecbe..71c64087419 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -615,7 +615,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$(".collapse_bom").click(function() {
var id_bom_line = $(this).attr('id').replace('collapse-', '');
- console.log('tr [parentid="'+ id_bom_line +'"]')
if($(this).text().indexOf('+') > 0) {
$('[parentid="'+ id_bom_line +'"]').show();
$(this).html('(-) ');
@@ -630,14 +629,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//TODO : SHOW ALL / COLLAPSE ALL
$("#show_all").click(function() {
- $("[class^=batch_warehouse]").show();
- $("[class^=collapse_batch]").html('(-) ');
+ $("[class^=sub_bom_lines]").show();
+ $("[class^=collapse_bom]").html('(-) ');
return false;
});
$("#hide_all").click(function() {
- $("[class^=batch_warehouse]").hide();
- $("[class^=collapse_batch]").html('(+) ');
+ $("[class^=sub_bom_lines]").hide();
+ $("[class^=collapse_bom]").html('(+) ');
return false;
});
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 6b7f04b58f0..0656f23aed9 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -43,6 +43,8 @@ print "\n";
print "\n";
print '';
+print ''.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").' ';
+print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' ';
// Adds a line numbering column
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index c869a617b2a..87013582fac 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -193,7 +193,7 @@ if ($resql){
$sub_bom_line = new BOMLine($object->db);
$sub_bom_line->fetch($obj->rowid);
- print ' ';
+ print ' ';
print ' '.$sub_bom_product->getNomUrl(1).' ';
if ($sub_bom_line->fk_bom_child > 0) {
From 6cd92ca82971b3cbf5654a3b8eb35651b0fe9ad5 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Mon, 23 Aug 2021 12:15:09 +0200
Subject: [PATCH 0025/1231] NEW : Trad + Comments + Adding tooltips for conf
---
htdocs/bom/bom_card.php | 4 ++--
htdocs/bom/tpl/objectline_title.tpl.php | 2 ++
htdocs/langs/en_US/mrp.lang | 4 +++-
htdocs/langs/fr_FR/mrp.lang | 1 +
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 71c64087419..85ce0a0366d 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -627,13 +627,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
return false;
});
- //TODO : SHOW ALL / COLLAPSE ALL
+ //To Show all the sub bom lines
$("#show_all").click(function() {
$("[class^=sub_bom_lines]").show();
$("[class^=collapse_bom]").html('(-) ');
return false;
});
-
+ //To Hide all the sub bom lines
$("#hide_all").click(function() {
$("[class^=sub_bom_lines]").hide();
$("[class^=collapse_bom]").html('(+) ');
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 0656f23aed9..ce811096d33 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -45,6 +45,8 @@ print "\n";
print '';
print ''.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").' ';
print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' ';
+$form = new Form($object->db);
+print $form->textwithpicto('', $langs->trans('CollapseBOMHelp'), 1, 'help', '');
// Adds a line numbering column
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 8aaf345feed..c414a219894 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -101,4 +101,6 @@ HumanMachine=Human / Machine
WorkstationArea=Workstation area
Machines=Machines
THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
-BOM=Nomenclature
+BOM=Bill Of Materials
+CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 2db57d53bfb..12873fd5093 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -102,3 +102,4 @@ WorkstationArea=Espace Poste de travail
Machines=Machines
THMEstimatedHelp=Ce taux permet de définir un coût prévisionnel de l'article
BOM=Nomenclature
+CollapseBOMHelp=Vous pouvez définir l'affichage par défaut du détail des nomenclature dans la configuration du module "Nomenclature Produits"
From e282feb3970ef6f99b89b9ed1ced4364e91bd331 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Mon, 23 Aug 2021 14:43:17 +0200
Subject: [PATCH 0026/1231] NEW : Delete conf
---
htdocs/bom/tpl/objectline_title.tpl.php | 2 --
htdocs/bom/tpl/objectline_view.tpl.php | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index ce811096d33..0656f23aed9 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -45,8 +45,6 @@ print "\n";
print '';
print ''.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").' ';
print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' ';
-$form = new Form($object->db);
-print $form->textwithpicto('', $langs->trans('CollapseBOMHelp'), 1, 'help', '');
// Adds a line numbering column
if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 87013582fac..fbfb02576df 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -81,7 +81,7 @@ $coldisplay++;
$tmpproduct = new Product($object->db);
$tmpproduct->fetch($line->fk_product);
$tmpbom = new BOM($object->db);
-$tmpbom->fetch($line->fk_bom_child);
+$res = $tmpbom->fetch($line->fk_bom_child);
if (!empty($tmpbom->id)){
print '' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . ' ';
}
@@ -193,7 +193,11 @@ if ($resql){
$sub_bom_line = new BOMLine($object->db);
$sub_bom_line->fetch($obj->rowid);
- print ' ';
+ if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)){
+ print ' ';
+ } else {
+ print ' ';
+ }
print ' '.$sub_bom_product->getNomUrl(1).' ';
if ($sub_bom_line->fk_bom_child > 0) {
From 7474d2eef57aaec32713309ece7f84f7b85d8d88 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Mon, 23 Aug 2021 15:08:32 +0200
Subject: [PATCH 0027/1231] FIX : Add BOM column for create view
---
htdocs/bom/tpl/objectline_create.tpl.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 5835849e9ff..1a60029c439 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -61,6 +61,8 @@ if ($nolinesbefore) {
print '';
print '
'.$langs->trans('AddNewLine').' ';
print ' ';
+ // Linked BOM
+ print ''.$langs->trans('BOM').' ';
print ''.$langs->trans('Qty').' ';
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '';
From 2ecc448bc032e626436544c5eb6c7d95598fd480 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Wed, 25 Aug 2021 11:21:54 +0200
Subject: [PATCH 0028/1231] FIX : Set total_cost for parent line by
additionning total_cost of the children lines
---
htdocs/bom/tpl/objectline_view.tpl.php | 33 +++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index fbfb02576df..0d83754dd60 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -123,7 +123,8 @@ $coldisplay++;
echo $line->efficiency;
print ' ';
-print '';
+$total_cost = 0;
+print ' ';
$coldisplay++;
echo price($line->total_cost);
print ' ';
@@ -199,7 +200,7 @@ if ($resql){
print '';
}
- print ' '.$sub_bom_product->getNomUrl(1).' ';
+ print ''.$sub_bom_product->getNomUrl(1).' ';
if ($sub_bom_line->fk_bom_child > 0) {
print ''.$sub_bom->getNomUrl(1).' ';
} else {
@@ -219,13 +220,39 @@ if ($resql){
}
print ''.$sub_bom_line->efficiency.' ';
- print ''.price($sub_bom_line->total_cost * $line->qty).' ';
+ if ($sub_bom_product->cost_price > 0) {
+ print ''.price($sub_bom_product->cost_price * $line->qty).' ';
+ $total_cost.= $sub_bom_product->cost_price * $line->qty;
+ } else if ($sub_bom_product->pmp > 0) {
+ print ''.price($sub_bom_product->pmp * $line->qty).' ';
+ $total_cost.= $sub_bom_product->pmp * $line->qty;
+ } else {
+ $sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
+ $sql_supplier_price.= ' WHERE fk_product = '.$sub_bom_product->id;
+ $resql_supplier_price = $object->db->query($sql_supplier_price);
+ if ($resql_supplier_price) {
+ $obj = $object->db->fetch_object($resql_supplier_price);
+ print ''.price($obj->min_price * $line->qty).' ';
+ $total_cost+= $obj->min_price * $line->qty;
+ }
+ }
+
print '
Date: Wed, 25 Aug 2021 16:58:22 +0200
Subject: [PATCH 0029/1231] NEW : Add comments
---
htdocs/bom/tpl/objectline_view.tpl.php | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 0d83754dd60..26f4d070876 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -89,6 +89,7 @@ print $tmpproduct->getNomUrl(1);
print ' - '.$tmpproduct->label;
print '';
+// To show BOM links in the list
if ($res > 0) {
print ''.$tmpbom->getNomUrl(1).' ';
} else {
@@ -179,11 +180,13 @@ if ($action == 'selectlines') {
print ' ';
+// Select of all the sub-BOM lines
$sql = 'SELECT rowid, fk_bom_child, fk_product FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
$sql.= ' WHERE fk_bom = '.$tmpbom->id;
$resql = $object->db->query($sql);
if ($resql){
+ // Loop on all the sub-BOM lines if they exist
while ($obj = $object->db->fetch_object($resql)){
$sub_bom_product = new Product($object->db);
$sub_bom_product->fetch($obj->fk_product);
@@ -194,18 +197,24 @@ if ($resql){
$sub_bom_line = new BOMLine($object->db);
$sub_bom_line->fetch($obj->rowid);
+ //If hidden conf is set, we show directly all the sub-BOM lines
if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)){
print '';
} else {
print ' ';
}
+ // Product
print ''.$sub_bom_product->getNomUrl(1).' ';
+
+ // Sub-BOM
if ($sub_bom_line->fk_bom_child > 0) {
print ''.$sub_bom->getNomUrl(1).' ';
} else {
print ' ';
}
+
+ // Qty
print ''.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).' ';
if ($sub_bom_line->qty_frozen > 0) {
print ''.$sub_bom_line->qty_frozen.' ';
@@ -213,20 +222,28 @@ if ($resql){
print ' ';
}
+ // Disable stock change
if ($sub_bom_line->disable_stock_change > 0) {
print ''.$sub_bom_line->disable_stock_change.' ';
} else {
print ' ';
}
+ // Efficiency
print ''.$sub_bom_line->efficiency.' ';
+
+ // Cost price if it's defined
if ($sub_bom_product->cost_price > 0) {
print ''.price($sub_bom_product->cost_price * $line->qty).' ';
$total_cost.= $sub_bom_product->cost_price * $line->qty;
- } else if ($sub_bom_product->pmp > 0) {
+ }
+ // PMP if cost price isn't defined
+ else if ($sub_bom_product->pmp > 0) {
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
- } else {
+ }
+ // Minimum purchase price if cost price and PMP aren't defined
+ else {
$sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
$sql_supplier_price.= ' WHERE fk_product = '.$sub_bom_product->id;
$resql_supplier_price = $object->db->query($sql_supplier_price);
@@ -243,6 +260,7 @@ if ($resql){
}
}
+// Replace of the total_cost value by the sum of all sub-BOM lines total_cost
if ($total_cost > 0) {
$line->total_cost = price($total_cost);
?>
From 3a7d062d7deee5461391351bdb1cbbe6b60c863b Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Wed, 25 Aug 2021 15:24:03 +0000
Subject: [PATCH 0030/1231] Fixing style errors.
---
htdocs/bom/script/interface.php | 5 ++---
htdocs/bom/tpl/objectline_view.tpl.php | 10 +++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/htdocs/bom/script/interface.php b/htdocs/bom/script/interface.php
index d5811db0414..c93b54fdc33 100644
--- a/htdocs/bom/script/interface.php
+++ b/htdocs/bom/script/interface.php
@@ -7,7 +7,7 @@ $current_bom_id = GETPOST('current_bom_id', 'alphanohtml');
global $db;
-switch ($action){
+switch ($action) {
case 'select_BOM':
//Selection of nomenclatures corresponding to the selected product
$sql = 'SELECT b.rowid, b.ref, b.label, b.fk_product, p.label AS product_label FROM '.MAIN_DB_PREFIX.'bom_bom AS b ';
@@ -17,8 +17,7 @@ switch ($action){
if ($resql && $db->num_rows($resql) > 0) {
$options = array();
$cpt=0;
- while ($obj = $db->fetch_object($resql)){
-
+ while ($obj = $db->fetch_object($resql)) {
$options[$obj->rowid] = $obj->ref.' - '.$obj->label;
$cpt++;
}
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 26f4d070876..a25cdeb87ec 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -82,7 +82,7 @@ $tmpproduct = new Product($object->db);
$tmpproduct->fetch($line->fk_product);
$tmpbom = new BOM($object->db);
$res = $tmpbom->fetch($line->fk_bom_child);
-if (!empty($tmpbom->id)){
+if (!empty($tmpbom->id)) {
print '' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . ' ';
}
print $tmpproduct->getNomUrl(1);
@@ -185,9 +185,9 @@ $sql = 'SELECT rowid, fk_bom_child, fk_product FROM '.MAIN_DB_PREFIX.'bom_bomlin
$sql.= ' WHERE fk_bom = '.$tmpbom->id;
$resql = $object->db->query($sql);
-if ($resql){
+if ($resql) {
// Loop on all the sub-BOM lines if they exist
- while ($obj = $object->db->fetch_object($resql)){
+ while ($obj = $object->db->fetch_object($resql)) {
$sub_bom_product = new Product($object->db);
$sub_bom_product->fetch($obj->fk_product);
@@ -198,7 +198,7 @@ if ($resql){
$sub_bom_line->fetch($obj->rowid);
//If hidden conf is set, we show directly all the sub-BOM lines
- if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)){
+ if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)) {
print '';
} else {
print ' ';
@@ -238,7 +238,7 @@ if ($resql){
$total_cost.= $sub_bom_product->cost_price * $line->qty;
}
// PMP if cost price isn't defined
- else if ($sub_bom_product->pmp > 0) {
+ elseif ($sub_bom_product->pmp > 0) {
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
}
From a79abfd4e01e70850c8893c1c5b645bd5fdb962c Mon Sep 17 00:00:00 2001
From: henrynopo
Date: Thu, 26 Aug 2021 10:37:03 +0800
Subject: [PATCH 0031/1231] Update card.php
---
htdocs/compta/facture/card.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 31de2bbd4ff..4658c10873d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4052,6 +4052,8 @@ if ($action == 'create') {
$i++;
$close[$i]['code'] = 'badcustomer';
$i++;
+ $close[$i]['code'] = 'bankcharge';
+ $i++;
$close[$i]['code'] = 'other';
$i++;
// Help
@@ -4060,6 +4062,8 @@ if ($action == 'create') {
$i++;
$close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
$i++;
+ $close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBankChargeDesc");
+ $i++;
$close[$i]['label'] = $langs->trans("Other");
$i++;
// Texte
@@ -4068,6 +4072,8 @@ if ($action == 'create') {
$i++;
$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
$i++;
+ $close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBankCharge", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+ $i++;
$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
$i++;
// arrayreasons[code]=reason
From a25580f97cfeda3e314926264063d85e0d251a18 Mon Sep 17 00:00:00 2001
From: henrynopo
Date: Thu, 26 Aug 2021 10:38:53 +0800
Subject: [PATCH 0032/1231] Update bills.lang
---
htdocs/langs/en_US/bills.lang | 2 ++
1 file changed, 2 insertions(+)
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index a921aac9e48..6a88f2599dd 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -192,6 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
@@ -199,6 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuses to pay his debt.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is intermediary bank fees , deducted directly from the correct amount paid by the Customer.
ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:
Date: Thu, 26 Aug 2021 09:27:03 +0200
Subject: [PATCH 0033/1231] FIX : Stickler
---
htdocs/bom/tpl/objectline_view.tpl.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 26f4d070876..3e1922db7fc 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -237,11 +237,13 @@ if ($resql){
print ''.price($sub_bom_product->cost_price * $line->qty).' ';
$total_cost.= $sub_bom_product->cost_price * $line->qty;
}
+
// PMP if cost price isn't defined
else if ($sub_bom_product->pmp > 0) {
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
}
+
// Minimum purchase price if cost price and PMP aren't defined
else {
$sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
From 578de93dc4e98e3360223ca2053829605e73b676 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Thu, 26 Aug 2021 07:30:36 +0000
Subject: [PATCH 0034/1231] Fixing style errors.
---
htdocs/bom/tpl/objectline_view.tpl.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 1ee64890384..6aa00e79835 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -243,7 +243,7 @@ if ($resql) {
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
}
-
+
// Minimum purchase price if cost price and PMP aren't defined
else {
$sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
From 0222df7ecc65c0589a32fb911102d9c18facf991 Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Thu, 26 Aug 2021 09:34:30 +0200
Subject: [PATCH 0035/1231] FIX : Expected 1 space after closing brace; newline
found
---
htdocs/bom/tpl/objectline_view.tpl.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 1ee64890384..b8d054d9ecc 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -236,14 +236,14 @@ if ($resql) {
if ($sub_bom_product->cost_price > 0) {
print ''.price($sub_bom_product->cost_price * $line->qty).' ';
$total_cost.= $sub_bom_product->cost_price * $line->qty;
- }
+ }
// PMP if cost price isn't defined
elseif ($sub_bom_product->pmp > 0) {
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
}
-
+
// Minimum purchase price if cost price and PMP aren't defined
else {
$sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
From bdcddebb5fdc47084a5279b68ec65957cae47e54 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Thu, 26 Aug 2021 07:37:39 +0000
Subject: [PATCH 0036/1231] Fixing style errors.
---
htdocs/bom/tpl/objectline_view.tpl.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index b8d054d9ecc..6aa00e79835 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -236,7 +236,7 @@ if ($resql) {
if ($sub_bom_product->cost_price > 0) {
print ''.price($sub_bom_product->cost_price * $line->qty).' ';
$total_cost.= $sub_bom_product->cost_price * $line->qty;
- }
+ }
// PMP if cost price isn't defined
elseif ($sub_bom_product->pmp > 0) {
From 05444078bdffd9fd880fd9b9a7cd537c3d34a58b Mon Sep 17 00:00:00 2001
From: Adrien Raze
Date: Thu, 26 Aug 2021 09:43:50 +0200
Subject: [PATCH 0037/1231] FIX : stickler
---
htdocs/bom/tpl/objectline_view.tpl.php | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index b8d054d9ecc..41ff84b4d13 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -236,16 +236,10 @@ if ($resql) {
if ($sub_bom_product->cost_price > 0) {
print ''.price($sub_bom_product->cost_price * $line->qty).' ';
$total_cost.= $sub_bom_product->cost_price * $line->qty;
- }
-
- // PMP if cost price isn't defined
- elseif ($sub_bom_product->pmp > 0) {
+ } elseif ($sub_bom_product->pmp > 0) { // PMP if cost price isn't defined
print ''.price($sub_bom_product->pmp * $line->qty).' ';
$total_cost.= $sub_bom_product->pmp * $line->qty;
- }
-
- // Minimum purchase price if cost price and PMP aren't defined
- else {
+ } else { // Minimum purchase price if cost price and PMP aren't defined
$sql_supplier_price = 'SELECT MIN(price) AS min_price FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
$sql_supplier_price.= ' WHERE fk_product = '.$sub_bom_product->id;
$resql_supplier_price = $object->db->query($sql_supplier_price);
From 9ec72acaa04025185a98bcb6dbce4a52324d5803 Mon Sep 17 00:00:00 2001
From: atm-florian
Date: Mon, 13 Sep 2021 08:58:24 +0200
Subject: [PATCH 0038/1231] FIX: apply eldy's suggestion to not overwrite
existing extrafields of $line (cf. PR#18167)
---
htdocs/reception/card.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 70dfd7f28b0..c27c544e35d 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1183,10 +1183,10 @@ if ($action == 'create')
$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
$line->fetch_optionals();
- $line->array_options = array_merge($line->array_options, $srcLine->array_options);
if (empty($line->array_options) && !empty($dispatchLines[$indiceAsked]['array_options'])) {
$line->array_options = $dispatchLines[$indiceAsked]['array_options'];
}
+ $line->array_options = array_merge($line->array_options, $srcLine->array_options);
print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
}
From e74043d48e8cec111fb052506bc9621f107b8f1d Mon Sep 17 00:00:00 2001
From: javieralapps4up
Date: Wed, 22 Sep 2021 17:56:31 +0200
Subject: [PATCH 0039/1231] Close: #18801 Jan-30 + 1m IS NOT Mar-2
Close: #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
---
htdocs/core/lib/date.lib.php | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index fe21071901a..21a8835a229 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -166,7 +166,33 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
} else {
$date->add($interval);
}
-
+ //Change the behavior of PHP over data-interval when the result of this function is Feb 29 (non-leap years), 30 or Feb 31 (php returns March 1, 2 or 3 respectively)
+ if ($conf->global->MAIN_DATE_CHANGE_PHP_DATEINTERVAL_RESULT_FEBRUARY && $duration_unit == 'm') {
+
+ $timeyear = dol_print_date($time, '%Y');
+ $timemonth = dol_print_date($time, '%m');
+ $timetotalmonths = (($timeyear * 12) + $timemonth);
+
+ $monthsexpected = ($timetotalmonths + $duration_value);
+
+ $newtime = $date->getTimestamp();
+
+ $newtimeyear = dol_print_date($newtime, '%Y');
+ $newtimemonth = dol_print_date($newtime, '%m');
+ $newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
+
+ if ($monthsexpected < $newtimetotalmonths) {
+
+ $newtimehours = dol_print_date($newtime, '%m');
+ $newtimemins = dol_print_date($newtime, '%m');
+ $newtimesecs = dol_print_date($newtime, '%m');
+
+ $datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
+ $datelim -= (3600 * 24);
+
+ $date->setTimestamp($datelim);
+ }
+ }
return $date->getTimestamp();
}
From e5cff0ede117553c11b269a2a529fbac41eee8fb Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Wed, 22 Sep 2021 16:07:36 +0000
Subject: [PATCH 0040/1231] Fixing style errors.
---
htdocs/core/lib/date.lib.php | 46 +++++++++++++++++-------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 21a8835a229..cff6d22518f 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -168,30 +168,28 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
}
//Change the behavior of PHP over data-interval when the result of this function is Feb 29 (non-leap years), 30 or Feb 31 (php returns March 1, 2 or 3 respectively)
if ($conf->global->MAIN_DATE_CHANGE_PHP_DATEINTERVAL_RESULT_FEBRUARY && $duration_unit == 'm') {
-
- $timeyear = dol_print_date($time, '%Y');
- $timemonth = dol_print_date($time, '%m');
- $timetotalmonths = (($timeyear * 12) + $timemonth);
-
- $monthsexpected = ($timetotalmonths + $duration_value);
-
- $newtime = $date->getTimestamp();
-
- $newtimeyear = dol_print_date($newtime, '%Y');
- $newtimemonth = dol_print_date($newtime, '%m');
- $newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
-
- if ($monthsexpected < $newtimetotalmonths) {
-
- $newtimehours = dol_print_date($newtime, '%m');
- $newtimemins = dol_print_date($newtime, '%m');
- $newtimesecs = dol_print_date($newtime, '%m');
-
- $datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
- $datelim -= (3600 * 24);
-
- $date->setTimestamp($datelim);
- }
+ $timeyear = dol_print_date($time, '%Y');
+ $timemonth = dol_print_date($time, '%m');
+ $timetotalmonths = (($timeyear * 12) + $timemonth);
+
+ $monthsexpected = ($timetotalmonths + $duration_value);
+
+ $newtime = $date->getTimestamp();
+
+ $newtimeyear = dol_print_date($newtime, '%Y');
+ $newtimemonth = dol_print_date($newtime, '%m');
+ $newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
+
+ if ($monthsexpected < $newtimetotalmonths) {
+ $newtimehours = dol_print_date($newtime, '%m');
+ $newtimemins = dol_print_date($newtime, '%m');
+ $newtimesecs = dol_print_date($newtime, '%m');
+
+ $datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
+ $datelim -= (3600 * 24);
+
+ $date->setTimestamp($datelim);
+ }
}
return $date->getTimestamp();
}
From c4f1eb0c46fdaa81cc335e906177d752e8bb829e Mon Sep 17 00:00:00 2001
From: javieralapps4up
Date: Mon, 27 Sep 2021 14:32:03 +0200
Subject: [PATCH 0041/1231] Update date.lib.php
Fix my error
---
htdocs/core/lib/date.lib.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index cff6d22518f..b17c0c9d56d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -181,9 +181,9 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
$newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
if ($monthsexpected < $newtimetotalmonths) {
- $newtimehours = dol_print_date($newtime, '%m');
- $newtimemins = dol_print_date($newtime, '%m');
- $newtimesecs = dol_print_date($newtime, '%m');
+ $newtimehours = dol_print_date($newtime, '%h');
+ $newtimemins = dol_print_date($newtime, '%i');
+ $newtimesecs = dol_print_date($newtime, '%s');
$datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
$datelim -= (3600 * 24);
From 11723c2cd08fb15ffac8a51e8526fb9fec5c287a Mon Sep 17 00:00:00 2001
From: javieralapps4up
Date: Mon, 27 Sep 2021 14:49:22 +0200
Subject: [PATCH 0042/1231] Update date.lib.php
Without words, sorry
---
htdocs/core/lib/date.lib.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b17c0c9d56d..613533a443a 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -181,9 +181,9 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
$newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
if ($monthsexpected < $newtimetotalmonths) {
- $newtimehours = dol_print_date($newtime, '%h');
- $newtimemins = dol_print_date($newtime, '%i');
- $newtimesecs = dol_print_date($newtime, '%s');
+ $newtimehours = dol_print_date($newtime, '%H');
+ $newtimemins = dol_print_date($newtime, '%M');
+ $newtimesecs = dol_print_date($newtime, '%S');
$datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
$datelim -= (3600 * 24);
From 68ac62d09c8a01dc09f2d0e947094757dff871d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 7 Oct 2021 11:05:06 +0200
Subject: [PATCH 0043/1231] Fix phpcs
---
htdocs/fourn/facture/card.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e4aeae07581..985c9a4cc62 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -984,7 +984,7 @@ if (empty($reshook))
if (!in_array($lines[$i]->id, $selectedLines)) {
continue; // Skip unselected lines
}
-
+
$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
From 1efc2eda694479940fd143cc8a5e6207c82a60be Mon Sep 17 00:00:00 2001
From: lvessiller
Date: Fri, 8 Oct 2021 11:54:38 +0200
Subject: [PATCH 0044/1231] FIX reload user lang
---
scripts/cron/cron_run_jobs.php | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 80f586a6788..7e6fb991478 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -125,7 +125,7 @@ if ($userlogin == 'firstadmin') {
// Check user login
$user = new User($db);
-$result = $user->fetch('', $userlogin);
+$result = $user->fetch('', $userlogin, '', 1);
if ($result < 0) {
echo "User Error: ".$user->error;
dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
@@ -137,6 +137,16 @@ if ($result < 0) {
exit(-1);
}
}
+
+// Reload langs
+$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
+if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
+ $langcode = $user->conf->MAIN_LANG_DEFAULT;
+}
+if ($langs->getDefaultLang() != $langcode) {
+ $langs->setDefaultLang($langcode);
+}
+
$user->getrights();
if (isset($argv[3]) && $argv[3]) {
@@ -195,8 +205,8 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
$mysoc->setMysoc($conf);
// Force recheck that user is ok for the entity to process and reload permission for entity
- if ($conf->entity != $user->entity && $user->entity != 0) {
- $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
+ if ($conf->entity != $user->entity) {
+ $result = $user->fetch('', $userlogin, '', 1);
if ($result < 0) {
echo "\nUser Error: ".$user->error."\n";
dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
From be4a00213c6765d239bac5a861ed7f0d8ed8b141 Mon Sep 17 00:00:00 2001
From: lvessiller
Date: Fri, 8 Oct 2021 15:58:08 +0200
Subject: [PATCH 0045/1231] FIX optional visibility on create card
---
htdocs/asset/type.php | 2 +-
htdocs/categories/card.php | 2 +-
htdocs/comm/action/card.php | 2 +-
htdocs/comm/mailing/card.php | 2 +-
htdocs/commande/card.php | 2 +-
htdocs/compta/bank/card.php | 2 +-
htdocs/compta/facture/card.php | 2 +-
htdocs/don/card.php | 2 +-
htdocs/expensereport/card.php | 2 +-
htdocs/fichinter/card.php | 2 +-
htdocs/fourn/commande/card.php | 2 +-
htdocs/fourn/facture/card.php | 2 +-
htdocs/product/card.php | 2 +-
htdocs/reception/card.php | 2 +-
htdocs/salaries/card.php | 2 +-
htdocs/supplier_proposal/card.php | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 6103b963e21..b09b56ffbcf 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -389,7 +389,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print '';
print "\n";
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 141e061ac20..a11d9f843a5 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -266,7 +266,7 @@ if ($user->rights->categorie->creer) {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print '';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index bc9b77cc881..53b6e329c90 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1262,7 +1262,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print '';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e03d13c29e8..b91bc866d9a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -726,7 +726,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'create');
}
print '';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c40a64032c0..1c0ae369be6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1721,7 +1721,7 @@ if ($action == 'create' && $usercancreate) {
}
};
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
// Template to use by default
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index d1cc0413bfd..c6b852be444 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -444,7 +444,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print '';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6ea03d8bd23..83c8ec8d718 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3636,7 +3636,7 @@ if ($action == 'create') {
}
};
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
// Template to use by default
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 1b3c72906b4..9579497411f 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -492,7 +492,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print ' ';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 81995792dbb..eec14c85a99 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1421,7 +1421,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
print '';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index e138c8ed6fe..225f9ebacb8 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -930,7 +930,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'create');
}
// Show link to origin object
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f02ffb99d77..cdeeeff9d17 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1760,7 +1760,7 @@ if ($action == 'create') {
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'create');
}
// Bouton "Create Draft"
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6241a0cee15..80f868f3484 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2270,7 +2270,7 @@ if ($action == 'create') {
}
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'create');
}
// Public note
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b7aba2ec398..9aa2c1a1a09 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1334,7 +1334,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
// Note (private, no output on invoices, propales...)
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 40b605bbe17..111d65e8c7f 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -869,7 +869,7 @@ if ($action == 'create') {
if ($objectsrc->fetch_optionals() > 0) {
$recept->array_options = array_merge($recept->array_options, $objectsrc->array_options);
}
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
// Incoterms
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index b6f8dd91f14..486b4fd70ea 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -576,7 +576,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit');
+ print $object->showOptionals($extrafields, 'create');
}
print '';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 6f1d0824b0b..1500f00ba91 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1233,7 +1233,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- print $object->showOptionals($extrafields, 'edit', $parameters);
+ print $object->showOptionals($extrafields, 'create', $parameters);
}
From 90be175c500d57f60118764b7a2110e118a7c07b Mon Sep 17 00:00:00 2001
From: lvessiller
Date: Fri, 8 Oct 2021 16:20:51 +0200
Subject: [PATCH 0046/1231] FIX load tranlate array after setting lang
---
scripts/cron/cron_run_jobs.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 7e6fb991478..8aa996f9c17 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -76,9 +76,6 @@ $userlogin = $argv[2];
$version = DOL_VERSION;
$error = 0;
-// Language Management
-$langs->loadLangs(array('main', 'admin', 'cron', 'dict'));
-
/*
* Main
@@ -145,7 +142,10 @@ if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
}
if ($langs->getDefaultLang() != $langcode) {
$langs->setDefaultLang($langcode);
+ $langs->tab_translate = array();
}
+// Language Management
+$langs->loadLangs(array('main', 'admin', 'cron', 'dict'));
$user->getrights();
@@ -228,6 +228,8 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
}
if ($langs->getDefaultLang() != $langcode) {
$langs->setDefaultLang($langcode);
+ $langs->tab_translate = array();
+ $langs->loadLangs(array('main', 'admin', 'cron', 'dict'));
}
}
From 2da16ade6c722e1464a6c8f571beaba150f194d9 Mon Sep 17 00:00:00 2001
From: atm-florian
Date: Fri, 8 Oct 2021 17:24:52 +0200
Subject: [PATCH 0047/1231] FIX: consistent UX when calling a tab from the
invoice card with empty ref / id
---
htdocs/compta/facture/card.php | 11 +++++++++++
htdocs/compta/facture/contact.php | 11 +++++++++++
htdocs/compta/facture/document.php | 11 +++++++++++
htdocs/compta/facture/info.php | 11 +++++++++++
htdocs/compta/facture/note.php | 11 +++++++++++
5 files changed, 55 insertions(+)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e15b2722800..ab568332dd8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2756,6 +2756,17 @@ if (empty($reshook))
* View
*/
+if (empty($object->id)) {
+ llxHeader();
+ $head = facture_prepare_head($object);
+ $langs->load('errors');
+ echo dol_get_fiche_head($head, 'compta', $langs->trans("InvoiceCustomer"), -1, 'bill'),
+ '' . $langs->trans("ErrorRecordNotFound") . '
';
+ llxFooter();
+ dol_shutdown();
+ exit;
+}
+
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c340d68242e..c0e0a40c2c5 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -118,6 +118,17 @@ elseif ($action == 'deletecontact' && $user->rights->facture->creer)
* View
*/
+if (empty($object->id)) {
+ llxHeader();
+ $head = facture_prepare_head($object);
+ $langs->load('errors');
+ echo dol_get_fiche_head($head, 'contact', $langs->trans("InvoiceCustomer"), -1, 'bill'),
+ '' . $langs->trans("ErrorRecordNotFound") . '
';
+ llxFooter();
+ dol_shutdown();
+ exit;
+}
+
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('ContactsAddresses');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index e880d77db74..64ebed251d3 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -85,6 +85,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
* View
*/
+if (empty($object->id)) {
+ llxHeader();
+ $head = facture_prepare_head($object);
+ $langs->load('errors');
+ echo dol_get_fiche_head($head, 'documents', $langs->trans("InvoiceCustomer"), -1, 'bill'),
+ '' . $langs->trans("ErrorRecordNotFound") . '
';
+ llxFooter();
+ dol_shutdown();
+ exit;
+}
+
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index bad63cf1f61..9e40fd8b5a8 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -43,6 +43,17 @@ $ref = GETPOST("ref", 'alpha');
* View
*/
+if (empty($object->id)) {
+ llxHeader();
+ $head = facture_prepare_head($object);
+ $langs->load('errors');
+ echo dol_get_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill'),
+ '' . $langs->trans("ErrorRecordNotFound") . '
';
+ llxFooter();
+ dol_shutdown();
+ exit;
+}
+
$form = new Form($db);
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Info');
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 07084a0cf2c..428383b4907 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -64,6 +64,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
* View
*/
+if (empty($object->id)) {
+ llxHeader();
+ $head = facture_prepare_head($object);
+ $langs->load('errors');
+ echo dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill'),
+ '' . $langs->trans("ErrorRecordNotFound") . '
';
+ llxFooter();
+ dol_shutdown();
+ exit;
+}
+
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
From cdf1d37a1d50f57bec4a6a5140cafde5ef82a818 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Fri, 8 Oct 2021 18:52:01 +0200
Subject: [PATCH 0048/1231] Fix changelog
---
ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 4625e7bc077..f202acb2403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,48 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+***** ChangeLog for 14.0.3 compared to 14.0.2 *****
+
+FIX: #18698 Supplier invoice list - "alert" checkbox not working
+FIX: #18735
+FIX: #18767 : Member delete
+FIX: #18854
+FIX: #18910 : MRP List SQL query syntax error with more than one extrafileds.
+FIX: Accountancy - Format Quadra export - Missing line type C to create automaticly a subledger account with label
+FIX: Accountancy - Missing specific filename for export on format FEC2, Ciel & repare it
+FIX: Accountancy - Option of export popup are inverted
+FIX: Accountancy - Some correction on export name
+FIX: Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50)
+FIX: add warehouse in projects' overview count
+FIX: autocalculation of the supplier price in main currency.
+FIX: avoid warning if $categories is an id
+FIX: Bad use of a forced contact of another company on PDF/ODT documents
+FIX: Button text on proposal card to create a invoice
+FIX: calculateCosts of BOM must not be included into fetch
+FIX: check if greater 0
+FIX: default language defined for IN country
+FIX: fetch of product with modulebuilder load too much data
+FIX: Filter on categories
+FIX: indentation
+FIX: init hookmanager after loading $conf values
+FIX: legal issue on expense report pdf (must also show price without tax)
+FIX: missing filter status=1 on rss feeds
+FIX: move fetch_optionnal into $ac_static->fetch()
+FIX: payment using wrong type in takepos when too many payment mode
+FIX: Product accountancy affectation with product_perentity activated (PR #18620)
+FIX: products/services card: hidden extrafields were overridden
+FIX: Propal list - Problem of pagination on date
+FIX: selected lines on supplier invoice create
+FIX: Selection of type "people" for membership must hide the company
+FIX: select list of orders not complete when field type of company is on
+FIX: support of localtax on expense report
+FIX: task time: can't filter by user with pgsql + show error message
+FIX: task time: keep on using natural_search
+FIX: Test when date of invoie is in future (pb with TZ and offset)
+FIX: translation into email for member at membership validation.
+FIX: unprivileged user can see task associated with a not allowed project
+FIX: user without permission can set ticket subject
+
***** ChangeLog for 14.0.2 compared to 14.0.1 *****
FIX: #18353 Invoice list translation issue
From de17b367c8e873d12c86ed004f7521097f5e5927 Mon Sep 17 00:00:00 2001
From: Benjamin Chantalat <74144396+PyroShape@users.noreply.github.com>
Date: Sat, 9 Oct 2021 20:14:16 +0200
Subject: [PATCH 0049/1231] FIX #18875 in v14
---
htdocs/reception/list.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 624748ded8f..2d6600dcc45 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -612,11 +612,13 @@ if ($search_ref_supplier) {
$param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
}
// Add $param from extra fields
-foreach ($search_array_options as $key => $val) {
- $crit = $val;
- $tmpkey = preg_replace('/search_options_/', '', $key);
- if ($val != '') {
- $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
+if ($search_array_options) {
+ foreach ($search_array_options as $key => $val) {
+ $crit = $val;
+ $tmpkey = preg_replace('/search_options_/', '', $key);
+ if ($val != '') {
+ $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
+ }
}
}
From 6e60e1f45308c4bcf5b08636ad6bda6cc601b1fe Mon Sep 17 00:00:00 2001
From: Benjamin Chantalat <74144396+PyroShape@users.noreply.github.com>
Date: Sat, 9 Oct 2021 20:38:46 +0200
Subject: [PATCH 0050/1231] Fix date format into supplier order info tab
---
htdocs/fourn/class/fournisseur.commande.class.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3facc342f08..2e9727de83c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2927,11 +2927,11 @@ class CommandeFournisseur extends CommonOrder
$this->user_approve_id2 = $obj->fk_user_approve2;
}
- $this->date_creation = $this->db->idate($obj->datec);
- $this->date_modification = $this->db->idate($obj->datem);
- $this->date_approve = $this->db->idate($obj->datea);
- $this->date_approve2 = $this->db->idate($obj->datea2);
- $this->date_validation = $this->db->idate($obj->date_validation);
+ $this->date_creation = $obj->datec;
+ $this->date_modification = $obj->datem;
+ $this->date_approve = $obj->datea;
+ $this->date_approve2 = $obj->datea2;
+ $this->date_validation = $obj->date_validation;
}
$this->db->free($result);
} else {
From ff5f3714280979bc3899ac74c760f2e09f35f448 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 10 Oct 2021 20:46:06 +0200
Subject: [PATCH 0051/1231] Fix add protection to avoid deletion of page when
deleting a file
---
htdocs/website/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 6aab64736e3..f40c21778f5 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1231,7 +1231,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes' && $permissiontodelete)
}
// Delete page (from website page menu)
-if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
+if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete && !GETPOST('file_manager')) {
$error = 0;
$db->begin();
From 65c0167d077605451f37351d94ef76cd8113fc69 Mon Sep 17 00:00:00 2001
From: Benjamin Chantalat <74144396+PyroShape@users.noreply.github.com>
Date: Sun, 10 Oct 2021 20:50:51 +0200
Subject: [PATCH 0052/1231] ADD : info of number of product still to dispatched
in a supplier order
---
htdocs/core/lib/fourn.lib.php | 4 ++
.../class/fournisseur.commande.class.php | 43 +++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index efc9f60147c..e81bdb5e9d0 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -157,8 +157,12 @@ function ordersupplier_prepare_head($object)
if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
$langs->load("stocks");
+ $nbLineToDispatch = count($object->getNotCompletlyDispatchedLines());
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
$head[$h][1] = $langs->trans("OrderDispatch");
+ if ($nbLineToDispatch > 0) {
+ $head[$h][1] .= ''.$nbLineToDispatch.' ';
+ }
$head[$h][2] = 'dispatch';
$h++;
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 99ef4e54e87..5277f5b1d34 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2274,6 +2274,49 @@ class CommandeFournisseur extends CommonOrder
return $ret;
}
+ /**
+ * Return array of the lines that are waiting to be dispatched
+ *
+ * @return array Array of lines
+ */
+ public function getNotCompletlyDispatchedLines()
+ {
+ $ret = array();
+
+ $sql = "SELECT supplierOrderDet.fk_product as product_id, supplierOrderDet.qty as qty_ordered, supplierOrderDet.fk_commande,";
+ $sql .= " dispatch.rowid as dispatchedlineid, sum(dispatch.qty) as qty_dispatched";
+ $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as supplierOrderDet";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as dispatch ON supplierOrderDet.rowid = dispatch.fk_commandefourndet";
+ $sql .= " WHERE supplierOrderDet.fk_commande = ".$this->id;
+ $sql .= " GROUP BY supplierOrderDet.fk_product";
+
+ $resql = $this->db->query($sql);
+
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+ $i = 0;
+
+ while ($i < $num) {
+ $objp = $this->db->fetch_object($resql);
+
+ if ($objp) {
+ // If product not completly dispatched
+ if (is_null($objp->qty_dispatched) OR ($objp->qty_dispatched < $objp->qty_ordered)){
+ $ret[] = array(
+ 'product_id' => $objp->product_id,
+ 'qty_ordered' => $objp->qty_ordered,
+ 'qty_dispatched' => $objp->qty_dispatched,
+ );
+ }
+ }
+ $i++;
+ }
+ } else {
+ dol_print_error($this->db, 'Failed to execute request to get not completly dispatched lines');
+ }
+
+ return $ret;
+ }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
From 73bd05606c554802d3371cfb7235e365e8f0fff2 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Sun, 10 Oct 2021 18:53:22 +0000
Subject: [PATCH 0053/1231] Fixing style errors.
---
htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5277f5b1d34..a9d3cbdcac5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2289,7 +2289,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as dispatch ON supplierOrderDet.rowid = dispatch.fk_commandefourndet";
$sql .= " WHERE supplierOrderDet.fk_commande = ".$this->id;
$sql .= " GROUP BY supplierOrderDet.fk_product";
-
+
$resql = $this->db->query($sql);
if ($resql) {
@@ -2301,7 +2301,7 @@ class CommandeFournisseur extends CommonOrder
if ($objp) {
// If product not completly dispatched
- if (is_null($objp->qty_dispatched) OR ($objp->qty_dispatched < $objp->qty_ordered)){
+ if (is_null($objp->qty_dispatched) OR ($objp->qty_dispatched < $objp->qty_ordered)) {
$ret[] = array(
'product_id' => $objp->product_id,
'qty_ordered' => $objp->qty_ordered,
From a7563ff62e1fbef41f99bbb679674f0ef2cce67c Mon Sep 17 00:00:00 2001
From: Benjamin Chantalat <74144396+PyroShape@users.noreply.github.com>
Date: Sun, 10 Oct 2021 21:15:14 +0200
Subject: [PATCH 0054/1231] Fix : Found non quoted or not casted var into sql
request
---
htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a9d3cbdcac5..787d9ee321b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2287,7 +2287,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= " dispatch.rowid as dispatchedlineid, sum(dispatch.qty) as qty_dispatched";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as supplierOrderDet";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as dispatch ON supplierOrderDet.rowid = dispatch.fk_commandefourndet";
- $sql .= " WHERE supplierOrderDet.fk_commande = ".$this->id;
+ $sql .= " WHERE supplierOrderDet.fk_commande = ".((int) $this->id);
$sql .= " GROUP BY supplierOrderDet.fk_product";
$resql = $this->db->query($sql);
From 754b13a83fbada80e28ff7be2146740ea299b87b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Mon, 11 Oct 2021 08:58:00 +0200
Subject: [PATCH 0055/1231] NEW Add sortorder on units list
---
htdocs/admin/dict.php | 12 ++++++------
htdocs/core/class/cunits.class.php | 8 +++++++-
htdocs/core/class/html.form.class.php | 1 +
htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 2 ++
htdocs/install/mysql/tables/llx_c_units.sql | 15 ++++++++-------
5 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d0a699ef979..ea7f0c92b37 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
* Copyright (C) 2011 Remy Younes
* Copyright (C) 2012-2015 Marcos García
* Copyright (C) 2012 Christophe Battarel
- * Copyright (C) 2011-2020 Alexandre Spangaro
+ * Copyright (C) 2011-2021 Alexandre Spangaro
* Copyright (C) 2015 Ferran Marcet
* Copyright (C) 2016 Raphaël Doursenaud
* Copyright (C) 2019-2020 Frédéric France
@@ -232,7 +232,7 @@ $tabsql[33] = "SELECT rowid, pos, code, label, active FROM ".MAIN_DB_PREFIX."c_h
$tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM ".MAIN_DB_PREFIX."c_hrm_function";
$tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_cat c";
$tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_range r";
-$tabsql[37] = "SELECT r.rowid, r.code, r.label, r.short_label, r.unit_type, r.scale, r.active FROM ".MAIN_DB_PREFIX."c_units r";
+$tabsql[37] = "SELECT r.rowid, r.code, r.sortorder, r.label, r.short_label, r.unit_type, r.scale, r.active FROM ".MAIN_DB_PREFIX."c_units r";
$tabsql[38] = "SELECT rowid, entity, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
$tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
$tabsql[40] = "SELECT id as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
@@ -278,7 +278,7 @@ $tabsqlsort[33] = "code ASC";
$tabsqlsort[34] = "code ASC";
$tabsqlsort[35] = "c.label ASC";
$tabsqlsort[36] = "r.fk_c_exp_tax_cat ASC, r.range_ik ASC";
-$tabsqlsort[37] = "r.unit_type ASC, r.scale ASC, r.code ASC";
+$tabsqlsort[37] = "sortorder ASC";
$tabsqlsort[38] = "rowid, code ASC";
$tabsqlsort[39] = "sortorder ASC";
$tabsqlsort[40] = "code ASC";
@@ -324,7 +324,7 @@ $tabfield[33] = "code,label";
$tabfield[34] = "code,label";
$tabfield[35] = "label";
$tabfield[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfield[37] = "code,label,short_label,unit_type,scale";
+$tabfield[37] = "code,label,short_label,unit_type,scale,sortorder";
$tabfield[38] = "code,label,url,icon,entity";
$tabfield[39] = "code,libelle,sortorder";
$tabfield[40] = "code,libelle,picto";
@@ -370,7 +370,7 @@ $tabfieldvalue[33] = "code,label";
$tabfieldvalue[34] = "code,label";
$tabfieldvalue[35] = "label";
$tabfieldvalue[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfieldvalue[37] = "code,label,short_label,unit_type,scale";
+$tabfieldvalue[37] = "code,label,short_label,unit_type,scale,sortorder";
$tabfieldvalue[38] = "code,label,url,icon";
$tabfieldvalue[39] = "code,libelle,sortorder";
$tabfieldvalue[40] = "code,libelle,picto";
@@ -417,7 +417,7 @@ $tabfieldinsert[33] = "code,label";
$tabfieldinsert[34] = "code,label";
$tabfieldinsert[35] = "label";
$tabfieldinsert[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfieldinsert[37] = "code,label,short_label,unit_type,scale";
+$tabfieldinsert[37] = "code,label,short_label,unit_type,scale,sortorder";
$tabfieldinsert[38] = "code,label,url,icon,entity";
$tabfieldinsert[39] = "code,label,sortorder";
$tabfieldinsert[40] = "code,libelle,picto";
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index f2a672ec1a7..7219f901c9f 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -240,6 +240,7 @@ class CUnits // extends CommonObject
$sql = 'SELECT';
$sql .= " t.rowid,";
$sql .= " t.code,";
+ $sql .= " t.sortorder,";
$sql .= " t.label,";
$sql .= " t.short_label,";
$sql .= " t.unit_type,";
@@ -280,8 +281,9 @@ class CUnits // extends CommonObject
while ($obj = $this->db->fetch_object($resql)) {
$record = new self($this->db);
- $record->id = $obj->rowid;
+ $record->id = $obj->rowid;
$record->code = $obj->code;
+ $record->sortorder = $obj->sortorder;
$record->label = $obj->label;
$record->short_label = $obj->short_label;
$record->unit_type = $obj->unit_type;
@@ -318,6 +320,9 @@ class CUnits // extends CommonObject
if (isset($this->code)) {
$this->code = trim($this->code);
}
+ if (isset($this->sortorder)) {
+ $this->sortorder = trim($this->sortorder);
+ }
if (isset($this->label)) {
$this->libelle = trim($this->label);
}
@@ -340,6 +345,7 @@ class CUnits // extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+ $sql .= " sortorder=".(isset($this->sortorder) ? "'".$this->db->escape($this->sortorder)."'" : "null").",";
$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
$sql .= " short_label=".(isset($this->short_label) ? "'".$this->db->escape($this->short_label)."'" : "null").",";
$sql .= " unit_type=".(isset($this->unit_type) ? "'".$this->db->escape($this->unit_type)."'" : "null").",";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c69b794a011..da6b60218e2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4353,6 +4353,7 @@ class Form
if (!empty($unit_type)) {
$sql .= " AND unit_type = '".$this->db->escape($unit_type)."'";
}
+ $sql .= " ORDER BY sortorder";
$resql = $this->db->query($sql);
if ($resql && $this->db->num_rows($resql) > 0) {
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 82a6bdec3dc..e99bbae7a10 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -370,3 +370,5 @@ ALTER TABLE llx_hrm_skillrank ADD INDEX idx_hrm_skillrank_fk_skill (fk_skill);
ALTER TABLE llx_hrm_skillrank ADD CONSTRAINT llx_hrm_skillrank_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
--END GRH/HRM MODULE
+
+ALTER TABLE llx_c_units ADD COLUMN sortorder smallint AFTER code;
diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql
index d4ff78b79f1..ef77703ae6e 100644
--- a/htdocs/install/mysql/tables/llx_c_units.sql
+++ b/htdocs/install/mysql/tables/llx_c_units.sql
@@ -19,11 +19,12 @@
-- ========================================================================
create table llx_c_units(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- code varchar(3),
- scale integer,
- label varchar(50),
- short_label varchar(5),
- unit_type varchar(10),
- active tinyint DEFAULT 1 NOT NULL
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ code varchar(3),
+ sortorder smallint,
+ scale integer,
+ label varchar(50),
+ short_label varchar(5),
+ unit_type varchar(10),
+ active tinyint DEFAULT 1 NOT NULL
) ENGINE=innodb;
From b43dcb24f0b0c2819b30fed0bde5d76f8a6523d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 11 Oct 2021 11:04:21 +0200
Subject: [PATCH 0056/1231] Update fournisseur.commande.class.php
---
htdocs/fourn/class/fournisseur.commande.class.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2e9727de83c..02ffc77918a 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2927,11 +2927,11 @@ class CommandeFournisseur extends CommonOrder
$this->user_approve_id2 = $obj->fk_user_approve2;
}
- $this->date_creation = $obj->datec;
- $this->date_modification = $obj->datem;
- $this->date_approve = $obj->datea;
- $this->date_approve2 = $obj->datea2;
- $this->date_validation = $obj->date_validation;
+ $this->date_creation = $this->db->jdate($obj->datec);
+ $this->date_modification = $this->db->jdate($obj->datem);
+ $this->date_approve = $this->db->jdate($obj->datea);
+ $this->date_approve2 = $this->db->jdate($obj->datea2);
+ $this->date_validation = $this->db->jdate($obj->date_validation);
}
$this->db->free($result);
} else {
From 57052e2fbabffa16b25a25fe02a1966e117d09db Mon Sep 17 00:00:00 2001
From: atm-florian
Date: Mon, 11 Oct 2021 11:10:14 +0200
Subject: [PATCH 0057/1231] FIX PR#18931 Remove useless explicit call to
dol_shutdown
---
htdocs/compta/facture/card.php | 1 -
htdocs/compta/facture/contact.php | 1 -
htdocs/compta/facture/document.php | 1 -
htdocs/compta/facture/info.php | 1 -
htdocs/compta/facture/note.php | 1 -
5 files changed, 5 deletions(-)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ab568332dd8..c772fd0ad7b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2763,7 +2763,6 @@ if (empty($object->id)) {
echo dol_get_fiche_head($head, 'compta', $langs->trans("InvoiceCustomer"), -1, 'bill'),
'' . $langs->trans("ErrorRecordNotFound") . '
';
llxFooter();
- dol_shutdown();
exit;
}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c0e0a40c2c5..7177463c30e 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -125,7 +125,6 @@ if (empty($object->id)) {
echo dol_get_fiche_head($head, 'contact', $langs->trans("InvoiceCustomer"), -1, 'bill'),
'' . $langs->trans("ErrorRecordNotFound") . '
';
llxFooter();
- dol_shutdown();
exit;
}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 64ebed251d3..0818b944705 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -92,7 +92,6 @@ if (empty($object->id)) {
echo dol_get_fiche_head($head, 'documents', $langs->trans("InvoiceCustomer"), -1, 'bill'),
'' . $langs->trans("ErrorRecordNotFound") . '
';
llxFooter();
- dol_shutdown();
exit;
}
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 9e40fd8b5a8..955c41693c0 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -50,7 +50,6 @@ if (empty($object->id)) {
echo dol_get_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill'),
'' . $langs->trans("ErrorRecordNotFound") . '
';
llxFooter();
- dol_shutdown();
exit;
}
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 428383b4907..dadb61b551d 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -71,7 +71,6 @@ if (empty($object->id)) {
echo dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill'),
'' . $langs->trans("ErrorRecordNotFound") . '
';
llxFooter();
- dol_shutdown();
exit;
}
From e899d94ed5c396edb5956ea7ed4011a0acd7cb42 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Mon, 11 Oct 2021 12:50:07 +0200
Subject: [PATCH 0058/1231] NEW Accountancy - rewrite bind accountancy code
finding on purchase invoice
---
htdocs/accountancy/supplier/index.php | 90 ++++++++++----
htdocs/accountancy/supplier/list.php | 161 ++++++++++----------------
2 files changed, 130 insertions(+), 121 deletions(-)
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 5e409f303ea..476ead53860 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -1,7 +1,7 @@
- * Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2013-2020 Alexandre Spangaro
+ * Copyright (C) 2013-2021 Florian Henry
+ * Copyright (C) 2013-2021 Alexandre Spangaro
* Copyright (C) 2014 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
// Load translation files required by the page
$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
@@ -44,6 +45,7 @@ if (!$user->rights->accounting->bind->write) {
accessforbidden();
}
+$accountingAccount = new AccountingAccount($db);
$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
if (GETPOST("year", 'int')) {
@@ -97,6 +99,7 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
$sql1 .= ' ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
$sql1 .= ' AND fd.fk_facture_fourn IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE entity = '.$conf->entity.')';
$sql1 .= ' AND fk_code_ventilation <> 0';
+
dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
$resql1 = $db->query($sql1);
if (!$resql1) {
@@ -163,7 +166,7 @@ if ($action == 'validatehistory') {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON " . $alias_product_perentity . ".accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_buy_intra = aa2.account_number AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_product_perentity . ".accountancy_code_buy = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_buy = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2";
if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
@@ -181,27 +184,74 @@ if ($action == 'validatehistory') {
$isBuyerInEEC = isInEEC($mysoc);
+ $thirdpartystatic = new Societe($db);
+ $facture_static = new FactureFournisseur($db);
+ $facture_static_det = new SupplierInvoiceLine($db);
+ $product_static = new Product($db);
+
$i = 0;
while ($i < min($num_lines, 10000)) { // No more than 10000 at once
$objp = $db->fetch_object($result);
- $isSellerInEEC = isInEEC($objp);
+ $thirdpartystatic->id = $objp->socid;
+ $thirdpartystatic->name = $objp->name;
+ $thirdpartystatic->client = $objp->client;
+ $thirdpartystatic->fournisseur = $objp->fournisseur;
+ $thirdpartystatic->code_client = $objp->code_client;
+ $thirdpartystatic->code_compta_client = $objp->code_compta_client;
+ $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+ $thirdpartystatic->email = $objp->email;
+ $thirdpartystatic->country_code = $objp->country_code;
+ $thirdpartystatic->tva_intra = $objp->tva_intra;
+ $thirdpartystatic->code_compta = $objp->company_code_sell;
- // Level 2: Search suggested account for product/service (similar code exists in page list.php to make manual binding)
- $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)
- $objp->code_buy_p = $objp->code_buy;
- $objp->aarowid_suggest = $objp->aarowid;
- $suggestedaccountingaccountfor = '';
+ $product_static->ref = $objp->product_ref;
+ $product_static->id = $objp->product_id;
+ $product_static->type = $objp->type;
+ $product_static->label = $objp->product_label;
+ $product_static->status = $objp->status;
+ $product_static->status_buy = $objp->status_buy;
+ $product_static->accountancy_code_sell = $objp->code_sell;
+ $product_static->accountancy_code_sell_intra = $objp->code_sell_intra;
+ $product_static->accountancy_code_sell_export = $objp->code_sell_export;
+ $product_static->accountancy_code_buy = $objp->code_buy;
+ $product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
+ $product_static->accountancy_code_buy_export = $objp->code_buy_export;
+ $product_static->tva_tx = $objp->tva_tx_prod;
+
+ $facture_static->ref = $objp->ref;
+ $facture_static->id = $objp->facid;
+ $facture_static->type = $objp->ftype;
+ $facture_static->datef = $objp->datef;
+
+ $facture_static_det->id = $objp->rowid;
+ $facture_static_det->total_ht = $objp->total_ht;
+ $facture_static_det->tva_tx = $objp->tva_tx_line;
+ $facture_static_det->vat_src_code = $objp->vat_src_code;
+ $facture_static_det->product_type = $objp->type_l;
+ $facture_static_det->desc = $objp->description;
+
+ $accoutingAccountArray = array(
+ 'dom'=>$objp->aarowid,
+ 'intra'=>$objp->aarowid_intra,
+ 'export'=>$objp->aarowid_export,
+ 'thirdparty' =>$objp->aarowid_thirdparty);
+
+ $code_buy_p_notset = '';
+ $code_buy_t_notset = '';
+
+ $return = $accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facture_static, $facture_static_det, $accoutingAccountArray);
+ if (!is_array($return) && $return<0) {
+ setEventMessage($accountingAccount->error, 'errors');
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
- $objp->code_buy_p = $objp->code_buy_intra;
- $objp->aarowid_suggest = $objp->aarowid_intra;
- $suggestedaccountingaccountfor = 'eec';
- } else { // Foreign sale
- $objp->code_buy_p = $objp->code_buy_export;
- $objp->aarowid_suggest = $objp->aarowid_export;
- $suggestedaccountingaccountfor = 'export';
+ $suggestedid=$return['suggestedid'];
+ $suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+
+ if (!empty($suggestedid) && $suggestedaccountingaccountfor<>'') {
+ $suggestedid=$return['suggestedid'];
+ } else {
+ $suggestedid=0;
}
}
@@ -216,8 +266,8 @@ if ($action == 'validatehistory') {
if ($objp->aarowid_suggest > 0) {
$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
- $sqlupdate .= " SET fk_code_ventilation = ".((int) $objp->aarowid_suggest);
- $sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $objp->rowid);
+ $sqlupdate .= " SET fk_code_ventilation = ".((int) $suggestedid);
+ $sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $facture_static_det->id);
$resqlupdate = $db->query($sqlupdate);
if (!$resqlupdate) {
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index ffdd5b6de57..d3bb7985376 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2013-2014 Olivier Geffroy
* Copyright (C) 2013-2021 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
- * Copyright (C) 2013-2014 Florian Henry
+ * Copyright (C) 2013-2021 Florian Henry
* Copyright (C) 2014 Juanjo Menent s
* Copyright (C) 2016 Laurent Destailleur
*
@@ -46,6 +46,7 @@ $massaction = GETPOST('massaction', 'alpha');
$show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
+$optioncss = GETPOST('optioncss', 'alpha');
// Select Box
$mesCasesCochees = GETPOST('toselect', 'array');
@@ -97,10 +98,7 @@ if (!$sortorder) {
$hookmanager->initHooks(array('accountancysupplierlist'));
$formaccounting = new FormAccounting($db);
-$accounting = new AccountingAccount($db);
-// TODO: we should need to check if result is a really exist accountaccount rowid.....
-$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
-$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);
+$accountingAccount = new AccountingAccount($db);
$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
@@ -518,9 +516,9 @@ if ($result) {
$thirdpartystatic = new Societe($db);
$facturefourn_static = new FactureFournisseur($db);
+ $facturefourn_static_det = new SupplierInvoiceLine($db);
$product_static = new Product($db);
- $isBuyerInEEC = isInEEC($mysoc);
$accountingaccount_codetotid_cache = array();
@@ -543,6 +541,8 @@ if ($result) {
$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
$thirdpartystatic->email = $objp->email;
$thirdpartystatic->country_code = $objp->country_code;
+ $thirdpartystatic->tva_intra = $objp->tva_intra;
+ $thirdpartystatic->code_compta_fournisseur = $objp->company_code_buy;
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
@@ -556,95 +556,63 @@ if ($result) {
$product_static->accountancy_code_buy = $objp->code_buy;
$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
$product_static->accountancy_code_buy_export = $objp->code_buy_export;
+ $product_static->tva_tx = $objp->tva_tx_prod;
$facturefourn_static->ref = $objp->ref;
$facturefourn_static->id = $objp->facid;
$facturefourn_static->type = $objp->ftype;
$facturefourn_static->label = $objp->invoice_label;
+ $facturefourn_static_det->id = $objp->rowid;
+ $facturefourn_static_det->total_ht = $objp->total_ht;
+ $facturefourn_static_det->tva_tx_line = $objp->tva_tx_line;
+ $facturefourn_static_det->vat_src_code = $objp->vat_src_code;
+ $facturefourn_static_det->product_type = $objp->type_l;
+ $facturefourn_static_det->desc = $objp->description;
+
$code_buy_p_notset = '';
$code_buy_t_notset = '';
$objp->aarowid_suggest = ''; // Will be set later
- $isSellerInEEC = isInEEC($objp);
+ $accoutingAccountArray = array(
+ 'dom'=>$objp->aarowid,
+ 'intra'=>$objp->aarowid_intra,
+ 'export'=>$objp->aarowid_export,
+ 'thirdparty' =>$objp->aarowid_thirdparty);
- // Level 1: Search suggested default account for product/service
- $suggestedaccountingaccountbydefaultfor = '';
- if ($objp->type_l == 1) {
- 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)
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = '';
- } else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = 'eec';
- } else { // Foreign sale
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = 'export';
- }
- }
- } elseif ($objp->type_l == 0) {
- 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)
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = '';
- } else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = 'eec';
- } else {
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : '');
- $suggestedaccountingaccountbydefaultfor = 'export';
- }
- }
- }
- if ($objp->code_sell_l == -1) {
- $objp->code_sell_l = '';
- }
+ $code_buy_p_notset = '';
+ $code_buy_t_notset = '';
- // Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
- $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)
- $objp->code_buy_p = $objp->code_buy;
- $objp->aarowid_suggest = $objp->aarowid;
- $suggestedaccountingaccountfor = '';
+ $return=$accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facture_static, $facture_static_det, $accoutinAccountArray);
+ if (!is_array($return) && $return<0) {
+ setEventMessage($accountingAccount->error, 'errors');
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
- $objp->code_buy_p = $objp->code_buy_intra;
- $objp->aarowid_suggest = $objp->aarowid_intra;
- $suggestedaccountingaccountfor = 'eec';
- } else { // Foreign sale
- $objp->code_buy_p = $objp->code_buy_export;
- $objp->aarowid_suggest = $objp->aarowid_export;
- $suggestedaccountingaccountfor = 'export';
- }
+ $suggestedid=$return['suggestedid'];
+ $suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+ $suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
+ $code_buy_l=$return['code_buy_l'];
+ $code_buy_p=$return['code_buy_p'];
+ $code_buy_t=$return['code_buy_t'];
}
+ //var_dump($return);
- // Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
- if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
- if (!empty($objp->company_code_buy)) {
- $objp->code_buy_t = $objp->company_code_buy;
- $objp->aarowid_suggest = $objp->aarowid_thirdparty;
- $suggestedaccountingaccountfor = '';
- }
- }
-
- if (!empty($objp->code_buy_p)) {
+ if (!empty($code_buy_p)) {
// Value was defined previously
} else {
$code_buy_p_notset = 'color:orange';
}
- if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) {
+ if (empty($code_buy_l) && empty($code_buy_p)) {
$code_buy_p_notset = 'color:red';
}
- // $objp->code_buy_l is now default code of product/service
- // $objp->code_buy_p is now code of product/service
- // $objp->code_buy_t is now code of thirdparty
+ // $code_buy_l is now default code of product/service
+ // $code_buy_p is now code of product/service
+ // $code_buy_t is now code of thirdparty
print '';
// Line id
- print ''.$objp->rowid.' ';
+ print ''.$facturefourn_static_det->id.' ';
// Ref Invoice
print ''.$facturefourn_static->getNomUrl(1).' ';
@@ -654,23 +622,23 @@ if ($result) {
print '';
*/
- print ''.dol_print_date($db->jdate($objp->datef), 'day').' ';
+ print ''.dol_print_date($db->jdate($facturefourn_static_det->datef), 'day').' ';
// Ref Product
print '';
if ($product_static->id > 0) {
print $product_static->getNomUrl(1);
}
- if ($objp->product_label) {
- print ''.$objp->product_label.' ';
+ if ($product_static->product_label) {
+ print ''.$product_static->product_label.' ';
}
print ' ';
// Description
print '';
- $text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+ $text = dolGetFirstLineOfText(dol_string_nohtmltag($facturefourn_static_det->desc));
$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
- print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
+ print $form->textwithtooltip(dol_trunc($text, $trunclength), $facturefourn_static_det->desc);
print ' ';
print '';
@@ -678,11 +646,11 @@ if ($result) {
print ' ';
// Vat rate
- if ($objp->vat_tx_l != $objp->vat_tx_p) {
+ if ($product_static->vat_tx_l != $product_static->vat_tx_p) {
$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
}
print '';
- print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
+ print vatrate($facturefourn_static_det->tva_tx_line.($facturefourn_static_det->vat_src_code ? ' ('.$facturefourn_static_det->vat_src_code.')' : ''));
print ' ';
// Thirdparty
@@ -699,26 +667,26 @@ if ($result) {
// Found accounts
print '';
- $s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+ $s = '1. '.(($facturefourn_static_det->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountbydefaultfor == 'eec') {
$shelp .= $langs->trans("SaleEEC");
} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
$shelp .= $langs->trans("SaleExport");
}
- $s .= ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : ''.$langs->trans("NotDefined").' ');
+ $s .= ($code_buy_l > 0 ? length_accountg($code_buy_l) : ''.$langs->trans("NotDefined").' ');
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
- if ($objp->product_id > 0) {
+ if ($product_static->id > 0) {
print ''.$langs->trans("NotDefined").' ' : length_accountg($objp->code_buy_p));
- print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+ $s .= (empty($code_buy_p) ? ''.$langs->trans("NotDefined").' ' : length_accountg($code_buy_p));
+ print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
} else {
print ''.$langs->trans("NotDefined").' ');
+ $s .= ($code_buy_t > 0 ? length_accountg($code_buy_t) : ''.$langs->trans("NotDefined").' ');
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
}
print ' ';
// Suggested accounting account
print '';
- $suggestedid = $objp->aarowid_suggest;
- if (empty($suggestedid) && empty($objp->code_buy_p) && !empty($objp->code_buy_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
- if (empty($accountingaccount_codetotid_cache[$objp->code_buy_l])) {
- $tmpaccount = new AccountingAccount($db);
- $tmpaccount->fetch(0, $objp->code_buy_l, 1);
- if ($tmpaccount->id > 0) {
- $suggestedid = $tmpaccount->id;
- }
- $accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
- } else {
- $suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
- }
- }
- print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+ print $formaccounting->select_account($suggestedid, 'codeventil'.$facturefourn_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
// Column with checkbox
print '';
- $ischecked = $objp->aarowid_suggest;
- print ' ';
print ' ';
From af8e8077b163eda70c4d0ca72a14d782a6590040 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Mon, 11 Oct 2021 12:50:16 +0200
Subject: [PATCH 0059/1231] Uniformize
---
htdocs/accountancy/customer/index.php | 19 +++++++++++++++----
htdocs/accountancy/customer/list.php | 9 ++++-----
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 7c3cc2cf0e2..795da583486 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -73,12 +73,23 @@ $action = GETPOST('action', 'aZ09');
$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
+// Security check
+if (empty($conf->accounting->enabled)) {
+ accessforbidden();
+}
+if ($user->socid > 0) {
+ accessforbidden();
+}
+if (empty($user->rights->accounting->mouvements->lire)) {
+ accessforbidden();
+}
+
/*
* Actions
*/
-if ($action == 'clean' || $action == 'validatehistory') {
+if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) {
// Clean database
$db->begin();
$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
@@ -165,6 +176,7 @@ if ($action == 'validatehistory') {
}
dol_syslog('htdocs/accountancy/customer/index.php');
+
$result = $db->query($sql);
if (!$result) {
$error++;
@@ -209,7 +221,6 @@ if ($action == 'validatehistory') {
$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
$product_static->accountancy_code_buy_export = $objp->code_buy_export;
$product_static->tva_tx = $objp->tva_tx_prod;
- $product_static->tva_tx = $objp->tva_tx_prod;
$facture_static->ref = $objp->ref;
$facture_static->id = $objp->facid;
@@ -223,7 +234,7 @@ if ($action == 'validatehistory') {
$facture_static_det->product_type = $objp->type_l;
$facture_static_det->desc = $objp->description;
- $accoutinAccountArray = array(
+ $accoutingAccountArray = array(
'dom'=>$objp->aarowid,
'intra'=>$objp->aarowid_intra,
'export'=>$objp->aarowid_export,
@@ -232,7 +243,7 @@ if ($action == 'validatehistory') {
$code_sell_p_notset = '';
$code_sell_t_notset = '';
- $return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accoutinAccountArray);
+ $return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accoutingAccountArray);
if (!is_array($return) && $return<0) {
setEventMessage($accountingAccount->error, 'errors');
} else {
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index a730a8a9af6..88e6c52be3d 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2013-2014 Olivier Geffroy
* Copyright (C) 2013-2021 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
- * Copyright (C) 2013-2014 Florian Henry
+ * Copyright (C) 2013-2021 Florian Henry
* Copyright (C) 2014 Juanjo Menent
* Copyright (C) 2016 Laurent Destailleur
*
@@ -192,10 +192,10 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
dol_syslog("accountancy/customer/list.php", LOG_DEBUG);
if ($db->query($sql)) {
- $msg .= ''.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
+ $msg .= ''.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
$ok++;
} else {
- $msg .= ''.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).''.$sql.' '.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).''.$sql.'
Date: Mon, 11 Oct 2021 16:03:56 +0200
Subject: [PATCH 0061/1231] hook createDictioaryFieldList : tr html tag to
right place
---
htdocs/admin/dict.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 897fcdf7555..ab7eaf73653 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1238,6 +1238,10 @@ if ($id)
print $tdsoffields;
+ // Line to enter new values
+ print '';
+ print '';
+
$obj = new stdClass();
// If data was already input, we define them in obj to populate input fields.
if (GETPOST('actionadd'))
@@ -1256,9 +1260,6 @@ if ($id)
if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
- // Line to enter new values
- print '';
- print ' ';
if (empty($reshook))
{
From 5fc0802eb1a6462d923c04f0e3e503254012cda7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 11 Oct 2021 16:13:55 +0200
Subject: [PATCH 0062/1231] Fix for backward compatibility
---
htdocs/core/lib/functions.lib.php | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 54ef73f19d6..ac019f33bc2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -41,6 +41,30 @@
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+/**
+ * Return dolibarr global constant string value
+ * @param string $key key to return value, return '' if not set
+ * @return string
+ */
+function getDolGlobalString($key)
+{
+ global $conf;
+ // return $conf->global->$key ?? '';
+ return (string) (empty($conf->global->$key) ? '' : $conf->global->$key);
+}
+
+/**
+ * Return dolibarr global constant int value
+ * @param string $key key to return value, return 0 if not set
+ * @return int
+ */
+function getDolGlobalInt($key)
+{
+ global $conf;
+ // return $conf->global->$key ?? 0;
+ return (int) (empty($conf->global->$key) ? 0 : $conf->global->$key);
+}
+
/**
* Return a DoliDB instance (database handler).
*
From 3a32787f150d7071210a00a6ead2aeae752a2c25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 11 Oct 2021 16:14:34 +0200
Subject: [PATCH 0063/1231] Fix for backward compatibility
---
htdocs/core/lib/functions.lib.php | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 51b7442defe..01e8acf4896 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -40,6 +40,30 @@
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+/**
+ * Return dolibarr global constant string value
+ * @param string $key key to return value, return '' if not set
+ * @return string
+ */
+function getDolGlobalString($key)
+{
+ global $conf;
+ // return $conf->global->$key ?? '';
+ return (string) (empty($conf->global->$key) ? '' : $conf->global->$key);
+}
+
+/**
+ * Return dolibarr global constant int value
+ * @param string $key key to return value, return 0 if not set
+ * @return int
+ */
+function getDolGlobalInt($key)
+{
+ global $conf;
+ // return $conf->global->$key ?? 0;
+ return (int) (empty($conf->global->$key) ? 0 : $conf->global->$key);
+}
+
/**
* Return a DoliDB instance (database handler).
*
From 4e9c7c9efb4166f79cc159615e6a19f4a661ca2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 11 Oct 2021 20:04:45 +0200
Subject: [PATCH 0064/1231] FIX Attachment of pdf into shipment when sending
email
---
htdocs/core/class/html.formmail.class.php | 2 ++
htdocs/core/lib/files.lib.php | 5 +++--
htdocs/core/tpl/massactions_pre.tpl.php | 5 +----
htdocs/expedition/card.php | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3dc2743adf1..40496ee7fa9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -792,6 +792,7 @@ class FormMail extends Form
if (count($listofpaths)) {
foreach ($listofpaths as $key => $val) {
$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+
if ($conf->entity > 1) {
$relativepathtofile = str_replace($conf->entity.'/', '', $relativepathtofile);
}
@@ -802,6 +803,7 @@ class FormMail extends Form
$out .= '';
// Preview of attachment
$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
+
$out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
if (!$this->withfilereadonly) {
$out .= '
';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 43ad95157dc..613f7f2d8a8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2707,13 +2707,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
$accessallowed = 1;
}
- $original_file = $conf->expedition->dir_output."/sending/".$original_file;
+ $original_file = $conf->expedition->dir_output."/".(strpos('sending/', $original_file) == 0 ? '' : 'sending/').$original_file;
+ //$original_file = $conf->expedition->dir_output."/".$original_file;
} elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output)) {
// Delivery Note Wrapping
if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file)) {
$accessallowed = 1;
}
- $original_file = $conf->expedition->dir_output."/receipt/".$original_file;
+ $original_file = $conf->expedition->dir_output."/".(strpos('receipt/', $original_file) == 0 ? '' : 'receipt/').$original_file;
} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
// Wrapping pour les actions
if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file)) {
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index f9c74dd7085..91fc11ac217 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -99,12 +99,9 @@ if ($massaction == 'presend') {
print '
';
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
- $formmail = new FormMail($db);
-
print dol_get_fiche_head(null, '', '');
- // Cree l'objet formulaire mail
+ // Create mail form
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->withform = -1;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 902914c4327..3d2b995233a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2552,8 +2552,8 @@ if ($action == 'create') {
// Presend form
$modelmail = 'shipping_send';
- $defaulttopic = 'SendShippingRef';
- $diroutput = $conf->expedition->dir_output;
+ $defaulttopic = $langs->trans('SendShippingRef');
+ $diroutput = $conf->expedition->dir_output.'/sending';
$trackid = 'shi'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
From 2e32254574c03e712024f5a4c6ddb92e747598da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 11 Oct 2021 20:36:10 +0200
Subject: [PATCH 0065/1231] Fix rul to shipment files
---
htdocs/core/lib/files.lib.php | 4 ++--
htdocs/core/lib/functions.lib.php | 24 ------------------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 613f7f2d8a8..36feaf79a6e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2707,14 +2707,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
$accessallowed = 1;
}
- $original_file = $conf->expedition->dir_output."/".(strpos('sending/', $original_file) == 0 ? '' : 'sending/').$original_file;
+ $original_file = $conf->expedition->dir_output."/".(strpos('sending/', $original_file) === 0 ? '' : 'sending/').$original_file;
//$original_file = $conf->expedition->dir_output."/".$original_file;
} elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output)) {
// Delivery Note Wrapping
if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file)) {
$accessallowed = 1;
}
- $original_file = $conf->expedition->dir_output."/".(strpos('receipt/', $original_file) == 0 ? '' : 'receipt/').$original_file;
+ $original_file = $conf->expedition->dir_output."/".(strpos('receipt/', $original_file) === 0 ? '' : 'receipt/').$original_file;
} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
// Wrapping pour les actions
if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 443a757b512..e0dcc51917b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -65,30 +65,6 @@ function getDolGlobalInt($key)
return (int) (empty($conf->global->$key) ? 0 : $conf->global->$key);
}
-/**
- * Return dolibarr global constant string value
- * @param string $key key to return value, return '' if not set
- * @return string
- */
-function getDolGlobalString($key)
-{
- global $conf;
- // return $conf->global->$key ?? '';
- return (string) (empty($conf->global->$key) ? '' : $conf->global->$key);
-}
-
-/**
- * Return dolibarr global constant int value
- * @param string $key key to return value, return 0 if not set
- * @return int
- */
-function getDolGlobalInt($key)
-{
- global $conf;
- // return $conf->global->$key ?? 0;
- return (int) (empty($conf->global->$key) ? 0 : $conf->global->$key);
-}
-
/**
* Return a DoliDB instance (database handler).
*
From 17885089636859773c1bce76c66dec3a59af0479 Mon Sep 17 00:00:00 2001
From: lvessiller
Date: Tue, 12 Oct 2021 14:11:19 +0200
Subject: [PATCH 0066/1231] FIX payment style and html5 tags
---
htdocs/takepos/css/pos.css.php | 7 ++--
htdocs/takepos/pay.php | 66 +++++++++++++++++-----------------
2 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index e180dc33b3e..395c786b232 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -320,12 +320,11 @@ table.postablelines tr td {
div.paymentbordline
{
- width:calc(50% - 16px);
- background-color:#888;
+ background-color: #888;
border-radius: 8px;
- margin-bottom: 4px;
- display: inline-block;
+ margin: 4px auto;
padding: 5px;
+ width: calc(50% - 10px);
}
@media only screen and (max-aspect-ratio: 6/4) {
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 60a4840471e..66d710c2a52 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -37,9 +37,9 @@ if (!defined('NOREQUIREMENU')) {
if (!defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', '1');
}
-if (!defined('NOREQUIREAJAX')) {
- define('NOREQUIREAJAX', '1');
-}
+//if (!defined('NOREQUIREAJAX')) {
+// define('NOREQUIREAJAX', '1');
+//}
require '../main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -257,38 +257,36 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
}
-
-
-
-
trans('TotalTTC'); ?>: total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?>
+
+
+
+ trans('TotalTTC'); ?>: total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?>
+
+ total_ttc) { ?>
+
+ trans('RemainToPay'); ?>: multicurrency_code); ?>
+
+
+
+ trans("Received"); ?>: multicurrency_code); ?>
+
+
+ trans("Change"); ?>: multicurrency_code); ?>
+
+ global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+ print '
';
+ $filter = '';
+ $form = new Form($db);
+ print ''.$langs->trans("BankAccount").':
';
+ }
+ ?>
+
-total_ttc) { ?>
-
-
trans('RemainToPay'); ?>: multicurrency_code); ?>
-
-
-
trans("Received"); ?>: multicurrency_code); ?>
-
-
trans("Change"); ?>: multicurrency_code); ?>
-global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
- print '
-
';
- $filter = '';
- $form = new Form($db);
- print ''.$langs->trans("BankAccount").':
- ';
-}
-?>
-
-
-
Date: Tue, 12 Oct 2021 15:52:59 +0200
Subject: [PATCH 0067/1231] FIX 2 columns for total labels
---
htdocs/takepos/css/pos.css.php | 7 +++--
htdocs/takepos/pay.php | 54 ++++++++++++++++------------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 395c786b232..e180dc33b3e 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -320,11 +320,12 @@ table.postablelines tr td {
div.paymentbordline
{
- background-color: #888;
+ width:calc(50% - 16px);
+ background-color:#888;
border-radius: 8px;
- margin: 4px auto;
+ margin-bottom: 4px;
+ display: inline-block;
padding: 5px;
- width: calc(50% - 10px);
}
@media only screen and (max-aspect-ratio: 6/4) {
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 66d710c2a52..4bd20f33f4b 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -257,35 +257,33 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
}
-
-
-
- trans('TotalTTC'); ?>: total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?>
-
- total_ttc) { ?>
-
- trans('RemainToPay'); ?>: multicurrency_code); ?>
-
-
-
- trans("Received"); ?>: multicurrency_code); ?>
-
-
- trans("Change"); ?>: multicurrency_code); ?>
-
- global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
- print '
';
- $filter = '';
- $form = new Form($db);
- print ''.$langs->trans("BankAccount").':
';
- }
- ?>
+
+
+ trans('TotalTTC'); ?>: total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?>
+ total_ttc) { ?>
+
+ trans('RemainToPay'); ?>: multicurrency_code); ?>
+
+
+
+ trans("Received"); ?>: multicurrency_code); ?>
+
+
+ trans("Change"); ?>: multicurrency_code); ?>
+
+ global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+ print '
';
+ $filter = '';
+ $form = new Form($db);
+ print ''.$langs->trans("BankAccount").': ';
+ $form->select_comptes(0, 'accountid', 0, $filter, 1, '');
+ print ajax_combobox('selectaccountid');
+ print '
';
+ }
+ ?>
From d50c1a7603d7bc18bc62a0ded07172be8bdfa025 Mon Sep 17 00:00:00 2001
From: Vincent Dieltiens
Date: Tue, 12 Oct 2021 23:23:57 +0200
Subject: [PATCH 0068/1231] preview of expense report file using pdf file
instead of generated image
---
htdocs/expensereport/card.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 6e40b6b3a77..f700feb400b 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2174,7 +2174,10 @@ if ($action == 'create') {
// If the preview file is found
if (file_exists($fileimage)) {
$thumbshown = 1;
+ $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+ print '';
print ' ';
}
}
}
From 04091169dab12429e88430b9f2eb3cf0f8fd9e90 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Wed, 13 Oct 2021 02:48:42 +0200
Subject: [PATCH 0069/1231] Accountancy - Show message for admin if accountancy
hidden options are activated to help to resolve some problems
---
htdocs/accountancy/admin/index.php | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index f8c0c95d3c1..4f4bff526c8 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,7 +1,7 @@
* Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2013-2019 Alexandre Spangaro
+ * Copyright (C) 2013-2021 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2014 Marcos García
* Copyright (C) 2014 Juanjo Menent
@@ -260,6 +260,22 @@ $linkback = '';
//$linkback = '' . $langs->trans("BackToModuleList") . ' ';
print load_fiche_titre($title, $linkback, 'accountancy');
+// Show message if accountancy hidden options are activated to help to resolve some problems
+if (!$user->admin) {
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+ print '' . $langs->trans("ConstantIsOn", "FACTURE_DEPOSITS_ARE_JUST_PAYMENTS") . '
';
+ }
+ if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+ print '' . $langs->trans("ConstantIsOn", "ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY") . '
';
+ }
+ if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+ print '' . $langs->trans("ConstantIsOn", "MAIN_COMPANY_PERENTITY_SHARED") . '
';
+ }
+ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+ print '' . $langs->trans("ConstantIsOn", "MAIN_PRODUCT_PERENTITY_SHARED") . '
';
+ }
+}
+
print ' ';
// Address
print ''.$langs->trans("Address").' ';
- print '';
+ print '';
print ' '.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $formcompany->select_ziptown((GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alphanohtml') : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+ print $formcompany->select_ziptown((GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alphanohtml') : $soc->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
print ' ';
- print $formcompany->select_ziptown((GETPOSTISSET('town') ? GETPOST('town', 'alphanohtml') : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+ print $formcompany->select_ziptown((GETPOSTISSET('town') ? GETPOST('town', 'alphanohtml') : $soc->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
print ' '.$langs->trans('Country').' ';
- print $form->select_country(GETPOSTISSET('country_id') ? GETPOST('country_id', 'alpha') : $object->country_id, 'country_id');
+ print $form->select_country(GETPOSTISSET('country_id') ? GETPOST('country_id', 'alpha') : $soc->country_id, 'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
print ' '.$langs->trans('State').' ';
- if ($object->country_id) {
- print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
+ if ($soc->country_id) {
+ print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $soc->state_id, $soc->country_code);
} else {
print $countrynotdefined;
}
@@ -935,7 +935,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Pro phone
print ' '.$langs->trans("PhonePro").' ';
- print ''.img_picto('', 'object_phoning').' '.img_picto('', 'object_phoning').' ';
// Personal phone
print ''.$langs->trans("PhonePerso").' ';
From 5d7587259d88e17df0c49f63d3bf791f239b62e7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Wed, 13 Oct 2021 21:21:16 +0200
Subject: [PATCH 0077/1231] FIX Accountancy - If deposit invoice is used, force
binding in deposit accounting account to solve transaction
---
htdocs/accountancy/customer/list.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 5ce9f5e13e8..2be7cd5f4ca 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -637,11 +637,15 @@ if ($result) {
}
// Manage Deposit
- if ($objp->description == "(DEPOSIT)") {
- $accountdeposittoventilated = new AccountingAccount($db);
- $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
- $objp->code_sell_l = $accountdeposittoventilated->ref;
- $objp->aarowid_suggest = $accountdeposittoventilated->rowid;
+ if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT)) {
+ if ($objp->description == "(DEPOSIT)" || $objp->ftype == $facture_static::TYPE_DEPOSIT) {
+ $accountdeposittoventilated = new AccountingAccount($db);
+ $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+ $objp->code_sell_l = $accountdeposittoventilated->ref;
+ $objp->code_sell_p = '';
+ $objp->code_sell_t = '';
+ $objp->aarowid_suggest = $accountdeposittoventilated->rowid;
+ }
}
if (!empty($objp->code_sell_p)) {
From 9e3a00521d8a1f7e4daa221cce5d2f393bee29ef Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Wed, 13 Oct 2021 21:36:04 +0200
Subject: [PATCH 0078/1231] FIX also on customer index for automatic binding
---
htdocs/accountancy/customer/index.php | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 0ee9c865603..7dc88a6939a 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -170,6 +170,8 @@ if ($action == 'validatehistory') {
} else {
$num_lines = $db->num_rows($result);
+ $facture_static = new Facture($db);
+
$isSellerInEEC = isInEEC($mysoc);
$i = 0;
@@ -213,6 +215,18 @@ if ($action == 'validatehistory') {
}
}
+ // Manage Deposit
+ if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT)) {
+ if ($objp->description == "(DEPOSIT)" || $objp->ftype == $facture_static::TYPE_DEPOSIT) {
+ $accountdeposittoventilated = new AccountingAccount($db);
+ $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+ $objp->code_sell_l = $accountdeposittoventilated->ref;
+ $objp->code_sell_p = '';
+ $objp->code_sell_t = '';
+ $objp->aarowid_suggest = $accountdeposittoventilated->rowid;
+ }
+ }
+
if ($objp->aarowid_suggest > 0) {
$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facturedet";
$sqlupdate .= " SET fk_code_ventilation = ".((int) $objp->aarowid_suggest);
From 3438a4a9f695b9526604f3a0da5857858fe33f31 Mon Sep 17 00:00:00 2001
From: Benjamin Chantalat <74144396+PyroShape@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:33:26 +0200
Subject: [PATCH 0079/1231] Add the module reception to the calcul of virtual
stock
---
htdocs/product/class/product.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index acb66eb1ebb..c7a48479f60 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5281,7 +5281,7 @@ class Product extends CommonObject
}
$stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];
}
- if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->reception->enabled)) {
+ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->reception->enabled)) {
$filterStatus = '4';
if (isset($includedraftpoforvirtual)) {
$filterStatus = '0,'.$filterStatus;
From 371c75e76a1be84fc4ce497f2d7ccb70256d41f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 14 Oct 2021 11:58:21 +0200
Subject: [PATCH 0080/1231] FIX list of categories in stats of supplier
invoices
---
htdocs/compta/facture/stats/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 49f9be88ac6..7482faebad8 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -283,7 +283,7 @@ if (! empty($conf->category->enabled)) {
$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
}
print ''.$cat_label.' ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories($cat_type, null, 'parent', null, null, 1);
print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
//print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
print '
Date: Thu, 14 Oct 2021 14:49:01 +0200
Subject: [PATCH 0081/1231] NEW Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide
unit price on movement list.
---
htdocs/product/stock/movement_list.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index bdd22c313ee..f3b9ea40559 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -132,7 +132,7 @@ $arrayfields = array(
'origin'=>array('label'=>"Origin", 'checked'=>1, 'position'=>155),
'm.fk_projet'=>array('label'=>'Project', 'checked'=>0, 'position'=>180),
'm.value'=>array('label'=>"Qty", 'checked'=>1, 'position'=>200),
- 'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210)
+ 'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210, 'enabled'=>empty($conf->global->STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE))
//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
);
From db3d16f080a1151ab581920553b6d4dd227aed42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 14 Oct 2021 15:43:35 +0200
Subject: [PATCH 0082/1231] Fix filter tag for supplier invoice statistics
---
htdocs/compta/facture/stats/index.php | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 7482faebad8..fb47a3eb788 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -92,18 +92,15 @@ print load_fiche_titre($title, '', $picto);
dol_mkdir($dir);
$stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($mode == 'customer')
-{
- if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+if ($mode == 'customer' || $mode == 'supplier') {
+ if ($object_status != '' && $object_status >= 0) {
+ $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+ }
if (is_array($custcats) && !empty($custcats)) {
$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
$stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
}
}
-if ($mode == 'supplier')
-{
- if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
-}
// Build graphic number of object
// $data = array(array('Lib',val1,val2,val3),...)
From 3875d26a2feb7f6fb39cc158101521f7b563b617 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 14 Oct 2021 15:55:12 +0200
Subject: [PATCH 0083/1231] Fix filter for supplierinvoice stats
---
htdocs/compta/facture/stats/index.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index fb47a3eb788..03fcf5b37d0 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -92,7 +92,7 @@ print load_fiche_titre($title, '', $picto);
dol_mkdir($dir);
$stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($mode == 'customer' || $mode == 'supplier') {
+if ($mode == 'customer') {
if ($object_status != '' && $object_status >= 0) {
$stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
}
@@ -101,6 +101,16 @@ if ($mode == 'customer' || $mode == 'supplier') {
$stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
}
}
+if ($mode == 'supplier') {
+ if ($object_status != '' && $object_status >= 0) {
+ $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+ }
+ if (is_array($custcats) && !empty($custcats)) {
+ $stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_fournisseur as cat ON (f.fk_soc = cat.fk_soc)';
+ $stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
+ }
+
+}
// Build graphic number of object
// $data = array(array('Lib',val1,val2,val3),...)
From a6c3c6b7ec8f1b3d30a364234ac7376fedda677e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 14 Oct 2021 15:56:01 +0200
Subject: [PATCH 0084/1231] url
---
htdocs/compta/facture/stats/index.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 5fe028e1268..088899956e4 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -119,10 +119,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
$filenamenb = $dir."/invoicesnbinyear-".$year.".png";
if ($mode == 'customer') {
- $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
}
if ($mode == 'supplier') {
- $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicesnbinyear-'.$year.'.png';
+ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicesnbinyear-'.$year.'.png';
}
$px1 = new DolGraph();
From 5d22eeeff2b946573481983953b446326f89539a Mon Sep 17 00:00:00 2001
From: lvessiller
Date: Thu, 14 Oct 2021 16:06:22 +0200
Subject: [PATCH 0085/1231] FIX user date timezone offset
---
htdocs/core/lib/functions.lib.php | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e0dcc51917b..3ef328924f5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2284,8 +2284,17 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
$to_gmt = true;
$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
- $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
- $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore
+
+ if (class_exists('DateTimeZone')) {
+ $user_date_tz = new DateTimeZone($offsettzstring);
+ $user_dt = new DateTime();
+ $user_dt->setTimezone($user_date_tz);
+ $user_dt->setTimestamp($time);
+ $offsettz = $user_dt->getOffset();
+ } else {
+ $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
+ $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore
+ }
}
}
}
From ff7727466ad129070c0b56965eb0457f0ddf1795 Mon Sep 17 00:00:00 2001
From: atm-lena
Date: Thu, 14 Oct 2021 17:13:44 +0200
Subject: [PATCH 0086/1231] Function updateExtrafield : replace empty value to
null
---
htdocs/core/class/commonobject.class.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5a5e1a58928..50c6f1893ea 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5492,7 +5492,6 @@ abstract class CommonObject
}
$sql .= ")";
-
$resql = $this->db->query($sql);
if (!$resql)
{
@@ -5792,7 +5791,7 @@ abstract class CommonObject
}
if ($linealreadyfound) {
- if ($this->array_options["options_".$key] === null) {
+ if ($this->array_options["options_".$key] === '') {
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = null";
} else {
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
From 3d62ee22d323f821b81e725e60c32bfdc1585ef1 Mon Sep 17 00:00:00 2001
From: Henry
Date: Fri, 15 Oct 2021 11:13:40 +0800
Subject: [PATCH 0087/1231] Supplier Invoice Payment List
fix the missing multicurrency payments and remainders
---
htdocs/fourn/facture/paiement.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f0967453701..1dd6f0a0f12 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -642,13 +642,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
- print price($objp->multicurrency_am);
+ print price($sign * $multicurrency_payment);
+ if ($multicurrency_creditnotes) {
+ print '+'.price($multicurrency_creditnotes);
+ }
+ if ($multicurrency_deposits) {
+ print '+'.price($multicurrency_deposits);
+ }
}
print ' ';
print '';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
- print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
+ print price($sign * $multicurrency_remaintopay);
}
print ' ';
}
From 316bc16634ffc8abb76bae5cb3b8c8e7af59a86d Mon Sep 17 00:00:00 2001
From: Henry
Date: Fri, 15 Oct 2021 15:05:13 +0800
Subject: [PATCH 0088/1231] Update card.php
---
htdocs/fourn/facture/card.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 80f868f3484..8a148bbb666 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2406,6 +2406,15 @@ if ($action == 'create') {
// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled)) {
+ $multicurrency_totalpaye = $object->getSommePaiement(1);
+ $multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
+ $multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
+ $multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
+ $resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
+ }
+
if ($object->paye) {
$resteapayer = 0;
}
From 0cb19726740a7e78c7e3e8a34e81f37bf3acde86 Mon Sep 17 00:00:00 2001
From: Henry
Date: Fri, 15 Oct 2021 15:07:48 +0800
Subject: [PATCH 0089/1231] Update card.php
---
htdocs/compta/facture/card.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 83c8ec8d718..5541725a480 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3844,6 +3844,15 @@ if ($action == 'create') {
// $resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled)) {
+ $multicurrency_totalpaye = $object->getSommePaiement(1);
+ $multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
+ $multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
+ $multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
+ $resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
+ }
if ($object->paye) {
$resteapayer = 0;
From fb79aaeb0c2a4d187cc6aaa3c40430c975c125a2 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Fri, 15 Oct 2021 07:19:49 +0000
Subject: [PATCH 0090/1231] Fixing style errors.
---
htdocs/compta/facture/card.php | 2 +-
htdocs/fourn/facture/card.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5541725a480..56e66b9f759 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3844,7 +3844,7 @@ if ($action == 'create') {
// $resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-
+
// Multicurrency
if (!empty($conf->multicurrency->enabled)) {
$multicurrency_totalpaye = $object->getSommePaiement(1);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8a148bbb666..79a93cf3b0c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2414,7 +2414,7 @@ if ($action == 'create') {
$multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
$resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
}
-
+
if ($object->paye) {
$resteapayer = 0;
}
From 412746ec8fea883dc437e6f3135d33773bc02be9 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024
Date: Fri, 15 Oct 2021 10:18:32 +0200
Subject: [PATCH 0091/1231] NEW : we need to be able to put more filters on
deleteByParentField() function
---
htdocs/core/class/commonobject.class.php | 24 ++++++++++++++++++++++--
htdocs/hrm/class/job.class.php | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 37083cdf5f8..2bf6d758435 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9056,10 +9056,13 @@ abstract class CommonObject
$className = str_replace('@', '', $deleteFromObject[0]);
$filePath = $deleteFromObject[1];
$columnName = $deleteFromObject[2];
+ $TMoreSQL = array();
+ $more_sql = $deleteFromObject[3];
+ if(!empty($more_sql)) $TMoreSQL['customsql'] = $more_sql;
if (dol_include_once($filePath)) {
$childObject = new $className($this->db);
if (method_exists($childObject, 'deleteByParentField')) {
- $result = $childObject->deleteByParentField($this->id, $columnName);
+ $result = $childObject->deleteByParentField($this->id, $columnName, $TMoreSQL);
if ($result < 0) {
$error++;
$this->errors[] = $childObject->error;
@@ -9144,7 +9147,7 @@ abstract class CommonObject
* @return int <0 if KO, >0 if OK
* @throws Exception
*/
- public function deleteByParentField($parentId = 0, $parentField = '')
+ public function deleteByParentField($parentId = 0, $parentField = '', $filter=array(), $filtermode="AND")
{
global $user;
@@ -9157,6 +9160,23 @@ abstract class CommonObject
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE ".$parentField." = ".(int) $parentId;
+ // Manage filter
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
+ if ($key == 'customsql') {
+ $sqlwhere[] = $value;
+ } elseif (strpos($value, '%') === false) {
+ $sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+ } else {
+ $sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+ }
+ }
+ }
+ if (count($sqlwhere) > 0) {
+ $sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+ }
+
$resql = $this->db->query($sql);
if (!$resql) {
$this->errors[] = $this->db->lasterror();
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 4ff5ccbe303..01cc9260c61 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -154,7 +154,7 @@ class Job extends CommonObject
// * If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
// * call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
// */
- // protected $childtablesoncascade = array('hrm_jobdet');
+ protected $childtablesoncascade = array("@SkillRank:hrm/class/skillrank.class.php:fk_object:objecttype='job'");
// /**
// * @var JobLine[] Array of subtable lines
From 5f4410468d66efaae1da08606f20a29429c1d591 Mon Sep 17 00:00:00 2001
From: Florian HENRY
Date: Fri, 15 Oct 2021 10:24:56 +0200
Subject: [PATCH 0092/1231] add filed budget in task
---
htdocs/core/lib/project.lib.php | 17 +++++++-
.../install/mysql/migration/14.0.0-15.0.0.sql | 2 +
.../install/mysql/tables/llx_projet_task.sql | 1 +
htdocs/projet/class/task.class.php | 23 ++++++++++-
htdocs/projet/tasks.php | 29 +++++++++++++-
htdocs/projet/tasks/list.php | 39 ++++++++++++++++++-
htdocs/projet/tasks/task.php | 12 ++++++
7 files changed, 119 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9d6b9c48192..b7c2279188d 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -572,7 +572,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$numlines = count($lines);
// We declare counter as global because we want to edit them into recursive call
- global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed;
+ global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed, $total_budget_amount;
if ($level == 0) {
$total_projectlinesa_spent = 0;
@@ -581,6 +581,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$total_projectlinesa_declared_if_planned = 0;
$total_projectlinesa_tobill = 0;
$total_projectlinesa_billed = 0;
+ $total_budget_amount = 0;
}
for ($i = 0; $i < $numlines; $i++) {
@@ -651,6 +652,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$taskstatic->datee = $lines[$i]->date_end; // deprecated
$taskstatic->planned_workload = $lines[$i]->planned_workload;
$taskstatic->duration_effective = $lines[$i]->duration;
+ $taskstatic->budget_amount = $lines[$i]->budget_amount;
if ($showproject) {
@@ -850,6 +852,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
print '';
}*/
+ if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
+ print '';
+ print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ $total_budget_amount += $lines[$i]->budget_amount;
+ print ' ';
+ }
// Contacts of task
if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
@@ -1021,6 +1029,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '';
}
}
+
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
+ print '';
+ price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ print ' ';
+ }
+
// Contacts of task for backward compatibility,
if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
print ' '.$langs->trans("Budget").' ';
+ print '';
+ print ' ';
+ }
+
if (!empty($arrayfields['c.assigned']['checked'])) {
print '';
print ' ';
@@ -1005,6 +1027,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
}
*/
+
+ if (!empty($arrayfields['t.budget_amount']['checked'])) {
+ print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+
if (!empty($arrayfields['c.assigned']['checked'])) {
print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
}
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e6d8e5c6dfa..fc316fb2705 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -65,6 +65,7 @@ $search_task_ref_parent = GETPOST('search_task_ref_parent');
$search_project_user = GETPOST('search_project_user', 'int');
$search_task_user = GETPOST('search_task_user', 'int');
$search_task_progress = GETPOST('search_task_progress');
+$search_task_budget_amount = GETPOST('search_task_budget_amount');
$search_societe = GETPOST('search_societe');
$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
@@ -154,6 +155,7 @@ $arrayfields = array(
't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>104),
't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>105),
't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>106),
+ 't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>107),
't.tobill'=>array('label'=>"TimeToBill", 'checked'=>0, 'position'=>110),
't.billed'=>array('label'=>"TimeBilled", 'checked'=>0, 'position'=>111),
't.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -200,6 +202,7 @@ if (empty($reshook)) {
$search_task_description = "";
$search_task_ref_parent = "";
$search_task_progress = "";
+ $search_task_budget_amount = "";
$search_task_user = -1;
$search_project_user = -1;
$search_date_startday = '';
@@ -314,6 +317,7 @@ $sql .= " s.nom as name, s.rowid as socid,";
$sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update,";
$sql .= " t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut, ";
$sql .= " t.description, t.fk_task_parent";
+$sql .= " ,t.budget_amount";
// We'll need these fields in order to filter by categ
if ($search_categ) {
$sql .= ", cs.fk_categorie, cs.fk_project";
@@ -390,6 +394,9 @@ if ($search_task_ref_parent) {
if ($search_task_progress) {
$sql .= natural_search('t.progress', $search_task_progress, 1);
}
+if ($search_task_budget_amount) {
+ $sql .= natural_search('t.budget_amount', $search_task_budget_amount, 1);
+}
if ($search_societe) {
$sql .= natural_search('s.nom', $search_societe);
}
@@ -431,7 +438,7 @@ if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed
$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
$sql .= " s.nom, s.rowid,";
$sql .= " t.datec, t.dateo, t.datee, t.tms,";
- $sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+ $sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress,t.budget_amount, t.fk_statut";
if ($search_categ) {
$sql .= ", cs.fk_categorie, cs.fk_project";
}
@@ -521,6 +528,9 @@ if ($search_datelimit_endmonth) {
if ($search_datelimit_endyear) {
$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
}
+if ($search_task_budget_amount) {
+ $param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
+}
if ($socid) {
$param .= '&socid='.urlencode($socid);
}
@@ -756,6 +766,11 @@ if (!empty($arrayfields['t.progress']['checked'])) {
print '';
+ print ' ';
+}
if (!empty($arrayfields['t.progress_summary']['checked'])) {
print '';
+ print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 't.budget_amount';
+ }
+ $totalarray['val']['t.budget_amount'] += $obj->budget_amount;
+ if (!$i) {
+ $totalarray['totalbudgetamount'] = $totalarray['nbfield'];
+ }
+ $totalarray['totalbudgetamount'] += $obj->budget_amount;
+ print ' ';
+ }
// Time not billed
if (!empty($arrayfields['t.tobill']['checked'])) {
print '';
@@ -1232,6 +1267,8 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
print ' '.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).' ';
} elseif ($totalarray['totalbilledfield'] == $i) {
print ''.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).' ';
+ } elseif ($totalarray['totalbudgetamount'] == $i) {
+ print ''.price($totalarray['totalbudgetamount'], 0, $langs, 1, 0, 0, $conf->currency).' ';
} else {
print ''.$langs->trans("Budget").' ';
+ print ''.$langs->trans("Budget").' ';
+ if (strcmp($object->budget_amount, '')) {
+ print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ }
+ print '
Date: Fri, 15 Oct 2021 10:36:47 +0200
Subject: [PATCH 0093/1231] FIX : stickler
---
htdocs/core/class/commonobject.class.php | 36 +++++++++++++-----------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2bf6d758435..8689f7c26d1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9058,7 +9058,7 @@ abstract class CommonObject
$columnName = $deleteFromObject[2];
$TMoreSQL = array();
$more_sql = $deleteFromObject[3];
- if(!empty($more_sql)) $TMoreSQL['customsql'] = $more_sql;
+ if (!empty($more_sql)) $TMoreSQL['customsql'] = $more_sql;
if (dol_include_once($filePath)) {
$childObject = new $className($this->db);
if (method_exists($childObject, 'deleteByParentField')) {
@@ -9144,10 +9144,12 @@ abstract class CommonObject
*
* @param int $parentId Parent Id
* @param string $parentField Name of Foreign key parent column
+ * @param array $filter an array filter
+ * @param string $filtermode AND or OR
* @return int <0 if KO, >0 if OK
* @throws Exception
*/
- public function deleteByParentField($parentId = 0, $parentField = '', $filter=array(), $filtermode="AND")
+ public function deleteByParentField($parentId = 0, $parentField = '', $filter = array(), $filtermode = "AND")
{
global $user;
@@ -9160,22 +9162,22 @@ abstract class CommonObject
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE ".$parentField." = ".(int) $parentId;
- // Manage filter
- $sqlwhere = array();
- if (count($filter) > 0) {
- foreach ($filter as $key => $value) {
+ // Manage filters
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
if ($key == 'customsql') {
- $sqlwhere[] = $value;
- } elseif (strpos($value, '%') === false) {
- $sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
- } else {
- $sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
- }
- }
- }
- if (count($sqlwhere) > 0) {
- $sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
- }
+ $sqlwhere[] = $value;
+ } elseif (strpos($value, '%') === false) {
+ $sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+ } else {
+ $sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+ }
+ }
+ }
+ if (count($sqlwhere) > 0) {
+ $sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+ }
$resql = $this->db->query($sql);
if (!$resql) {
From 0865916fe2c65db05c02926d38e3fec635fa662d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Fri, 15 Oct 2021 10:01:07 +0200
Subject: [PATCH 0094/1231] Init page for public subscription
---
htdocs/partnership/admin/website.php | 258 ++++++++
.../partnership/class/partnership.class.php | 4 +-
htdocs/partnership/lib/partnership.lib.php | 5 +
htdocs/public/partnership/index.php | 26 +
htdocs/public/partnership/new.php | 620 ++++++++++++++++++
htdocs/theme/eldy/btn.inc.php | 2 +-
6 files changed, 912 insertions(+), 3 deletions(-)
create mode 100644 htdocs/partnership/admin/website.php
create mode 100644 htdocs/public/partnership/index.php
create mode 100644 htdocs/public/partnership/new.php
diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
new file mode 100644
index 00000000000..96ebb4ba6e9
--- /dev/null
+++ b/htdocs/partnership/admin/website.php
@@ -0,0 +1,258 @@
+
+ * Copyright (C) 2006-2015 Laurent Destailleur
+ * Copyright (C) 2006-2012 Regis Houssin
+ * Copyright (C) 2011 Juanjo Menent
+ *
+ * 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 '.$langs->trans("BackToModuleList").' ';
+print load_fiche_titre($langs->trans("PartnershipsSetup"), $linkback, 'title_setup');
+
+$head = partnershipAdminPrepareHead();
+
+
+
+print '';
+
+
+if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+ print ''.$langs->trans('BlankSubscriptionForm').'
+ * Copyright (C) 2006-2013 Laurent Destailleur
+ * Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 2012 J. Fernando Lagrange
+ * Copyright (C) 2018-2019 Frédéric France
+ * Copyright (C) 2018 Alexandre Spangaro
+ * Copyright (C) 2021 Waël Almoman
+ *
+ * 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 ';
+
+ // Output html code for logo
+ if ($urllogo) {
+ print '
';
+ print '
';
+ print '
';
+ print '
';
+ if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+ print '
';
+ }
+ print '
';
+ }
+
+ if (!empty($conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION)) {
+ print '
';
+ print '
';
+ print '
';
+ }
+
+ print '
';
+}
+
+/**
+ * Show footer for new member
+ *
+ * @return void
+ */
+function llxFooterVierge()
+{
+ print '
';
+
+ printCommonFooter('public');
+
+ print "\n";
+ print " 