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

Merge pull request #9064 from grandoc/new_branch_06_07_2018

Browse Source 
fix : typo and update code
This commit is contained in:
Laurent Destailleur 2018-07-09 15:33:25 +02:00 committed by GitHub
commit ba6566867e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 93 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,23 +38,78 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
*/ */
class pdf_standard extends ModelePDFSuppliersPayments class pdf_standard extends ModelePDFSuppliersPayments
{ {
var $db; /**
var $name; * @var DoliDb Database handler
var $description; */
var $type; public $db;
var $phpmin = array(4,3,0); // Minimum version of PHP required by module /**
var $version = 'dolibarr'; * @var string model name
*/
public $name;
var $page_largeur; /**
var $page_hauteur; * @var string model description (short text)
var $format; */
var $marge_gauche; public $description;
var $marge_droite;
var $marge_haute;
var $marge_basse;
var $emetteur; // Objet societe qui emet /**
* @var string document type
*/
public $type;
/**
* @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
* @public string
*/
public $version = 'dolibarr';
/**
* @var int page_largeur
*/
public $page_largeur;
/**
* @var int page_hauteur
*/
public $page_hauteur;
/**
* @var array format
*/
public $format;
/**
* @var int marge_gauche
*/
public $marge_gauche;
/**
* @var int marge_droite
*/
public $marge_droite;
/**
* @var int marge_haute
*/
public $marge_haute;
/**
* @var int marge_basse
*/
public $marge_basse;
/**
* Issuer
* @var Societe
*/
public $emetteur;
/** /**

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

@ -60,9 +60,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
/** /**
* @var array() Minimum version of PHP required by module. * @var array() Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.3 = array(5, 3) * e.g.: PHP ≥ 5.4 = array(5, 4)
*/ */
public $phpmin = array(5, 2); public $phpmin = array(5, 4);
/** /**
* Dolibarr version of the loaded document * Dolibarr version of the loaded document

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

@ -346,12 +346,12 @@ class Holiday extends CommonObject
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid"; // Hack pour la recherche sur le tableau $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid"; // Hack pour la recherche sur le tableau
$sql.= " AND cp.fk_user IN (".$user_id.")"; $sql.= " AND cp.fk_user IN (".$user_id.")";
// Filtre de séléction // Selection filter
if(!empty($filter)) { if(!empty($filter)) {
$sql.= $filter; $sql.= $filter;
} }
// Ordre d'affichage du résultat // Order of display of the result
if(!empty($order)) { if(!empty($order)) {
$sql.= $order; $sql.= $order;
} }
@ -359,19 +359,19 @@ class Holiday extends CommonObject
dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG); dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
// Si pas d'erreur SQL // If no SQL error
if ($resql) { if ($resql) {
$i = 0; $i = 0;
$tab_result = $this->holiday; $tab_result = $this->holiday;
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
// Si pas d'enregistrement // If no registration
if(!$num) { if(!$num) {
return 2; return 2;
} }
// Liste les enregistrements et les ajoutent au tableau // List the records and add them to the table
while($i < $num) { while($i < $num) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
@ -412,13 +412,13 @@ class Holiday extends CommonObject
$i++; $i++;
} }
// Retourne 1 avec le tableau rempli // Returns 1 with the filled array
$this->holiday = $tab_result; $this->holiday = $tab_result;
return 1; return 1;
} }
else else
{ {
// Erreur SQL // SQL Error
$this->error="Error ".$this->db->lasterror(); $this->error="Error ".$this->db->lasterror();
return -1; return -1;
} }
@ -471,12 +471,12 @@ class Holiday extends CommonObject
$sql.= " WHERE cp.entity IN (".getEntity('holiday').")"; $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
// Filtrage de séléction // Selection filtering
if(!empty($filter)) { if(!empty($filter)) {
$sql.= $filter; $sql.= $filter;
} }
// Ordre d'affichage // order of display
if(!empty($order)) { if(!empty($order)) {
$sql.= $order; $sql.= $order;
} }
@ -484,19 +484,19 @@ class Holiday extends CommonObject
dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
// Si pas d'erreur SQL // If no SQL error
if ($resql) { if ($resql) {
$i = 0; $i = 0;
$tab_result = $this->holiday; $tab_result = $this->holiday;
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
// Si pas d'enregistrement // If no registration
if(!$num) { if(!$num) {
return 2; return 2;
} }
// On liste les résultats et on les ajoutent dans le tableau // List the records and add them to the table
while($i < $num) { while($i < $num) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
@ -536,13 +536,13 @@ class Holiday extends CommonObject
$i++; $i++;
} }
// Retourne 1 et ajoute le tableau à la variable // Returns 1 and adds the array to the variable
$this->holiday = $tab_result; $this->holiday = $tab_result;
return 1; return 1;
} }
else else
{ {
// Erreur SQL // SQL Error
$this->error="Error ".$this->db->lasterror(); $this->error="Error ".$this->db->lasterror();
return -1; return -1;
} }

2
htdocs/modulebuilder/template/core/modules/modMyModule.class.php
View File

@ -116,7 +116,7 @@ class modMyModule extends DolibarrModules
$this->requiredby = array(); // List of module class names to disable if this one is disabled $this->requiredby = array(); // List of module class names to disable if this one is disabled
$this->conflictwith = array(); // List of module class names as string this module is in conflict with $this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->langfiles = array("mymodule@mymodule"); $this->langfiles = array("mymodule@mymodule");
$this->phpmin = array(5,3); // Minimum version of PHP required by module $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(4,0); // Minimum version of Dolibarr required by module $this->need_dolibarr_version = array(4,0); // Minimum version of Dolibarr required by module
$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...) $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...) $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)

17
htdocs/product/document.php
View File

@ -288,11 +288,11 @@ if ($object->id)
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre"><td>';
$delauft_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id; $default_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id;
$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12); $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
print Form::selectarray('lang_id', $langs_available, $delauft_lang, 0, 0, 0, '', 0, 0, 0, 'ASC'); print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
if ($conf->global->MAIN_MULTILANGS) { if ($conf->global->MAIN_MULTILANGS) {
print '<input type="submit" class="button" name="refresh" value="' . $langs->trans('Refresh') . '">'; print '<input type="submit" class="button" name="refresh" value="' . $langs->trans('Refresh') . '">';
@ -301,25 +301,18 @@ if ($object->id)
print '</td></tr>'; print '</td></tr>';
} }
$style = 'impair';
foreach ($filearray as $filetoadd) foreach ($filearray as $filetoadd)
{ {
if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf') if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf')
{ {
if ($style == 'pair') {
$style = 'impair';
} else {
$style = 'pair';
}
$checked = ''; $checked = '';
$filename = $filetoadd['name']; $filename = $filetoadd['name'];
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) if (array_key_exists($filetoadd['name'] . '_' . $default_lang, $filetomerge->lines))
{ {
$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang); $filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $default_lang);
$checked = ' checked '; $checked = ' checked ';
} }
} }
@ -331,7 +324,7 @@ if ($object->id)
} }
} }
print '<tr class="' . $style . '"><td>'; print '<tr class="oddeven"><td>';
print '<input type="checkbox" ' . $checked . ' name="filetoadd[]" id="filetoadd" value="' . $filetoadd['name'] . '">' . $filename . '</input>'; print '<input type="checkbox" ' . $checked . ' name="filetoadd[]" id="filetoadd" value="' . $filetoadd['name'] . '">' . $filename . '</input>';
print '</td></tr>'; print '</td></tr>';
} }