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

Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-04 11:04:11 +01:00
commit 937414e9b1
59 changed files with 159 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.tx/config
View File

@ -218,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.oscommerce]
file_filter = htdocs/langs/<lang>/oscommerce.lang
source_file = htdocs/langs/en_US/oscommerce.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.other]
file_filter = htdocs/langs/<lang>/other.lang
source_file = htdocs/langs/en_US/other.lang
@ -242,9 +236,9 @@ source_file = htdocs/langs/en_US/paypal.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.products]
file_filter = htdocs/langs/<lang>/products.lang
source_file = htdocs/langs/en_US/products.lang
[dolibarr.printipp]
file_filter = htdocs/langs/<lang>/printipp.lang
source_file = htdocs/langs/en_US/printipp.lang
source_lang = en_US
type = MOZILLAPROPERTIES
@ -254,6 +248,12 @@ source_file = htdocs/langs/en_US/productbatch.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.products]
file_filter = htdocs/langs/<lang>/products.lang
source_file = htdocs/langs/en_US/products.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.projects]
file_filter = htdocs/langs/<lang>/projects.lang
source_file = htdocs/langs/en_US/projects.lang
@ -325,4 +325,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
source_file = htdocs/langs/en_US/workflow.lang
source_lang = en_US
type = MOZILLAPROPERTIES

