Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
d408e48eb7
14 changed files with 48 additions and 40 deletions
|
|
@ -74,11 +74,11 @@ $h++;
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
|
||||
$head[$h][1] = $langs->trans("Info");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
|
||||
print dol_get_fiche_head($head, (string) $hselected, $langs->trans("LineRecord"), -1, 'accountline');
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'accountline');
|
||||
|
||||
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
|
||||
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ if ($action == 'new') {
|
|||
$h = 0;
|
||||
$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
|
||||
$head[$h][1] = $langs->trans("MenuChequeDeposits");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print load_fiche_titre($title, '', 'bank_account');
|
||||
|
|
@ -336,13 +336,13 @@ if ($action == 'new') {
|
|||
$head = array();
|
||||
$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
|
||||
$head[$h][1] = $langs->trans("CheckReceipt");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
// $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/info.php?id='.$object->id;
|
||||
// $head[$h][1] = $langs->trans("Info");
|
||||
// $h++;
|
||||
|
||||
print dol_get_fiche_head($head, (string) $hselected, $langs->trans("Cheques"), -1, 'payment');
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
|
||||
|
||||
/*
|
||||
* Confirmation of slip's delete
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ $h = 0;
|
|||
$head = array();
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$id;
|
||||
$head[$h][1] = $langs->trans("PaymentSocialContribution");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$id;
|
||||
|
|
@ -114,7 +114,7 @@ $h++;
|
|||
*/
|
||||
|
||||
|
||||
print dol_get_fiche_head($head, (string) $hselected, $langs->trans("PaymentSocialContribution"), -1, 'payment');
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), -1, 'payment');
|
||||
|
||||
/*
|
||||
* Deletion confirmation of payment
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ $h = 0;
|
|||
$head = array();
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$id;
|
||||
$head[$h][1] = $langs->trans("VATPayment");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$id;
|
||||
|
|
@ -143,7 +143,7 @@ $h++;
|
|||
*/
|
||||
|
||||
|
||||
print dol_get_fiche_head($head, (string) $hselected, $langs->trans("VATPayment"), -1, 'payment');
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("VATPayment"), -1, 'payment');
|
||||
|
||||
/*
|
||||
* Deletion confirmation of payment
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ $head = array();
|
|||
$h = 0;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.((int) $id).'&type='.urlencode($type);
|
||||
$head[$h][1] = $title;
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
if ($id) {
|
||||
|
|
@ -164,7 +164,7 @@ if ($id) {
|
|||
$bon = new BonPrelevement($db);
|
||||
$bon->fetch($lipre->bon_rowid);
|
||||
|
||||
print dol_get_fiche_head($head, (string) $hselected, $title, -1, 'payment');
|
||||
print dol_get_fiche_head($head, $hselected, $title, -1, 'payment');
|
||||
|
||||
print '<table class="border centpercent tableforfield">';
|
||||
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ $extralabelslines = $extrafields->fetch_name_optionals_label($object->table_elem
|
|||
|
||||
$permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
|
||||
$permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php
|
||||
$permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
|
||||
$permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->status == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
|
||||
$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
|
||||
$permissiontoedit = $permissiontoadd;
|
||||
$permissiontoactivate = $user->hasRight('contrat', 'activer');
|
||||
|
|
@ -1345,7 +1345,7 @@ if ($action == 'create') {
|
|||
|
||||
$head = contract_prepare_head($object);
|
||||
|
||||
$hselected = 0;
|
||||
$hselected = '0';
|
||||
$formconfirm = '';
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
* Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2023 Christian Foellmann <christian@foellmann.de>
|
||||
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -143,7 +144,7 @@ if ($id > 0 || !empty($ref)) {
|
|||
|
||||
$head = contract_prepare_head($object);
|
||||
|
||||
$hselected = 1;
|
||||
$hselected = '1';
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
|
||||
|
||||
|
|
|
|||
|
|
@ -1295,7 +1295,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
|
|||
<?php } ?>
|
||||
/* jQuery("#tva_tx, #title_vat").hide(); */
|
||||
/* jQuery("#title_fourn_ref").hide(); */
|
||||
jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
|
||||
<?php if (!getDolGlobalString('DISPLAY_MARGIN_RATES')) { ?>
|
||||
jQuery("#np_marginRate, .np_marginRate").hide();
|
||||
<?php } ?>
|
||||
<?php if (!getDolGlobalString('DISPLAY_MARK_RATES')) { ?>
|
||||
jQuery("#np_markRate, .np_markRate").hide();
|
||||
<?php } ?>
|
||||
jQuery(#units, #title_units").hide();
|
||||
jQuery("#buying_price").show();
|
||||
jQuery('#trlinefordates, .divlinefordates').show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -90,7 +90,7 @@ $h = 0;
|
|||
$head = array();
|
||||
$head[$h][0] = DOL_URL_ROOT.'/don/payment/card.php?id='.$id;
|
||||
$head[$h][1] = $langs->trans("DonationPayment");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1, 'payment');
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ if ($step == 1 || !$datatoexport) {
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
|
||||
$head[$h][1] = $langs->trans("Step")." 1";
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, '', -1);
|
||||
|
|
@ -516,7 +516,7 @@ if ($step == 2 && $datatoexport) {
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
|
||||
$head[$h][1] = $langs->trans("Step")." 2";
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, '', -2);
|
||||
|
|
@ -702,7 +702,7 @@ if ($step == 3 && $datatoexport) {
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
|
||||
$head[$h][1] = $langs->trans("Step")." 3";
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, '', -2);
|
||||
|
|
@ -884,7 +884,7 @@ if ($step == 4 && $datatoexport) {
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
|
||||
$head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, '', -2);
|
||||
|
|
@ -1168,7 +1168,7 @@ if ($step == 5 && $datatoexport) {
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
|
||||
$head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, '', -2);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2014-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
/* Copyright (C) 2014-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -92,7 +93,7 @@ $h = 0;
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/loan/payment/card.php?id='.$id;
|
||||
$head[$h][1] = $langs->trans("PaymentLoan");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), -1, 'payment');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2020-2022 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -305,19 +306,19 @@ if ($object->url && !getDolUserInt('USER_PUBLIC_HIDE_URL', 0, $object)) {
|
|||
if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0, $object)) {
|
||||
$usersection .= '<div class="flexitemsmall">';
|
||||
$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
|
||||
$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
|
||||
$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', '', '');
|
||||
$usersection .= '</div>';
|
||||
}
|
||||
if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
|
||||
$usersection .= '<div class="flexitemsmall">';
|
||||
$usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
|
||||
$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
|
||||
$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', '', '');
|
||||
$usersection .= '</div>';
|
||||
}
|
||||
if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
|
||||
$usersection .= '<div class="flexitemsmall">';
|
||||
$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
|
||||
$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
|
||||
$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', '', '');
|
||||
$usersection .= '</div>';
|
||||
}
|
||||
if (getDolUserInt('USER_PUBLIC_SHOW_BIRTH', 0, $object) && !is_null($object->birth)) {
|
||||
|
|
@ -393,13 +394,13 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
|
|||
if ($mysoc->phone) {
|
||||
$companysection .= '<div class="flexitemsmall">';
|
||||
$companysection .= img_picto('', 'phone', 'class="pictofixedwidth"');
|
||||
$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
|
||||
$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', '', '');
|
||||
$companysection .= '</div>';
|
||||
}
|
||||
if ($mysoc->fax) {
|
||||
$companysection .= '<div class="flexitemsmall">';
|
||||
$companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
|
||||
$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
|
||||
$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', '', '');
|
||||
$companysection .= '</div>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
<?php
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Alexandre SPANGARO <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Alexandre SPANGARO <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -103,7 +104,7 @@ $head = array();
|
|||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/salaries/payment_salary/card.php?id='.$id;
|
||||
$head[$h][1] = $langs->trans("SalaryPayment");
|
||||
$hselected = $h;
|
||||
$hselected = (string) $h;
|
||||
$h++;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -81,11 +81,9 @@ parameters:
|
|||
- '#dol_copy expects string, int given#'
|
||||
- '#dol_getIdFromCode expects string, int given#'
|
||||
- '#dol_strlen expects string, int given#'
|
||||
- '#dol_get_fiche_head expects string, int given#'
|
||||
- '#EvalMath::trigger\(\) expects string, int given#'
|
||||
- '#get_next_value expects string, int given#'
|
||||
- '#pdf_writeLinkedObjects expects string, int given#'
|
||||
- '#dol_print_phone expects string, int given#'
|
||||
- '#dol_move expects string, int given#'
|
||||
- '#expects int, float#'
|
||||
- '#expects int, array\|string given.#'
|
||||
|
|
|
|||
Loading…
Reference in a new issue