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

Merge pull request #11936 from aspangaro/11.0_translation

Browse Source 
Translate and some fix
This commit is contained in:
Laurent Destailleur 2019-09-27 12:15:50 +02:00 committed by GitHub
commit 138b494b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
105 changed files with 337 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ if ($action == 'updateall')
}
}
// Action mise a jour ou ajout d'une constante
// Action to update or add a constant
if ($action == 'update' || $action == 'add')
{
$constname=GETPOST('constname', 'alpha');
@ -108,7 +108,7 @@ if ($action == 'update' || $action == 'add')
}
}
// Action activation d'un sous module du module adherent
// Action to enable of a submodule of the adherent module
if ($action == 'set')
{
$result=dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
@ -118,7 +118,7 @@ if ($action == 'set')
}
}
// Action desactivation d'un sous module du module adherent
// Action to disable a submodule of the adherent module
if ($action == 'unset')
{
$result=dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
@ -220,9 +220,9 @@ if ($conf->facture->enabled)
print '</table>';
print '<center>';
print '<div class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
print '</center>';
print '</div>';
print '</form>';
@ -230,7 +230,7 @@ print '<br>';
/*
* Edition info modele document
* Edit info of model document
*/
$constantes=array(
'ADHERENT_CARD_TYPE',
@ -254,7 +254,7 @@ print '<br>';
/*
* Edition info modele document
* Edit info of model document
*/
$constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT');

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

@ -82,7 +82,7 @@ if ($action == 'updateall')
}
}
// Action mise a jour ou ajout d'une constante
// Action to update or add a constant
if ($action == 'update' || $action == 'add')
{
$constlineid = GETPOST('rowid', 'int');
@ -108,7 +108,7 @@ if ($action == 'update' || $action == 'add')
}
}
// Action activation d'un sous module du module adherent
// Action to enable a submodule of the adherent module
if ($action == 'set')
{
$result=dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
@ -118,7 +118,7 @@ if ($action == 'set')
}
}
// Action desactivation d'un sous module du module adherent
// Action to disable a submodule of the adherent module
if ($action == 'unset')
{
$result=dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);

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

@ -22,7 +22,6 @@
* \file htdocs/adherents/admin/website.php
* \ingroup member
* \brief File of main public page for member module
* \author Laurent Destailleur
*/
require '../../main.inc.php';
@ -211,9 +210,9 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
print '</table>';
print '<center>';
print '<div class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</center>';
print '</div>';
}

