Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2023-02-23 20:41:14 +01:00
commit 926d88ede6
10 changed files with 38 additions and 3 deletions

View File

@ -1992,6 +1992,8 @@ class Contrat extends CommonObject
{
global $conf, $langs, $user;
$langs->load('contracts');
$datas = [];
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

View File

@ -16,9 +16,9 @@
*/
/**
* \file htdocs/core/class/commonincoterm.class.php
* \file htdocs/core/class/commonsocialnetworks.class.php
* \ingroup core
* \brief File of the superclass of object classes that support incoterm (customer and supplier)
* \brief File of the superclass of object classes that support socialnetworks
*/

View File

@ -79,6 +79,10 @@ class Conf
// An array to store cache results ->cache['nameofcache']=...
public $cache;
/**
* @var int To tell header was output
*/
public $headerdone;
/**
* @var string[]

View File

@ -49,6 +49,11 @@ class Cstate // extends CommonObject
*/
public $id;
/**
* @var int ID
*/
public $rowid;
public $code_departement;
public $code;

View File

@ -43,6 +43,7 @@ class DolEditor
public $cols;
public $height;
public $width;
public $uselocalbrowser;
public $readonly;
public $posx;
public $posy;

View File

@ -152,6 +152,10 @@ class Menubase
*/
public $tms;
/**
* @var Menu menu
*/
public $newmenu;
/**
* Constructor

View File

@ -37,6 +37,11 @@ class MenuManager
public $atarget = ""; // To store default target to use onto links
public $name = "auguria";
/**
* @var Menu
*/
public $menu;
public $menu_array;
public $menu_array_after;

View File

@ -36,6 +36,11 @@ class MenuManager
public $atarget = ""; // To store default target to use onto links
public $name = "eldy";
/**
* @var Menu
*/
public $menu;
public $menu_array;
public $menu_array_after;

View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2023 Frédéric France <frederic.france@netlogic.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
@ -27,6 +27,11 @@
*/
class DataPolicyCron
{
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* Constructor
*

View File

@ -92,6 +92,10 @@ class PaymentDonation extends CommonObject
public $type_code;
public $type_label;
public $chid;
public $datepaid;
public $bank_account;
public $bank_line;
/**
* @var string Id of external payment mode