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

Merge remote-tracking branch 'upstream/develop' into camelCaps2

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-09-08 10:50:27 +02:00
commit 2b62c4ca8f
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
67 changed files with 328 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/admin/adherent.php
View File

@ -33,8 +33,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("admin","members"));
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

4
htdocs/adherents/admin/adherent_emails.php
View File

@ -33,8 +33,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("admin","members"));
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

4
htdocs/adherents/admin/adherent_extrafields.php
View File

@ -28,8 +28,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$langs->load("members"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("admin","members"));
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$form = new Form($db); $form = new Form($db);

4
htdocs/adherents/admin/adherent_type_extrafields.php
View File

@ -31,8 +31,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$langs->load("members"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("admin","members"));
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$form = new Form($db); $form = new Form($db);

4
htdocs/adherents/admin/website.php
View File

@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("members"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("admin","members"));
$action=GETPOST('action', 'alpha'); $action=GETPOST('action', 'alpha');

4
htdocs/adherents/agenda.php
View File

@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("companies"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("companies","members"));
$id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int'); $id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');

6
htdocs/adherents/document.php
View File

@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("members"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("companies","members","other"));
$langs->load('other');
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');

4
htdocs/adherents/index.php
View File

@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
$langs->load("companies"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("companies","members"));
// Security check // Security check
$result=restrictedArea($user,'adherent'); $result=restrictedArea($user,'adherent');

6
htdocs/adherents/ldap.php
View File

@ -29,10 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("companies"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("companies","members","ldap","admin"));
$langs->load("ldap");
$langs->load("admin");
$rowid = GETPOST('id','int'); $rowid = GETPOST('id','int');
$action = GETPOST('action','aZ09'); $action = GETPOST('action','aZ09');

5
htdocs/adherents/note.php
View File

@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("companies"); // Load translation files required by the page
$langs->load("members"); $langs->loadLangs(array("companies","members","bills"));
$langs->load("bills");
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');
$id=GETPOST('id','int'); $id=GETPOST('id','int');

4
htdocs/adherents/stats/byproperties.php
View File