5
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@ -19,11 +19,11 @@
/**
* \file htdocs/adherents/canvas/actions_adherentcard_common.class.php
* \ingroup adherent
* \brief Fichier de la classe Adherent card controller (common)
* \brief File of class Thirdparty member card controller (common)
*/
/**
* Class to maage members using default canvas
* Class to manage members using default canvas
*/
abstract class ActionsAdherentCardCommon
{
@ -170,7 +170,6 @@ abstract class ActionsAdherentCardCommon
$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
}
// Dolibarr user
if ($this->object->user_id)
{

8
htdocs/adherents/card.php
View File

@ -638,7 +638,7 @@ if (empty($reshook))
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -719,7 +719,7 @@ if (empty($reshook))
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -1483,7 +1483,7 @@ else
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -1544,7 +1544,7 @@ else
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

6
htdocs/adherents/cartes/carte.php
View File

@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/printsheet/modules_labels.php';
$langs->loadLangs(array("members","errors"));
// Choix de l'annee d'impression ou annee courante.
// Choice of printing year or current year.
$now = dol_now();
$year=dol_print_date($now, '%Y');
$month=dol_print_date($now, '%m');
@ -47,7 +47,7 @@ $adherentstatic=new Adherent($db);
$object=new Adherent($db);
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('adherent');
@ -97,7 +97,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
$adherentstatic->lastname=$objp->lastname;
$adherentstatic->firstname=$objp->firstname;
// format extrafiled so they can be parsed in function complete_substitutions_array
// Format extrafield so they can be parsed in function complete_substitutions_array
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
{
$adherentstatic->array_options = array();

4
htdocs/adherents/class/adherentstats.class.php
View File

@ -83,7 +83,7 @@ class AdherentStats extends Stats
* Return the number of proposition by month for a given year
*
* @param int $year Year
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of nb each month
*/
public function getNbByMonth($year, $format = 0)
@ -124,7 +124,7 @@ class AdherentStats extends Stats
* Return the number of subscriptions by month for a given year
*
* @param int $year Year
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of amount each month
*/
public function getAmountByMonth($year, $format = 0)

3
htdocs/adherents/htpasswd.php
View File

@ -20,8 +20,7 @@
/**
* \file htdocs/adherents/htpasswd.php
* \ingroup member
* \brief Page d'export htpasswd du fichier des adherents
* \author Rodolphe Quiedeville
* \brief Export page htpasswd of the membership file
*/
require '../main.inc.php';

4
htdocs/adherents/subscription.php
View File

@ -360,7 +360,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
@ -1093,7 +1093,7 @@ if ($rowid > 0)
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

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

@ -68,7 +68,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include,
if ($user->rights->adherent->cotisation->creer && $action == 'update' && ! $cancel)
{
// Charge objet actuel
// Load current object
$result=$object->fetch($rowid);
if ($result > 0)
{
@ -101,7 +101,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && ! $canc
if (! $errmsg)
{
// Modifie valeures
// Modify values
$object->dateh=dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
$object->datef=dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
$object->fk_type=$_POST["typeid"];
@ -389,7 +389,7 @@ if ($rowid && $action != 'edit')
}
}
// Supprimer
// Delete
if ($user->rights->adherent->cotisation->creer)
{
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=delete\">".$langs->trans("Delete")."</a></div>\n";

54
htdocs/admin/accountant.php
View File

@ -112,56 +112,56 @@ if ($action == 'edit' || $action == 'updateedit')
print '<input type="hidden" name="action" value="update">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
print '<tr class="oddeven liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
// Name
print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
// Address
print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
print '<tr><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address", 'nohtml')) . '</textarea></td></tr>'."\n";
print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
print '<tr><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode", 'alpha')) . '"></td></tr>'."\n";
print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
print '<tr><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town", 'nohtml')) . '"></td></tr>'."\n";
// Country
print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
print '<tr><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization
print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
print '</td></tr>'."\n";
print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
print '<tr><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
$formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
print '</td></tr>'."\n";
print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
print '<tr><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>';
print '</td></tr>'."\n";
print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
print '<tr><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>';
print '</td></tr>'."\n";
print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
print '<tr><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>';
print '</td></tr>'."\n";
// Web
print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
print '<tr><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
print '</td></tr>'."\n";
// Code
print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
print '<tr><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code", 'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
// Note
print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
print '<tr><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
print '</td></tr>';
@ -189,24 +189,24 @@ else
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="oddeven liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="oddeven"><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>';
print '<tr><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>';
print $conf->global->MAIN_INFO_ACCOUNTANT_NAME;
print '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '</td></tr>';
print '<tr><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '</td></tr>';
print '<tr><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '</td></tr>';
print '<tr><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>';
print '<tr><td>'.$langs->trans("CompanyCountry").'</td><td>';
if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY))
{
$code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2);
@ -217,23 +217,23 @@ else
print '</td></tr>';
if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr><td>'.$langs->trans("Region-State").'</td><td>';
else print '<tr><td>'.$langs->trans("State").'</td><td>';
if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
else print '&nbsp;';
print '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . '</td></tr>';
print '<tr><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . '</td></tr>';
print '<tr><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . '</td></tr>';
print '<tr><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . '</td></tr>';
print '<tr><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("AccountantFileNumber").'</td><td>' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '</td></tr>';
print '<tr><td>'.$langs->trans("AccountantFileNumber").'</td><td>' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '</td></tr>';
print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>';
print '<tr><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>';
print '</table>';
print "</div>";

4
htdocs/admin/agenda_reminder.php
View File

@ -148,8 +148,8 @@ elseif ($action == 'setdoc')
{
if (dolibarr_set_const($db, "ACTION_EVENT_ADDON_PDF", $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 has been read in front of the new set
// is therefore passed through a variable to have a coherent display
$conf->global->ACTION_EVENT_ADDON_PDF = $value;
}

2
htdocs/admin/bank.php
View File

@ -49,7 +49,7 @@ $type = 'bankaccount';
* Actions
*/
//Order display of bank account
// Order display of bank account
if ($action == 'setbankorder') {
if (dolibarr_set_const($db, "BANK_SHOW_ORDER_OPTION", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity) > 0)
{

14
htdocs/admin/boxes.php
View File

@ -63,7 +63,7 @@ if ($action == 'add') {
{
$pos = $boxid['pos'];
// Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
// Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
$distinctfkuser=array();
if (! $error)
{
@ -225,8 +225,8 @@ print load_fiche_titre($langs->trans("Boxes"), '', 'title_setup');
print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
/*
* Recherche des boites actives par defaut pour chaque position possible
* On stocke les boites actives par defaut dans $boxes[position][id_boite]=1
* Search for the default active boxes for each possible position
* We store the active boxes by default in $boxes[position][id_boite]=1
*/
$actives = array();
@ -257,7 +257,7 @@ if ($resql)
array_push($actives, $obj->box_id);
if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) $decalage++;
// On renumerote l'ordre des boites si l'une d'elle est a ''
// We renumber the order of the boxes if one of them is in ''
// This occurs just after an insert.
if ($decalage)
{
@ -268,7 +268,7 @@ if ($resql)
if ($decalage)
{
// Si on a renumerote, on corrige champ box_order
// If we have renumbered, we correct the field box_order
// This occurs just after an insert.
$sql = "SELECT box_order";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes";
@ -366,7 +366,7 @@ foreach($boxtoadd as $box)
print '</td>'."\n";
print '<td>' . $box->sourcefile . '</td>'."\n";
// Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position
// For each possible position, an activation link is displayed if the box is not already active for that position
print '<td class="center">';
print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n";
print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
@ -483,7 +483,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIV
print '</table>';
print '<br>';
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button"></div>';
print '<br>';
print '</form>';
print "\n".'<!-- End Other Const -->'."\n";

3
htdocs/admin/chequereceipts.php
View File

@ -91,7 +91,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
}
/*
* view
* View
*/
$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
@ -233,7 +233,6 @@ print '<br>';
/*
* Other options
*
*/
print load_fiche_titre($langs->trans("OtherOptions"), '', '');

2
htdocs/admin/delais.php
View File

@ -222,7 +222,7 @@ if ($action == 'edit')
else
{
/*
* Affichage des parametres
* Show parameters
*/
print '<table class="noborder" width="100%">';

18
htdocs/admin/dict.php
View File

@ -251,7 +251,7 @@ $tabsqlsort[35]="c.label ASC";
$tabsqlsort[36]="r.fk_c_exp_tax_cat ASC, r.range_ik ASC";
$tabsqlsort[37]="r.unit_type ASC, r.scale ASC, r.code ASC";
// Nom des champs en resultat de select pour affichage du dictionnaire
// Field names in select result for dictionary display
$tabfield=array();
$tabfield[1] = "code,libelle,country";
$tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,region,country_code-country"
@ -291,7 +291,7 @@ $tabfield[35]= "label";
$tabfield[36]= "range_ik,fk_c_exp_tax_cat";
$tabfield[37]= "code,label,short_label,unit_type,scale";
// Nom des champs d'edition pour modification d'un enregistrement
// Edit field names for editing a record
$tabfieldvalue=array();
$tabfieldvalue[1] = "code,libelle,country";
$tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region"
@ -331,7 +331,7 @@ $tabfieldvalue[35]= "label";
$tabfieldvalue[36]= "range_ik,fk_c_exp_tax_cat";
$tabfieldvalue[37]= "code,label,short_label,unit_type,scale";
// Nom des champs dans la table pour insertion d'un enregistrement
// Field names in the table for inserting a record
$tabfieldinsert=array();
$tabfieldinsert[1] = "code,libelle,fk_pays";
$tabfieldinsert[2] = "code_departement,nom,fk_region";
@ -979,7 +979,7 @@ if ($sortfield) $paramwithsearch.= '&sortfield='.urlencode($sortfield);
if (GETPOST('from')) $paramwithsearch.= '&from='.urlencode(GETPOST('from', 'alpha'));
// Confirmation de la suppression de la ligne
// Confirmation of the deletion of the line
if ($action == 'delete')
{
print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
@ -991,7 +991,7 @@ if ($action == 'delete')
*/
if ($id)
{
// Complete requete recherche valeurs avec critere de tri
// Complete search values request with sort criteria
$sql=$tabsql[$id];
if (! preg_match('/ WHERE /', $sql)) $sql.= " WHERE 1 = 1";
@ -1283,8 +1283,8 @@ if ($id)
{
if ($fieldlist[$field] == 'entity') continue;
// Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees
// Determines the name of the field in relation to the possible names
// in data dictionaries
$showfield=1; // By defaut
$align="left";
$cssprefix='';
@ -1850,14 +1850,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
print '</td>';
}
// Le type de l'element (pour les type de contact)
// The type of the element (for contact types)
elseif ($fieldlist[$field] == 'element')
{
print '<td>';
print $form->selectarray('element', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
print '</td>';
}
// La source de l'element (pour les type de contact)
// The source of the element (for contact types)
elseif ($fieldlist[$field] == 'source')
{
print '<td>';

2
htdocs/admin/emailcollector_card.php
View File

@ -36,7 +36,7 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
if (!$user->admin) accessforbidden();
if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("admin", "mails", "other"));
// Get parameters

2
htdocs/admin/emailcollector_list.php
View File

@ -34,7 +34,7 @@ dol_include_once('/emailcollector/class/emailcollector.class.php');
if (!$user->admin) accessforbidden();
if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("admin", "other"));
$action = GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...

2
htdocs/admin/expensereport.php
View File

@ -496,7 +496,7 @@ else
}
print '</td></tr>'."\n";
//Use draft Watermark
// Use draft Watermark
print '<tr class="oddeven"><td colspan="2">';
print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';

6
htdocs/admin/ihm.php
View File

@ -432,11 +432,13 @@ if ($action == 'edit') // Edit
print '</table>'."\n";
print '<br><div class="center">';
print '<br>';
print '<div class="center">';
print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
print ' &nbsp; ';
print '&nbsp;&nbsp;&nbsp;';
print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</div>';
print '<br>';
print '</form>';
}

20
htdocs/admin/limits.php
View File

@ -102,7 +102,7 @@ if ($action == 'edit')
clearstatcache();
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="oddeven"><td>';
@ -110,23 +110,25 @@ if ($action == 'edit')
print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_UNIT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_UNIT . '"></td></tr>';
print '<tr class="oddeven"><td>';
print '<tr><td>';
print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_TOT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_TOT . '"></td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
print '<tr><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
print '<tr class="oddeven"><td>';
print '<tr><td>';
print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td><input class="flat" name="MAIN_ROUNDING_RULE_TOT" size="3" value="' . $conf->global->MAIN_ROUNDING_RULE_TOT . '"></td></tr>';
print '</table>';
print '<br><div class="center">';
print '<br>';
print '<div class="center">';
print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
print '</div>';
print '<br>';
print '</form>';
print '<br>';
@ -142,21 +144,21 @@ else
print '</td><td class="right">'.$conf->global->MAIN_MAX_DECIMALS_UNIT.'</td></tr>';
print '<tr class="oddeven"><td>';
print '<tr><td>';
print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td class="right">'.$conf->global->MAIN_MAX_DECIMALS_TOT.'</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td class="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
print '<tr><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td class="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
print '<tr class="oddeven"><td>';
print '<tr><td>';
print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td class="right">'.$conf->global->MAIN_ROUNDING_RULE_TOT.'</td></tr>';
print '</table>';
print '<div class="tabsAction">';
print '<div class="tabsAction tabsActionNoBottom">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
print '</div>';
}

10
htdocs/admin/payment.php
View File

@ -252,14 +252,16 @@ print "</td></tr>\n";
print '</table>';
print '<center>';
dol_fiche_end();
print '<br>';
print '<div class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
print '</center>';
print '</div>';
print '<br>';
print '</form>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

4
htdocs/comm/propal/class/propalestats.class.php
View File

@ -103,7 +103,7 @@ class PropaleStats extends Stats
* Return propals number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with number by month
*/
public function getNbByMonth($year, $format = 0)
@ -146,7 +146,7 @@ class PropaleStats extends Stats
* Return the propals amount by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getAmountByMonth($year, $format)

4
htdocs/commande/class/commandestats.class.php
View File

@ -98,7 +98,7 @@ class CommandeStats extends Stats
* Return orders number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with number by month
*/
public function getNbByMonth($year, $format = 0)
@ -141,7 +141,7 @@ class CommandeStats extends Stats
* Return the orders amount by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getAmountByMonth($year, $format = 0)

4
htdocs/compta/deplacement/class/deplacementstats.class.php
View File

@ -93,7 +93,7 @@ class DeplacementStats extends Stats
* Renvoie le nombre de facture par mois pour une annee donnee
*
* @param string $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getNbByMonth($year, $format = 0)
@ -115,7 +115,7 @@ class DeplacementStats extends Stats
* Renvoie le montant de facture par mois pour une annee donnee
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getAmountByMonth($year, $format = 0)

4
htdocs/compta/facture/class/facturestats.class.php
View File

@ -97,7 +97,7 @@ class FactureStats extends Stats
* Return orders number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getNbByMonth($year, $format = 0)
@ -142,7 +142,7 @@ class FactureStats extends Stats
* Return the invoices amount by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getAmountByMonth($year, $format = 0)

1
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -19,7 +19,6 @@
* \file compta/facture/class/paymentterm.class.php
* \ingroup facture
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
* \author Put author name here
*/

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

@ -18,7 +18,6 @@
/**
* \file htdocs/compta/localtax/class/localtax.class.php
* \ingroup tax
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';

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

@ -22,7 +22,6 @@
/**
* \file htdocs/compta/tva/class/tva.class.php
* \ingroup tax
* \author Laurent Destailleur
*/
// Put here all includes required by your class file

1
htdocs/core/class/antivir.class.php
View File

@ -22,7 +22,6 @@
/**
* \file htdocs/core/class/antivir.class.php
* \brief File of class to scan viruses
* \author Laurent Destailleur.
*/
/**

10
htdocs/core/class/stats.class.php
View File

@ -39,7 +39,7 @@ abstract class Stats
* @param int $endyear Start year
* @param int $startyear End year
* @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @param int $startmonth month of the fiscal year start min 1 max 12 ; if 1 = january
* @return array Array of values
@ -137,7 +137,7 @@ abstract class Stats
* @param int $endyear Start year
* @param int $startyear End year
* @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @param int $startmonth month of the fiscal year start min 1 max 12 ; if 1 = january
* @return array Array of values
*/
@ -423,7 +423,7 @@ abstract class Stats
*
* @param int $year Year
* @param string $sql SQL
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of nb each month
*/
protected function _getNbByMonth($year, $sql, $format = 0)
@ -483,7 +483,7 @@ abstract class Stats
*
* @param int $year Year
* @param string $sql SQL
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array
*/
protected function _getAmountByMonth($year, $sql, $format = 0)
@ -540,7 +540,7 @@ abstract class Stats
*
* @param int $year Year
* @param string $sql SQL
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array
*/
protected function _getAverageByMonth($year, $sql, $format = 0)

4
htdocs/core/modules/action/rapport.pdf.php
View File

@ -84,7 +84,7 @@ class CommActionRapport
$this->month = $month;
$this->year = $year;
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -117,7 +117,7 @@ class CommActionRapport
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
$dir = $conf->agenda->dir_temp."/";

14
htdocs/core/modules/bank/doc/pdf_ban.modules.php
View File

@ -61,7 +61,7 @@ class pdf_ban extends ModeleBankAccountDoc
$this->name = "ban";
$this->description = $langs->trans("DocumentModelBan").' (Volunteer wanted to finish)';
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -76,11 +76,11 @@ class pdf_ban extends ModeleBankAccountDoc
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_codeproduitservice = 1; // Affiche code produit-service
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
$this->posxref=$this->marge_gauche+1;
$this->posxlabel=$this->marge_gauche+25;
$this->posxworkload=$this->marge_gauche+100;
@ -106,7 +106,7 @@ class pdf_ban extends ModeleBankAccountDoc
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->bank->dir_output)
@ -197,7 +197,7 @@ class pdf_ban extends ModeleBankAccountDoc
$nexY = $pdf->GetY();
$height_note=$nexY-($tab_top-2);
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -231,7 +231,7 @@ class pdf_ban extends ModeleBankAccountDoc
}
/*
* Pied de page
* Footer of the page
*/
$this->_pagefoot($pdf, $object, $outputlangs);
if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
@ -261,7 +261,7 @@ class pdf_ban extends ModeleBankAccountDoc
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{

16
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -63,7 +63,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$this->name = "sepamandate";
$this->description = $langs->transnoentitiesnoconv("DocumentModelSepaMandate");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -78,11 +78,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_codeproduitservice = 1; // Affiche code produit-service
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
$this->posxref=$this->marge_gauche;
}
@ -109,7 +109,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
if (! empty($conf->bank->dir_output))
@ -194,7 +194,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$tab_top_newpage = 40;
$tab_height_newpage = 210;
// Affiche notes
// Show notes
if (! empty($object->note_public))
{
$pdf->SetFont('', '', $default_font_size - 1);
@ -202,7 +202,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$nexY = $pdf->GetY();
$height_note=$nexY-($tab_top-2);
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -374,7 +374,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
/*
* Pied de page
* Footer of the page
*/
$this->_pagefoot($pdf, $object, $outputlangs);
if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
@ -404,7 +404,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{

14
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@ -49,7 +49,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "bills"));
$this->db = $db;
@ -57,7 +57,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$this->tab_top = 60;
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -68,11 +68,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
$this->line_height = 5;
$this->line_per_page = 40;
$this->tab_height = 200; //$this->line_height * $this->line_per_page;
@ -98,7 +98,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$sav_charset_output=$outputlangs->charset_output;
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
$dir = $_dir . "/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
@ -205,7 +205,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$this->result = array('fullpath'=>$file);
$outputlangs->charset_output=$sav_charset_output;
return 1; // Pas d'erreur
return 1; // No error
}
@ -225,7 +225,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
global $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("compta", "banks"));
$title = $outputlangs->transnoentities("CheckReceipt");

2
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -75,7 +75,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'COMMANDE_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

12
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -353,7 +353,7 @@ class pdf_einstein extends ModelePDFCommandes
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -388,7 +388,7 @@ class pdf_einstein extends ModelePDFCommandes
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -633,7 +633,7 @@ class pdf_einstein extends ModelePDFCommandes
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1156,11 +1156,11 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
@ -1236,7 +1236,7 @@ class pdf_einstein extends ModelePDFCommandes
// phpcs:enable
global $conf,$langs,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

8
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -383,7 +383,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -831,7 +831,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1343,13 +1343,13 @@ class pdf_eratosthene extends ModelePDFCommandes
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
}
}

4
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -74,7 +74,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'CONTRACT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;
@ -217,7 +217,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->contrat->dir_output)

10
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -132,7 +132,7 @@ class pdf_strato extends ModelePDFContract
$this->name = 'strato';
$this->description = $langs->trans("StandardContractsTemplate");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
@ -181,7 +181,7 @@ class pdf_strato extends ModelePDFContract
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
if ($conf->contrat->dir_output)
@ -279,7 +279,7 @@ class pdf_strato extends ModelePDFContract
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -556,7 +556,7 @@ class pdf_strato extends ModelePDFContract
*/
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height+3); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height+3); // Rect takes a length in 3rd parameter and 4th parameter
}
/**
@ -602,7 +602,7 @@ class pdf_strato extends ModelePDFContract
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "contract", "companies"));
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);

2
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -83,7 +83,7 @@ class html_cerfafr extends ModeleDon
if (! is_object($outputlangs)) $outputlangs=$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
$currency = !empty($currency) ? $currency : $conf->currency;

4
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -76,7 +76,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'EXPEDITION_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;
@ -227,7 +227,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->expedition->dir_output."/sending")

10
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -165,7 +165,7 @@ class pdf_espadon extends ModelePdfExpedition
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
$nblines = count($object->lines);
@ -320,7 +320,7 @@ class pdf_espadon extends ModelePdfExpedition
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -377,7 +377,7 @@ class pdf_espadon extends ModelePdfExpedition
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -788,13 +788,13 @@ class pdf_espadon extends ModelePdfExpedition
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
}
}

4
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -165,7 +165,7 @@ class pdf_merou extends ModelePdfExpedition
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
if ($conf->expedition->dir_output)
@ -281,7 +281,7 @@ class pdf_merou extends ModelePdfExpedition
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);

8
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -195,7 +195,7 @@ class pdf_rouget extends ModelePdfExpedition
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
$nblines = count($object->lines);
@ -350,7 +350,7 @@ class pdf_rouget extends ModelePdfExpedition
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -407,7 +407,7 @@ class pdf_rouget extends ModelePdfExpedition
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -800,7 +800,7 @@ class pdf_rouget extends ModelePdfExpedition
$pdf->SetFont('', '', $default_font_size - 2);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$pdf->SetDrawColor(128, 128, 128);
$pdf->SetFont('', '', $default_font_size - 1);

12
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -133,7 +133,7 @@ class pdf_standard extends ModeleExpenseReport
$this->name = "";
$this->description = $langs->trans('PDFStandardExpenseReports');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -217,7 +217,7 @@ class pdf_standard extends ModeleExpenseReport
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
$nblines = count($object->lines);
@ -334,7 +334,7 @@ class pdf_standard extends ModeleExpenseReport
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -525,7 +525,7 @@ class pdf_standard extends ModeleExpenseReport
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -635,7 +635,7 @@ class pdf_standard extends ModeleExpenseReport
// global $conf, $langs, $hookmanager;
global $user, $langs, $conf, $mysoc, $db, $hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "trips", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -883,7 +883,7 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetDrawColor(128, 128, 128);
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
// line prend une position y en 3eme param
if (empty($hidetop)) {

1
htdocs/core/modules/export/export_csv.modules.php
View File

@ -19,7 +19,6 @@
* \file htdocs/core/modules/export/export_csv.modules.php
* \ingroup export
* \brief File of class to build exports with CSV format
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';

1
htdocs/core/modules/export/export_excel.modules.php
View File

@ -20,7 +20,6 @@
* \file htdocs/core/modules/export/export_excel.modules.php
* \ingroup export
* \brief File of class to generate export file with Excel format
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';

1
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -20,7 +20,6 @@
* \file htdocs/core/modules/export/export_excel2007.modules.php
* \ingroup export
* \brief File of class to generate export file with Excel format
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';

1
htdocs/core/modules/export/export_excel2007new.modules.php
View File

@ -20,7 +20,6 @@
* \file htdocs/core/modules/export/export_excelnew.modules.php
* \ingroup export
* \brief File of class to generate export file with Excel format
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';

1
htdocs/core/modules/export/export_tsv.modules.php
View File

@ -20,7 +20,6 @@
* \file htdocs/core/modules/export/export_csv.modules.php
* \ingroup export
* \brief File of class to build export files with format TSV
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';

2
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -75,7 +75,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'FACTURE_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

28
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -243,7 +243,7 @@ class pdf_crabe extends ModelePDFFactures
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
$nblines = count($object->lines);
@ -420,7 +420,7 @@ class pdf_crabe extends ModelePDFFactures
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -455,7 +455,7 @@ class pdf_crabe extends ModelePDFFactures
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -1351,7 +1351,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
// Retained warranty
if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
{
@ -1367,29 +1367,29 @@ class pdf_crabe extends ModelePDFFactures
}
}
}
if($displayWarranty){
$pdf->SetTextColor(40, 40, 40);
$pdf->SetFillColor(255, 255, 255);
$retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
// Billed - retained warranty
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
// retained warranty
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
$retainedWarrantyToPayOn.= !empty($object->retained_warranty_date_limit)?' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
@ -1498,11 +1498,11 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
@ -1591,7 +1591,7 @@ class pdf_crabe extends ModelePDFFactures
{
global $conf, $langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

6
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -414,7 +414,7 @@ class pdf_sponge extends ModelePDFFactures
$nexY = max($pdf->GetY(), $nexY);
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -1795,13 +1795,13 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
}
}

10
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -125,7 +125,7 @@ class pdf_soleil extends ModelePDFFicheinter
$this->name = 'soleil';
$this->description = $langs->trans("DocumentModelStandardPDF");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -173,7 +173,7 @@ class pdf_soleil extends ModelePDFFicheinter
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
if ($conf->ficheinter->dir_output)
@ -282,7 +282,7 @@ class pdf_soleil extends ModelePDFFicheinter
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -529,7 +529,7 @@ class pdf_soleil extends ModelePDFFicheinter
*/
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height+1, 0, 0); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height+1, 0, 0); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidebottom))
{
@ -562,7 +562,7 @@ class pdf_soleil extends ModelePDFFicheinter
global $conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "interventions"));
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);

