diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index c4ec266d454..384727d60b0 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -110,7 +110,7 @@ if (empty($reshook))
if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}
- // conditions de reglement
+ // terms of the settlement
if ($action == 'setconditions' && $user->rights->societe->creer)
{
$object->fetch($id);
@@ -317,7 +317,7 @@ if ($object->id > 0)
print $object->tva_intra;
print '';
- // Conditions de reglement par defaut
+ // default terms of the settlement
$langs->load('bills');
print '
';
print '| ';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f85870bd6f1..372c2c8641e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2015 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2010-2013 Juanjo Menent
- * Copyright (C) 2011-2018 Philippe Grand
+ * Copyright (C) 2011-2019 Philippe Grand
* Copyright (C) 2012-2013 Christophe Battarel
* Copyright (C) 2012-2016 Marcos GarcĂa
* Copyright (C) 2012 Cedric Salvador
@@ -1674,7 +1674,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print $form->selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
print " | ";
- // Conditions de reglement
+ // terms of the settlement
print '| ' . $langs->trans('PaymentConditionsShort') . ' | ';
$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
print ' | ';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index ae17cdecd46..2c6580be662 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -90,7 +90,7 @@ if (empty($reshook))
$mesg=join(',', $object->errors);
}
}
- // conditions de reglement
+ // terms of the settlement
if ($action == 'setconditions' && $user->rights->societe->creer)
{
$object->fetch($id);
@@ -225,7 +225,7 @@ if ($object->id > 0)
print $object->tva_intra;
print '';
- // Conditions de reglement par defaut
+ // Default terms of the settlement
$langs->load('bills');
$form = new Form($db);
print '| ';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a75064178ae..16b388c728e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1916,7 +1916,7 @@ elseif (! empty($object->id))
print ' | ';
- // Conditions de reglement par defaut
+ // Default terms of the settlement
$langs->load('bills');
print '';
print '| ';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 13e30293525..c5f19c00f31 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2495,7 +2495,7 @@ else
}
print ' | ';
- // Conditions de reglement par defaut
+ // Default terms of the settlement
$langs->load('bills');
print ' ';
print '| ';
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index cb63e99c5b2..d3baa965bdc 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -72,9 +72,19 @@ class UserGroup extends CommonObject
public $globalgroup; // Global group
- public $datec; // Creation date of group
+ /**
+ * Date creation record (datec)
+ *
+ * @var integer
+ */
+ public $datec;
- public $datem; // Modification date of group
+ /**
+ * Date modification record (tms)
+ *
+ * @var integer
+ */
+ public $datem;
public $note; // Description
@@ -100,7 +110,7 @@ class UserGroup extends CommonObject
/**
- * Charge un objet group avec toutes ces caracteristiques (except ->members array)
+ * Charge un objet group avec toutes ses caracteristiques (except ->members array)
*
* @param int $id Id of group to load
* @param string $groupname Name of group to load
|
|
|
|