@ -44,8 +44,8 @@ $year = strftime("%Y", time());
$startyear=$year-2; $startyear=$year-2;
$endyear=$year; $endyear=$year;
$langs->load("members"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("companies","members"));
/* /*

4
htdocs/adherents/stats/geo.php
View File

@ -45,8 +45,8 @@ $year = strftime("%Y", time());
$startyear=$year-2; $startyear=$year-2;
$endyear=$year; $endyear=$year;
$langs->load("members"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("companies","members"));
/* /*

4
htdocs/adherents/stats/index.php
View File

@ -46,8 +46,8 @@ $year = strftime("%Y", time());
$startyear=$year-2; $startyear=$year-2;
$endyear=$year; $endyear=$year;
$langs->load("members"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("companies","members"));
/* /*

6
htdocs/adherents/subscription/card.php
View File

@ -29,10 +29,8 @@ if (! empty($conf->banque->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
} }
$langs->load("companies"); // Load translation files required by the page
$langs->load("bills"); $langs->loadLangs(array("companies","members","bills","users"));
$langs->load("members");
$langs->load("users");
$adh = new Adherent($db); $adh = new Adherent($db);
$object = new Subscription($db); $object = new Subscription($db);

6
htdocs/adherents/subscription/info.php
View File

@ -28,10 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
$langs->load("companies"); // Load translation files required by the page
$langs->load("bills"); $langs->loadLangs(array("companies","members","bills","users"));
$langs->load("members");
$langs->load("users");
if (!$user->rights->adherent->lire) if (!$user->rights->adherent->lire)
accessforbidden(); accessforbidden();

5
htdocs/adherents/type_ldap.php
View File

@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
$langs->load("members"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("admin","members","ldap"));
$langs->load("ldap");
$id = GETPOST('rowid', 'int'); $id = GETPOST('rowid', 'int');
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');

5
htdocs/admin/menus/edit.php
View File

@ -28,9 +28,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
// Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("other","admin"));
$langs->load('other');
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

4
htdocs/admin/menus/index.php
View File

@ -27,8 +27,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
$langs->load("other"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("other","admin"));
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

5
htdocs/admin/menus/other.php
View File

@ -24,9 +24,8 @@
require '../../main.inc.php'; require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
$langs->load("users"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("user","other","admin"));
$langs->load("other");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

8
htdocs/admin/system/about.php
View File

@ -28,10 +28,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("help"); $langs->loadLangs(array("help","members","other","admin"));
$langs->load("members");
$langs->load("other");
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');
@ -196,7 +194,7 @@ if ($showpromotemessage)
{ {
print '<br>'; print '<br>';
print '<br>'; print '<br>';
if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0)) if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
{ {
print $langs->trans("TitleExampleForMajorRelease").':<br>'; print $langs->trans("TitleExampleForMajorRelease").':<br>';

5
htdocs/admin/system/browser.php
View File

@ -26,9 +26,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("install"); $langs->loadLangs(array("install","other","admin"));
$langs->load("other");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();

5
htdocs/admin/system/constall.php
View File

@ -24,9 +24,8 @@
require '../../main.inc.php'; require '../../main.inc.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("user"); $langs->loadLangs(array("install","user","admin"));
$langs->load("install");
if (!$user->admin) if (!$user->admin)

5
htdocs/admin/system/dolibarr.php
View File

@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("install"); $langs->loadLangs(array("install","other","admin"));
$langs->load("other");
$action=GETPOST('action','alpha'); $action=GETPOST('action','alpha');

5
htdocs/admin/system/modules.php
View File

@ -25,9 +25,8 @@
require '../../main.inc.php'; require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("install"); $langs->loadLangs(array("install","other","admin"));
$langs->load("other");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();

5
htdocs/admin/system/perf.php
View File

@ -26,9 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("install"); $langs->loadLangs(array("install","other","admin"));
$langs->load("other");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();

8
htdocs/asset/class/asset.class.php
View File

@ -109,16 +109,16 @@ class Asset extends CommonObject
public $entity; public $entity;
/** /**
* @var string Asset label * @var string Asset label
*/ */
public $label; public $label;
public $amount; public $amount;
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
/** /**
* @var string description * @var string description

18
htdocs/bookmarks/class/bookmark.class.php
View File

@ -29,9 +29,9 @@
class Bookmark extends CommonObject class Bookmark extends CommonObject
{ {
/** /**
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='bookmark'; public $element='bookmark';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
@ -41,9 +41,9 @@ class Bookmark extends CommonObject
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/ */
public $picto = 'bookmark'; public $picto = 'bookmark';
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
@ -56,9 +56,9 @@ class Bookmark extends CommonObject
public $id; public $id;
/** /**
* @var int User ID * @var int User ID
*/ */
public $fk_user; public $fk_user;
public $datec; public $datec;
public $url; public $url;

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -67,7 +67,7 @@ class ActionComm extends CommonObject
* Id of the event * Id of the event
* @var int * @var int
*/ */
public $id; public $id;
/** /**
* Id of the event. Use $id as possible * Id of the event. Use $id as possible

3
htdocs/commande/class/commande.class.php
View File

@ -64,6 +64,9 @@ class Commande extends CommonOrder
*/ */
public $fk_element = 'fk_commande'; public $fk_element = 'fk_commande';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'order'; public $picto = 'order';
/** /**

10
htdocs/compta/bank/class/account.class.php
View File

@ -46,6 +46,9 @@ class Account extends CommonObject
*/ */
public $table_element = 'bank_account'; public $table_element = 'bank_account';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'account'; public $picto = 'account';
/** /**
@ -1656,7 +1659,7 @@ class AccountLine extends CommonObject
*/ */
public $error=''; public $error='';
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
@ -1671,7 +1674,10 @@ class AccountLine extends CommonObject
*/ */
public $table_element='bank'; public $table_element='bank';
public $picto = 'generic'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic';
/** /**
* @var int ID * @var int ID

5
htdocs/compta/bank/class/bankcateg.class.php
View File

@ -30,7 +30,10 @@ class BankCateg // extends CommonObject
{ {
//public $element='bank_categ'; //!< Id that identify managed objects //public $element='bank_categ'; //!< Id that identify managed objects
//public $table_element='bank_categ'; //!< Name of table without prefix where object is stored //public $table_element='bank_categ'; //!< Name of table without prefix where object is stored
public $picto='generic'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='generic';
/** /**
* @var int ID * @var int ID

3
htdocs/compta/bank/class/paymentvarious.class.php
View File

@ -40,6 +40,9 @@ class PaymentVarious extends CommonObject
*/ */
public $table_element='payment_various'; public $table_element='payment_various';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bill'; public $picto = 'bill';
/** /**

3
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -59,6 +59,9 @@ class FactureRec extends CommonInvoice
*/ */
public $fk_element='fk_facture'; public $fk_element='fk_facture';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='bill'; public $picto='bill';
public $entity; public $entity;