11
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -25,7 +25,6 @@
* \file htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
* \ingroup livraison
* \brief File of class to manage receving receipts with template Typhon
* \author Laurent Destailleur
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
@ -128,7 +127,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->name = "typhon";
$this->description = $langs->trans("DocumentModelTyphon");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -335,7 +334,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -354,7 +353,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -624,7 +623,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->result = array('fullpath'=>$file);
return 1; // pas d'erreur
return 1; // No error
}
else
{
@ -695,7 +694,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetFont('', '', $default_font_size - 2);
// Output Rec
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{

2
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -329,7 +329,7 @@ class pdf_standard extends CommonStickerGenerator
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
if (empty($mode) || $mode == 'member')

2
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
View File

@ -260,7 +260,7 @@ class pdf_standardlabel extends CommonStickerGenerator
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$title=$outputlangs->transnoentities('Labels');

2
htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
View File

@ -301,7 +301,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$title=$outputlangs->transnoentities('Labels');

2
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -73,7 +73,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'PRODUCT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

16
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -119,14 +119,14 @@ class pdf_standard extends ModelePDFProduct
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
$this->name = "standard";
$this->description = $langs->trans("DocumentModelStandardPDF");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -169,7 +169,7 @@ class pdf_standard extends ModelePDFProduct
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
$nblines = count($object->lines);
@ -328,7 +328,7 @@ class pdf_standard extends ModelePDFProduct
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -572,7 +572,7 @@ class pdf_standard extends ModelePDFProduct
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -630,11 +630,11 @@ class pdf_standard extends ModelePDFProduct
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
@ -709,7 +709,7 @@ class pdf_standard extends ModelePDFProduct
{
global $conf,$langs,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

4
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -82,7 +82,7 @@ class doc_generic_project_odt extends ModelePDFProjects
{
global $conf, $langs, $mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("companies", "main"));
$this->db = $db;
@ -90,7 +90,7 @@ class doc_generic_project_odt extends ModelePDFProjects
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'PROJECT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

23
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -20,8 +20,7 @@
/**
* \file htdocs/core/modules/project/doc/pdf_baleine.modules.php
* \ingroup project
* \brief File of class to generate project document Baleine
* \author Regis Houssin
* \brief File of the class allowing to generate projects with the baleine model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
@ -128,7 +127,7 @@ class pdf_baleine extends ModelePDFProjects
$this->name = "baleine";
$this->description = $langs->trans("DocumentModelBaleine");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -143,11 +142,11 @@ class pdf_baleine extends ModelePDFProjects
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_codeproduitservice = 1; // Affiche code produit-service
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
$this->posxref=$this->marge_gauche+1;
$this->posxlabel=$this->marge_gauche+25;
$this->posxworkload=$this->marge_gauche+120;
@ -183,7 +182,7 @@ class pdf_baleine extends ModelePDFProjects
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)
@ -295,7 +294,7 @@ class pdf_baleine extends ModelePDFProjects
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-2, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+2);
@ -410,7 +409,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
}
$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
// Ref of task
$pdf->SetXY($this->posxref, $curY);
@ -483,7 +482,7 @@ class pdf_baleine extends ModelePDFProjects
$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
// Pied de page
// Footer of the page
$this->_pagefoot($pdf, $object, $outputlangs);
if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
@ -507,7 +506,7 @@ class pdf_baleine extends ModelePDFProjects
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -545,10 +544,10 @@ class pdf_baleine extends ModelePDFProjects
$pdf->SetDrawColor(128, 128, 128);
// Draw rect of all tab (title + lines). Rect prend une longueur en 3eme param
// Draw rect of all tab (title + lines). Rect takes a length in 3rd parameter
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
// line prend une position y en 3eme param
// line takes a position y in 3rd parameter
$pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
$pdf->SetTextColor(0, 0, 0);

19
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -21,8 +21,7 @@
/**
* \file htdocs/core/modules/project/doc/pdf_beluga.modules.php
* \ingroup project
* \brief Fichier de la classe permettant de generer les projets au modele beluga
* \author Charlie Benke
* \brief File of the class allowing to generate projects with the beluga model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
@ -50,7 +49,7 @@ if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/com
/**
* Class to manage generation of project document Baleine
* Class to manage generation of project document Beluga
*/
class pdf_beluga extends ModelePDFProjects
@ -83,7 +82,7 @@ class pdf_beluga extends ModelePDFProjects
$this->name = "beluga";
$this->description = $langs->trans("DocumentModelBeluga");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->orientation = 'L';
@ -104,11 +103,11 @@ class pdf_beluga extends ModelePDFProjects
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_codeproduitservice = 1; // Affiche code produit-service
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
$this->posxref=$this->marge_gauche+1;
$this->posxdate=$this->marge_gauche+105;
@ -155,7 +154,7 @@ class pdf_beluga extends ModelePDFProjects
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)
@ -268,7 +267,7 @@ class pdf_beluga extends ModelePDFProjects
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-2, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+2);
@ -680,7 +679,7 @@ class pdf_beluga extends ModelePDFProjects
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -718,7 +717,7 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetDrawColor(128, 128, 128);
// Draw rect of all tab (title + lines). Rect prend une longueur en 3eme param
// Draw rect of all tab (title + lines). Rect takes a length in 3rd parameter
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
// line prend une position y en 3eme param

19
htdocs/core/modules/project/doc/pdf_timespent.modules.php
View File

@ -17,10 +17,9 @@
*/
/**
* \file htdocs/core/modules/project/doc/pdf_baleine.modules.php
* \file htdocs/core/modules/project/doc/pdf_timespent.modules.php
* \ingroup project
* \brief File of class to generate project document Baleine
* \author Regis Houssin
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
@ -33,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
/**
* Class to manage generation of project document Baleine
* Class to manage generation of project document Timespent
*/
class pdf_timespent extends ModelePDFProjects
@ -60,7 +59,7 @@ class pdf_timespent extends ModelePDFProjects
$this->name = "timespent";
$this->description = $langs->trans("DocumentModelTimeSpent");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -75,11 +74,11 @@ class pdf_timespent extends ModelePDFProjects
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_codeproduitservice = 1; // Affiche code produit-service
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default if not defined
// Defini position des colonnes
// Define column position
$this->posxref=$this->marge_gauche+1;
$this->posxlabel=$this->marge_gauche+25;
$this->posxtimespent=$this->marge_gauche+120;
@ -115,7 +114,7 @@ class pdf_timespent extends ModelePDFProjects
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)
@ -226,7 +225,7 @@ class pdf_timespent extends ModelePDFProjects
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -438,7 +437,7 @@ class pdf_timespent extends ModelePDFProjects
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -476,7 +475,7 @@ class pdf_timespent extends ModelePDFProjects
$pdf->SetDrawColor(128, 128, 128);
// Draw rect of all tab (title + lines). Rect prend une longueur en 3eme param
// Draw rect of all tab (title + lines). Rect takes a length in 3rd parameter
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
// line prend une position y en 3eme param

