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

Bad var

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-04 01:36:53 +01:00
parent 3de0702f2b
commit b5d74372de
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/mailman.php
View File

@ -158,7 +158,8 @@ $head = mailmanspip_admin_prepare_head();
dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
$var=!$var; $var=true;
if (! empty($conf->global->ADHERENT_USE_MAILMAN)) if (! empty($conf->global->ADHERENT_USE_MAILMAN))
{ {
//$lien=img_picto($langs->trans("Active"),'tick').' '; //$lien=img_picto($langs->trans("Active"),'tick').' ';

3
htdocs/admin/spip.php
View File

@ -117,10 +117,11 @@ $head = mailmanspip_admin_prepare_head();
dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
$var=true;
/* /*
* Spip * Spip
*/ */
$var=!$var;
if (! empty($conf->global->ADHERENT_USE_SPIP)) if (! empty($conf->global->ADHERENT_USE_SPIP))
{ {
//$lien=img_picto($langs->trans("Active"),'tick').' '; //$lien=img_picto($langs->trans("Active"),'tick').' ';

4
htdocs/barcode/printsheet.php
View File

@ -121,8 +121,8 @@ if ($action == 'builddoc')
if (! $error) if (! $error)
{ {
$code=$forbarcode; $code=$forbarcode;
$generator=$stdobject->barcode_type_coder; $generator=$stdobject->barcode_type_coder; // coder (loaded by fetch_barcode). Engine.
$encoding=strtoupper($stdobject->barcode_type_code); $encoding=strtoupper($stdobject->barcode_type_code); // code (loaded by fetch_barcode). Example 'ean', 'isbn', ...
$barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; $barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
$diroutput=$conf->barcode->dir_temp; $diroutput=$conf->barcode->dir_temp;

2
htdocs/core/class/commonobject.class.php
View File

@ -633,7 +633,7 @@ abstract class CommonObject
/** /**
* Load data for barcode into properties ->barcode_type* * Load data for barcode into properties ->barcode_type*
* Properties ->barcode_type that is id of barcode type is used to find other properties, but * Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
* if it is not defined, ->element must be defined to know default barcode type. * if it is not defined, ->element must be defined to know default barcode type.
* *
* @return int <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded) * @return int <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)

4
htdocs/product/class/product.class.php
View File

@ -124,9 +124,9 @@ class Product extends CommonObject
//! barcode //! barcode
var $barcode; // value var $barcode; // value
var $barcode_type; // id var $barcode_type; // id
var $barcode_type_code; // code (loaded by fetch_barcode). Example ean, isbn... var $barcode_type_code; // code (loaded by fetch_barcode). Example 'ean', 'isbn', ...
var $barcode_type_label; // label (loaded by fetch_barcode) var $barcode_type_label; // label (loaded by fetch_barcode)
var $barcode_type_coder; // coder (loaded by fetch_barcode) var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine.
var $stats_propale=array(); var $stats_propale=array();
var $stats_commande=array(); var $stats_commande=array();