3
htdocs/compta/facture/class/facture.class.php
View File

@ -73,6 +73,9 @@ class Facture extends CommonInvoice
*/ */
public $fk_element = 'fk_facture'; public $fk_element = 'fk_facture';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='bill'; public $picto='bill';
/** /**

19
htdocs/compta/localtax/class/localtax.class.php
View File

@ -39,22 +39,25 @@ class Localtax extends CommonObject
*/ */
public $table_element='localtax'; public $table_element='localtax';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
var $ltt; public $ltt;
var $tms; public $tms;
var $datep; public $datep;
var $datev; public $datev;
var $amount; public $amount;
/** /**
* @var string local tax * @var string local tax
*/ */
public $label; public $label;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
/** /**
* Constructor * Constructor

9
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -43,12 +43,15 @@ class RemiseCheque extends CommonObject
*/ */
public $table_element='bordereau_cheque'; public $table_element='bordereau_cheque';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment'; public $picto = 'payment';
var $num; public $num;
var $intitule; public $intitule;
//! Numero d'erreur Plage 1024-1279 //! Numero d'erreur Plage 1024-1279
var $errno; public $errno;
public $amount; public $amount;
public $date_bordereau; public $date_bordereau;

36
htdocs/compta/paiement/class/paiement.class.php
View File