2
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -91,7 +91,7 @@ class doc_generic_task_odt extends ModelePDFTask
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

2
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -72,7 +72,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

14
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -224,7 +224,7 @@ class pdf_azur extends ModelePDFPropales
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
$nblines = count($object->lines);
@ -415,7 +415,7 @@ class pdf_azur extends ModelePDFPropales
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -458,7 +458,7 @@ class pdf_azur extends ModelePDFPropales
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -818,7 +818,7 @@ class pdf_azur extends ModelePDFPropales
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1350,11 +1350,11 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
@ -1438,7 +1438,7 @@ class pdf_azur extends ModelePDFPropales
{
global $conf,$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

8
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -392,7 +392,7 @@ class pdf_cyan extends ModelePDFPropales
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -933,7 +933,7 @@ class pdf_cyan extends ModelePDFPropales
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1457,13 +1457,13 @@ class pdf_cyan extends ModelePDFPropales
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
}
}

2
htdocs/core/modules/rapport/pdf_paiement.class.php
View File

@ -47,7 +47,7 @@ class pdf_paiement
$this->db = $db;
$this->description = $langs->transnoentities("ListOfCustomerPayments");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];

2
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
View File

@ -70,7 +70,7 @@ class doc_generic_reception_odt extends ModelePdfReception
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'RECEPTION_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