35
htdocs/accountancy/customer/index.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
*/
require '../../main.inc.php';
// Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@ -43,7 +43,7 @@ if ($user->societe_id > 0)
accessforbidden();
if (! $user->rights->accounting->ventilation->read)
accessforbidden();
// Filter
$year = $_GET["year"];
if ($year == 0) {
@ -57,10 +57,10 @@ if ($year == 0) {
// Validate History
$action = GETPOST('action');
if ($action == 'validatehistory') {
$error = 0;
$db->begin();
if ($db->type == 'pgsql') {
$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
@ -75,8 +75,7 @@ if ($action == 'validatehistory') {
$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
$sql1 .= " AND fd.fk_code_ventilation = 0";
}
dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
$resql1 = $db->query($sql1);
if (! $resql1) {
$error ++;
@ -106,7 +105,6 @@ $sql .= " , " . MAIN_DB_PREFIX . "facture as f";
$sql .= " WHERE fd.fk_code_ventilation = 0";
$sql .= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1;";
dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
$result = $db->query($sql);
if ($result) {
$row = $db->fetch_row($result);
@ -162,15 +160,14 @@ if (! empty($conf->multicompany->enabled)) {
$sql .= " GROUP BY fd.fk_code_ventilation";
dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
$resql = $db->query($sql);
if ($resql) {
$i = 0;
$num = $db->num_rows($resql);
while ( $i < $num ) {
$row = $db->fetch_row($resql);
print '<tr><td>' . length_accountg($row[0]) . '</td>';
print '<td align="left">' . $row[1] . '</td>';
print '<td align="right">' . price($row[2]) . '</td>';
@ -235,15 +232,14 @@ if (! empty($conf->multicompany->enabled)) {
$sql .= " AND f.entity = '" . $conf->entity . "'";
}
dol_syslog('accountancy/customer/index.php:: $sql=' . $sql);
$resql = $db->query($sql);
if ($resql) {
$i = 0;
$num = $db->num_rows($resql);
while ( $i < $num ) {
$row = $db->fetch_row($resql);
print '<tr><td>' . $row[0] . '</td>';
print '<td align="right">' . price($row[1]) . '</td>';
print '<td align="right">' . price($row[2]) . '</td>';
@ -284,7 +280,7 @@ if (! empty($conf->margin->enabled)) {
print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
$sql = "SELECT '" . $langs->trans("Vide") . "' AS 'Marge',";
$sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Janvier',";
$sql .= " ROUND(SUM(IF(MONTH(f.datef)=2,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Fevrier',";
@ -303,20 +299,19 @@ if (! empty($conf->margin->enabled)) {
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
$sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
if (! empty($conf->multicompany->enabled)) {
$sql .= " AND f.entity = '" . $conf->entity . "'";
}
dol_syslog('accountancy/customer/index.php:: $sql=' . $sql);
$resql = $db->query($sql);
if ($resql) {
$i = 0;
$num = $db->num_rows($resql);
while ( $i < $num ) {
$row = $db->fetch_row($resql);
print '<tr><td>' . $row[0] . '</td>';
print '<td align="right">' . price($row[1]) . '</td>';
print '<td align="right">' . price($row[2]) . '</td>';

204
htdocs/admin/boxes.php
View File

@ -46,7 +46,6 @@ $boxes = array();
*/
if ($action == 'addconst')
{
dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
}
@ -54,85 +53,91 @@ if ($action == 'addconst')
if ($action == 'add')
{
$error=0;
$db->begin();
if (isset($_POST['boxid']) && is_array($_POST['boxid']))
{
foreach($_POST['boxid'] as $boxid)
{
if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=...
{
$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")
$distinctfkuser=array();
if (! $error)
{
$sql = "SELECT fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."user_param";
$sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'";
$sql.= " AND entity = ".$conf->entity;
// Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
$distinctfkuser=array();
if (! $error)
{
$sql = "SELECT fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."user_param";
$sql.= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
$sql.= " AND entity = ".$conf->entity;
dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i=0;
while ($i < $num)
{
$obj=$db->fetch_object($resql);
$distinctfkuser[$obj->fk_user]=$obj->fk_user;
$i++;
}
}
else
{
setEventMessage($db->lasterror(), 'errors');
$error++;
}
}
dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i=0;
while ($i < $num)
{
$obj=$db->fetch_object($resql);
$distinctfkuser[$obj->fk_user]=$obj->fk_user;
$i++;
}
}
else
{
setEventMessage($db->lasterror(), 'errors');
$error++;
}
}
$distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val
$distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val
foreach($distinctfkuser as $fk_user)
{
if (! $error && $fk_user != '')
{
$nbboxonleft=$nbboxonright=0;
$sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
dol_syslog("boxes.php activate box", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
while($obj = $db->fetch_object($resql))
{
$boxorder=$obj->box_order;
if (preg_match('/A/',$boxorder)) $nbboxonleft++;
if (preg_match('/B/',$boxorder)) $nbboxonright++;
}
}
else dol_print_error($db);
foreach($distinctfkuser as $fk_user)
{
if (! $error && $fk_user != '')
{
$nbboxonleft=$nbboxonright=0;
$sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
dol_syslog("boxes.php activate box", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
while($obj = $db->fetch_object($resql))
{
$boxorder=$obj->box_order;
if (preg_match('/A/',$boxorder)) $nbboxonleft++;
if (preg_match('/B/',$boxorder)) $nbboxonright++;
}
}
else dol_print_error($db);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
$sql.= "box_id, position, box_order, fk_user, entity";
$sql.= ") values (";
$sql.= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
$sql.= ")";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
$sql.= "box_id, position, box_order, fk_user, entity";
$sql.= ") values (";
$sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
$sql.= ")";
dol_syslog("boxes.php activate box", LOG_DEBUG);
$resql = $db->query($sql);
if (! $resql)
{
setEventMessage($db->lasterror(), 'errors');
$error++;
}
}
}
if (! $error)
{
header("Location: boxes.php");
$db->commit();
exit;
}
else
{
$db->rollback();
}
dol_syslog("boxes.php activate box", LOG_DEBUG);
$resql = $db->query($sql);
if (! $resql)
{
setEventMessage($db->lasterror(), 'errors');
$error++;
}
}
}
}
}
}
if (! $error)
{
$db->commit();
$action='';
}
else
{
$db->rollback();
}
}
if ($action == 'delete')
@ -317,14 +322,18 @@ if ($resql)
$boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives);
print "<br>\n";
print "\n\n".'<!-- Boxes Available -->'."\n";
print_titre($langs->trans("BoxesAvailable"));
print '<table class="noborder" width="100%">';
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
print '<input type="hidden" name="action" value="add">'."\n";
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">';
print '<td width="300">'.$langs->trans("Box").'</td>';
print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("SourceFile").'</td>';
print '<td width="160">'.$langs->trans("ActivateOn").'</td>';
print '<td width="160" align="center">'.$langs->trans("ActivateOn").'</td>';
print "</tr>\n";
$var=true;
foreach($boxtoadd as $box)
@ -341,12 +350,10 @@ foreach($boxtoadd as $box)
}
print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr '.$bc[$var].'>';
print '<tr '.$bc[$var].'>'."\n";
print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
print '</td>';
print '</td>'."\n";
print '<td>';
if ($box->note == '(WarningUsingThisBoxSlowDown)')
{
@ -354,22 +361,25 @@ foreach($boxtoadd as $box)
print $langs->trans("WarningUsingThisBoxSlowDown");
}
else print ($box->note?$box->note:'&nbsp;');
print '</td>';
print '<td>' . $box->sourcefile . '</td>';
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
print '<td>';
print $form->selectarray("pos",$pos_name,0,0,0,0,'',1);
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="boxid" value="'.$box->box_id.'">';
print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
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";
//print '<input type="checkbox" class="flat" name="boxid['.$box->box_id.'][active]">'."\n";
print '</td>';
print '</tr>';
print '</form>';
print '</tr>'."\n";
}
print '</table>';
print '</table>'."\n";
print '<div class="right">';
print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled="disabled"').' value="'.$langs->trans("Activate").'">';
print '</div>'."\n";
print '</form>';
print "\n".'<!-- End Boxes Available -->'."\n";
// Activated boxes
@ -421,8 +431,8 @@ foreach($boxactivated as $key => $box)
$hasprevious=($key != 0);
print '<td align="center">'.($key+1).'</td>';
print '<td align="center">';
print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a>&nbsp;':'');
print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
print ($hasnext?'<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a>&nbsp;':'');
print ($hasprevious?'<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
print '</td>';
print '<td align="center">';
print '<a href="boxes.php?rowid='.$box->rowid.'&amp;action=delete">'.img_delete().'</a>';
@ -436,13 +446,14 @@ print '</table><br>';
// Other parameters
print "\n\n".'<!-- Other Const -->'."\n";
print_titre($langs->trans("Other"));
print '<table class="noborder" width="100%">';
$var=false;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addconst">';
print '<table class="noborder" width="100%">';
$var=false;
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans("Parameter").'</td>';
print '<td class="liste_titre">'.$langs->trans("Value").'</td>';
@ -459,9 +470,10 @@ print '<td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button">';
print '</td>'."\n";
print '</tr>';
print '</form>';
print '</table>';
print '</form>';
print "\n".'<!-- End Other Const -->'."\n";
llxFooter();

2
htdocs/admin/const.php
View File

@ -260,7 +260,7 @@ if ($result)
// Note
print '<td>';
print '<input type="text" id="note_'.$i.'"class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
print '<input type="text" id="note_'.$i.'" class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
print '</td>';
// Entity limit to superadmin

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');
$var=!$var;
$var=true;
if (! empty($conf->global->ADHERENT_USE_MAILMAN))
{
//$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');
$var=true;
/*
* Spip
*/
$var=!$var;
if (! empty($conf->global->ADHERENT_USE_SPIP))
{
//$lien=img_picto($langs->trans("Active"),'tick').' ';

4
htdocs/barcode/printsheet.php
View File

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

15
htdocs/bookmarks/card.php
View File

@ -44,6 +44,8 @@ $userid=GETPOST("userid","int");
$position=GETPOST("position","int");
$backtopage=GETPOST('backtopage','alpha');
$bookmark=new Bookmark($db);
/*
* Actions
@ -60,7 +62,6 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
exit;
}
$bookmark=new Bookmark($db);
if ($action == 'update') $bookmark->fetch($_POST["id"]);
$bookmark->fk_user=$userid;
$bookmark->title=$title;
@ -120,6 +121,17 @@ llxHeader();
$form=new Form($db);
$head = array();
$h=1;
$head[$h][0] = $_SERVER["PHP_SELF"].($bookmark->id?'id='.$bookmark->id:'');
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
$hselected='card';
if ($action == 'create')
{
/*
@ -172,7 +184,6 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
/*
* Fact bookmark mode or visually edition
*/
$bookmark=new Bookmark($db);
$bookmark->fetch($id);

4
htdocs/cashdesk/include/keypad.php
View File

@ -16,7 +16,7 @@
*/
/**
* Return a string to outptu a keypad
* Return a string to output a keypad
*
* @param string $keypadname Key pad name
* @param string $formname Form name
@ -24,6 +24,8 @@
*/
function genkeypad($keypadname, $formname)
{
global $conf;
if (empty($conf->global->CASHDESK_SHOW_KEYPAD)) return '';
// défine the font size of button

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

@ -633,7 +633,7 @@ abstract class CommonObject
/**
* 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.
*
* @return int <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)
@ -3029,7 +3029,7 @@ abstract class CommonObject
});</script>';
if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
}
print '<table class="noborder margintable" width="100%">';
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';

8
htdocs/langs/ar_SA/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=نظام التشغيل والتجارة
OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل

8
htdocs/langs/bg_BG/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce модул за настройка
OSCommerceSetupSaved=OS Commerce настройка спаси
OSCommerceServer=OS Commerce хост сървъра / IP
OSCommerceDatabaseName=OS Commerce името на базата данни
OSCommercePrefix=OS Commerce таблици префикс
OSCommerceUser=OS Commerce база данни за вход

8
htdocs/langs/bs_BA/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce podešavanje modula
OSCommerceSetupSaved=OS Commerce postavke snimljene
OSCommerceServer=OS Commerce server host / IP
OSCommerceDatabaseName=OS Commerce ime baze podataka
OSCommercePrefix=OS Commerce prefiks tabela
OSCommerceUser=OS Commerce login baze podataka

8
htdocs/langs/ca_ES/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Configuració del mòdul OS Commerce
OSCommerceSetupSaved=Configuració OS Commerce desada
OSCommerceServer=Nom/IP servidor de la base de dades OS commerce
OSCommerceDatabaseName=Nom de la base de dades OS Commerce
OSCommercePrefix=Prefix taules OS Commerce
OSCommerceUser=Usuari de la base de dades OS Commerce

8
htdocs/langs/cs_CZ/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul nastavení
OSCommerceSetupSaved=OS Commerce nastavení uloží
OSCommerceServer=OS Commerce Server host / ip
OSCommerceDatabaseName=OS Commerce název databáze
OSCommercePrefix=OS Commerce tabulky prefix
OSCommerceUser=OS Commerce databáze login

8
htdocs/langs/da_DK/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul opsætning
OSCommerceSetupSaved=OS Commerce opsætning gemmes
OSCommerceServer=OS Commerce Server host / ip
OSCommerceDatabaseName=OS Commerce databasenavn
OSCommercePrefix=OS Commerce tabeller præfiks
OSCommerceUser=OS Commerce database login

1
htdocs/langs/de_AT/oscommerce.lang
View File

@ -1 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce

8
htdocs/langs/de_DE/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OSCommerce
OSCommerceSetup=OSCommerce-Modul Einstellungen
OSCommerceSetupSaved=OSCommerce-Einstellungen gespeichert
OSCommerceServer=OSCommerce Server Host/IP
OSCommerceDatabaseName=OSCommerce Datenbankname
OSCommercePrefix=OSCommerce Tabellen-Präfix
OSCommerceUser=OSCommerce Datenbank Login

8
htdocs/langs/el_GR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce εγκατάσταση μονάδας
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

8
htdocs/langs/en_US/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce module setup
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

0
htdocs/langs/en_US/resource.lang Executable file → Normal file
View File

8
htdocs/langs/es_ES/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Configuración del módulo OS Commerce
OSCommerceSetupSaved=Configuración OS Commerce guardada
OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce
OSCommerceDatabaseName=Nombre de la base de datos OS Commerce
OSCommercePrefix=Prefijo tablas OS Commerce
OSCommerceUser=Usuario de la base de datos OS Commerce

8
htdocs/langs/et_EE/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OSCommerce
OSCommerceSetup=OSCommerce mooduli seadistamine
OSCommerceSetupSaved=OSCommercei seadistus salvestatud
OSCommerceServer=OSCommerce serveri host/IP
OSCommerceDatabaseName=OSCommercei andmebaasi nimi
OSCommercePrefix=OSCommercei tabelite prefiks
OSCommerceUser=OSCommercei andmebaasi kasutajanimi

8
htdocs/langs/eu_ES/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/fa_IR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=نظام التشغيل والتجارة
OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل

8
htdocs/langs/fi_FI/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce moduulin asetukset
OSCommerceSetupSaved=OS Commerce asetukset tallennetaan
OSCommerceServer=OS Commerce Server isännän / ip
OSCommerceDatabaseName=OS Commerce tietokannan nimi
OSCommercePrefix=OS Commerce taulukot etuliite
OSCommerceUser=OS Commerce tietokanta sisäänkirjoittautumissivuksesi

8
htdocs/langs/fr_FR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Configuration du module OS Commerce
OSCommerceSetupSaved=Configuration OS Commerce sauvegardée
OSCommerceServer=Nom d'hôte / adresse IP serveur base de données OS Commerce
OSCommerceDatabaseName=Nom base de données OS Commerce
OSCommercePrefix=Préfixe tables base de données OS Commerce
OSCommerceUser=Identifiant d'accès base de données OS Commerce

0
htdocs/langs/fr_FR/resource.lang Executable file → Normal file
View File

8
htdocs/langs/he_IL/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/hr_HR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce postaljanje modula
OSCommerceSetupSaved=OS Commerce postavljanje spremljeno
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce ime baze podataka
OSCommercePrefix=OS Commerce prefix tablice
OSCommerceUser=OS Commerce prijava u bazu podataka

8
htdocs/langs/hu_HU/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul beállítása
OSCommerceSetupSaved=OS Commerce beállítás mentése
OSCommerceServer=OS Commerce Server host / ip
OSCommerceDatabaseName=OS Commerce adatbázis neve
OSCommercePrefix=OS Commerce táblázatok előtag
OSCommerceUser=OS Commerce adatbázis bejelentkezés

8
htdocs/langs/id_ID/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/is_IS/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce mát skipulag
OSCommerceSetupSaved=OS Commerce skipulag vistuð
OSCommerceServer=OS Commerce miðlara gestgjafi / ip
OSCommerceDatabaseName=OS Commerce gagnasafn nafn
OSCommercePrefix=OS Commerce matskeið forskeyti
OSCommerceUser=OS Commerce gagnasafn Innskráning

8
htdocs/langs/it_IT/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Impostazioni modulo OS Commerce
OSCommerceSetupSaved=Impostazioni OS Commerce salvate
OSCommerceServer=Host/IP del server OS Commerce
OSCommerceDatabaseName=Nome database OS Commerce
OSCommercePrefix=Prefisso tabelle database OS Commerce
OSCommerceUser=Nome utente per il database di OS Commerce

8
htdocs/langs/ja_JP/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OSコマース
OSCommerceSetup=OSコマースモジュールのセットアップ
OSCommerceSetupSaved=保存されたOSコマースのセットアップ
OSCommerceServer=OS Commerce Serverのホスト名/ IPアドレス
OSCommerceDatabaseName=OS Commerceデータベース名
OSCommercePrefix=OSコマースのテーブルの接頭辞
OSCommerceUser=OS Commerceデータベースへのログイン

8
htdocs/langs/ko_KR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/lt_LT/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/lv_LV/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce moduļa konfigurēšana
OSCommerceSetupSaved=OS Commerce uzstādīšanas konfigurācija saglabāta
OSCommerceServer=OS Commerce servera nosaukums / ip adrese
OSCommerceDatabaseName=OS Commerce datubāzes nosaukums
OSCommercePrefix=OS Commerce tabulas prefikss
OSCommerceUser=OS Commerce datu bāzes pieteikšanās vārds

8
htdocs/langs/mk_MK/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
# OSCommerce=OS Commerce
# OSCommerceSetup=OS Commerce module setup
# OSCommerceSetupSaved=OS Commerce setup saved
# OSCommerceServer=OS Commerce server host/ip
# OSCommerceDatabaseName=OS Commerce database name
# OSCommercePrefix=OS Commerce tables prefix
# OSCommerceUser=OS Commerce database login

8
htdocs/langs/nb_NO/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce moduloppsett
OSCommerceSetupSaved=OS Commerce innstillinger lagret
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce databasenavn
OSCommercePrefix=OS Commerce tabellprefix
OSCommerceUser=OS Commerce databaseinnlogging

4
htdocs/langs/nl_BE/oscommerce.lang
View File

@ -1,4 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerceSetup=OSCommerce module setup
OSCommerceSetupSaved=OSCommerce setup opgeslagen
OSCommerceServer=OSCommerce server host / ip

8
htdocs/langs/nl_NL/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OSCommerce module instellen
OSCommerceSetupSaved=OSCommerce instellingen opgeslagen
OSCommerceServer=OSCommerce server host / IP
OSCommerceDatabaseName=OSCommerce databasenaam
OSCommercePrefix=OSCommerce tabellen voorvoegsel
OSCommerceUser=OSCommerce database login

8
htdocs/langs/pl_PL/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce konfiguracji modułu
OSCommerceSetupSaved=OS Commerce konfiguracji zapisywane
OSCommerceServer=OS Commerce Server host / ip
OSCommerceDatabaseName=OS Handlowa nazwa bazy danych
OSCommercePrefix=OS Commerce prefiks tabel
OSCommerceUser=OS Commerce bazy danych logowania

2
htdocs/langs/pt_BR/oscommerce.lang
View File

@ -1,2 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerceUser=Usuário da base de dados OS Commerce

8
htdocs/langs/pt_PT/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Configuração do módulo OS Commerce
OSCommerceSetupSaved=Configuração OS Commerce guardada
OSCommerceServer=Nome/IP servidor da base de dados OS commerce
OSCommerceDatabaseName=Nome da base de dados OS Commerce
OSCommercePrefix=Prefixo Tabelas OS Commerce
OSCommerceUser=Utilizador da base de dados OS Commerce

8
htdocs/langs/ro_RO/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul de configurare
OSCommerceSetupSaved=OS Commerce setup salvate
OSCommerceServer=Sistem de operare server gazdă Comert / IP
OSCommerceDatabaseName=OS Commerce denumirea de baze de date
OSCommercePrefix=OS Commerce tabele prefix
OSCommerceUser=OS Commerce baza de date de login

8
htdocs/langs/ru_RU/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=Настройка модуля OS Commerce
OSCommerceSetupSaved=Настройка OS Commerce сохранена
OSCommerceServer=Хост/IP сервера OS Commerce
OSCommerceDatabaseName=Имя базы данных OS Commerce
OSCommercePrefix=Префикс таблиц OS Commerce
OSCommerceUser=Имя пользователя базы данных OS Commerce

8
htdocs/langs/sk_SK/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul nastavenia
OSCommerceSetupSaved=OS Commerce nastavenie uloží
OSCommerceServer=OS Commerce Server host / ip
OSCommerceDatabaseName=OS Commerce názov databázy
OSCommercePrefix=OS Commerce tabuľky prefix
OSCommerceUser=OS Commerce databázy login

8
htdocs/langs/sl_SI/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=Nakupovalni voziček
OSCommerceSetup=Nastavitev modula Nakupovalni voziček
OSCommerceSetupSaved=Shranjene nastavitve za Nakupovalni voziček
OSCommerceServer=Gostiteljski strežnik/IP za Nakupovalni voziček
OSCommerceDatabaseName=Ime baze podatkov za Nakupovalni voziček
OSCommercePrefix=Predpone tabel za Nakupovalni voziček
OSCommerceUser=Uporabniško ime za bazo podatkov za Nakupovalni voziček

8
htdocs/langs/sq_AL/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce module setup
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

8
htdocs/langs/sv_SE/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce modul setup
OSCommerceSetupSaved=OS Commerce setup sparas
OSCommerceServer=OS Commerce Server värd / ip
OSCommerceDatabaseName=OS Commerce databasnamn
OSCommercePrefix=OS Commerce tabeller prefix
OSCommerceUser=OS Commerce databas login

8
htdocs/langs/th_TH/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce module setup
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

8
htdocs/langs/tr_TR/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Ticaret modülü kurulumu
OSCommerceSetupSaved=OS Ticaret kurulumu kaydedildi
OSCommerceServer=OS Ticaret Sunucusu host/ip
OSCommerceDatabaseName=OS Ticaret veritabanı adı
OSCommercePrefix=OS Ticaret tablo öneki
OSCommerceUser=OS Ticaret veritabanı kullanıcı girişi

8
htdocs/langs/uk_UA/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce module setup
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

8
htdocs/langs/uz_UZ/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=OS Commerce
OSCommerceSetup=OS Commerce module setup
OSCommerceSetupSaved=OS Commerce setup saved
OSCommerceServer=OS Commerce server host/ip
OSCommerceDatabaseName=OS Commerce database name
OSCommercePrefix=OS Commerce tables prefix
OSCommerceUser=OS Commerce database login

8
htdocs/langs/vi_VN/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=Hệ điều hành thương mại
OSCommerceSetup=Thiết lập mô-đun hệ điều hành thương mại
OSCommerceSetupSaved=Thiết lập hệ điều hành thương mại lưu
OSCommerceServer=Hệ điều hành máy chủ lưu trữ thương mại / ip
OSCommerceDatabaseName=Tên cơ sở dữ liệu hệ điều hành thương mại
OSCommercePrefix=Hệ điều hành thương mại bảng tiền tố
OSCommerceUser=Đăng nhập cơ sở dữ liệu hệ điều hành thương mại

8
htdocs/langs/zh_CN/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=商务部操作系统
OSCommerceSetup=商务部模块安装操作系统
OSCommerceSetupSaved=商务部操作系统设置保存
OSCommerceServer=商业服务器操作系统的主机/ IP
OSCommerceDatabaseName=操作系统商业数据库的名称
OSCommercePrefix=操作系统商务部表前缀
OSCommerceUser=操作系统商业数据库登录

8
htdocs/langs/zh_TW/oscommerce.lang
View File

@ -1,8 +0,0 @@
# Dolibarr language file - Source file is en_US - oscommerce
OSCommerce=商務部操作系統
OSCommerceSetup=商務部模塊安裝操作系統
OSCommerceSetupSaved=商務部操作系統設置保存
OSCommerceServer=商業服務器操作系統的主機/ IP
OSCommerceDatabaseName=操作系統商業數據庫的名稱
OSCommercePrefix=操作系統商務部表前綴
OSCommerceUser=操作系統商業數據庫登錄

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

@ -124,9 +124,9 @@ class Product extends CommonObject
//! barcode
var $barcode; // value
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_coder; // coder (loaded by fetch_barcode)
var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine.
var $stats_propale=array();
var $stats_commande=array();