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

Merge pull request #1440 from grandoc/develop

Browse Source 
anglicized
This commit is contained in:
Laurent Destailleur 2014-02-27 11:17:30 +01:00
commit 8f0e96fd02
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/barcode/codeinit.php
View File

@ -28,7 +28,7 @@ $langs->load("admin");
$langs->load("members");
$langs->load("errors");
// Choix de l'annee d'impression ou annee courante.
// Choice of print year or current year.
$now = dol_now();
$year=dol_print_date($now,'%Y');
$month=dol_print_date($now,'%m');

6
htdocs/barcode/printsheet.php
View File

@ -32,7 +32,7 @@ $langs->load("admin");
$langs->load("members");
$langs->load("errors");
// Choix de l'annee d'impression ou annee courante.
// Choice of print year or current year.
$now = dol_now();
$year=dol_print_date($now,'%Y');
$month=dol_print_date($now,'%m');
@ -57,7 +57,7 @@ $thirdpartytmp=new Societe($db);
if (GETPOST('submitproduct') && GETPOST('submitproduct'))
{
$action=''; // We reset because we dont want to build doc
$action=''; // We reset because we don't want to build doc
if (GETPOST('productid') > 0)
{
$producttmp->fetch(GETPOST('productid'));
@ -74,7 +74,7 @@ if (GETPOST('submitproduct') && GETPOST('submitproduct'))
}
if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
{
$action=''; // We reset because we dont want to build doc
$action=''; // We reset because we don't want to build doc
if (GETPOST('socid') > 0)
{
$thirdpartytmp->fetch(GETPOST('socid'));

18
htdocs/core/modules/barcode/mod_barcode_product_standard.php
View File

@ -33,17 +33,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php'
*/
class mod_barcode_product_standard extends ModeleNumRefBarCode
{
var $nom='Standard'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
var $code_null; // Code facultatif
var $nom='Standard'; // Model Name
var $code_modifiable; // Editable code
var $code_modifiable_invalide; // Modified code if it is invalid
var $code_modifiable_null; // Modified code if it is null
var $code_null; // Optional code
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $code_auto; // Numerotation automatique
var $code_auto; // Automatic Numbering
var $searchcode; // String de recherche
var $numbitcounter; // Nombre de chiffres du compteur
var $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
var $searchcode; // Search string
var $numbitcounter; // Number of digits the counter
var $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
/**

18
htdocs/core/modules/barcode/modules_barcode.class.php
View File

@ -25,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
/**
* Parent class for barcode document modules
* Parent class for barcode document models
*/
abstract class ModeleBarCode
{
@ -33,9 +33,9 @@ abstract class ModeleBarCode
/**
* Return if a module can be used or not
* Return if a model can be used or not
*
* @return boolean true if module can be used
* @return boolean true if model can be used
*/
function isEnabled()
{
@ -46,16 +46,16 @@ abstract class ModeleBarCode
/**
* Parent class for barcode numbering modules
* Parent class for barcode numbering models
*/
abstract class ModeleNumRefBarCode
{
var $error='';
/** Renvoi la description par defaut du modele de numerotation
/** Return default description of numbering model
*
* @param Translate $langs Object langs
* @return string Texte descripif
* @return string Descriptive text
*/
function info($langs)
{
@ -63,17 +63,17 @@ abstract class ModeleNumRefBarCode
return $langs->trans("NoDescription");
}
/** Renvoi nom module
/** Return model name
*
* @param Translate $langs Object langs
* @return string Nom du module
* @return string Model name
*/
function getNom($langs)
{
return $this->nom;
}
/** Renvoi un exemple de numerotation
/** Return a numbering example
*
* @param Translate $langs Object langs
* @return string Example