6
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View File

@ -274,7 +274,7 @@ class pdf_squille extends ModelePdfReception
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -331,7 +331,7 @@ class pdf_squille extends ModelePdfReception
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -716,7 +716,7 @@ class pdf_squille extends ModelePdfReception
$pdf->SetFont('', '', $default_font_size - 2);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$pdf->SetDrawColor(128, 128, 128);
$pdf->SetFont('', '', $default_font_size - 1);

6
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -66,7 +66,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'COMPANY_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;
@ -78,7 +78,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$this->option_logo = 1; // Affiche logo
// Recupere emmetteur
// Retrieves transmitter
$this->emetteur=$mysoc;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
}
@ -94,7 +94,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
global $conf,$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("companies", "errors"));
$form = new Form($this->db);

2
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@ -73,7 +73,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'STOCK_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

16
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@ -119,14 +119,14 @@ class pdf_standard extends ModelePDFStock
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
$this->name = "standard";
$this->description = $langs->trans("DocumentModelStandardPDF");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -198,7 +198,7 @@ class pdf_standard extends ModelePDFStock
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
$nblines = count($object->lines);
@ -558,7 +558,7 @@ class pdf_standard extends ModelePDFStock
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -738,7 +738,7 @@ class pdf_standard extends ModelePDFStock
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -796,7 +796,7 @@ class pdf_standard extends ModelePDFStock
$pdf->SetFont('', 'B', $default_font_size - 3);
// Output Rect
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
$pdf->SetDrawColor(220, 26, 26);
@ -807,7 +807,7 @@ class pdf_standard extends ModelePDFStock
if (empty($hidetop))
{
//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
}
@ -875,7 +875,7 @@ class pdf_standard extends ModelePDFStock
{
global $conf,$langs,$db,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

16
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -119,14 +119,14 @@ class pdf_stdmovement extends ModelePDFMovement
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
$this->name = "stdmouvement";
$this->description = $langs->trans("DocumentModelStandardPDF");
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -200,7 +200,7 @@ class pdf_stdmovement extends ModelePDFMovement
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
/**
@ -732,7 +732,7 @@ class pdf_stdmovement extends ModelePDFMovement
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -794,7 +794,7 @@ class pdf_stdmovement extends ModelePDFMovement
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -852,7 +852,7 @@ class pdf_stdmovement extends ModelePDFMovement
$pdf->SetFont('', 'B', $default_font_size - 3);
// Output Rect
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
$pdf->SetDrawColor(220, 26, 26);
@ -864,7 +864,7 @@ class pdf_stdmovement extends ModelePDFMovement
//Ref mouv
if (empty($hidetop))
{
//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxidref, $tab_top+1);
$pdf->MultiCell($this->posxdatemouv-$this->posxdatemouv-0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
}
@ -954,7 +954,7 @@ class pdf_stdmovement extends ModelePDFMovement
{
global $conf,$langs,$db,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

14
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -128,7 +128,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->name = "canelle";
$this->description = $langs->trans('SuppliersInvoiceModel');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -148,7 +148,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->franchise=!$mysoc->tva_assuj;
// Defini position des colonnes
// Define column position
$this->posxdesc=$this->marge_gauche+1;
$this->posxtva=112;
$this->posxup=126;
@ -340,7 +340,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -358,7 +358,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -590,7 +590,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -858,11 +858,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');

4
htdocs/core/modules/supplier_order/pdf/doc_generic_supplier_order_odt.modules.php
View File

@ -76,7 +76,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'SUPPLIER_ORDER_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;
@ -233,7 +233,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
if ($conf->fournisseur->commande->dir_output)
{
$object->fetch_thirdparty();
if ($object->specimen)
{
$dir = $conf->fournisseur->commande->dir_output;

10
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
View File

@ -131,7 +131,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$this->name = "cornas";
$this->description = $langs->trans('SuppliersCommandModel');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -355,7 +355,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -785,7 +785,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1141,7 +1141,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
foreach ($this->cols as $colKey => $colDef)
{
@ -1165,7 +1165,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
}
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
}
}

12
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -131,7 +131,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->name = "muscadet";
$this->description = $langs->trans('SuppliersCommandModel');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -388,7 +388,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
@ -406,7 +406,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -687,7 +687,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1043,11 +1043,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');

8
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
View File

@ -128,7 +128,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->name = "standard";
$this->description = $langs->trans('DocumentModelStandardPDF');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -144,7 +144,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->franchise=!$mysoc->tva_assuj;
// Defini position des colonnes
// Define column position
$this->posxdate=$this->marge_gauche+1;
$this->posxreffacturefourn=30;
$this->posxreffacture=65;
@ -502,7 +502,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -619,7 +619,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

2
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -74,7 +74,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

18
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -24,7 +24,7 @@
/**
* \file htdocs/core/modules/propale/doc/pdf_azur.modules.php
* \ingroup propale
* \brief Fichier de la classe permettant de generer les propales au modele Azur
* \brief File of the class allowing to generate the supplier propals to the Aurore model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
/**
* Class to generate PDF proposal Azur
* Class to generate PDF supplier proposal Aurore
*/
class pdf_aurore extends ModelePDFSupplierProposal
{
@ -128,7 +128,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$this->name = "aurore";
$this->description = $langs->trans('DocModelAuroreDescription');
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'pdf';
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
@ -215,7 +215,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
$nblines = count($object->lines);
@ -391,7 +391,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$nexY = $pdf->GetY();
$height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
// Rect takes a length in 3rd parameter
$pdf->SetDrawColor(192, 192, 192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
@ -685,7 +685,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$this->result = array('fullpath'=>$file);
return 1; // Pas d'erreur
return 1; // No error
}
else
{
@ -1201,11 +1201,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
if (empty($hidetop))
{
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line takes a position y in 2nd parameter and 4th parameter
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
@ -1278,7 +1278,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
{
global $conf, $langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "supplier_proposal", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

2
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -71,7 +71,7 @@ class doc_generic_user_odt extends ModelePDFUser
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'USER_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

2
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -74,7 +74,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$this->description = $langs->trans("DocumentModelOdt");
$this->scandir = 'USERGROUP_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
// Page size for A4 format
$this->type = 'odt';
$this->page_largeur = 0;
$this->page_hauteur = 0;

2
htdocs/core/tpl/card_presend.tpl.php
View File

@ -76,7 +76,7 @@ if ($action == 'presend')
{
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang($newlang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
}

2
htdocs/don/class/donstats.class.php
View File

@ -80,7 +80,7 @@ class DonationStats extends Stats
* Return shipment number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with number by month
*/
public function getNbByMonth($year, $format = 0)

1
htdocs/ecm/dir_card.php
View File

@ -20,7 +20,6 @@
* \file htdocs/ecm/dir_card.php
* \ingroup ecm
* \brief Card of a directory for ECM module
* \author Laurent Destailleur
*/
require '../main.inc.php';

2
htdocs/expedition/class/expeditionstats.class.php
View File

@ -85,7 +85,7 @@ class ExpeditionStats extends Stats
* Return shipment number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with number by month
*/
public function getNbByMonth($year, $format = 0)

4
htdocs/expensereport/class/expensereportstats.class.php
View File

@ -104,7 +104,7 @@ class ExpenseReportStats extends Stats
* Renvoie le nombre de facture par mois pour une annee donnee
*
* @param string $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getNbByMonth($year, $format = 0)
@ -126,7 +126,7 @@ class ExpenseReportStats extends Stats
* Renvoie le montant de facture par mois pour une annee donnee
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getAmountByMonth($year, $format = 0)

4
htdocs/fichinter/class/fichinterstats.class.php
View File

@ -86,7 +86,7 @@ class FichinterStats extends Stats
* Return intervention number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with number by month
*/
public function getNbByMonth($year, $format = 0)
@ -129,7 +129,7 @@ class FichinterStats extends Stats
* Return the intervention amount by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getAmountByMonth($year, $format = 0)

6
htdocs/projet/class/projectstats.class.php
View File

@ -190,7 +190,7 @@ class ProjectStats extends Stats
* Return Project number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getNbByMonth($year, $format = 0)
@ -219,7 +219,7 @@ class ProjectStats extends Stats
* Return the Project amount by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getAmountByMonth($year, $format = 0)
@ -453,7 +453,7 @@ class ProjectStats extends Stats
* Return the Project transformation rate by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array with amount by month
*/
public function getTransformRateByMonth($year, $format = 0)

2
htdocs/projet/class/taskstats.class.php
View File

@ -163,7 +163,7 @@ class TaskStats extends Stats
* Return Task number by month for a year
*
* @param int $year Year to scan
* @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
* @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
* @return array Array of values
*/
public function getNbByMonth($year, $format = 0)

1
htdocs/public/agenda/index.php
View File

@ -19,7 +19,6 @@
* \file htdocs/public/agenda/index.php
* \ingroup core
* \brief A redirect page to an error
* \author Laurent Destailleur
*/
require '../../master.inc.php';

1
htdocs/public/donations/index.php
View File

@ -19,7 +19,6 @@
* \file htdocs/public/donations/index.php
* \ingroup core
* \brief A redirect page to an error
* \author Laurent Destailleur
*/
require '../../master.inc.php';

1
htdocs/public/index.php
View File

@ -19,7 +19,6 @@
* \file htdocs/public/index.php
* \ingroup core
* \brief A redirect page to an error
* \author Laurent Destailleur
*/
require '../master.inc.php';

1
htdocs/public/members/index.php
View File

@ -19,7 +19,6 @@
* \file htdocs/public/members/index.php
* \ingroup core
* \brief A redirect page to an error
* \author Laurent Destailleur
*/
require '../../master.inc.php';

2
htdocs/public/members/new.php
View File

@ -281,7 +281,7 @@ if ($action == 'add')
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

1
htdocs/public/payment/index.php
View File

@ -19,7 +19,6 @@
* \file htdocs/public/payment/index.php
* \ingroup core
* \brief A redirect page to an error
* \author Laurent Destailleur
*/
require '../../master.inc.php';

Some files were not shown because too many files have changed in this diff Show More