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

Merge pull request #5368 from grandoc/develop

Browse Source 
international comment for code
This commit is contained in:
Laurent Destailleur 2016-06-18 18:10:12 +02:00 committed by GitHub
commit f9509bf345
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/adherents/card.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2016 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -94,7 +94,7 @@ if ($rowid > 0)
// Define variables to know what current user can do on properties of user linked to edited member
if ($object->user_id)
{
// $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite
// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@ -209,7 +209,7 @@ if (empty($reshook))
{
if ($result > 0)
{
// Creation user
// User creation
$company = new Societe($db);
$result=$company->create_from_member($object,GETPOST('companyname'));
@ -495,7 +495,7 @@ if (empty($reshook))
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
}
// Test si le login existe deja
// Tests if the login already exists
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
{
if (empty($login)) {
@ -550,11 +550,11 @@ if (empty($reshook))
{
$db->begin();
// Email a peu pres correct et le login n'existe pas
// Email about right and login does not exist
$result=$object->create($user);
if ($result > 0)
{
// Categories association
// Fundation categories
$memcats = GETPOST('memcats', 'array');
$object->setCategories($memcats);
@ -615,7 +615,7 @@ if (empty($reshook))
if ($result >= 0 && ! count($object->errors))
{
// Send confirmation Email (selon param du type adherent sinon generique)
// Send confirmation email (according to parameters of member type. Otherwise generic)
if ($object->email && GETPOST("send_mail"))
{
$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
@ -1379,7 +1379,7 @@ else
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
// Cree un tableau formulaire
// Create an array
$formquestion=array();
if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));

12
htdocs/don/admin/donation.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013-2016 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Benoit Bruchard <benoitb21@gmail.com>
*
@ -90,12 +90,12 @@ else if ($action == 'setdoc')
{
if (dolibarr_set_const($db, "DON_ADDON_MODEL",$value,'chaine',0,'',$conf->entity))
{
// La constante qui a ete lue en avant du nouveau set
// on passe donc par une variable pour avoir un affichage coherent
// The constant that was read before the new set
// So we go through a variable for a coherent display
$conf->global->DON_ADDON_MODEL = $value;
}
// On active le modele
// It enables the model
$ret = delDocumentModel($value, $type);
if ($ret > 0)
{
@ -321,7 +321,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
print '<br>';
print load_fiche_titre($langs->trans("DonationsModels"));
// Defini tableau def de modele
// Defined the template definition table
$type='donation';
$def = array();
$sql = "SELECT nom";
@ -408,7 +408,7 @@ if (is_resource($handle))
print "</td>";
}
// Defaut
// Default
if ($conf->global->DON_ADDON_MODEL == "$name")
{
print "<td align=\"center\">";