@ -46,34 +46,40 @@ class Paiement extends CommonObject
*/ */
public $table_element='paiement'; public $table_element='paiement';
public $picto = 'payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment';
public $facid;
public $datepaye;
var $facid;
var $datepaye;
/** /**
* @deprecated * @deprecated
* @see amount, amounts * @see amount, amounts
*/ */
var $total; public $total;
/** /**
* @deprecated * @deprecated
* @see amount, amounts * @see amount, amounts
*/ */
var $montant; public $montant;
var $amount; // Total amount of payment
var $amounts=array(); // Array of amounts public $amount; // Total amount of payment
var $multicurrency_amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
var $author; public $multicurrency_amounts=array(); // Array of amounts
var $paiementid; // Type de paiement. Stocke dans fk_paiement public $author;
public $paiementid; // Type de paiement. Stocke dans fk_paiement
// de llx_paiement qui est lie aux types de // de llx_paiement qui est lie aux types de
//paiement de llx_c_paiement //paiement de llx_c_paiement
var $num_paiement; // Numero du CHQ, VIR, etc... public $num_paiement; // Numero du CHQ, VIR, etc...
var $num_payment; // Numero du CHQ, VIR, etc... public $num_payment; // Numero du CHQ, VIR, etc...
var $bank_account; // Id compte bancaire du paiement public $bank_account; // Id compte bancaire du paiement
var $bank_line; // Id de la ligne d'ecriture bancaire public $bank_line; // Id de la ligne d'ecriture bancaire
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...) // fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement // fk_paiement dans llx_paiement_facture est le rowid du paiement
var $fk_paiement; // Type of paiment public $fk_paiement; // Type of paiment
/** /**

43
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -49,27 +49,30 @@ class BonPrelevement extends CommonObject
*/ */
public $table_element='prelevement_bons'; public $table_element='prelevement_bons';
public $picto = 'payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment';
var $date_echeance; public $date_echeance;
var $raison_sociale; public $raison_sociale;
var $reference_remise; public $reference_remise;
var $emetteur_code_guichet; public $emetteur_code_guichet;
var $emetteur_numero_compte; public $emetteur_numero_compte;
var $emetteur_code_banque; public $emetteur_code_banque;
var $emetteur_number_key; public $emetteur_number_key;
var $emetteur_iban; public $emetteur_iban;
var $emetteur_bic; public $emetteur_bic;
var $emetteur_ics; public $emetteur_ics;
var $total; public $total;
var $_fetched; public $fetched;
var $statut; // 0-Wait, 1-Trans, 2-Done public $statut; // 0-Wait, 1-Trans, 2-Done
var $labelstatut=array(); public $labelstatut=array();
var $invoice_in_error=array(); public $invoice_in_error=array();
var $thirdparty_in_error=array(); public $thirdparty_in_error=array();
/** /**
@ -106,7 +109,7 @@ class BonPrelevement extends CommonObject
$this->methodes_trans[0] = "Internet"; $this->methodes_trans[0] = "Internet";
$this->_fetched = 0; $this->fetched = 0;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@ -313,7 +316,7 @@ class BonPrelevement extends CommonObject
$this->statut = $obj->statut; $this->statut = $obj->statut;
$this->_fetched = 1; $this->fetched = 1;
return 1; return 1;
} }
@ -423,7 +426,7 @@ class BonPrelevement extends CommonObject
$error = 0; $error = 0;
if ($this->_fetched == 1) if ($this->fetched == 1)
{ {
if ($date >= $this->date_trans) if ($date >= $this->date_trans)
{ {

3
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -41,6 +41,9 @@ class PaymentSalary extends CommonObject
*/ */
public $table_element='payment_salary'; public $table_element='payment_salary';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
public $tms; public $tms;

27
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -44,6 +44,9 @@ class ChargeSociales extends CommonObject
*/ */
public $table_element='chargesociales'; public $table_element='chargesociales';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bill'; public $picto = 'bill';
/** /**
@ -51,18 +54,18 @@ class ChargeSociales extends CommonObject
*/ */
protected $table_ref_field = 'ref'; protected $table_ref_field = 'ref';
var $date_ech; public $date_ech;
var $lib; public $lib;
var $type; public $type;
var $type_libelle; public $type_libelle;
var $amount; public $amount;
var $paye; public $paye;
var $periode; public $periode;
var $date_creation; public $date_creation;
var $date_modification; public $date_modification;
var $date_validation; public $date_validation;
var $fk_account; public $fk_account;
var $fk_project; public $fk_project;
/** /**

5
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

@ -41,17 +41,22 @@ class PaymentSocialContribution extends CommonObject
*/ */
public $table_element='paiementcharge'; public $table_element='paiementcharge';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment'; public $picto = 'payment';
public $fk_charge; public $fk_charge;
public $datec=''; public $datec='';
public $tms=''; public $tms='';
public $datep=''; public $datep='';
/** /**
* @deprecated * @deprecated
* @see amount * @see amount
*/ */
public $total; public $total;
public $amount; // Total amount of payment public $amount; // Total amount of payment
public $amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
public $fk_typepaiement; public $fk_typepaiement;

21
htdocs/compta/tva/class/tva.class.php
View File

@ -43,23 +43,26 @@ class Tva extends CommonObject
*/ */
public $table_element='tva'; public $table_element='tva';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
var $tms; public $tms;
var $datep; public $datep;
var $datev; public $datev;
var $amount; public $amount;
var $type_payment; public $type_payment;
var $num_payment; public $num_payment;
/** /**
* @var string label * @var string label
*/ */
public $label; public $label;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
/** /**
* Constructor * Constructor

4
htdocs/contact/class/contact.class.php
View File

@ -48,6 +48,10 @@ class Contact extends CommonObject
public $table_element='socpeople'; public $table_element='socpeople';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'contact'; public $picto = 'contact';

5
htdocs/contrat/class/contrat.class.php
View File

@ -61,7 +61,10 @@ class Contrat extends CommonObject
*/ */
public $fk_element='fk_contrat'; public $fk_element='fk_contrat';
public $picto='contract'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='contract';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

