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

Merge pull request #10902 from grandoc/new_branch_22_03_2019

Browse Source 
translation
This commit is contained in:
Laurent Destailleur 2019-03-22 12:28:21 +01:00 committed by GitHub
commit 4cdfad548c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/card.php
View File

@ -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 '</td></tr>';
// Conditions de reglement par defaut
// default terms of the settlement
$langs->load('bills');
print '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td>';

4
htdocs/commande/card.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005-2015 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2012-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
@ -1674,7 +1674,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print $form->selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
print "</td></tr>";
// Conditions de reglement
// terms of the settlement
print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
print '</td></tr>';

4
htdocs/fourn/card.php
View File

@ -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 '</td></tr>';
// Conditions de reglement par defaut
// Default terms of the settlement
$langs->load('bills');
$form = new Form($db);
print '<tr><td>';

2
htdocs/fourn/commande/card.php
View File

@ -1916,7 +1916,7 @@ elseif (! empty($object->id))
print '</td></tr>';
// Conditions de reglement par defaut
// Default terms of the settlement
$langs->load('bills');
print '<tr><td class="nowrap">';
print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';

2
htdocs/fourn/facture/card.php
View File

@ -2495,7 +2495,7 @@ else
}
print '</td>';
// Conditions de reglement par defaut
// Default terms of the settlement
$langs->load('bills');
print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';

16
htdocs/user/class/usergroup.class.php
View File

@ -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