24
htdocs/core/class/discount.class.php
View File

@ -34,9 +34,9 @@ class DiscountAbsolute
public $db; public $db;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error; public $error;
/** /**
* @var string[] Array of error strings * @var string[] Array of error strings
@ -48,9 +48,9 @@ class DiscountAbsolute
*/ */
public $id; public $id;
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
public $discount_type; // 0 => customer discount, 1 => supplier discount public $discount_type; // 0 => customer discount, 1 => supplier discount
@ -60,14 +60,14 @@ class DiscountAbsolute
public $tva_tx; // Vat rate public $tva_tx; // Vat rate
/** /**
* @var int User ID Id utilisateur qui accorde la remise * @var int User ID Id utilisateur qui accorde la remise
*/ */
public $fk_user; public $fk_user;
/** /**
* @var string description * @var string description
*/ */
public $description; public $description;
public $datec; // Date creation public $datec; // Date creation
public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts) public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts)

6
htdocs/core/lib/company.lib.php
View File

@ -1485,10 +1485,10 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
{ {
$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
$formactions=new FormActions($db); $formactions=new FormActions($db);

11
htdocs/core/tpl/login.tpl.php
View File

@ -19,6 +19,7 @@
// Need global variable $title to be defined by caller (like dol_loginfunction) // Need global variable $title to be defined by caller (like dol_loginfunction)
// Caller can also set $morelogincontent = array(['options']=>array('js'=>..., 'table'=>...); // Caller can also set $morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
// Protection to avoid direct call of template // Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf)) if (empty($conf) || ! is_object($conf))
{ {
@ -27,6 +28,8 @@ if (empty($conf) || ! is_object($conf))
} }
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
header('Cache-Control: Public, must-revalidate'); header('Cache-Control: Public, must-revalidate');
header("Content-type: text/html; charset=".$conf->file->character_set_client); header("Content-type: text/html; charset=".$conf->file->character_set_client);
@ -55,6 +58,12 @@ if (! preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenof
print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow); print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);
$colorbackhmenu1='60,70,100'; // topmenu
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1):(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
?> ?>
<!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP --> <!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP -->
@ -69,7 +78,7 @@ $(document).ready(function () {
</script> </script>
<?php } ?> <?php } ?>
<div class="login_center center"> <div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.'), rgb(240,240,240));"':'' ?>>
<div class="login_vertical_align"> <div class="login_vertical_align">
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>"> <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">

11
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -24,6 +24,8 @@ if (empty($conf) || ! is_object($conf))
} }
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
header('Cache-Control: Public, must-revalidate'); header('Cache-Control: Public, must-revalidate');
header("Content-type: text/html; charset=".$conf->file->character_set_client); header("Content-type: text/html; charset=".$conf->file->character_set_client);
@ -42,6 +44,13 @@ $php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag(
$titleofpage=$langs->trans('SendNewPassword'); $titleofpage=$langs->trans('SendNewPassword');
print top_htmlhead('', $titleofpage); print top_htmlhead('', $titleofpage);
$colorbackhmenu1='60,70,100'; // topmenu
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
?> ?>
<!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP --> <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
@ -57,7 +66,7 @@ $(document).ready(function () {
<?php } ?> <?php } ?>
<div class="login_center center"> <div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.'), rgb(240,240,240));"':'' ?>>
<div class="login_vertical_align"> <div class="login_vertical_align">
<form id="login" name="login" method="POST" action="<?php echo $php_self; ?>"> <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">

4
htdocs/core/triggers/interface_20_all_Logevents.class.php
View File

@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
*/ */
class InterfaceLogevents extends DolibarrTriggers class InterfaceLogevents extends DolibarrTriggers
{ {
/**
* @var string Image of the trigger
*/
public $picto = 'technic'; public $picto = 'technic';
public $family = 'core'; public $family = 'core';
public $description = "Triggers of this module allows to add security event records inside Dolibarr."; public $description = "Triggers of this module allows to add security event records inside Dolibarr.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;

4
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
class InterfaceWorkflowManager extends DolibarrTriggers class InterfaceWorkflowManager extends DolibarrTriggers
{ {
/**
* @var string Image of the trigger
*/
public $picto = 'technic'; public $picto = 'technic';
public $family = 'core'; public $family = 'core';
public $description = "Triggers of this module allows to manage workflows"; public $description = "Triggers of this module allows to manage workflows";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;

4
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -37,6 +37,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
public $family = 'agenda'; public $family = 'agenda';
public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup."; public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;
/**
* @var string Image of the trigger
*/
public $picto = 'action'; public $picto = 'action';
/** /**

4
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
View File

@ -33,6 +33,10 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
public $family = 'system'; public $family = 'system';
public $description = "Triggers of this module add action for BlockedLog module."; public $description = "Triggers of this module add action for BlockedLog module.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;
/**
* @var string Image of the trigger
*/
public $picto = 'technic'; public $picto = 'technic';
/** /**

4
htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
View File

@ -34,6 +34,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
public $family = 'ldap'; public $family = 'ldap';
public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database."; public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;
/**
* @var string Image of the trigger
*/
public $picto = 'technic'; public $picto = 'technic';
/** /**

4
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
View File

@ -32,6 +32,10 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
public $family = 'mailmanspip'; public $family = 'mailmanspip';
public $description = "Triggers of this module allows to synchronize Mailman an Spip."; public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;
/**
* @var string Image of the trigger
*/
public $picto = 'technic'; public $picto = 'technic';
/** /**

6
htdocs/core/triggers/interface_50_modNotification_Notification.class.php
View File

@ -33,9 +33,13 @@ class InterfaceNotification extends DolibarrTriggers
public $family = 'notification'; public $family = 'notification';
public $description = "Triggers of this module send email notifications according to Notification module setup."; public $description = "Triggers of this module send email notifications according to Notification module setup.";
public $version = self::VERSION_DOLIBARR; public $version = self::VERSION_DOLIBARR;
/**
* @var string Image of the trigger
*/
public $picto = 'email'; public $picto = 'email';
var $listofmanagedevents=array( public $listofmanagedevents=array(
'BILL_VALIDATE', 'BILL_VALIDATE',
'BILL_PAYED', 'BILL_PAYED',
'ORDER_VALIDATE', 'ORDER_VALIDATE',

5
htdocs/cron/class/cronjob.class.php
View File

@ -40,7 +40,10 @@ class Cronjob extends CommonObject
*/ */
public $table_element='cronjob'; public $table_element='cronjob';
public $picto = 'cron'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'cron';
/** /**
* @var int Entity * @var int Entity

6
htdocs/don/class/don.class.php
View File

@ -50,7 +50,11 @@ class Don extends CommonObject
public $fk_element = 'fk_donation'; public $fk_element = 'fk_donation';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'generic';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic';
public $date; public $date;
public $amount; public $amount;

5
htdocs/don/class/paymentdonation.class.php
View File

@ -39,7 +39,10 @@ class PaymentDonation extends CommonObject
*/ */
public $table_element='payment_donation'; public $table_element='payment_donation';
public $picto = 'payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment';
/** /**
* @var int ID * @var int ID

3
htdocs/ecm/class/ecmdirectory.class.php
View File

@ -37,6 +37,9 @@ class EcmDirectory // extends CommonObject
*/ */
//public $table_element='ecm_directories'; //public $table_element='ecm_directories';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'dir'; public $picto = 'dir';
/** /**

3
htdocs/ecm/class/ecmfiles.class.php
View File

@ -46,6 +46,9 @@ class EcmFiles extends CommonObject
*/ */
public $table_element = 'ecm_files'; public $table_element = 'ecm_files';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic'; public $picto = 'generic';
/** /**

4
htdocs/expedition/class/expedition.class.php
View File

@ -62,6 +62,10 @@ class Expedition extends CommonObject
public $table_element_line="expeditiondet"; public $table_element_line="expeditiondet";
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'sending'; public $picto = 'sending';
public $socid; public $socid;

33
htdocs/expensereport/class/paymentexpensereport.class.php
View File

@ -40,24 +40,27 @@ class PaymentExpenseReport extends CommonObject
*/ */
public $table_element='payment_expensereport'; public $table_element='payment_expensereport';
public $picto = 'payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment';
var $rowid; public $rowid;
var $fk_expensereport; public $fk_expensereport;
var $datec=''; public $datec='';
var $tms=''; public $tms='';
var $datep=''; public $datep='';
var $amount; // Total amount of payment public $amount; // Total amount of payment
var $amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
var $fk_typepayment; public $fk_typepayment;
var $num_payment; public $num_payment;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
//Unknow field //Unknow field
var $chid; public $chid;
var $total; public $total;
/** /**
* Constructor * Constructor

3
htdocs/fichinter/class/fichinter.class.php
View File

@ -55,6 +55,9 @@ class Fichinter extends CommonObject
*/ */
public $table_element_line='fichinterdet'; public $table_element_line='fichinterdet';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'intervention'; public $picto = 'intervention';
/** /**

42
htdocs/holiday/class/holiday.class.php
View File

@ -947,53 +947,53 @@ class Holiday extends CommonObject
if ($mode == 0) if ($mode == 0)
{ {
if ($statut == 1) return $langs->trans('DraftCP'); if ($statut == 1) return $langs->trans('DraftCP');
if ($statut == 2) return $langs->trans('ToReviewCP'); elseif ($statut == 2) return $langs->trans('ToReviewCP');
if ($statut == 3) return $langs->trans('ApprovedCP'); elseif ($statut == 3) return $langs->trans('ApprovedCP');
if ($statut == 4) return $langs->trans('CancelCP'); elseif ($statut == 4) return $langs->trans('CancelCP');
if ($statut == 5) return $langs->trans('RefuseCP'); elseif ($statut == 5) return $langs->trans('RefuseCP');
} }
elseif ($mode == 2) elseif ($mode == 2)
{ {
$pictoapproved='statut6'; $pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP'); // Draft if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP'); // Draft
if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP'); // Waiting approval elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP'); // Waiting approval
if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP'); elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP'); elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP'); elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
} }
elseif ($mode == 3) elseif ($mode == 3)
{ {
$pictoapproved='statut6'; $pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0'); if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1'); elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved); elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5'); elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5'); elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
} }
elseif ($mode == 5) elseif ($mode == 5)
{ {
$pictoapproved='statut6'; $pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft
if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved); elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5'); elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5'); elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
} }
elseif ($mode == 6) elseif ($mode == 6)
{ {
$pictoapproved='statut6'; $pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft
if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved); elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5'); elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5'); elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
} }
return $statut; else return $statut;
} }

5
htdocs/product/class/productcustomerprice.class.php
View File

@ -46,7 +46,7 @@ class Productcustomerprice extends CommonObject
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
public $price; public $price;
public $price_ttc; public $price_ttc;
@ -67,6 +67,7 @@ class Productcustomerprice extends CommonObject
public $lines = array (); public $lines = array ();
/** /**
* Constructor * Constructor
* *
@ -985,7 +986,7 @@ class PriceByCustomerLine
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
public $price; public $price;
public $price_ttc; public $price_ttc;

2
htdocs/societe/class/companypaymentmode.class.php
View File

@ -127,7 +127,7 @@ class CompanyPaymentMode extends CommonObject
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
public $label; public $label;
public $bank; public $bank;

2
htdocs/stripe/class/stripe.class.php
View File

@ -36,7 +36,7 @@ class Stripe extends CommonObject
/** /**
* @var int Thirdparty ID * @var int Thirdparty ID
*/ */
public $fk_soc; public $fk_soc;
public $fk_key; public $fk_key;