diff --git a/build/debian/README.howto b/build/debian/README.howto index eba9e651915..da7077f1f26 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -226,7 +226,7 @@ http://packages.qa.debian.org/t/tcpdf.html ##### Create/Maintain dolibarr package -To update dolibarr debian package +To update dolibarr debian package when upstream version has changed * You can git clone debian git repo > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian] @@ -270,6 +270,15 @@ Then check/modify also the user/date signature: - Date must have format reported by "date -R" - Name and email must match value into debian/control file (Entry added here is used by next step). + +To update dolibarr debian package when only files into debian has changed + +* Change files and commit. +* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2) + + +Once files has been prepared, it's time to test: + * Try to build package > rm -fr ../build-area; git-buildpackage -us -uc @@ -288,6 +297,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu > git-buildpackage --git-tag-only --git-retag > git push --tags + * Compilation is then done by a debian developer and sent > sbuild ... > dput ... diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php index cdb6cdae9e2..6ecce081d45 100755 --- a/dev/examples/create_product.php +++ b/dev/examples/create_product.php @@ -66,7 +66,7 @@ $myproduct=new Product($db); // Definition of product instance properties $myproduct->ref = '1234'; -$myproduct->libelle = 'libelle'; +$myproduct->label = 'label'; $myproduct->price = '10'; $myproduct->price_base_type = 'HT'; $myproduct->tva_tx = '19.6'; diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 38ea93f131b..6e7ea6dd05f 100755 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -88,7 +88,7 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++) $produit->type = rand(0,1); $produit->status = 1; $produit->ref = ($produit->type?'S':'P').time().$s; - $produit->libelle = 'Label '.time().$s; + $produit->label = 'Label '.time().$s; $produit->description = 'Description '.time().$s; $produit->price = rand(1,1000); $produit->tva_tx = "19.6"; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 364b87a2d35..a569632cc02 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -264,7 +264,6 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); -print '
'; $head = order_admin_prepare_head(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 10f6cffc18a..2dca4821727 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -294,7 +294,6 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); -print '
'; $head = invoice_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice'); diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index fd89390f3db..81af2aafa10 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -1,7 +1,7 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2006-2013 Laurent Destailleur +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur * * 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 @@ -10,7 +10,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -18,9 +18,9 @@ */ /** - * \file htdocs/barcode/printsheet.php - * \ingroup member - * \brief Page to print sheets with barcodes using the document templates into core/modules/printsheets + * \file htdocs/barcode/printsheet.php + * \ingroup member + * \brief Page to print sheets with barcodes using the document templates into core/modules/printsheets */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; @@ -96,13 +96,13 @@ if ($action == 'builddoc') if (empty($forbarcode)) // barcode value { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("BarcodeValue")),'errors'); - $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("BarcodeValue")),'errors'); + $error++; } if (empty($fk_barcode_type)) // barcode type = barcode encoding { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("BarcodeType")),'errors'); - $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("BarcodeType")),'errors'); + $error++; } if (! $error) @@ -123,46 +123,54 @@ if ($action == 'builddoc') $code=$forbarcode; $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; dol_mkdir($diroutput); // Generate barcode - $dirbarcode=array_merge(array("/core/modules/barcode/doc/"),$conf->modules_parts['barcode']); + $dirbarcode=array_merge(array("/core/modules/barcode/doc/"),$conf->modules_parts['barcode']); - foreach($dirbarcode as $reldir) - { - $dir=dol_buildpath($reldir,0); - $newdir=dol_osencode($dir); - - // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php) - if (! is_dir($newdir)) continue; - - $result=@include_once $newdir.$generator.'.modules.php'; - if ($result) break; - } - - // Load barcode class - $classname = "mod".ucfirst($generator); - $module = new $classname($db); - if ($module->encodingIsSupported($encoding)) - { - dol_delete_file($barcodeimage); - // File is created with full name $barcodeimage = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; - $result=$module->writeBarCode($code,$encoding,'Y',4); - - if ($result <= 0 || ! dol_is_file($barcodeimage)) - { - $error++; - setEventMessage('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), 'errors'); - } - } - else + foreach($dirbarcode as $reldir) { - $error++; - setEventMessage("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, 'errors'); - } + $dir=dol_buildpath($reldir,0); + $newdir=dol_osencode($dir); + + // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php) + if (! is_dir($newdir)) continue; + + $result=@include_once $newdir.$generator.'.modules.php'; + if ($result) break; + } + + // Load barcode class for generating barcode image + $classname = "mod".ucfirst($generator); + $module = new $classname($db); + if ($generator != 'tcpdfbarcode') { + $template = 'standardlabel'; + $is2d = false; + if ($module->encodingIsSupported($encoding)) + { + $barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; + dol_delete_file($barcodeimage); + // File is created with full name $barcodeimage = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; + $result=$module->writeBarCode($code,$encoding,'Y',4); + + if ($result <= 0 || ! dol_is_file($barcodeimage)) + { + $error++; + setEventMessage('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), 'errors'); + } + } + else + { + $error++; + setEventMessage("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, 'errors'); + } + } else { + $template = 'tcpdflabel'; + $encoding = $module->getTcpdfEncodingType($encoding); //convert to TCPDF compatible encoding types + $is2d = $module->is2d; + } } if (! $error) @@ -188,11 +196,12 @@ if ($action == 'builddoc') // For labels if ($mode == 'label') { - $txtforsticker="%PHOTO%"; - $textleft=make_substitutions($txtforsticker, $substitutionarray); - $textheader=''; - $textfooter=''; - $textright=''; + + $txtforsticker="%PHOTO%"; // Photo will be barcode image, %BARCODE% posible when using TCPDF generator + $textleft=make_substitutions((empty($conf->global->BARCODE_LABEL_LEFT_TEXT)?$txtforsticker:$conf->global->BARCODE_LABEL_LEFT_TEXT), $substitutionarray); + $textheader=make_substitutions((empty($conf->global->BARCODE_LABEL_HEADER_TEXT)?'':$conf->global->BARCODE_LABEL_HEADER_TEXT), $substitutionarray); + $textfooter=make_substitutions((empty($conf->global->BARCODE_LABEL_FOOTER_TEXT)?'':$conf->global->BARCODE_LABEL_FOOTER_TEXT), $substitutionarray); + $textright=make_substitutions((empty($conf->global->BARCODE_LABEL_RIGHT_TEXT)?'':$conf->global->BARCODE_LABEL_RIGHT_TEXT), $substitutionarray); $forceimgscalewidth=(empty($conf->global->BARCODE_FORCEIMGSCALEWIDTH)?1:$conf->global->BARCODE_FORCEIMGSCALEWIDTH); $forceimgscaleheight=(empty($conf->global->BARCODE_FORCEIMGSCALEHEIGHT)?1:$conf->global->BARCODE_FORCEIMGSCALEHEIGHT); @@ -203,6 +212,9 @@ if ($action == 'builddoc') 'textheader'=>$textheader, 'textfooter'=>$textfooter, 'textright'=>$textright, + 'code'=>$code, + 'encoding'=>$encoding, + 'is2d'=>$is2d, 'photo'=>$barcodeimage // Photo must be a file that exists with format supported by TCPDF ); } @@ -222,7 +234,7 @@ if ($action == 'builddoc') { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE")); } - if (! $mesg) $result=members_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs, $diroutput); + if (! $mesg) $result=members_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs, $diroutput, $template); } if ($result <= 0) @@ -230,11 +242,11 @@ if ($action == 'builddoc') dol_print_error('',$result); } - if (! $mesg) - { - $db->close(); - exit; - } + if (! $mesg) + { + $db->close(); + exit; + } } } diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 905c042a286..db7b73998c1 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2006-2015 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2013 Florian Henry @@ -229,11 +229,13 @@ if ($user->rights->categorie->creer) print_fiche_titre($langs->trans("CreateCat")); + dol_fiche_head(''); + print ''; // Ref print ''; - print ''; // Description @@ -257,9 +259,11 @@ if ($user->rights->categorie->creer) print '
'.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; print'
'; - print '
'; + dol_fiche_end(''); + + print '
'; print ''; - print '     '; + print '     '; print ''; print '
'; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 1cd605ea9ca..0dc404ac3d1 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -357,7 +357,7 @@ else if ($id || $ref) print ''; // Label - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 6ca5b2fad02..20fce315153 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -643,8 +643,8 @@ class Categorie extends CommonObject { $field=''; $classname=''; $category_table=''; $object_table=''; if ($type=='product') { $field='product'; $classname='Product'; } - if ($type=='customer') { $field='societe'; $classname='Societe'; } - if ($type=='supplier') { $field='societe'; $classname='Fournisseur'; $category_table='fournisseur'; } + if ($type=='customer') { $field='soc'; $classname='Societe'; $category_table='societe'; $object_table='societe'; } + if ($type=='supplier') { $field='soc'; $classname='Fournisseur'; $category_table='fournisseur'; $object_table='societe'; } if ($type=='member') { $field='member'; $classname='Adherent'; $category_table=''; $object_table='adherent'; } if ($type=='contact') { $field='socpeople'; $classname='Contact'; $category_table='contact'; $object_table='socpeople'; } diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 32bc33938f5..c3acb807e01 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -37,7 +37,7 @@ $action=GETPOST('action'); $confirm=GETPOST('confirm'); $socid=GETPOST('socid','int'); -$nom=GETPOST('nom'); +$label=GETPOST('label'); $description=GETPOST('description'); $visible=GETPOST('visible'); $parent=GETPOST('parent'); @@ -66,7 +66,7 @@ if ($action == 'update' && $user->rights->categorie->creer) $categorie = new Categorie($db); $result=$categorie->fetch($id); - $categorie->label = $nom; + $categorie->label = $label; $categorie->description = dol_htmlcleanlastbr($description); $categorie->socid = ($socid ? $socid : 'null'); $categorie->visible = $visible; @@ -138,13 +138,13 @@ print ''; // Ref print ''; -print ''; // Description print ''; -print ''; -print ''; +print '
'; print $langs->trans("Ref").''; +print ''; print '
'.$langs->trans("Description").''; +print ''.$langs->trans("Description").''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index c55f324ab06..a1c544f338b 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -127,7 +127,7 @@ if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produ $newobject = new Product($db); $result = $newobject->fetch($elemid); $elementtype = 'product'; - + // TODO Add into categ $result=$object->add_type($newobject,$elementtype); if ($result >= 0) @@ -145,7 +145,7 @@ if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produ setEventMessages($object->error,$object->errors,'errors'); } } - + } @@ -232,7 +232,7 @@ print ""; $cats = $object->get_filles(); if ($cats < 0) { - dol_print_error(); + dol_print_error($db, $cats->error, $cats->errors); } else { @@ -286,12 +286,12 @@ if ($object->type == 0) $prods = $object->getObjectsInCateg("product"); if ($prods < 0) { - dol_print_error(); + dol_print_error($db, $prods->error, $prods->errors); } else { $showclassifyform=1; $typeid=0; - + // Form to add record into a category if ($showclassifyform) { @@ -312,7 +312,7 @@ if ($object->type == 0) print '
'; print ''; } - + print "
"; print "\n"; print '\n"; @@ -327,7 +327,7 @@ if ($object->type == 0) print '\n"; - print '\n"; + print '\n"; // Link to delete from category print ''."\n"; print ''; - print ''."\n"; + print ''."\n"; print ''."\n"; $i++; $total += $obj->total_ttc; diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index 59f284408b8..719a8c830f1 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -26,8 +26,7 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; /** - * \class Prospect - * \brief Classe permettant la gestion des prospects + * Class to manage prospects */ class Prospect extends Societe { @@ -37,7 +36,7 @@ class Prospect extends Societe /** * Constructor * - * @param DoliDB $db Databas handler + * @param DoliDB $db Database handler */ function __construct($db) { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ad26b0c409d..bb0f8353709 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1402,7 +1402,7 @@ class Commande extends CommonOrder $line->localtax1_tx=$localtax1_tx; $line->localtax2_tx=$localtax2_tx; $line->ref=$prod->ref; - $line->libelle=$prod->libelle; + $line->libelle=$prod->label; $line->product_desc=$prod->description; $line->fk_unit=$prod->fk_unit; diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index fce813aaa05..d27e6e59fb4 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -22,7 +22,7 @@ */ -// TODO Include this include file into all class objects +// TODO Include this include file into all element pages allowing email sending // $id must be defined // $actiontypecode must be defined @@ -161,9 +161,11 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $filename = $attachedfiles['names']; $mimetype = $attachedfiles['mimes']; + $trackid = GETPOST('trackid','aZ'); + // Send mail require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1); + $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid); if ($mailfile->error) { $mesgs[]='
'.$mailfile->error.'
'; diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index 2cd5922d784..24c940fb9ea 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -101,8 +101,6 @@ class box_clients extends ModeleBoxes if ($result) { $num = $db->num_rows($result); - if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/card.php?socid="; - else $url= DOL_URL_ROOT."/societe/soc.php?socid="; $line = 0; while ($line < $num) diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index 53e3aaf2861..6eb5006182c 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -128,7 +128,7 @@ class box_commandes extends ModeleBoxes $this->info_box_contents[$line][] = array( 'td' => 'align="right"', - 'text' => price($objp->total_ht), + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), ); if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) { diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index dd1059cf9d2..d04c3e48a3b 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -94,10 +94,10 @@ class box_factures extends ModeleBoxes $num = $db->num_rows($result); $now=dol_now(); - $i = 0; + $line = 0; $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; - while ($i < $num) { + while ($line < $num) { $objp = $db->fetch_object($result); $datelimite = $db->jdate($objp->datelimite); $date = $db->jdate($objp->df); @@ -115,39 +115,39 @@ class box_factures extends ModeleBoxes $late = ''; if ($objp->paye == 0 && ($objp->fk_statut != 2 && $objp->fk_statut != 3) && $datelimite < ($now - $conf->facture->client->warning_delay)) { $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));} - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $facturestatic->getNomUrl(1), 'text2'=> $late, 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $societestatic->getNomUrl(1, '', 40), 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', - 'text' => price($objp->total_ht), + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($date,'day'), ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3), ); - $i++; + $line++; } if ($num==0) - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text'=>$langs->trans("NoRecordedInvoices"), ); diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index f48d2ab43d3..2f31fa61f78 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -56,10 +56,10 @@ class box_factures_fourn extends ModeleBoxes $this->max=$max; include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; - include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; $facturestatic = new FactureFournisseur($db); - $societestatic = new Societe($db); + $thirdpartytmp = new Fournisseur($db); $this->info_box_head = array( 'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max) @@ -95,10 +95,10 @@ class box_factures_fourn extends ModeleBoxes $num = $db->num_rows($result); $now=dol_now(); - $i = 0; + $line = 0; $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)'; - while ($i < $num) { + while ($line < $num) { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); $date=$db->jdate($objp->df); @@ -108,36 +108,41 @@ class box_factures_fourn extends ModeleBoxes $facturestatic->total_ht = $objp->total_ht; $facturestatic->total_tva = $objp->total_tva; $facturestatic->total_ttc = $objp->total_ttc; - $societestatic->id = $objp->socid; - $societestatic->name = $objp->name; - $societestatic->fournisseur = 1; - $societestatic->code_fournisseur = $objp->code_fournisseur; - $societestatic->logo = $objp->logo; + $thirdpartytmp->id = $objp->socid; + $thirdpartytmp->name = $objp->name; + $thirdpartytmp->fournisseur = 1; + $thirdpartytmp->code_fournisseur = $objp->code_fournisseur; + $thirdpartytmp->logo = $objp->logo; $late = ''; if ($objp->paye == 0 && $datelimite && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day'))); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $facturestatic->getNomUrl(1), 'text2'=> $late, 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $objp->ref_supplier, 'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'
'.$langs->trans('RefSupplier').': '.$objp->ref_supplier, 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $societestatic->getNomUrl(1, 'supplier'), + 'text' => $thirdpartytmp->getNomUrl(1, 'supplier'), 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( + 'td' => 'align="right"', + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), + ); + + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($date,'day'), ); @@ -145,16 +150,16 @@ class box_factures_fourn extends ModeleBoxes $fac = new FactureFournisseur($db); $fac->fetch($objp->facid); $alreadypaid=$fac->getSommePaiement(); - $this->info_box_contents[$i][6] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type), ); - $i++; + $line++; } if ($num==0) - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text'=>$langs->trans("NoModifiedSupplierBills"), ); diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index a82af75332a..ecea4a27fd1 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -56,6 +56,8 @@ class box_factures_fourn_imp extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $facturestatic=new FactureFournisseur($db); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; + $thirdpartytmp=new Fournisseur($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills",$max)); @@ -64,6 +66,9 @@ class box_factures_fourn_imp extends ModeleBoxes $sql = "SELECT s.nom as name, s.rowid as socid,"; $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,"; $sql.= " f.amount, f.datef as df,"; + $sql.= " f.total_ht as total_ht,"; + $sql.= " f.tva as total_tva,"; + $sql.= " f.total_ttc,"; $sql.= " f.paye, f.fk_statut, f.type"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ",".MAIN_DB_PREFIX."facture_fourn as f"; @@ -83,26 +88,30 @@ class box_factures_fourn_imp extends ModeleBoxes $num = $db->num_rows($result); $now=dol_now(); - $i = 0; + $line = 0; $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)'; - while ($i < $num) + while ($line < $num) { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); + $thirdpartytmp->id = $objp->socid; + $thirdpartytmp->name = $objp->name; + $thirdpartytmp->code_client = $objp->code_client; + $thirdpartytmp->logo = $objp->logo; $late=''; if ($datelimite && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day'))); $tooltip = $langs->trans('SupplierInvoice') . ': ' . ($objp->ref?$objp->ref:$objp->facid) . '
' . $langs->trans('RefSupplier') . ': ' . $objp->ref_supplier; - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left" width="16"', 'logo' => $this->boximg, 'tooltip' => $tooltip, 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid, ); - $this->info_box_contents[$i][1] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => ($objp->ref?$objp->ref:$objp->facid), 'text2'=> $late, @@ -110,29 +119,18 @@ class box_factures_fourn_imp extends ModeleBoxes 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid, ); - $this->info_box_contents[$i][2] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $objp->ref_supplier, - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid, + 'text' => $thirdpartytmp->getNomUrl(1, '', 40), + 'asis' => 1, ); - $tooltip = $langs->trans('Supplier') . ': '. $objp->name; - $this->info_box_contents[$i][3] = array( - 'td' => 'align="left" width="16"', - 'logo' => 'company', - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid, + $this->info_box_contents[$line][] = array( + 'td' => 'align="right"', + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), ); - $this->info_box_contents[$i][4] = array( - 'td' => 'align="left"', - 'text' => $objp->name, - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid, - ); - - $this->info_box_contents[$i][5] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($datelimite,'day'), ); @@ -140,16 +138,16 @@ class box_factures_fourn_imp extends ModeleBoxes $fac = new FactureFournisseur($db); $fac->fetch($objp->facid); $alreadypaid=$fac->getSommePaiement(); - $this->info_box_contents[$i][6] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type), ); - $i++; + $line++; } if ($num==0) - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text'=>$langs->trans("NoUnpaidSupplierBills"), ); diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index d7817d134d3..42e889138cc 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -95,10 +95,10 @@ class box_factures_imp extends ModeleBoxes $num = $db->num_rows($result); $now=dol_now(); - $i = 0; + $line = 0; $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; - while ($i < $num) + while ($line < $num) { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); @@ -117,33 +117,38 @@ class box_factures_imp extends ModeleBoxes $late=''; if ($datelimite < ($now - $conf->facture->client->warning_delay)) $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day'))); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $facturestatic->getNomUrl(1), 'text2'=> $late, 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $societestatic->getNomUrl(1, '', 44), 'asis' => 1, ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( + 'td' => 'align="right"', + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), + ); + + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($datelimite,'day'), ); - $this->info_box_contents[$i][] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3), ); - $i++; + $line++; } - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills")); + if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills")); $db->free($result); } diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index e9c21da739f..e3e6061d803 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -58,12 +58,16 @@ class box_fournisseurs extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdpartystatic=new Societe($db); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; + $thirdpartytmp=new Fournisseur($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers",$max)); if ($user->rights->societe->lire) { - $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,"; + $sql.= " s.code_fournisseur,"; + $sql.= " s.logo"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -78,42 +82,37 @@ class box_fournisseurs extends ModeleBoxes { $num = $db->num_rows($result); - $i = 0; - while ($i < $num) + $line = 0; + while ($line < $num) { $objp = $db->fetch_object($result); $datec=$db->jdate($objp->datec); $datem=$db->jdate($objp->tms); + $thirdpartytmp->id = $objp->socid; + $thirdpartytmp->name = $objp->name; + $thirdpartytmp->code_client = $objp->code_client; + $thirdpartytmp->logo = $objp->logo; - $tooltip = $langs->trans('Supplier') . ': ' . $objp->name; - $this->info_box_contents[$i][0] = array( - 'td' => 'align="left" width="16"', - 'logo' => $this->boximg, - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid, - ); - - $this->info_box_contents[$i][1] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $objp->name, - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid, + 'text' => $thirdpartytmp->getNomUrl(1, '', 40), + 'asis' => 1, ); - $this->info_box_contents[$i][2] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($datem, "day"), ); - $this->info_box_contents[$i][3] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $thirdpartystatic->LibStatut($objp->status,3), ); - $i++; + $line++; } - if ($num==0) $this->info_box_contents[$i][0] = array( + if ($num==0) $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text'=>$langs->trans("NoRecordedSuppliers"), ); diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 4e8b47aa0d4..c14cf07a51c 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -123,7 +123,7 @@ class box_propales extends ModeleBoxes $this->info_box_contents[$line][] = array( 'td' => 'align="right"', - 'text' => price($objp->total_ht), + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), ); $this->info_box_contents[$line][] = array( diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index ef9585202b0..2f96c57ee95 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -74,14 +74,20 @@ class box_prospect extends ModeleBoxes $this->max=$max; - include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; - $thirdpartystatic=new Societe($db); + include_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php'; + $thirdpartystatic=new Prospect($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max)); if ($user->rights->societe->lire) { - $sql = "SELECT s.nom as name, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status"; + $sql = "SELECT s.nom as name, s.rowid as socid"; + $sql.= ", s.code_client"; + $sql.= ", s.client"; + $sql.= ", s.code_fournisseur"; + $sql.= ", s.fournisseur"; + $sql.= ", s.logo"; + $sql.= ", s.fk_stcomm, s.datec, s.tms, s.status"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (2, 3)"; @@ -97,48 +103,46 @@ class box_prospect extends ModeleBoxes { $num = $db->num_rows($resql); - $i = 0; - $prospectstatic=new Prospect($db); - while ($i < $num) + $line = 0; + while ($line < $num) { $objp = $db->fetch_object($resql); $datec=$db->jdate($objp->datec); $datem=$db->jdate($objp->tms); + $thirdpartystatic->id = $objp->socid; + $thirdpartystatic->name = $objp->name; + $thirdpartystatic->code_client = $objp->code_client; + $thirdpartystatic->code_fournisseur = $objp->code_fournisseur; + $thirdpartystatic->client = $objp->client; + $thirdpartystatic->fournisseur = $objp->fournisseur; + $thirdpartystatic->logo = $objp->logo; - $this->info_box_contents[$i][0] = array( - 'td' => 'align="left" width="16"', - 'logo' => $this->boximg, - 'tooltip' => $objp->name, - 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid, - ); - - $this->info_box_contents[$i][1] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $objp->name, - 'tooltip' => $objp->name, - 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid, + 'text' => $thirdpartystatic->getNomUrl(1), + 'asis' => 1, ); - $this->info_box_contents[$i][2] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($datem, "day"), ); - $this->info_box_contents[$i][3] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', - 'text' => str_replace('img ','img height="14" ',$prospectstatic->LibProspStatut($objp->fk_stcomm,3)), + 'text' => str_replace('img ','img height="14" ',$thirdpartystatic->LibProspStatut($objp->fk_stcomm,3)), ); - $this->info_box_contents[$i][4] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $thirdpartystatic->LibStatut($objp->status,3), ); - $i++; + $line++; } if ($num==0) - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text'=>$langs->trans("NoRecordedProspects"), ); diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index d435e5ca3dc..84521bf4ee0 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -58,13 +58,20 @@ class box_supplier_orders extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $supplierorderstatic=new CommandeFournisseur($db); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; + $thirdpartytmp = new Fournisseur($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max)); if ($user->rights->fournisseur->commande->lire) { $sql = "SELECT s.nom as name, s.rowid as socid,"; + $sql.= " s.code_client, s.code_fournisseur,"; + $sql.= " s.logo,"; $sql.= " c.ref, c.tms, c.rowid, c.date_commande,"; + $sql.= " c.total_ht,"; + $sql.= " c.tva as total_tva,"; + $sql.= " c.total_ttc,"; $sql.= " c.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c"; @@ -82,60 +89,61 @@ class box_supplier_orders extends ModeleBoxes { $num = $db->num_rows($result); - $i = 0; - while ($i < $num) { + $line = 0; + while ($line < $num) { $objp = $db->fetch_object($result); $date=$db->jdate($objp->date_commande); $datem=$db->jdate($objp->tms); + $thirdpartytmp->id = $objp->socid; + $thirdpartytmp->name = $objp->name; + $thirdpartytmp->fournisseur = 1; + $thirdpartytmp->code_fournisseur = $objp->code_fournisseur; + $thirdpartytmp->logo = $objp->logo; $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid; $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid; $tooltip = $langs->trans('SupplierOrder') . ': ' . $objp->ref; - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left" width="16"', 'logo' => $this->boximg, 'tooltip' => $tooltip, 'url' => $urlo, ); - $this->info_box_contents[$i][1] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $objp->ref, 'tooltip' => $tooltip, 'url' => $urlo, ); - $tooltip = $langs->trans('Supplier') . ': ' . $objp->name; - $this->info_box_contents[$i][2] = array( - 'td' => 'align="left" width="16"', - 'logo' => 'company', - 'tooltip' => $tooltip, - 'url' => $urls, - ); - - $this->info_box_contents[$i][3] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $objp->name, - 'tooltip' => $tooltip, - 'url' => $urls, + 'text' => $thirdpartytmp->getNomUrl(1, 'supplier'), + 'asis' => 1, ); - $this->info_box_contents[$i][4] = array( + $this->info_box_contents[$line][] = array( + 'td' => 'align="right"', + 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), + ); + + $this->info_box_contents[$line][] = array( 'td' => 'align="right"', 'text' => dol_print_date($date,'day'), ); - $this->info_box_contents[$i][5] = array( + $this->info_box_contents[$line][] = array( 'td' => 'align="right" width="18"', 'text' => $supplierorderstatic->LibStatut($objp->fk_statut,3), ); - $i++; + $line++; } if ($num == 0) - $this->info_box_contents[$i][0] = array( + $this->info_box_contents[$line][0] = array( 'td' => 'align="center"', 'text' => $langs->trans("NoSupplierOrder"), ); diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 967b764dc65..6e41384dbce 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -4,7 +4,7 @@ * Copyright (C) Eric Seigne * Copyright (C) 2000-2005 Rodolphe Quiedeville * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ /** * Class to send emails (with attachments or not) - * Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to); + * Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid); * $mailfile->sendfile(); */ class CMailFile @@ -45,6 +45,7 @@ class CMailFile var $addr_to; var $addr_cc; var $addr_bcc; + var $trackid; var $mixed_boundary; var $related_boundary; @@ -65,6 +66,9 @@ class CMailFile //! Defined background directly in body tag var $bodyCSS; + var $headers; + var $message; + // Image var $html; var $image_boundary; @@ -95,10 +99,11 @@ class CMailFile * @param string $addr_bcc Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined) * @param int $deliveryreceipt Ask a delivery receipt * @param int $msgishtml 1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable) - * @param string $errors_to Email errors + * @param string $errors_to Email for errors-to * @param string $css Css option + * @param string $trackid Tracking string */ - function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='') + function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='') { global $conf; @@ -124,7 +129,7 @@ class CMailFile // If ending method not defined if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail'; - dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to", LOG_DEBUG); + dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid", LOG_DEBUG); dol_syslog("CMailFile::CMailfile: subject=$subject, deliveryreceipt=$deliveryreceipt, msgishtml=$msgishtml", LOG_DEBUG); // Detect if message is HTML (use fast method) @@ -190,6 +195,7 @@ class CMailFile $this->addr_cc = $addr_cc; $this->addr_bcc = $addr_bcc; $this->deliveryreceipt = $deliveryreceipt; + $this->trackid = $trackid; $smtp_headers = $this->write_smtpheaders(); // Define mime_headers @@ -249,6 +255,7 @@ class CMailFile $smtps->setSubject($this->encodetorfc2822($subject)); $smtps->setTO($this->getValidAddress($to,0,1)); $smtps->setFrom($this->getValidAddress($from,0,1)); + $smtps->setTrackId($trackid); if (! empty($this->html)) { @@ -301,6 +308,7 @@ class CMailFile $this->phpmailer->Subject($this->encodetorfc2822($subject)); $this->phpmailer->setTO($this->getValidAddress($to,0,1)); $this->phpmailer->SetFrom($this->getValidAddress($from,0,1)); + // TODO Add trackid into smtp header if (! empty($this->html)) { @@ -516,7 +524,7 @@ class CMailFile /** * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word - * + * * @param string $stringtoencode String to encode * @return string string encoded */ @@ -674,7 +682,17 @@ class CMailFile //$out.= "X-Priority: 3".$this->eol2; $out.= 'Date: ' . date("r") . $this->eol2; - $out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2; + + $trackid = $this->trackid; + if ($trackid) + { + $out.= 'Message-ID: <' . time() . '.phpmail-'.$trackid.'@' . $host . ">" . $this->eol2; + $out.= 'references: <' . time() . '.phpmail-'.$trackid.'@' . $host . ">" . $this->eol2; + } + else + { + $out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2; + } $out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2; $out.= "Mime-Version: 1.0".$this->eol2; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 77877a37cb2..567505db15a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -91,11 +91,10 @@ abstract class CommonObject */ public $canvas; - - public $name; - public $lastname; - public $firstname; - public $civility_id; + /** + * + * @var object Thirdparty associated with object + */ public $thirdparty; // No constructor as it is an abstract class diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php new file mode 100644 index 00000000000..1091962f6ea --- /dev/null +++ b/htdocs/core/class/commonstickergenerator.class.php @@ -0,0 +1,270 @@ + + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2015 Francis Appels + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* Inspire de PDF_Label + * PDF_Label - PDF label editing + * @package PDF_Label + * @author Laurent PASSEBECQ + * @copyright 2003 Laurent PASSEBECQ + * disponible ici : http://www.fpdf.org/fr/script/script29.php + */ + +//------------------------------------------------------------------- +// VERSIONS : +// 1.0 : Initial release +// 1.1 : + : Added unit in the constructor +// + : Now Positions start @ (1,1).. then the first image @top-left of a page is (1,1) +// + : Added in the description of a label : +// font-size : defaut char size (can be changed by calling Set_Char_Size(xx); +// paper-size : Size of the paper for this sheet (thanx to Al Canton) +// metric : type of unit used in this description +// You can define your label properties in inches by setting metric to 'in' +// and printing in millimiter by setting unit to 'mm' in constructor. +// Added some labels : +// 5160, 5161, 5162, 5163,5164 : thanx to Al Canton : acanton@adams-blake.com +// 8600 : thanx to Kunal Walia : kunal@u.washington.edu +// + : Added 3mm to the position of labels to avoid errors +//////////////////////////////////////////////////// + +/** + * \file htdocs/core/class/commonstickergenerator.class.php + * \ingroup core + * \brief generate pdf document with labels or cards in Avery or custom format + */ + +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; + + +/** + * Class to generate stick sheet with format Avery or other personalised + */ +abstract class CommonStickerGenerator +{ + + public $code; // Code of format + public $format; // Array with informations + + // protected + var $_Avery_Name = ''; // Nom du format de l'etiquette + var $_Margin_Left = 0; // Marge de gauche de l'etiquette + var $_Margin_Top = 0; // marge en haut de la page avant la premiere etiquette + var $_X_Space = 0; // Espace horizontal entre 2 bandes d'etiquettes + var $_Y_Space = 0; // Espace vertical entre 2 bandes d'etiquettes + var $_X_Number = 0; // NX Nombre d'etiquettes sur la largeur de la page + var $_Y_Number = 0; // NY Nombre d'etiquettes sur la hauteur de la page + var $_Width = 0; // Largeur de chaque etiquette + var $_Height = 0; // Hauteur de chaque etiquette + var $_Char_Size = 10; // Hauteur des caracteres + var $_Line_Height = 10; // Hauteur par defaut d'une ligne + var $_Metric = 'mm'; // Type of metric.. Will help to calculate good values + var $_Metric_Doc = 'mm'; // Type of metric for the doc.. + var $_COUNTX = 1; + var $_COUNTY = 1; + var $_First = 1; + var $Tformat; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + } + + /** + * Function to build PDF on disk, then output on HTTP strem. + * + * @param array $arrayofrecords Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>) + * @param Translate $outputlangs Lang object for output language + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param string $outputdir Output directory for pdf file + * @return int 1=OK, 0=KO + */ + abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir=''); + + /** + * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) + * + * @param PDF $pdf PDF reference + * @param Translate $outputlangs Output langs + * @param array $param Associative array containing label content and optional parameters + * @return void + */ + abstract function addSticker(&$pdf,$outputlangs,$param); + + /** + * Methode qui permet de modifier la taille des caracteres + * Cela modiera aussi l'espace entre chaque ligne + * + * @param PDF $pdf PDF reference + * @param int $pt point + * @return void + */ + function Set_Char_Size(&$pdf,$pt) + { + if ($pt > 3) { + $this->_Char_Size = $pt; + $this->_Line_Height = $this->_Get_Height_Chars($pt); + $pdf->SetFont('','',$pt); + } + } + + /** + * protected Print dot line + * + * @param PDF $pdf PDF reference + * @param int $x1 X1 + * @param int $y1 Y1 + * @param int $x2 X2 + * @param int $y2 Y2 + * @param int $epaisseur Epaisseur + * @param int $nbPointilles Nb pointilles + * @return void + */ + function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15) + { + $pdf->SetLineWidth($epaisseur); + $length=abs($x1-$x2); + $hauteur=abs($y1-$y2); + if($length>$hauteur) { + $Pointilles=($length/$nbPointilles)/2; // taille des pointilles + } + else { + $Pointilles=($hauteur/$nbPointilles)/2; + } + for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) { + for($j=$i;$j<=($i+$Pointilles);$j++) { + if($j<=($x2-1)) { + $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point + $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point + } + } + } + for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) { + for($j=$i;$j<=($i+$Pointilles);$j++) { + if($j<=($y2-1)) { + $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point + $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point + } + } + } + } + + /** + * protected Function realisant une croix aux 4 coins des cartes + * + * @param PDF $pdf PDF reference + * @param int $x1 X1 + * @param int $y1 Y1 + * @param int $x2 X2 + * @param int $y2 Y2 + * @param int $epaisseur Epaisseur + * @param int $taille Size + * @return void + */ + function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4) + { + $pdf->SetDrawColor(192,192,192); + + $pdf->SetLineWidth($epaisseur); + $lg=$taille/2; + // croix haut gauche + $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg); + $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1); + // croix bas gauche + $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg); + $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2); + // croix haut droit + $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg); + $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1); + // croix bas droit + $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg); + $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2); + + $pdf->SetDrawColor(0,0,0); + } + + /** + * protected Convert units (in to mm, mm to in) + * $src and $dest must be 'in' or 'mm' + * + * @param int $value value + * @param string $src from + * @param string $dest to + * @return float value value after conversion + */ + function _Convert_Metric ($value, $src, $dest) + { + if ($src != $dest) { + $tab['in'] = 39.37008; + $tab['mm'] = 1000; + return $value * $tab[$dest] / $tab[$src]; + } else { + return $value; + } + } + + /** + * protected Give the height for a char size given. + * + * @param int $pt Point + * @return int Height chars + */ + function _Get_Height_Chars($pt) + { + // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes + $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10); + if (in_array($pt, array_keys($_Table_Hauteur_Chars))) { + return $_Table_Hauteur_Chars[$pt]; + } else { + return 100; // There is a prob.. + } + } + + /** + * protected Set format + * + * @param PDF $pdf PDF reference + * @param string $format Format + * @return void + */ + function _Set_Format(&$pdf, $format) + { + $this->_Metric = $format['metric']; + $this->_Avery_Name = $format['name']; + $this->_Avery_Code = $format['code']; + $this->_Margin_Left = $this->_Convert_Metric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc); + $this->_Margin_Top = $this->_Convert_Metric($format['marginTop'], $this->_Metric, $this->_Metric_Doc); + $this->_X_Space = $this->_Convert_Metric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc); + $this->_Y_Space = $this->_Convert_Metric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc); + $this->_X_Number = $format['NX']; + $this->_Y_Number = $format['NY']; + $this->_Width = $this->_Convert_Metric($format['width'], $this->_Metric, $this->_Metric_Doc); + $this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); + $this->Set_Char_Size($pdf, $format['font-size']); + } + +} diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 0839639217f..f95924929bb 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -160,7 +160,7 @@ class DolEditor { $found=1; //$out.= ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 82364874cfe..f80fdd87304 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1493,13 +1493,13 @@ class Form * @param int $price_level Level of price to show * @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell * @param int $finished 2=all, 1=finished, 0=raw material - * @param string $selected_input_value Value of preselected input text (with ajax) + * @param string $selected_input_value Value of preselected input text (for use with ajax) * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after) * @param array $ajaxoptions Options for ajax_autocompleter * @param int $socid Thirdparty Id * @return void */ - function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(),$socid=0) + function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0) { global $langs,$conf; @@ -1512,9 +1512,10 @@ class Form if ($selected && empty($selected_input_value)) { require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - $product = new Product($this->db); - $product->fetch($selected); - $selected_input_value=$product->ref; + $producttmpselect = new Product($this->db); + $producttmpselect->fetch($selected); + $selected_input_value=$producttmpselect->ref; + unset($producttmpselect); } // mode=1 means customers products $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 3c799b767af..b9d5048db74 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -44,6 +44,7 @@ class FormMail extends Form var $replytomail; var $toname; var $tomail; + var $trackid; var $withsubstit; // Show substitution array var $withfrom; @@ -244,7 +245,7 @@ class FormMail extends Form else { $out=''; - + // Define list of attached files $listofpaths=array(); $listofnames=array(); @@ -277,12 +278,13 @@ class FormMail extends Form $out.= '
'."\n"; $out.= ''; $out.= ''; + $out.= ''; } foreach ($this->param as $key=>$value) { $out.= ''."\n"; } - + $result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs); if ($result<0) { setEventMessage($this->error,'errors'); @@ -291,7 +293,7 @@ class FormMail extends Form foreach($this->lines_model as $line) { $modelmail_array[$line->id]=$line->label; } - + if (count($modelmail_array)>0) { $out.= '
'.$langs->trans("ProductsAndServices")."
'; print $prod->getNomUrl(1,'category'); print "'.$prod->libelle."'.$prod->label."'; $typeid=$object->type; @@ -359,7 +359,7 @@ if ($object->type == 1) $socs = $object->getObjectsInCateg("supplier"); if ($socs < 0) { - dol_print_error(); + dol_print_error($db, $socs->error, $socs->errors); } else { @@ -410,7 +410,7 @@ if($object->type == 2) $socs = $object->getObjectsInCateg("customer"); if ($socs < 0) { - dol_print_error(); + dol_print_error($db, $socs->error, $socs->errors); } else { @@ -466,7 +466,7 @@ if ($object->type == 3) $prods = $object->getObjectsInCateg("member"); if ($prods < 0) { - dol_print_error($db,$object->error); + dol_print_error($db, $prods->error, $prods->errors); } else { @@ -518,7 +518,7 @@ if($object->type == 4) $contacts = $object->getObjectsInCateg("contact"); if ($contacts < 0) { - dol_print_error(); + dol_print_error($db, $contacts->error, $contacts->errors); } else { diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 3924774f7fc..6766bd1f868 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -585,9 +585,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) */ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { - $langs->load("order"); + $langs->load("orders"); - $sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv "; + $sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -654,7 +654,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) print ''; print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).''.$orderstatic->LibStatut($obj->fk_statut,3).''.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).'
'; $out.= '
'."\n"; $out.= $langs->trans('SelectMailModel').':'.$this->selectarray('modelmailselected', $modelmail_array,$model_id); @@ -302,8 +304,8 @@ class FormMail extends Form $out.= '
'; } - - + + $out.= ''."\n"; // Substitution array @@ -644,7 +646,7 @@ class FormMail extends Form $defaultmessage = dol_nl2br($defaultmessage); } - + if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"]; else { @@ -774,7 +776,7 @@ class FormMail extends Form return -1; } } - + /** * Find if template exists * Search into table c_email_templates @@ -787,7 +789,7 @@ class FormMail extends Form public function isEMailTemplate($type_template, $user, $outputlangs) { $ret=array(); - + $sql = "SELECT label, topic, content, lang"; $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql.= " WHERE type_template='".$this->db->escape($type_template)."'"; @@ -796,7 +798,7 @@ class FormMail extends Form if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')"; $sql.= $this->db->order("lang,label","ASC"); //print $sql; - + $resql = $this->db->query($sql); if ($resql) { @@ -810,7 +812,7 @@ class FormMail extends Form return -1; } } - + /** * Find if template exists * Search into table c_email_templates @@ -823,7 +825,7 @@ class FormMail extends Form public function fetchAllEMailTemplate($type_template, $user, $outputlangs) { $ret=array(); - + $sql = "SELECT rowid, label, topic, content, lang"; $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql.= " WHERE type_template='".$this->db->escape($type_template)."'"; @@ -832,12 +834,12 @@ class FormMail extends Form if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')"; $sql.= $this->db->order("lang,label","ASC"); //print $sql; - + $resql = $this->db->query($sql); if ($resql) { $this->lines_model=array(); - while ($obj = $this->db->fetch_object($resql)) + while ($obj = $this->db->fetch_object($resql)) { $line = new ModelMail(); $line->id=$obj->rowid; diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 5c7d73eb136..5cc62c56bc6 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1,7 +1,7 @@ [with a *lot* of help!] - * Copyright (C) 2005-2012 Laurent Destailleur + * Copyright (C) 2005-2015 Laurent Destailleur * Copyright (C) 2006-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -224,7 +224,7 @@ class SMTPs var $log = ''; var $_errorsTo = ''; var $_deliveryReceipt = 0; - + var $_trackId = ''; /** @@ -248,6 +248,27 @@ class SMTPs return $this->_deliveryReceipt; } + /** + * Set trackid + * + * @param string $_val Value + * @return void + */ + function setTrackId($_val = '') + { + $this->_trackId = $_val; + } + + /** + * get trackid + * + * @return string Delivery receipt + */ + function getTrackId() + { + return $this->_trackId; + } + /** * Set errors to * @@ -1106,11 +1127,23 @@ class SMTPs $host=preg_replace('@ssl://@i','',$host); // Remove prefix //NOTE: Message-ID should probably contain the username of the user who sent the msg - $_header .= 'Subject: ' . $this->getSubject() . "\r\n" - . 'Date: ' . date("r") . "\r\n" - . 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n"; - // . 'Read-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n" - // . 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n"; + $_header .= 'Subject: ' . $this->getSubject() . "\r\n"; + $_header .= 'Date: ' . date("r") . "\r\n"; + + $trackid = $this->getTrackId(); + if ($trackid) + { + $_header .= 'Message-ID: <' . time() . '.SMTPs-'.$trackid.'@' . $host . ">\r\n"; + $_header .= 'references: <' . time() . '.SMTPs-'.$trackid.'@' . $host . ">\r\n"; + } + else + { + $_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n"; + } + + //$_header .= + // 'Read-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n" + // 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n"; if ( $this->getSensitivity() ) $_header .= 'Sensitivity: ' . $this->getSensitivity() . "\r\n"; diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php index 4d020526e44..f03a313ce2a 100644 --- a/htdocs/core/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -34,6 +34,7 @@ function categories_prepare_head($object,$type) global $langs, $conf, $user; $langs->load("categories"); + $langs->load("products"); $h = 0; $head = array(); diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php index 29789791e14..b0b865c89f4 100644 --- a/htdocs/core/lib/format_cards.lib.php +++ b/htdocs/core/lib/format_cards.lib.php @@ -111,7 +111,7 @@ $_Avery_Labels = array ( 'marginTop'=>15, 'NX'=>2, 'NY'=>7, - 'SpaceX'=>25, + 'SpaceX'=>2.5, 'SpaceY'=>0, 'width'=>99.1, 'height'=>38.1, diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 59c0329b172..15057d6f3d7 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -413,8 +413,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM { print '
'.$tabstring; if ($menu_array[$i]['url']) print ''; + else print ''; print $menu_array[$i]['titre']; if ($menu_array[$i]['url']) print ''; + else print ''; // If title is not pure text and contains a table, no carriage return added if (! strstr($menu_array[$i]['titre'],''; print '
'."\n"; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e6d2e18752d..7bba3d5edfa 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -489,7 +489,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1); if (! in_array($langs->defaultlang,array('en_US','en_GB','en_NZ','en_AU','fr_FR','fr_BE','es_ES','ca_ES'))) { - if (empty($leftmenu) || $leftmenu=="setup") $newmenu->add("/admin/translation.php", $langs->trans("Translation"),1); + $newmenu->add("/admin/translation.php", $langs->trans("Translation"),1); } $newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1); $newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("Alerts"),1); @@ -546,12 +546,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } $newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, 1, '', $mainmenu, 'users'); - if (empty($leftmenu) || $leftmenu=="users") + if (empty($leftmenu) || $leftmenu == 'none' || $leftmenu=="users") { - $newmenu->add("/user/index.php", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin); - $newmenu->add("/user/card.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin); - $newmenu->add("/user/group/index.php", $langs->trans("Groups"), 1, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin); + $newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin); + $newmenu->add("/user/card.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin, '', 'home'); + $newmenu->add("/user/index.php", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin); + $newmenu->add("/user/hierarchy.php", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin); + $newmenu->add("", $langs->trans("Groups"), 1, $user->rights->user->user->lire || $user->admin); $newmenu->add("/user/group/card.php?action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin); + $newmenu->add("/user/group/index.php", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin); } } @@ -1441,8 +1444,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { print '
'.$tabstring; if ($menu_array[$i]['url']) print ''; + else print ''; print $menu_array[$i]['titre']; if ($menu_array[$i]['url']) print ''; + else print ''; // If title is not pure text and contains a table, no carriage return added if (! strstr($menu_array[$i]['titre'],''; print '
'."\n"; diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index ec783af938d..866e01b4959 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -177,10 +177,20 @@ class MenuManager print '
'; if ($this->menu->liste[$i]['enabled']) - print $tabstring.''.$this->menu->liste[$i]['titre'].'
'; + { + print $tabstring; + if ($this->menu->liste[$i]['url']) print 'menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>'; + else print ''; + if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].''; + else print ''; + } else - print $tabstring.''.$this->menu->liste[$i]['titre'].'
'; + { + print $tabstring.''.$this->menu->liste[$i]['titre'].''; + } + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu->liste[$i]['titre'],''; print '
'."\n"; } diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php new file mode 100644 index 00000000000..eb1b801821b --- /dev/null +++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php @@ -0,0 +1,252 @@ + + * Copyright (C) 2005 Regis Houssin + * Copyright (C) 2015 Francis Appels + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php + * \ingroup barcode + * \brief File of class to manage barcode numbering with tcpdf library + */ + +require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to include def like $genbarcode_loc and $font_loc + +/** + * Class to generate barcode images using tcpdf barcode generator + */ +class modTcpdfbarcode extends ModeleBarCode +{ + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $error=''; + var $is2d = false; + + /** + * Return description of numbering model + * + * @return string Text with description + */ + function info() + { + global $langs; + + return 'TCPDF-barcode'; + } + + /** + * Return if a module can be used or not + * + * @return boolean true if module can be used + */ + function isEnabled() + { + return true; + } + + /** + * Test si les numeros deja en vigueur dans la base ne provoquent pas de + * de conflits qui empechera cette numerotation de fonctionner. + * + * @return boolean false si conflit, true si ok + */ + function canBeActivated() + { + global $langs; + + return true; + } + + /** + * Return true if encoding is supported + * + * @param string $encoding Encoding norm + * @return int >0 if supported, 0 if not + */ + function encodingIsSupported($encoding) + { + $tcpdfEncoding = $this->getTcpdfEncodingType($encoding); + if (empty($tcpdfEncoding)) { + return 0; + } else { + return 1; + } + } + + /** + * Return an image file on the fly (no need to write on disk) + * + * @param String $code Value to encode + * @param String $encoding Mode of encoding + * @param String $readable Code can be read + * @return int <0 if KO, >0 if OK + */ + function buildBarCode($code,$encoding,$readable='Y') + { + global $_GET; + + $tcpdfEncoding = $this->getTcpdfEncodingType($encoding); + if (empty($tcpdfEncoding)) return -1; + + $color = array(0,0,0); + + $_GET["code"]=$code; + $_GET["type"]=$encoding; + $_GET["height"]=$height; + $_GET["readable"]=$readable; + + if ($code) { + // Load the tcpdf barcode class + if ($this->is2d) { + $height = 3; + $width = 3; + require_once TCPDF_PATH.'tcpdf_barcodes_2d.php'; + $barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding); + } else { + $height = 50; + $width = 1; + require_once TCPDF_PATH.'tcpdf_barcodes_1d.php'; + $barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding); + } + + dol_syslog("buildBarCode::TCPDF.getBarcodePNG"); + $barcodeobj->getBarcodePNG($width, $height, $color); + + return 1; + } else { + return -2; + } + } + + /** + * Save an image file on disk (with no output) + * + * @param String $code Value to encode + * @param String $encoding Mode of encoding + * @param String $readable Code can be read + * @return int <0 if KO, >0 if OK + */ + function writeBarCode($code,$encoding,$readable='Y') + { + global $conf,$_GET; + + dol_mkdir($conf->barcode->dir_temp); + $file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; + + $tcpdfEncoding = $this->getTcpdfEncodingType($encoding); + if (empty($tcpdfEncoding)) return -1; + + $color = array(0,0,0); + + $_GET["code"]=$code; + $_GET["type"]=$encoding; + $_GET["height"]=$height; + $_GET["readable"]=$readable; + + if ($code) { + // Load the tcpdf barcode class + if ($this->is2d) { + $height = 1; + $width = 1; + require_once TCPDF_PATH.'tcpdf_barcodes_2d.php'; + $barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding); + } else { + $height = 50; + $width = 1; + require_once TCPDF_PATH.'tcpdf_barcodes_1d.php'; + $barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding); + } + + dol_syslog("writeBarCode::TCPDF.getBarcodePngData"); + if ($imageData = $barcodeobj->getBarcodePngData($width, $height, $color)) { + if (function_exists('imagecreate')) { + $imageData = imagecreatefromstring($imageData); + } + if (imagepng($imageData, $file)) { + return 1; + } else { + return -3; + } + } else { + return -4; + } + } else { + return -2; + } + } + + /** + * get available output_modes for tcpdf class wth its translated description + * + * @param string $dolEncodingType dolibarr barcode encoding type + * @return string tcpdf encoding type + */ + public function getTcpdfEncodingType($dolEncodingType) + { + $tcpdf1dEncodingTypes = array( + 'C39' => 'C39', + 'C39+' => 'C39+', + 'C39E' => 'C39E', + 'C39E+' => 'C39E+', + 'S25' => 'S25', + 'S25+' => 'S25+', + 'I25' => 'I25', + 'I25+' => 'I25+', + 'C128' => 'C128', + 'C128A' => 'C128A', + 'C128B' => 'C128B', + 'C128C' => 'C128C', + 'EAN2' => 'EAN2', + 'EAN5' => 'EAN5', + 'EAN8' => 'EAN8', + 'EAN13' => 'EAN13', + 'ISBN' => 'EAN13', + 'UPC' => 'UPCA', + 'UPCE' => 'UPCE', + 'MSI' => 'MSI', + 'MSI+' => 'MSI+', + 'POSTNET' => 'POSTNET', + 'PLANET' => 'PLANET', + 'RMS4CC' => 'RMS4CC', + 'KIX' => 'KIX', + 'IMB' => 'IMB', + 'CODABAR' => 'CODABAR', + 'CODE11' => 'CODE11', + 'PHARMA' => 'PHARMA', + 'PHARMA2T' => 'PHARMA2T' + ); + + $tcpdf2dEncodingTypes = array( + 'DATAMATRIX' => 'DATAMATRIX', + 'PDF417' => 'PDF417', + 'QRCODE' => 'QRCODE,L', + 'QRCODE,L' => 'QRCODE,L', + 'QRCODE,M' => 'QRCODE,M', + 'QRCODE,Q' => 'QRCODE,Q', + 'QRCODE,H' => 'QRCODE,H' + ); + + if (array_key_exists($dolEncodingType, $tcpdf1dEncodingTypes)) { + $this->is2d = false; + return $tcpdf1dEncodingTypes[$dolEncodingType]; + } else if (array_key_exists($dolEncodingType, $tcpdf2dEncodingTypes)) { + $this->is2d = true; + return $tcpdf2dEncodingTypes[$dolEncodingType]; + } else { + return ''; + } + } +} diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index e5281150296..734b38f601a 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -190,7 +190,7 @@ class ExportExcel extends ModeleExports return -1; } } - + if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) { $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM; $cacheSettings = array ( @@ -426,7 +426,7 @@ class ExportExcel extends ModeleExports $this->workbook->disconnectWorksheets(); unset($this->workbook); } - return 0; + return 1; } diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index bf70c30ab1c..4f37a2e323e 100644 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -95,7 +95,7 @@ class ExportExcel2007 extends ExportExcel $this->workbook->disconnectWorksheets(); unset($this->workbook); } - return 0; + return 1; } } diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 9268a10f3c4..c421ae1cda4 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -2,8 +2,9 @@ /* Copyright (C) 2003 Steve Dillon * Copyright (C) 2003 Laurent Passebecq * Copyright (C) 2001-2003 Rodolphe Quiedeville - * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2015 Francis Appels * * 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 @@ -12,129 +13,61 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -/* Inspire de PDF_Label - * PDF_Label - PDF label editing - * @package PDF_Label - * @author Laurent PASSEBECQ - * @copyright 2003 Laurent PASSEBECQ - * disponible ici : http://www.fpdf.org/fr/script/script29.php - */ - -//------------------------------------------------------------------- -// VERSIONS : -// 1.0 : Initial release -// 1.1 : + : Added unit in the constructor -// + : Now Positions start @ (1,1).. then the first image @top-left of a page is (1,1) -// + : Added in the description of a label : -// font-size : defaut char size (can be changed by calling Set_Char_Size(xx); -// paper-size : Size of the paper for this sheet (thanx to Al Canton) -// metric : type of unit used in this description -// You can define your label properties in inches by setting metric to 'in' -// and printing in millimiter by setting unit to 'mm' in constructor. -// Added some labels : -// 5160, 5161, 5162, 5163,5164 : thanx to Al Canton : acanton@adams-blake.com -// 8600 : thanx to Kunal Walia : kunal@u.washington.edu -// + : Added 3mm to the position of labels to avoid errors -//////////////////////////////////////////////////// - /** - * \file htdocs/core/modules/member/doc/pdf_standard.class.php - * \ingroup member - * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise + * \file htdocs/core/modules/member/doc/pdf_standard.class.php + * \ingroup member + * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; - +require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php'; /** * Class to generate stick sheet with format Avery or other personalised */ -class pdf_standard +class pdf_standard extends CommonStickerGenerator { - var $code; // Code of format - var $format; // Array with informations - - // Proprietes privees - var $_Avery_Name = ''; // Nom du format de l'etiquette - var $_Margin_Left = 0; // Marge de gauche de l'etiquette - var $_Margin_Top = 0; // marge en haut de la page avant la premiere etiquette - var $_X_Space = 0; // Espace horizontal entre 2 bandes d'etiquettes - var $_Y_Space = 0; // Espace vertical entre 2 bandes d'etiquettes - var $_X_Number = 0; // NX Nombre d'etiquettes sur la largeur de la page - var $_Y_Number = 0; // NY Nombre d'etiquettes sur la hauteur de la page - var $_Width = 0; // Largeur de chaque etiquette - var $_Height = 0; // Hauteur de chaque etiquette - var $_Char_Size = 10; // Hauteur des caracteres - var $_Line_Height = 10; // Hauteur par defaut d'une ligne - var $_Metric = 'mm'; // Type of metric.. Will help to calculate good values - var $_Metric_Doc = 'mm'; // Type of metric for the doc.. - - var $_COUNTX = 1; - var $_COUNTY = 1; - var $_First = 1; - - /** - * Constructor + * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) * - * @param DoliDB $db Database handler + * @param PDF $pdf PDF reference + * @param Translate $outputlangs Output langs + * @param array $param Associative array containing label content and optional parameters + * @return void */ - function __construct($db) - { - $this->db = $db; + function addSticker(&$pdf,$outputlangs,$param) { + // use this method in future refactoring } - - - /** - * Methode qui permet de modifier la taille des caracteres - * Cela modiera aussi l'espace entre chaque ligne - * - * @param PDF $pdf PDF - * @param int $pt point - * @return void - */ - function Set_Char_Size(&$pdf,$pt) - { - if ($pt > 3) { - $this->_Char_Size = $pt; - $this->_Line_Height = $this->_Get_Height_Chars($pt); - $pdf->SetFont('','',$pt); - } - } - - + /** * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) * - %LOGO% is replace with company logo * - %PHOTO% is replace with photo provided as parameter * - * @param PDF $pdf PDF - * @param string $textleft Text left - * @param string $header Header - * @param string $footer Footer - * @param Translate $outputlangs Output langs - * @param string $textright Text right - * @param int $idmember Id member - * @param string $photo Photo (full path to image file used as replacement for key %PHOTOS% into left, right, header or footer text) - * @return void + * @param PDF $pdf PDF + * @param string $textleft Text left + * @param string $header Header + * @param string $footer Footer + * @param Translate $outputlangs Output langs + * @param string $textright Text right + * @param int $idmember Id member + * @param string $photo Photo (full path to image file used as replacement for key %PHOTOS% into left, right, header or footer text) + * @return void */ function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='') { global $mysoc,$conf,$langs; global $forceimgscalewidth,$forceimgscaleheight; - $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth); // Scale of image for width (1=Full width of sticker) - $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth); // Scale of image for height (1=Full height of sticker) + $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth); // Scale of image for width (1=Full width of sticker) + $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth); // Scale of image for height (1=Full height of sticker) // We are in a new page, then we must add a page if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) { @@ -297,151 +230,14 @@ class pdf_standard } } - /** - * Print dot line - * - * @param PDF $pdf PDF - * @param int $x1 X1 - * @param int $y1 Y1 - * @param int $x2 X2 - * @param int $y2 Y2 - * @param int $epaisseur Epaisseur - * @param int $nbPointilles Nb pointilles - * @return void - */ - function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15) - { - $pdf->SetLineWidth($epaisseur); - $length=abs($x1-$x2); - $hauteur=abs($y1-$y2); - if($length>$hauteur) { - $Pointilles=($length/$nbPointilles)/2; // taille des pointilles - } - else { - $Pointilles=($hauteur/$nbPointilles)/2; - } - for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) { - for($j=$i;$j<=($i+$Pointilles);$j++) { - if($j<=($x2-1)) { - $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point - $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point - } - } - } - for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) { - for($j=$i;$j<=($i+$Pointilles);$j++) { - if($j<=($y2-1)) { - $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point - $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point - } - } - } - } - - /** - * Fonction realisant une croix aux 4 coins des cartes - * - * @param PDF $pdf PDF - * @param int $x1 X1 - * @param int $y1 Y1 - * @param int $x2 X2 - * @param int $y2 Y2 - * @param int $epaisseur Epaisseur - * @param int $taille Size - * @return void - */ - function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4) - { - $pdf->SetDrawColor(192,192,192); - - $pdf->SetLineWidth($epaisseur); - $lg=$taille/2; - // croix haut gauche - $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg); - $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1); - // croix bas gauche - $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg); - $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2); - // croix haut droit - $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg); - $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1); - // croix bas droit - $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg); - $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2); - - $pdf->SetDrawColor(0,0,0); - } - - /** - * Convert units (in to mm, mm to in) - * $src and $dest must be 'in' or 'mm' - * - * @param int $value value - * @param string $src from - * @param string $dest to - * @return float value value after conversion - */ - function _Convert_Metric ($value, $src, $dest) - { - if ($src != $dest) { - $tab['in'] = 39.37008; - $tab['mm'] = 1000; - return $value * $tab[$dest] / $tab[$src]; - } else { - return $value; - } - } - - /** - * Give the height for a char size given. - * - * @param int $pt Point - * @return int Height chars - */ - function _Get_Height_Chars($pt) - { - // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes - $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10); - if (in_array($pt, array_keys($_Table_Hauteur_Chars))) { - return $_Table_Hauteur_Chars[$pt]; - } else { - return 100; // There is a prob.. - } - } - - /** - * Set format - * - * @param PDF $pdf PDF - * @param string $format Format - * @return void - */ - function _Set_Format(&$pdf, $format) - { - - $this->_Metric = $format['metric']; - $this->_Avery_Name = $format['name']; - $this->_Avery_Code = $format['code']; - $this->_Margin_Left = $this->_Convert_Metric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc); - $this->_Margin_Top = $this->_Convert_Metric($format['marginTop'], $this->_Metric, $this->_Metric_Doc); - $this->_X_Space = $this->_Convert_Metric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc); - $this->_Y_Space = $this->_Convert_Metric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc); - $this->_X_Number = $format['NX']; - $this->_Y_Number = $format['NY']; - $this->_Width = $this->_Convert_Metric($format['width'], $this->_Metric, $this->_Metric_Doc); - $this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); - $this->Set_Char_Size($pdf, $format['font-size']); - } - - /** * Function to build PDF on disk, then output on HTTP strem. * * @param array $arrayofrecords Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>) * @param Translate $outputlangs Lang object for output language - * @param string $srctemplatepath Full path of source filename for generator using a template file - * @param string $mode Tell if doc module is called for 'member', ... - * @return int 1=OK, 0=KO + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param string $mode Tell if doc module is called for 'member', ... + * @return int 1=OK, 0=KO */ function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$mode='member') { @@ -465,8 +261,8 @@ class pdf_standard if (empty($mode) || $mode == 'member') { - $title=$outputlangs->transnoentities('MembersCards'); - $keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name); + $title=$outputlangs->transnoentities('MembersCards'); + $keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name); $outputdir=$conf->adherent->dir_temp; } else @@ -488,14 +284,14 @@ class pdf_standard } } - $pdf=pdf_getInstance($this->format,$this->Tformat['metric']); + $pdf=pdf_getInstance($this->format,$this->Tformat['metric']); - if (class_exists('TCPDF')) - { - $pdf->setPrintHeader(false); - $pdf->setPrintFooter(false); - } - $pdf->SetFont(pdf_getPDFFont($outputlangs)); + if (class_exists('TCPDF')) + { + $pdf->setPrintHeader(false); + $pdf->setPrintFooter(false); + } + $pdf->SetFont(pdf_getPDFFont($outputlangs)); $pdf->SetTitle($title); $pdf->SetSubject($title); @@ -548,7 +344,7 @@ class pdf_standard $type=dol_mimetype($filename); //if ($encoding) header('Content-Encoding: '.$encoding); - if ($type) header('Content-Type: '.$type); + if ($type) header('Content-Type: '.$type); if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"'); else header('Content-Disposition: inline; filename="'.$filename.'"'); diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index d7fa0cbaae1..9a8b931125d 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2009 Regis Houssin * * 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 @@ -11,7 +11,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -20,9 +20,9 @@ */ /** - * \file htdocs/core/modules/member/modules_cards.php - * \ingroup member - * \brief File of parent class of document generator for members cards. + * \file htdocs/core/modules/member/modules_cards.php + * \ingroup member + * \brief File of parent class of document generator for members cards. */ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; @@ -38,11 +38,11 @@ class ModelePDFCards /** - * Return list of active generation modules + * Return list of active generation modules * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of templates */ function liste_modeles($db,$maxfilenamelength=0) { @@ -62,13 +62,15 @@ class ModelePDFCards /** * Cree un fichier de cartes de visites en fonction du modele de ADHERENT_CARDS_ADDON_PDF * - * @param DoliDB $db Database handler - * @param array $arrayofmembers Array of members + * @param DoliDB $db Database handler + * @param array $arrayofmembers Array of members * @param string $modele Force modele to use ('' to not force) - * @param Translate $outputlangs Objet langs to use for translation - * @return int <0 if KO, >0 if OK + * @param Translate $outputlangs Object langs to use for translation + * @param string $outputdir Output directory + * @param string $template pdf generenate document class to use default 'standard' + * @return int <0 if KO, >0 if OK */ -function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) +function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard') { global $conf,$langs; $langs->load("members"); @@ -97,13 +99,12 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) } } else $code=$modele; - $modele='standard'; - + // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); + $tmp=explode(':',$template,2); if (! empty($tmp[1])) { - $modele=$tmp[0]; + $template=$tmp[0]; $srctemplatepath=$tmp[1]; } else $srctemplatepath=$code; @@ -116,14 +117,14 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) { foreach(array('doc','pdf') as $prefix) { - $file = $prefix."_".$modele.".class.php"; - + $file = $prefix."_".$template.".class.php"; + // On verifie l'emplacement du modele $file=dol_buildpath($reldir."core/modules/member/doc/".$file,0); if (file_exists($file)) { $filefound=1; - $classname=$prefix.'_'.$modele; + $classname=$prefix.'_'.$template; break; } } diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index e0c4573bfb7..c897be729ec 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -81,8 +81,8 @@ class modAdherent extends DolibarrModules $this->const[21] = array("ADHERENT_MAIL_FROM","chaine","","From des mails"); $this->const[22] = array("ADHERENT_MAIL_COTIS","texte","Bonjour %FIRSTNAME%,\r\nCet email confirme que votre cotisation a été reçue\r\net enregistrée","Mail de validation de cotisation"); $this->const[23] = array("ADHERENT_MAIL_COTIS_SUBJECT","chaine","Reçu de votre cotisation","Sujet du mail de validation de cotisation"); - $this->const[25] = array("ADHERENT_CARD_HEADER_TEXT","chaine","%ANNEE%","Texte imprimé sur le haut de la carte adhérent"); - $this->const[26] = array("ADHERENT_CARD_FOOTER_TEXT","chaine","Association AZERTY","Texte imprimé sur le bas de la carte adhérent"); + $this->const[25] = array("ADHERENT_CARD_HEADER_TEXT","chaine","%YEAR%","Texte imprimé sur le haut de la carte adhérent"); + $this->const[26] = array("ADHERENT_CARD_FOOTER_TEXT","chaine","%COMPANY%","Texte imprimé sur le bas de la carte adhérent"); $this->const[27] = array("ADHERENT_CARD_TEXT","texte","%FULLNAME%\r\nID: %ID%\r\n%EMAIL%\r\n%ADDRESS%\r\n%ZIP% %TOWN%\r\n%COUNTRY%","Text to print on member cards"); $this->const[28] = array("ADHERENT_MAILMAN_ADMINPW","chaine","","Mot de passe Admin des liste mailman"); $this->const[31] = array("ADHERENT_BANK_USE_AUTO","yesno","","Insertion automatique des cotisations dans le compte banquaire"); diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php index c9ba87250bb..0d06c1657c2 100644 --- a/htdocs/core/modules/modBarcode.class.php +++ b/htdocs/core/modules/modBarcode.class.php @@ -1,7 +1,7 @@ - * Copyright (C) 2005-2008 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2005-2008 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin * * 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 @@ -10,7 +10,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -18,11 +18,11 @@ */ /** - * \defgroup barcode Module barcode - * \brief Module pour gerer les codes barres - * \file htdocs/core/modules/modBarcode.class.php - * \ingroup barcode,produit - * \brief Fichier de description et activation du module Barcode + * \defgroup barcode Module barcode + * \brief Module pour gerer les codes barres + * \file htdocs/core/modules/modBarcode.class.php + * \ingroup barcode,produit + * \brief Fichier de description et activation du module Barcode */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -34,9 +34,9 @@ class modBarcode extends DolibarrModules { /** - * Constructor. Define names, constants, directories, boxes, permissions + * Constructor. Define names, constants, directories, boxes, permissions * - * @param DoliDB $db Database handler + * @param DoliDB $db Database handler */ function __construct($db) { @@ -56,7 +56,7 @@ class modBarcode extends DolibarrModules $this->dirs = array("/barcode/temp"); // Dependances - $this->depends = array(); // May be used for product or service or third party module + $this->depends = array(); // May be used for product or service or third party module $this->requiredby = array(); // Config pages @@ -64,10 +64,12 @@ class modBarcode extends DolibarrModules // Constants // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0), - // 1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) ); - $this->const = array( - //0=>array('GENBARCODE_LOCATION','chaine',DOL_DOCUMENT_ROOT.'/includes/barcode/genbarcode/genbarcode','Path to genbarcode command line tool',0) - ); + // 1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) ); + $this->const = array(); + //$this->const[0] = array('BARCODE_LABEL_LEFT_TEXT','chaine','%BARCODE%','Print barcode on left side of label',1); + //$this->const[1] = array('BARCODE_LABEL_RIGHT_TEXT','chaine','%LOGO%','Print Company logo on right side',1); + //$this->const[2] = array('BARCODE_LABEL_HEADER_TEXT','chaine','My header','Print header text on label',1); + //$this->const[3] = array('BARCODE_LABEL_FOOTER_TEXT','chaine','My footer','Print footer text on label',1); // Boxes $this->boxes = array(); @@ -88,43 +90,43 @@ class modBarcode extends DolibarrModules $this->rights[2][3] = 0; // La permission est-elle une permission par defaut $this->rights[2][4] = 'creer_advance'; - // Main menu entries - $r=0; - $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'mainmenu'=>'tools', - 'leftmenu'=>'barcodeprint', - 'type'=>'left', // This is a Left menu entry - 'titre'=>'BarCodePrintsheet', - 'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint', - 'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>200, - 'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both + // Main menu entries + $r=0; + $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode + 'mainmenu'=>'tools', + 'leftmenu'=>'barcodeprint', + 'type'=>'left', // This is a Left menu entry + 'titre'=>'BarCodePrintsheet', + 'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint', + 'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'position'=>200, + 'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules + 'target'=>'', + 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both $r++; - $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'type'=>'left', // This is a Left menu entry + $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode + 'type'=>'left', // This is a Left menu entry 'titre'=>'MassBarcodeInit', 'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools', - 'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>300, - 'enabled'=>'$conf->barcode->enabled && $leftmenu=="modulesadmintools"', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules + 'enabled'=>'$conf->barcode->enabled && $leftmenu=="modulesadmintools"', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'target'=>'', - 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both + 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both $r++; } - /** - * Function called when module is enabled. - * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. - * It also creates data directories. - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories. + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO */ function init($options='') { @@ -137,25 +139,27 @@ class modBarcode extends DolibarrModules array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('UPC', 'UPC', 0, '123456789012', __ENTITY__)",'ignoreerror'=>1), array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('ISBN', 'ISBN', 0, '123456789', __ENTITY__)",'ignoreerror'=>1), array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C39', 'Code 39', 0, '1234567890', __ENTITY__)",'ignoreerror'=>1), - array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)",'ignoreerror'=>1) + array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)",'ignoreerror'=>1), + array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('DATAMATRIX', 'Datamatrix', 0, '1234567xyz', __ENTITY__)",'ignoreerror'=>1), + array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('QRCODE', 'Qr Code', 0, 'www.dolibarr.org', __ENTITY__)",'ignoreerror'=>1) ); return $this->_init($sql, $options); } - /** + /** * Function called when module is disabled. - * Remove from database constants, boxes and permissions from Dolibarr database. + * Remove from database constants, boxes and permissions from Dolibarr database. * Data directories are not deleted * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function remove($options='') - { + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function remove($options='') + { $sql = array(); return $this->_remove($sql, $options); - } + } } diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 53584e419eb..03b1a6d964b 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -153,7 +153,7 @@ class modCommande extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'order_advance'; $this->rights[$r][5] = 'annuler'; - + $r++; $this->rights[$r][0] = 89; $this->rights[$r][1] = 'Supprimer les commandes clients'; @@ -178,8 +178,8 @@ class modCommande extends DolibarrModules $this->export_label[$r]='CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("commande","commande","export")); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php index 27299e0f291..113db82c38f 100644 --- a/htdocs/core/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -119,7 +119,7 @@ class modContrat extends DolibarrModules // Exports //-------- $langs->load("contracts"); - + $r=1; $this->export_code[$r]=$this->rights_class.'_'.$r; @@ -154,7 +154,7 @@ class modContrat extends DolibarrModules 'cod.label'=>"Text",'cod.description'=>"Text",'cod.price_ht'=>"Numeric",'cod.tva_tx'=>"Numeric", 'cod.qty'=>"Numeric",'cod.total_ht'=>"Numeric",'cod.total_tva'=>"Numeric",'cod.total_ttc'=>"Numeric", 'cod.date_ouverture'=>"Date",'cod.date_ouverture_prevue'=>"Date",'cod.date_fin_validite'=>"Date",'cod.date_cloture'=>"Date", - 'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); + 'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'); $this->export_sql_start[$r]='SELECT DISTINCT '; diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index 9458a7844f6..f47fe099d0a 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -180,8 +180,8 @@ class modFacture extends DolibarrModules $this->export_icon[$r]='bill'; $this->export_permission[$r]=array(array("facture","facture","export","other")); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','fd.rowid'=>'LineId','fd.label'=>"Label",'fd.description'=>"LineDescription",'fd.subprice'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.special_code'=>'SpecialCode','fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_sell'=>'ProductAccountancySellCode'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.price'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.product_type'=>"Numeric",'fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.price'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.label'=>"invoice_line",'fd.description'=>"invoice_line",'fd.subprice'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.special_code'=>'invoice_line','fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_sell'=>'product','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user'); $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them // Add extra fields diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 569cfe07253..ef8b3f7888c 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -280,8 +280,8 @@ class modFournisseur extends DolibarrModules $this->export_icon[$r]='bill'; $this->export_permission[$r]=array(array("fournisseur","facture","export")); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product'); $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them // Add extra fields object diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php index a6340bd4f9c..2ae30951c8c 100644 --- a/htdocs/core/modules/modIncoterm.class.php +++ b/htdocs/core/modules/modIncoterm.class.php @@ -46,7 +46,7 @@ class modIncoterm extends DolibarrModules // Id for module (must be unique). // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id). - $this->numero = 210009; + $this->numero = 62000; // Key text used to identify module (for permissions, menus, etc...) $this->rights_class = 'incoterm'; diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php index 91839139f41..e288bd83e4d 100644 --- a/htdocs/core/modules/modPrinting.class.php +++ b/htdocs/core/modules/modPrinting.class.php @@ -44,7 +44,7 @@ class modPrinting extends DolibarrModules function __construct($db) { $this->db = $db ; - $this->numero = 112000; + $this->numero = 64000; // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' // It is used to group modules in module setup page $this->family = "other"; @@ -94,7 +94,7 @@ class modPrinting extends DolibarrModules // $this->rights[$r][5] Niveau 2 pour nommer permission dans code $r++; - $this->rights[$r][0] = 112001; + $this->rights[$r][0] = 64001; $this->rights[$r][1] = 'Printing'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 1; diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index e205c696a97..6a8dc7254d4 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -171,7 +171,7 @@ class modPropale extends DolibarrModules $this->export_label[$r]='ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("propale","export")); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'); $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index da1f807ecac..aa97f5608df 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -45,7 +45,7 @@ class modResource extends DolibarrModules // Id for module (must be unique). // Use a free id here // (See in Home -> System information -> Dolibarr for list of used modules id). - $this->numero = 110111; + $this->numero = 63000; // Key text used to identify module (for permissions, menus, etc...) $this->rights_class = 'resource'; @@ -114,7 +114,7 @@ class modResource extends DolibarrModules $this->requiredby = array('modPlace'); // Minimum version of PHP required by module $this->phpmin = array(5, 3); - + $this->langfiles = array("resource@resource"); // langfiles@resource // Constants // List of particular constants to add when module is enabled @@ -172,25 +172,25 @@ class modResource extends DolibarrModules $this->rights = array(); // Permission array used by this module $r = 0; - $this->rights[$r][0] = 1101201; - $this->rights[$r][1] = 'See resources'; + $this->rights[$r][0] = 63001; + $this->rights[$r][1] = 'Read resources'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'read'; $r++; - $this->rights[$r][0] = 1101202; - $this->rights[$r][1] = 'Modify resources'; + $this->rights[$r][0] = 63002; + $this->rights[$r][1] = 'Create/Modify resources'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'write'; $r++; - $this->rights[$r][0] = 1101203; + $this->rights[$r][0] = 63003; $this->rights[$r][1] = 'Delete resources'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'delete'; $r++; - $this->rights[$r][0] = 1101204; + $this->rights[$r][0] = 63004; $this->rights[$r][1] = 'Link resources'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'link'; diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php index 193de960bb8..0bfb2d849c5 100644 --- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php +++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php @@ -2,8 +2,9 @@ /* Copyright (C) 2003 Steve Dillon * Copyright (C) 2003 Laurent Passebecq * Copyright (C) 2001-2003 Rodolphe Quiedeville - * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2015 Francis Appels * * 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 @@ -12,129 +13,61 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -/* Inspire de PDF_Label - * PDF_Label - PDF label editing - * @package PDF_Label - * @author Laurent PASSEBECQ - * @copyright 2003 Laurent PASSEBECQ - * disponible ici : http://www.fpdf.org/fr/script/script29.php - */ - -//------------------------------------------------------------------- -// VERSIONS : -// 1.0 : Initial release -// 1.1 : + : Added unit in the constructor -// + : Now Positions start @ (1,1).. then the first image @top-left of a page is (1,1) -// + : Added in the description of a label : -// font-size : defaut char size (can be changed by calling Set_Char_Size(xx); -// paper-size : Size of the paper for this sheet (thanx to Al Canton) -// metric : type of unit used in this description -// You can define your label properties in inches by setting metric to 'in' -// and printing in millimiter by setting unit to 'mm' in constructor. -// Added some labels : -// 5160, 5161, 5162, 5163,5164 : thanx to Al Canton : acanton@adams-blake.com -// 8600 : thanx to Kunal Walia : kunal@u.washington.edu -// + : Added 3mm to the position of labels to avoid errors -//////////////////////////////////////////////////// - /** - * \file htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - * \ingroup core - * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise + * \file htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php + * \ingroup core + * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; - +require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php'; /** * Class to generate stick sheet with format Avery or other personalised */ -class pdf_standardlabel +class pdf_standardlabel extends CommonStickerGenerator { - - var $code; // Code of format - var $format; // Array with informations - - // Proprietes privees - var $_Avery_Name = ''; // Nom du format de l'etiquette - var $_Margin_Left = 0; // Marge de gauche de l'etiquette - var $_Margin_Top = 0; // marge en haut de la page avant la premiere etiquette - var $_X_Space = 0; // Espace horizontal entre 2 bandes d'etiquettes - var $_Y_Space = 0; // Espace vertical entre 2 bandes d'etiquettes - var $_X_Number = 0; // NX Nombre d'etiquettes sur la largeur de la page - var $_Y_Number = 0; // NY Nombre d'etiquettes sur la hauteur de la page - var $_Width = 0; // Largeur de chaque etiquette - var $_Height = 0; // Hauteur de chaque etiquette - var $_Char_Size = 10; // Hauteur des caracteres - var $_Line_Height = 10; // Hauteur par defaut d'une ligne - var $_Metric = 'mm'; // Type of metric.. Will help to calculate good values - var $_Metric_Doc = 'mm'; // Type of metric for the doc.. - - var $_COUNTX = 1; - var $_COUNTY = 1; - var $_First = 1; - - - /** - * Constructor + * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) * - * @param DoliDB $db Database handler + * @param PDF $pdf PDF reference + * @param Translate $outputlangs Output langs + * @param array $param Associative array containing label content and optional parameters + * @return void */ - function __construct($db) - { - $this->db = $db; + function addSticker(&$pdf,$outputlangs,$param) { + // use this method in future refactoring } - - /** - * Methode qui permet de modifier la taille des caracteres - * Cela modiera aussi l'espace entre chaque ligne - * - * @param PDF $pdf PDF - * @param int $pt point - * @return void - */ - function Set_Char_Size(&$pdf,$pt) - { - if ($pt > 3) { - $this->_Char_Size = $pt; - $this->_Line_Height = $this->_Get_Height_Chars($pt); - $pdf->SetFont('','',$pt); - } - } - + /** * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) * - %LOGO% is replace with company logo * - %PHOTO% is replace with photo provided as parameter * - * @param PDF $pdf PDF - * @param string $textleft Text left - * @param string $header Header - * @param string $footer Footer - * @param Translate $outputlangs Output langs - * @param string $textright Text right - * @param string $photo Photo (full path to image file used as replacement for key %PHOTOS% into left, right, header or footer text) - * @return void + * @param PDF $pdf PDF reference + * @param string $textleft Text left + * @param string $header Header + * @param string $footer Footer + * @param Translate $outputlangs Output langs + * @param string $textright Text right + * @param string $photo Photo (full path to image file used as replacement for key %PHOTOS% into left, right, header or footer text) + * @return void */ - function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$photo='') + function Add_PDF_label(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$photo='') { global $mysoc,$conf,$langs; global $forceimgscalewidth,$forceimgscaleheight; - $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth); // Scale of image for width (1=Full width of sticker) - $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth); // Scale of image for height (1=Full height of sticker) + $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth); // Scale of image for width (1=Full width of sticker) + $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth); // Scale of image for height (1=Full height of sticker) - // We are in a new page, then we must add a page + // We are in a new page, then we must add a page if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) { $pdf->AddPage(); } @@ -289,257 +222,123 @@ class pdf_standardlabel } - /** - * Print dot line - * - * @param PDF $pdf PDF - * @param int $x1 X1 - * @param int $y1 Y1 - * @param int $x2 X2 - * @param int $y2 Y2 - * @param int $epaisseur Epaisseur - * @param int $nbPointilles Nb pointilles - * @return void - */ - function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15) - { - $pdf->SetLineWidth($epaisseur); - $length=abs($x1-$x2); - $hauteur=abs($y1-$y2); - if($length>$hauteur) { - $Pointilles=($length/$nbPointilles)/2; // taille des pointilles - } - else { - $Pointilles=($hauteur/$nbPointilles)/2; - } - for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) { - for($j=$i;$j<=($i+$Pointilles);$j++) { - if($j<=($x2-1)) { - $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point - $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point - } - } - } - for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) { - for($j=$i;$j<=($i+$Pointilles);$j++) { - if($j<=($y2-1)) { - $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point - $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point - } - } - } - } + /** - * Fonction realisant une croix aux 4 coins des cartes + * Function to build PDF on disk, then output on HTTP strem. * - * @param PDF $pdf PDF - * @param int $x1 X1 - * @param int $y1 Y1 - * @param int $x2 X2 - * @param int $y2 Y2 - * @param int $epaisseur Epaisseur - * @param int $taille Size - * @return void - */ - function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4) - { - $pdf->SetDrawColor(192,192,192); - - $pdf->SetLineWidth($epaisseur); - $lg=$taille/2; - // croix haut gauche - $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg); - $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1); - // croix bas gauche - $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg); - $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2); - // croix haut droit - $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg); - $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1); - // croix bas droit - $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg); - $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2); - - $pdf->SetDrawColor(0,0,0); - } - - /** - * Convert units (in to mm, mm to in) - * $src and $dest must be 'in' or 'mm' - * - * @param int $value value - * @param string $src from - * @param string $dest to - * @return float value value after conversion - */ - function _Convert_Metric ($value, $src, $dest) - { - if ($src != $dest) { - $tab['in'] = 39.37008; - $tab['mm'] = 1000; - return $value * $tab[$dest] / $tab[$src]; - } else { - return $value; - } - } - - /** - * Give the height for a char size given. - * - * @param int $pt Point - * @return int Height chars - */ - function _Get_Height_Chars($pt) - { - // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes - $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10); - if (in_array($pt, array_keys($_Table_Hauteur_Chars))) { - return $_Table_Hauteur_Chars[$pt]; - } else { - return 100; // There is a prob.. - } - } - - /** - * Set format - * - * @param PDF $pdf PDF - * @param string $format Format - * @return void - */ - function _Set_Format(&$pdf, $format) - { - $this->_Metric = $format['metric']; - $this->_Avery_Name = $format['name']; - $this->_Avery_Code = $format['code']; - $this->_Margin_Left = $this->_Convert_Metric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc); - $this->_Margin_Top = $this->_Convert_Metric($format['marginTop'], $this->_Metric, $this->_Metric_Doc); - $this->_X_Space = $this->_Convert_Metric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc); - $this->_Y_Space = $this->_Convert_Metric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc); - $this->_X_Number = $format['NX']; - $this->_Y_Number = $format['NY']; - $this->_Width = $this->_Convert_Metric($format['width'], $this->_Metric, $this->_Metric_Doc); - $this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); - $this->Set_Char_Size($pdf, $format['font-size']); - } - - - /** - * Function to build PDF on disk, then output on HTTP strem. - * - * @param array $arrayofrecords Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>) - * @param Translate $outputlangs Lang object for output language - * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param array $arrayofrecords Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>) + * @param Translate $outputlangs Lang object for output language + * @param string $srctemplatepath Full path of source filename for generator using a template file * @param string $outputdir Output directory for pdf file - * @return int 1=OK, 0=KO - */ - function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='') - { - global $user,$conf,$langs,$mysoc,$_Avery_Labels; + * @return int 1=OK, 0=KO + */ + function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='') + { + global $user,$conf,$langs,$mysoc,$_Avery_Labels; - $this->code=$srctemplatepath; - $this->Tformat = $_Avery_Labels[$this->code]; - if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; } - $this->type = 'pdf'; - $this->format = $this->Tformat['paper-size']; + $this->code=$srctemplatepath; + $this->Tformat = $_Avery_Labels[$this->code]; + if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; } + $this->type = 'pdf'; + $this->format = $this->Tformat['paper-size']; - if (! is_object($outputlangs)) $outputlangs=$langs; + if (! is_object($outputlangs)) $outputlangs=$langs; // 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'; - $outputlangs->load("main"); - $outputlangs->load("dict"); - $outputlangs->load("companies"); - $outputlangs->load("admin"); + $outputlangs->load("main"); + $outputlangs->load("dict"); + $outputlangs->load("companies"); + $outputlangs->load("admin"); - $title=$outputlangs->transnoentities('Labels'); - $keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name); + $title=$outputlangs->transnoentities('Labels'); + $keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name); - $dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir); - $filename='tmp_address_sheet.pdf'; - $file = $dir."/".$filename; + $dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir); + $filename='tmp_address_sheet.pdf'; + $file = $dir."/".$filename; - if (! file_exists($dir)) - { - if (dol_mkdir($dir) < 0) - { - $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); - return 0; - } - } + if (! file_exists($dir)) + { + if (dol_mkdir($dir) < 0) + { + $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + return 0; + } + } - $pdf=pdf_getInstance($this->format,$this->Tformat['metric']); + $pdf=pdf_getInstance($this->format,$this->Tformat['metric']); - if (class_exists('TCPDF')) - { - $pdf->setPrintHeader(false); - $pdf->setPrintFooter(false); - } - $pdf->SetFont(pdf_getPDFFont($outputlangs)); + if (class_exists('TCPDF')) + { + $pdf->setPrintHeader(false); + $pdf->setPrintFooter(false); + } + $pdf->SetFont(pdf_getPDFFont($outputlangs)); - $pdf->SetTitle($title); - $pdf->SetSubject($title); - $pdf->SetCreator("Dolibarr ".DOL_VERSION); - $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs))); - $pdf->SetKeyWords($keywords); - if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false); + $pdf->SetTitle($title); + $pdf->SetSubject($title); + $pdf->SetCreator("Dolibarr ".DOL_VERSION); + $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs))); + $pdf->SetKeyWords($keywords); + if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false); - $pdf->SetMargins(0,0); - $pdf->SetAutoPageBreak(false); + $pdf->SetMargins(0,0); + $pdf->SetAutoPageBreak(false); - $this->_Metric_Doc = $this->Tformat['metric']; - // Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie - $posX=1; - $posY=1; - if ($posX > 0) $posX--; else $posX=0; - if ($posY > 0) $posY--; else $posY=0; - $this->_COUNTX = $posX; - $this->_COUNTY = $posY; - $this->_Set_Format($pdf, $this->Tformat); + $this->_Metric_Doc = $this->Tformat['metric']; + // Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie + $posX=1; + $posY=1; + if ($posX > 0) $posX--; else $posX=0; + if ($posY > 0) $posY--; else $posY=0; + $this->_COUNTX = $posX; + $this->_COUNTY = $posY; + $this->_Set_Format($pdf, $this->Tformat); - $pdf->Open(); - $pdf->AddPage(); + $pdf->Open(); + $pdf->AddPage(); - // Add each record - foreach($arrayofrecords as $val) - { - // imprime le texte specifique sur la carte - $this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['photo']); - } + // Add each record + foreach($arrayofrecords as $val) + { + // imprime le texte specifique sur la carte + $this->Add_PDF_label($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['photo']); + } - //$pdf->SetXY(10, 295); - //$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C'); + //$pdf->SetXY(10, 295); + //$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C'); - // Output to file - $pdf->Output($file,'F'); + // Output to file + $pdf->Output($file,'F'); - if (! empty($conf->global->MAIN_UMASK)) - @chmod($file, octdec($conf->global->MAIN_UMASK)); + if (! empty($conf->global->MAIN_UMASK)) + @chmod($file, octdec($conf->global->MAIN_UMASK)); - // Output to http stream - clearstatcache(); + // Output to http stream + clearstatcache(); - $attachment=true; - if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false; - $type=dol_mimetype($filename); + $attachment=true; + if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false; + $type=dol_mimetype($filename); - //if ($encoding) header('Content-Encoding: '.$encoding); - if ($type) header('Content-Type: '.$type); - if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"'); - else header('Content-Disposition: inline; filename="'.$filename.'"'); + //if ($encoding) header('Content-Encoding: '.$encoding); + if ($type) header('Content-Type: '.$type); + if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"'); + else header('Content-Disposition: inline; filename="'.$filename.'"'); - // Ajout directives pour resoudre bug IE - header('Cache-Control: Public, must-revalidate'); - header('Pragma: public'); + // Ajout directives pour resoudre bug IE + header('Cache-Control: Public, must-revalidate'); + header('Pragma: public'); - readfile($file); + readfile($file); - return 1; - } + return 1; + } } diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php new file mode 100644 index 00000000000..dd70c608f07 --- /dev/null +++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php @@ -0,0 +1,385 @@ + + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2015 Francis Appels + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php + * \ingroup core + * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise + */ + +require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php'; + +/** + * Class to generate stick sheet with format Avery or other personalised + */ +class pdf_tcpdflabel extends CommonStickerGenerator +{ + // define 1d barcode style + private $_style1d = array( + 'position' => '', + 'align' => 'C', + 'stretch' => false, + 'fitwidth' => true, + 'cellfitalign' => '', + 'border' => false, + 'hpadding' => 'auto', + 'vpadding' => 'auto', + 'fgcolor' => array(0,0,0), + 'bgcolor' => false, + 'text' => true, + 'font' => 'helvetica', + 'fontsize' => 8, + 'stretchtext' => 4 + ); + + // set style for 2d barcode + private $_style2d = array( + 'border' => false, + 'vpadding' => 'auto', + 'hpadding' => 'auto', + 'fgcolor' => array(0,0,0), + 'bgcolor' => false, + 'module_width' => 1, // width of a single module in points + 'module_height' => 1 // height of a single module in points + ); + + private $_align2d = 'N'; + + private $_xres = 0.4; + + /** + * write barcode to pdf + * + * @param PDF $pdf PDF reference + * @param string $code code to print + * @param string $encoding type of barcode + * @param boolean $is2d true if 2d barcode + * @param int $x x position in user units + * @param int $y y position in user units + * @param int $w width in user units + * @param int $h height in user units + */ + private function writeBarcode(&$pdf, $code, $encoding, $is2d, $x, $y, $w, $h) + { + if ($is2d) { + $pdf->write2DBarcode($code, $encoding, $x, $y, $w, $h, $this->_style2d, $this->_align2d); + } else { + $pdf->write1DBarcode($code, $encoding, $x, $y, $w, $h, $this->_xres, $this->_style1d); + } + } + + /** + * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0) + * + * @param PDF $pdf PDF reference + * @param Translate $outputlangs Output langs + * @param array $param Associative array containing label content and optional parameters + * @return void + */ + function addSticker(&$pdf,$outputlangs,$param) + { + global $mysoc,$conf; + + $textleft = $param['textleft']; + $header = $param['textheader']; + $footer = $param['textfooter']; + $textright = $param['textright']; + $code = $param['code']; + $encoding = $param['encoding']; + $is2d = $param['is2d']; + + + + // We are in a new page, then we must add a page + if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) { + $pdf->AddPage(); + } + $this->_First=0; + $_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space)); + $_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space)); + + // Define logo + $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; + if (! is_readable($logo)) + { + $logo=''; + if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) + { + $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small; + } + elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) + { + $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; + } + } + + $xleft = 2; + $ytop = 2; + + // Top + if ($header!='') + { + $pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text + $pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C'); + } + + $ytop += (empty($header)?0:(1+$this->_Line_Height)); + + // Define widthtouse and heighttouse + $pageMargins = $pdf->getMargins(); + $maxwidthtouse = round($this->_Width - 2*$xleft); + $maxheighttouse = round($this->_Height - 2*$ytop); + $maxheighttouse -= (empty($footer)?0:(1+$this->_Line_Height)); + $defaultratio = ($maxwidthtouse/$maxheighttouse); + $widthtouse = $maxwidthtouse; + $heighttouse = $maxheighttouse; + $logoHeight = $heighttouse; + $logoWidth = $heighttouse; + + //var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit; + + // Center + if ($textright=='') // Only a left part + { + // Output left area + if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, 0, $logoHeight); + else if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse, $heighttouse); + } + else + { + $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop); + $pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L'); + } + } + else if ($textleft!='' && $textright!='') // left and right part + { + if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%') ) // left part logo/barcode right part text + { + if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, 0); + else if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, $heighttouse); + } + $pdf->SetXY($_PosX+($widthtouse/2), $_PosY+$ytop); + $pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R'); + } + else if (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text + { + if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, 0); + else if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, $heighttouse); + } + $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop); + $pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L'); + } + else if ($textleft == '%LOGO%') // left part logo right part text/barcode + { + if ($logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, 0, $logoHeight); + if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft+$logoWidth+1, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse); + } else { + $pdf->SetXY($_PosX+$xleft+$logoWidth+1, $_PosY+$ytop); + $pdf->MultiCell($widthtouse-$logoWidth1-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R'); + } + } + else if ($textright == '%LOGO%') // right part logo left part text/barcode + { + if ($logo) $pdf->Image($logo, $_PosX+$xleft+$widthtouse-$logoWidth+1, $_PosY+$ytop, 0, $logoHeight); + if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse); + } else { + $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop); + $pdf->MultiCell($widthtouse-$logoWidth-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L'); + } + } + else // text on halft left and text on half right + { + $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop); + $pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L'); + $pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop); + $pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R'); + } + } + else // Only a right part + { + // Output right area + if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$this->_Width-$widthtouse-$xleft, $_PosY+$ytop, 0, $logoHeight); + else if ($code && !empty($encoding)) + { + $this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$this->_Width-$widthtouse-$xleft, $_PosY+$ytop, $widthtouse, $heighttouse); + } + else + { + $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop); + $pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R'); + } + } + + // Bottom + if ($footer!='') + { + $pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1); + $pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C'); + } + //print "$_PosY+$this->_Height-$this->_Line_Height-1
\n"; + + $this->_COUNTY++; + + if ($this->_COUNTY == $this->_Y_Number) { + // Si on est en bas de page, on remonte le 'curseur' de position + $this->_COUNTX++; + $this->_COUNTY=0; + } + + if ($this->_COUNTX == $this->_X_Number) { + // Si on est en bout de page, alors on repart sur une nouvelle page + $this->_COUNTX=0; + $this->_COUNTY=0; + } + } + + + + + /** + * Function to build PDF on disk, then output on HTTP strem. + * + * @param array $arrayofrecords Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>) + * @param Translate $outputlangs Lang object for output language + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param string $outputdir Output directory for pdf file + * @return int 1=OK, 0=KO + */ + function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='') + { + global $user,$conf,$langs,$mysoc,$_Avery_Labels; + + $this->code=$srctemplatepath; + $this->Tformat = $_Avery_Labels[$this->code]; + if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; } + $this->type = 'pdf'; + $this->format = $this->Tformat['paper-size']; + + if (! is_object($outputlangs)) $outputlangs=$langs; + // 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'; + + $outputlangs->load("main"); + $outputlangs->load("dict"); + $outputlangs->load("companies"); + $outputlangs->load("admin"); + + $title=$outputlangs->transnoentities('Labels'); + $keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name); + + $dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir); + $filename='tmp_address_sheet.pdf'; + $file = $dir."/".$filename; + + if (! file_exists($dir)) + { + if (dol_mkdir($dir) < 0) + { + $this->error=$langs->trans("ErrorCanNotCreateDir",$dir); + return 0; + } + } + + $pdf=pdf_getInstance($this->format,$this->Tformat['metric']); + + if (class_exists('TCPDF')) + { + $pdf->setPrintHeader(false); + $pdf->setPrintFooter(false); + } + $pdf->SetFont(pdf_getPDFFont($outputlangs)); + + $pdf->SetTitle($title); + $pdf->SetSubject($title); + $pdf->SetCreator("Dolibarr ".DOL_VERSION); + $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs))); + $pdf->SetKeyWords($keywords); + if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false); + + $pdf->SetMargins(0,0); + $pdf->SetAutoPageBreak(false); + + $this->_Metric_Doc = $this->Tformat['metric']; + // Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie + $posX=1; + $posY=1; + if ($posX > 0) $posX--; else $posX=0; + if ($posY > 0) $posY--; else $posY=0; + $this->_COUNTX = $posX; + $this->_COUNTY = $posY; + $this->_Set_Format($pdf, $this->Tformat); + + + $pdf->Open(); + $pdf->AddPage(); + + + // Add each record + foreach($arrayofrecords as $val) + { + // imprime le texte specifique sur la carte + $this->addSticker($pdf, $outputlangs, $val); + } + + //$pdf->SetXY(10, 295); + //$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C'); + + + // Output to file + $pdf->Output($file,'F'); + + if (! empty($conf->global->MAIN_UMASK)) + @chmod($file, octdec($conf->global->MAIN_UMASK)); + + + + // Output to http stream + clearstatcache(); + + $attachment=true; + if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false; + $type=dol_mimetype($filename); + + //if ($encoding) header('Content-Encoding: '.$encoding); + if ($type) header('Content-Type: '.$type); + if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"'); + else header('Content-Disposition: inline; filename="'.$filename.'"'); + + // Ajout directives pour resoudre bug IE + header('Cache-Control: Public, must-revalidate'); + header('Pragma: public'); + + readfile($file); + + return 1; + } +} diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index 15ef011ea04..1b077f8eab5 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -67,9 +67,10 @@ class ModelePDFLabels * @param string $modele Force le modele a utiliser ('' to not force) * @param Translate $outputlangs Objet lang a utiliser pour traduction * @param string $outputdir Output directory + * @param string $template pdf generenate document class to use default 'standardlabel' * @return int <0 if KO, >0 if OK */ -function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir='') +function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir='', $template='standardlabel') { global $conf,$langs; $langs->load("members"); @@ -98,13 +99,12 @@ function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $ } } else $code=$modele; - $modele='standardlabel'; // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); + $tmp=explode(':',$template,2); if (! empty($tmp[1])) { - $modele=$tmp[0]; + $template=$tmp[0]; $srctemplatepath=$tmp[1]; } else $srctemplatepath=$code; @@ -117,14 +117,14 @@ function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $ { foreach(array('doc','pdf') as $prefix) { - $file = $prefix."_".$modele.".class.php"; + $file = $prefix."_".$template.".class.php"; // On verifie l'emplacement du modele $file=dol_buildpath($reldir."core/modules/printsheet/doc/".$file,0); if (file_exists($file)) { $filefound=1; - $classname=$prefix.'_'.$modele; + $classname=$prefix.'_'.$template; break; } } diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index c6c638f06f3..d3842411d94 100755 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1693,10 +1693,10 @@ class ExpenseReportLine * Retourne la liste deroulante des differents etats d'une note de frais. * Les valeurs de la liste sont les id de la table c_expensereport_statuts * - * @param int $selected etat pre-selectionne + * @param int $selected preselect status * @param string $htmlname Name of HTML select * @param int $useempty 1=Add empty line - * @return string HTML select with sattus + * @return string HTML select with status */ function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1) { diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 9ef9c05a328..ca33fc34f0f 100755 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -41,7 +41,9 @@ $result = restrictedArea($user, 'expensereport','',''); $search_ref = GETPOST('search_ref'); $search_user = GETPOST('search_user','int'); -$search_status = GETPOST('search_status','int'); +$search_amount_ht = GETPOST('search_amount_ht','alpha'); +$search_amount_ttc = GETPOST('search_amount_ttc','alpha'); +$search_status = (GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha')); $month_start = GETPOST("month_start","int"); $year_start = GETPOST("year_start","int"); $month_end = GETPOST("month_end","int"); @@ -51,6 +53,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both { $search_ref=""; $search_user=""; + $search_amount_ht=""; + $search_amount_ttc=""; $search_status=""; $month_start=""; $year_start=""; @@ -58,6 +62,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $year_end=""; } +if ($search_status == '') $search_status=-1; +if ($search_user == '') $search_user=-1; + /* * View */ @@ -86,17 +93,16 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,"; +$sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,"; $sql.= " d.date_debut, d.date_fin,"; $sql.= " u.rowid as id_user, u.firstname, u.lastname"; $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid"; +$sql.= " WHERE d.entity = ".$conf->entity; -// Where +// Ref if(!empty($search_ref)){ - $sql.= " WHERE d.ref LIKE '%".$db->escape($search_ref)."%'"; -}else{ - $sql.= " WHERE 1 = 1"; + $sql.= " AND d.ref LIKE '%".$db->escape($search_ref)."%'"; } // Date Start if ($month_start > 0) @@ -126,13 +132,26 @@ else if ($year_end > 0) { $sql.= " AND d.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,1,false))."' AND '".$db->idate(dol_get_last_day($year_end,12,false))."'"; } -// User -if ($search_name) +// Amount +if ($search_amount_ht != '') { - $sql .= natural_search('u.lastname', $search_name); + $sql.= natural_search('d.total_ht', $search_amount_ht, 1); +} +if ($search_amount_ttc != '') +{ + $sql.= natural_search('d.total_ttc', $search_amount_ttc, 1); +} +// User +if ($search_user != '' && $search_user >= 0) +{ + $sql.= " AND u.rowid = '".$db->escape($search_user)."'"; } // Status -if($search_status != '') $sql.= " AND d.fk_statut = '".$search_status."'"; +if ($search_status != '' && $search_status >= 0) +{ + if (strstr($search_status, ',')) $sql.=" AND d.fk_statut IN (".$db->escape($search_status).")"; + else $sql.=" AND d.fk_statut = ".$search_status; +} // RESTRICT RIGHTS if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) @@ -150,11 +169,17 @@ $resql=$db->query($sql); if ($resql) { $num = $db->num_rows($resql); - $i = 0; - print_barre_liste($langs->trans("ListTripsAndExpenses"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); - print ''."\n"; + $param=""; + if ($search_ref) $param.="&search_ref=".$search_ref; + if ($search_user) $param.="&search_user=".$search_user; + if ($search_amount_ht) $param.="&search_amount_ht=".$search_amount_ht; + if ($search_amount_ttc) $param.="&search_amount_ttc=".$search_amount_ttc; + if ($search_status >= 0) $param.="&search_status=".$search_status; + + print_barre_liste($langs->trans("ListTripsAndExpenses"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print ''."\n"; print '
'; print ""; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","",$param,'',$sortfield,$sortorder); @@ -194,9 +219,13 @@ if ($resql) print ''; } + // Amount with no taxe + print ''; + print ''; - print ''; - print ''; + + // Amount with all taxes + print ''; // Status print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 4b565069b5c..c1b0262fd40 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -992,7 +992,7 @@ if ($step == 4 && $datatoexport) if ($step == 5 && $datatoexport) { - asort($array_selected); + asort($array_selected); llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); @@ -1142,6 +1142,7 @@ if ($step == 5 && $datatoexport) print ''; print '
    '; @@ -249,9 +278,9 @@ if ($resql) print '
'.$langs->trans("Total").''.$total_total_ht.''.$total_total_tva.''.$total_total_ttc.''.price($total_total_ht).''.price($total_total_tva).''.price($total_total_ttc).'
 
'; + } print '
'; @@ -1150,6 +1151,8 @@ llxFooter(); $db->close(); +exit; // don't know why but apache hangs with php 5.3.10-1ubuntu3.12 and apache 2.2.2 if i remove this exit or replace with return + /** * Return table name of an alias. For this, we look for the "tablename as alias" in sql string. @@ -1172,4 +1175,3 @@ function getablenamefromfield($code,$sqlmaxforexport) } else return ''; } - diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 725cd35a6cb..45670766788 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -317,7 +317,7 @@ if (empty($reshook)) { $res=$productsupplier->fetch($idprod); - $label = $productsupplier->libelle; + $label = $productsupplier->label; $desc = $productsupplier->description; if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 01574caa2b2..1794c34a48d 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -690,7 +690,7 @@ if (empty($reshook)) { $result=$productsupplier->fetch($idprod); - $label = $productsupplier->libelle; + $label = $productsupplier->label; $desc = $productsupplier->description; if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc); diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 448cf19e61e..ef07b730a97 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -115,7 +115,7 @@ if ($_GET["id"]) print ""; print ''.$langs->trans("Ref").''.$product->ref.''; - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print "
\n"; $c = new Categorie($db); diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index f20c360de6c..ba5c396c420 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -102,7 +102,7 @@ if ($id) print ''; print $object->getLibStatut(2); print ''; - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''.$langs->trans("SellingPrice").''.price($object->price).''; print "
\n"; diff --git a/htdocs/index.php b/htdocs/index.php index f43874363a5..a3d7c509540 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -134,7 +134,7 @@ if (empty($user->societe_id)) print ''.$langs->trans("DolibarrStateBoard").''; print ' '; print ''; - print ''; + print ''; $var=true; diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index 513c4ad2325..af86a545f5c 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=تدخل المصادق Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=فاتورة مصادق Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=من أجل الموافقة على المورد Notify_ORDER_SUPPLIER_REFUSE=من أجل رفض الموردين Notify_ORDER_VALIDATE=التحقق من صحة النظام العميل diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang index e41800f668c..c33043c5f38 100644 --- a/htdocs/langs/bg_BG/companies.lang +++ b/htdocs/langs/bg_BG/companies.lang @@ -18,7 +18,7 @@ NewCompany=Нова фирма (перспектива, клиент, доста NewThirdParty=Нов трета страна (перспектива, клиент, доставчик) NewSocGroup=Нова компания група NewPrivateIndividual=Нов частно лице (перспектива, клиент, доставчик) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) +CreateDolibarrThirdPartySupplier=Задаване на трети лица (доставчик) ProspectionArea=Проучване площ SocGroup=Група от компании IdThirdParty=ID на трета страна @@ -82,7 +82,7 @@ Poste= Позиция DefaultLang=Език по подразбиране VATIsUsed=ДДС се използва VATIsNotUsed=ДДС не се използва -CopyAddressFromSoc=Fill address with thirdparty address +CopyAddressFromSoc=Попълнете адреса на трета страна NoEmailDefined=Не е въведен имейл ##### Local Taxes ##### LocalTax1IsUsedES= RE се използва @@ -93,7 +93,7 @@ LocalTax1ES=RE LocalTax2ES=IRPF TypeLocaltax1ES=RE Type TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeES=Тип ThirdPartyEMail=%s WrongCustomerCode=Невалиден код на клиент WrongSupplierCode=Невалиден код на доставчик @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Абсолютни отстъпки на разполо DiscountNone=Няма Supplier=Доставчик CompanyList=Списък с фирми -AddContact=Добавяне на контакт -AddContactAddress=Добавяне на контакт/адрес +AddContact=Задаване на контакт +AddContactAddress=Задаване на контакт/адрес EditContact=Редактиране на контакт EditContactAddress=Редактиране на контакт/адрес Contact=Контакт @@ -268,8 +268,8 @@ ContactsAddresses=Контакти/Адреси NoContactDefinedForThirdParty=Няма зададен контакт за тази трета страна NoContactDefined=Няма зададен контакт DefaultContact=Контакт/адрес по подразбиране -AddCompany=Добавяне на фирма -AddThirdParty=Добавяне на трета страна +AddCompany=Задаване на компания +AddThirdParty=Създайте трета страна DeleteACompany=Изтриване на фирма PersonalInformations=Лични данни AccountancyCode=Счетоводен код @@ -311,7 +311,7 @@ LastContacts=Последни контакти MyContacts=Моите контакти Phones=Телефони Capital=Капитал -CapitalOf=Capital of %s +CapitalOf=Столица на %s EditCompany=Редактиране на фирма EditDeliveryAddress=Редактиране на адрес за доставка ThisUserIsNot=Този потребител не е перспектива, клиенти, нито с доставчика @@ -367,10 +367,10 @@ ExportCardToFormat=Износ карта формат ContactNotLinkedToCompany=Контактът не е свързано с която и да е трета страна DolibarrLogin=Dolibarr вход NoDolibarrAccess=Няма достъп Dolibarr -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_1=Трети страни (Компании/фондации/физически лица) и имущество ExportDataset_company_2=Контакти и свойства -ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_1=Трети страни (Компании/фондации/физически лица) и имущество +ImportDataset_company_2=Контакти/Адреси (на трети страни или не) и атрибути ImportDataset_company_3=Банкови данни PriceLevel=Ценовото равнище DeliveriesAddress=Доставка адреси @@ -379,8 +379,8 @@ DeliveryAddressLabel=Етикета Адрес за доставка DeleteDeliveryAddress=Изтриване на адрес за доставка ConfirmDeleteDeliveryAddress=Сигурен ли сте, че искате да изтриете този адрес за доставка? NewDeliveryAddress=Нов адрес за доставка -AddDeliveryAddress=Добавяне на адрес -AddAddress=Добавяне на адрес +AddDeliveryAddress=Задаване на адрес +AddAddress=Задаване на адрес NoOtherDeliveryAddress=Не е алтернативна доставка, определен адрес SupplierCategory=Доставчик категория JuridicalStatus200=Самостоятелна @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Трябва да създадете контакти ListSuppliersShort=Списък на доставчиците ListProspectsShort=Списък на перспективите ListCustomersShort=Списък на клиенти -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Трети страни и област на контакт LastModifiedThirdParties=Последните %s променени трети страни UniqueThirdParties=Общо уникални трети страни InActivity=Отворен ActivityCeased=Затворен ActivityStateFilter=Състоянието на дейността -ProductsIntoElements=List of products into %s +ProductsIntoElements=Списък на продуктите в %s CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Връщане Numero с формат %syymm-NNNN за клиента код и %syymm-NNNN за доставчика код, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад до 0. LeopardNumRefModelDesc=Кодът е безплатно. Този код може да бъде променен по всяко време. -ManagingDirectors=Manager(s) name (CEO, director, president...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +ManagingDirectors=Наименование на управител(и) (гл. изп. директор, директор, президент...) +SearchThirdparty=Търсене на трети лица +SearchContact=Търсене на контакт diff --git a/htdocs/langs/bg_BG/help.lang b/htdocs/langs/bg_BG/help.lang index 2755481b0b9..eb2b3696b20 100644 --- a/htdocs/langs/bg_BG/help.lang +++ b/htdocs/langs/bg_BG/help.lang @@ -25,4 +25,4 @@ LinkToGoldMember=Можете да се обадите на треньора, п PossibleLanguages=Поддържани езици MakeADonation=Помогнете на проекта Dolibarr, направете дарение SubscribeToFoundation=Помогнете на проекта Dolibarr, като се присъедините към фондацията -SeeOfficalSupport=For official Dolibarr support in your language:
%s +SeeOfficalSupport=За официална поддръжка на Dolibarr за Вашият език:
%s diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 4ee5f7c8469..b291c22fcd3 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -122,14 +122,14 @@ Activated=Активиран Closed=Затворен Closed2=Затворен Enabled=Разрешен -Deprecated=Deprecated +Deprecated=Отхвърлено Disable=Забрани Disabled=Забранен Add=Добавяне AddLink=Добавяне на връзка Update=Актуализация -AddActionToDo=Add event to do -AddActionDone=Add event done +AddActionToDo=Добави събитие +AddActionDone=Събитието е добавено Close=Затваряне Close2=Затваряне Confirm=Потвърждение @@ -150,7 +150,7 @@ ToClone=Клониране ConfirmClone=Изберете данните, които желаете да клонирате: NoCloneOptionsSpecified=Няма определени данни за клониране. Of=на -Go=Go +Go=Напред Run=Run CopyOf=Копие от Show=Показване @@ -238,10 +238,10 @@ DateOperation=Датата на операцията DateOperationShort=Oper. Дата DateLimit=Крайната дата DateRequest=Дата на заявка -DateProcess=Process date +DateProcess=Анализ на данни DatePlanShort=Планирана дата DateRealShort=Реална дата -DateBuild=Report build date +DateBuild=Докладване структурата на данните DatePayment=Дата на изплащане DateApprove=Approving date DateApprove2=Approving date (second approval) diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index 4695ddec913..55710fc727e 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Интервенция валидирани Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Клиентът фактура се заверява Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Доставчик утвърдения Notify_ORDER_SUPPLIER_REFUSE=Доставчик за отказа Notify_ORDER_VALIDATE=Клиента заявка се заверява diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index b964f2ff978..97ae33839b8 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -56,13 +56,13 @@ ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està ErrorCodeCantContainZero=El codi no pot contenir el valor 0 DisableJavascript=Desactivar funcions JavaScript i Ajax (Recomanat per a persones o navegadors de text) ConfirmAjax=Utilitzar els popups de confirmació Ajax -UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompanyTooltip=També si tenen un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciement COMPANY_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena UseSearchToSelectCompany=Utilitzeu els camps de autocompletat per triar tercers en lloc d'utilitzar un quadre de llista. ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir -UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. CONTACT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena UseSearchToSelectContact=Utilitzeu els camps de autocompletat per triar contactes (en lloc d'utilitzar un quadre de llista). -DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) -DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +DelaiedFullListToSelectCompany=Esperar que pressioni una tecla abans de carregar el contingut dels tercers en el combo (Això pot incrementar el rendiment si té un gran número de tercers) +DelaiedFullListToSelectContact=Esperar que pressioni un tecla abans de carregar el contingut dels contactes en el combo (Això pot incrementar el rendiment si té un gran número de contactes) SearchFilter=Opcions filtres de cerca NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer @@ -75,7 +75,7 @@ PreviewNotAvailable=Vista prèvia no disponible ThemeCurrentlyActive=Tema actualment actiu CurrentTimeZone=Fus horari PHP (Servidor) MySQLTimeZone=Zona horària MySql (base de dades) -TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +TZHasNoEffect=Les dates es guarden i tornen pel servidor de la base de dedes tal com si les haguessin enviat com una cadena. La zona horària només te efecte si s'utilitza la funció UNIX_TIMESTAMP (que no pot ser utilitzada per dolibarr, per el que la zona horària de la base de dades no hauria de tenir efecte, encara que s'hagi canviat després d'introduir les dades). Space=Àrea Table=Taula Fields=Camps @@ -85,7 +85,7 @@ NextValue=Pròxim valor NextValueForInvoices=Pròxim valor (factures) NextValueForCreditNotes=Pròxim valor (abonaments) NextValueForDeposit=Pròxim valor (dipòsit) -NextValueForReplacements=Next value (replacements) +NextValueForReplacements=Pròxim valor (rectificatives) MustBeLowerThanPHPLimit=Observació: El seu PHP limita la mida a %s %s de màxim, qualsevol que sigui el valor d'aquest paràmetre NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada) @@ -215,7 +215,7 @@ ModulesJobDesc=Els mòduls específics permeten una preconfiguració simplificad ModulesMarketPlaceDesc=Hi ha disponbiles per a baixar en llocs externs d'Internet altres mòduls / extensions... ModulesMarketPlaces=Més mòduls... DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM -DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) +DoliPartnersDesc=Llistat amb algunes empreses que poden proporcionar desenvolupar a mida mòduls o funcionalitats (Nota: qualsevol empresa Open Source amb coneixements de llenguatge PHP pot proporcionar desenvolupament especific) WebSiteDesc=Llocs proveïdors a consultar per trobar més mòduls URL=Enllaç BoxesAvailable=Panells disponibles @@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Automàtic si el JavaScript està desactivat AvailableOnlyIfJavascriptNotDisabled=Disponible només si Javascript està activat AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible només si Javascript i Ajax estan activats Required=Requerit -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Utilitzat només per alguna opció de l'agenda Security=Seguretat Passwords=Contrasenyes DoNotStoreClearPassword=No emmagatzemar la contrasenya sense xifrar a la base @@ -248,7 +248,7 @@ OfficialDemo=Demo en línia Dolibarr OfficialMarketPlace=Lloc oficial de mòduls complementaris i extensions OfficialWebHostingService=Serveis d'allotjament web (cloud hosting) ReferencedPreferredPartners=Soci preferent -OtherResources=Autres ressources +OtherResources=Altres recursos ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr:
%s ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr:
%s HelpCenterDesc1=Aquesta aplicació, independent de Dolibarr, us permet ajudar a obtenir un servei de suport de Dolibarr. @@ -269,8 +269,8 @@ MAIN_MAIL_EMAIL_FROM=Correu electrònic de l'emissor per trameses e automàtics MAIN_MAIL_ERRORS_TO=E-Mail usat per als retorns d'error dels e-mails enviats MAIN_MAIL_AUTOCOPY_TO= Enviar automàticament còpia oculta dels e-mails enviats a MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Enviar automàticament còpia oculta dels pressupostos enviats a -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_MAIL_AUTOCOPY_ORDER_TO= Enviar una copia oculta de les comandes que s'envien per e-mail a +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Enviar una copia oculta de les factures que s'envien per e-mail a MAIN_DISABLE_ALL_MAILS=Desactivar globalment tot enviament de correus electrònics (per mode de proves) MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP @@ -297,11 +297,11 @@ MenuHandlers=Gestors de menú MenuAdmin=Editor de menú DoNotUseInProduction=No utilitzar en producció ThisIsProcessToFollow=Heus aquí el procediment a seguir: -ThisIsAlternativeProcessToFollow=This is an alternative setup to process: +ThisIsAlternativeProcessToFollow=Aquesta es una configuració alternativa per processar: StepNb=Pas %s FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s) DownloadPackageFromWebSite=Descarregar el paquet %s. -UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s +UnpackPackageInDolibarrRoot=Descomprimir el paquet en el directori dedicat als móduls externs %s SetupIsReadyForUse=La instal·lació ha finalitzat i Dolibarr està disponible amb el nou component. NotExistsDirect=No existeix el directori alternatiu.
InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu, això li permet emmagatzemar en el mateix lloc mòduls i temes personalitzades.
Només cal crear un directori en l'arrel de Dolibarr (per exemple: custom).
@@ -324,7 +324,7 @@ ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça %s al po DoTestServerAvailability=Provar la connexió amb el servidor DoTestSend=Provar enviament DoTestSendHTML=Probar enviament HTML -ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. +ErrorCantUseRazIfNoYearInMask=Error: no pot utilitzar l'opció @ per reiniciar el comptador cada any si la seqüencia {yy} o {yyyy} no es troba a la mascara ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara. UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD. UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).
Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).
Aquest paràmetre no té cap efecte sobre un servidor Windows. @@ -394,11 +394,11 @@ ExtrafieldLink=Enllaç a un objecte ExtrafieldParamHelpselect=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... -ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpsellist=Llista Paràmetres be de una taula
Sintaxis: nom_taula: etiqueta_camp: identificador_camp :: filtro
Exemple: c_typent: libelle: id :: filtre
filtre pot ser una prova simple (per exemple, actiu = 1) per mostrar el valor nomes s'activa
si desitja filtrar un camp extra utilitzar la sintaxis extra.fieldcode = ... (on el codi de camp es el codi del camp extra)
per tenir la llista en funcio d'un altre:
c_typent: libelle: id: parent_list_code | parent_column: filtre +ExtrafieldParamHelpchkbxlst=Llista de paràmetres bé d'una taula
Sintaxi: table_name:label_field:id_field::filter
Exemple: c_typent:libelle:id::filter

filtre pot ser una prova simple (per exemple, actiu = 1) per mostrar el valor només s'activa
si desitja filtrar un camp extra, utilitza la sintaxi extra.fieldcode=... (on el codi del camp extra)

per tenir la llista en funció d'un altre:
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Llibreria usada per a la creació d'arxius PDF WarningUsingFPDF=Atenció: El seu arxiu conf.php conté la directiva dolibarr_pdf_force_fpdf=1. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.
Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la llibreria TCPDF , i a continuació comentar o eliminar la línia $dolibarr_pdf_force_fpdf=1, i afegir al seu lloc $dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF' -LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) +LocalTaxDesc=Alguns països aplica'n 2 o 3 tasses a cada línea de factura. Si és el cas, esculli el tipus de la segona i tercera tassa i el seu valor. Els possibles tipus són:
1: Tassa local aplicable a productes i serveis sense IVA (tassa local es calculada sobre la base imposable)
2: Tassa local s'aplica a productes i serveis incloent l'IVA (tassa local es calcula sobre la base imposable+IVA)
3: Tassa local s'aplica a productes sense IVA (tassa local es calcula sobre la base imposable)
4: Tassa local s'aplica a productes incloent l'IVA (tassa local es calcula sobre la base imposable+IVA)
5: Tassa local s'aplica a serveis sin IVA (tassa local es calcula sobre la base imposable)
6: Tassa local s'aplica a serveis incloent l'IVA (tassa local es calcula sobre base imposable+IVA) SMS=SMS LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari %s RefreshPhoneLink=Refrescar enllaç @@ -407,15 +407,15 @@ KeepEmptyToUseDefault=Deixeu aquest camp buit per usar el valor per defecte DefaultLink=Enllaç per defecte ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial) ExternalModule=Mòdul extern - Instal·lat al directori %s -BarcodeInitForThirdparties=Mass barcode init for thirdparties -BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services +BarcodeInitForThirdparties=Inici massiu de codi de barres per tercers +BarcodeInitForProductsOrServices=Inici massiu de codi de barres per productes o serveis CurrentlyNWithoutBarCode=Actualment, té %s registres a %s %s sense codi de barres definit. -InitEmptyBarCode=Init value for next %s empty records +InitEmptyBarCode=Iniciar valor pels %s registres buits EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals? AllBarcodeReset=S'han eliminat tots els valors de codi de barres NoBarcodeNumberingTemplateDefined=No hi ha plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres. -NoRecordWithoutBarcodeDefined=No record with no barcode value defined. +NoRecordWithoutBarcodeDefined=Sense registres sense codis de barres definits # Modules Module0Name=Usuaris y grups @@ -457,7 +457,7 @@ Module55Desc=Gestió dels codis de barra Module56Name=Telefonia Module56Desc=Gestió de la telefonia Module57Name=Domiciliacions -Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module57Desc=Gestió de domiciliacions. També inclou generació d'arxiu SEPA pels països europeus. Module58Name=ClickToDial Module58Desc=Integració amb ClickToDial Module59Name=Bookmark4u @@ -504,8 +504,8 @@ Module700Name=Donacions Module700Desc=Gestió de donacions Module770Name=Informe de despeses Module770Desc=Informes de despeses de gestió i reclamació (transport, menjar, ...) -Module1120Name=Supplier commercial proposal -Module1120Desc=Request supplier commercial proposal and prices +Module1120Name=Pressupost de proveïdor +Module1120Desc=Sol·licitud pressupost i preus a proveïdor Module1200Name=Mantis Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis Module1400Name=Comptabilitat experta @@ -513,7 +513,7 @@ Module1400Desc=Gestió experta de la comptabilitat (doble partida) Module1520Name=Generar document Module1520Desc=Generació de documents de correu massiu Module1780Name=Etiquetes/categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Desc=Crear etiquetes/Categories (Productes, clients, proveïdors, contactes i membres) Module2000Name=Editor WYSIWYG Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat Module2200Name=Multi-preus @@ -527,7 +527,7 @@ Module2500Desc=Permet administrar una base de documents Module2600Name=WebServices Module2600Desc=Activa els serveis de servidor web services de Dolibarr Module2650Name=WebServices (client) -Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2650Desc=Habilitar els serveis de client web de Dolibarr (pot ser utilitzar per gravar dades/sol·licituds de servidors externs. De moment només és suporta comandes a proveïdors) Module2700Name=Gravatar Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet Module2800Desc=Client FTP @@ -541,8 +541,8 @@ Module6000Name=Workflow Module6000Desc=Gestió Workflow Module20000Name=Dies lliures Module20000Desc=Gestió dels dies lliures dels empleats -Module39000Name=Product lot -Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +Module39000Name=Lots de productes +Module39000Desc=Gestió de lots o series, dates de caducitat i venda dels productes Module50000Name=PayBox Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox Module50100Name=TPV @@ -552,7 +552,7 @@ Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de c Module50400Name=Comptabilitat (avançat) Module50400Desc=Gestió experta de la comptabilitat (doble partida) Module54000Name=PrintIPP -Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor) Module55000Name=Obrir enquesta Module55000Desc=Mòdul per fer enquestes en línia (com Doodle, Studs, Rdvz, ...) Module59000Name=Marges @@ -719,7 +719,7 @@ Permission517=Exportació salaris Permission520=Consultar préstecs Permission522=Crear/modificar préstecs Permission524=Eliminar préstecs -Permission525=Access loan calculator +Permission525=Calculadora de crèdit Permission527=Exportar préstecs Permission531=Consultar serveis Permission532=Crear/modificar serveis @@ -729,10 +729,10 @@ Permission538=Exportar serveis Permission701=Consultar donacions Permission702=Crear/modificar donacions Permission703=Eliminar donacions -Permission771=Read expense reports (own and his subordinates) -Permission772=Create/modify expense reports +Permission771=Llegir informes de despeses (propis i dels seus subordinats) +Permission772=Crear/modificar informe de despeses Permission773=Eliminar els informes de despeses -Permission774=Read all expense reports (even for user not subordinates) +Permission774=Llegir tots els informes de despeses (incluint els no subordinats) Permission775=Aprovar els informes de despeses Permission776=Pagar informes de despeses Permission779=Exportar informes de despeses @@ -788,9 +788,9 @@ Permission50202=Importar les transaccions Permission54001=Imprimir Permission55001=Llegir enquestes Permission55002=Crear/modificar enquestes -Permission59001=Read commercial margins -Permission59002=Define commercial margins -Permission59003=Read every user margin +Permission59001=Llegir marges comercials +Permission59002=Definir marges comercials +Permission59003=Llegir qualsevol marge de l'usuari DictionaryCompanyType=Tipus de tercers DictionaryCompanyJuridicalType=Formes jurídiques de tercers DictionaryProspectLevel=Perspectiva nivell client potencial @@ -852,13 +852,13 @@ LocalTax2IsUsedDescES= El tipus d'IRPF proposat per defecte en les creacions de LocalTax2IsNotUsedDescES= El tipus d'IRPF proposat per defecte es 0. Final de regla. LocalTax2IsUsedExampleES= A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls. LocalTax2IsNotUsedExampleES= A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls. -CalcLocaltax=Reports on local taxes -CalcLocaltax1=Sales - Purchases -CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2=Purchases -CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3=Sales -CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +CalcLocaltax=Informes d'impostos locals +CalcLocaltax1=Vendes - Compres +CalcLocaltax1Desc=Els informes es calculen amb la diferència entre les vendes i les compres +CalcLocaltax2=Compres +CalcLocaltax2Desc=Els informes es basen en el total de les compres +CalcLocaltax3=Vendes +CalcLocaltax3Desc=Els informes es basen en el total de les vendes LabelUsedByDefault=Etiqueta que s'utilitzarà si no es troba traducció per aquest codi LabelOnDocuments=Etiqueta sobre documents NbOfDays=Nº de dies @@ -926,7 +926,7 @@ PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma) EnableMultilangInterface=Activar interface multiidioma EnableShowLogo=Mostra el logotip en el menú de l'esquerra -EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) +EnableHtml5=Activar HTML5 (En desenvolupament - Només disponible amb el tema Eldy) SystemSuccessfulyUpdated=El seu sistema està actualitzat CompanyInfo=Informació de l'empresa/institució CompanyIds=Identificació reglamentaria @@ -1017,14 +1017,14 @@ NoEventOrNoAuditSetup=No s'han registrat esdeveniments de seguretat. Això pot s NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca. SeeLocalSendMailSetup=Veure la configuració local d'sendmail BackupDesc=Per realitzar una còpia de seguretat completa de Dolibarr, vostè ha de: -BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). -BackupDesc3=Save content of your database (%s) into a dump file. For this, you can use following assistant. +BackupDesc2=Guardar el contingut del directori de documents (%s) que contingui tots els arxius pujats a generats (comprimint el directori, per exemple). +BackupDesc3=Guardar el contingut de la seva base de dades (%s) a un archiu de bolcat. Per aixo pot utilitzar l'asistent a continuació BackupDescX=La carpeta arxivada haurà de guardar-se en un lloc segur BackupDescY=L'arxiu de bolcat generat haurà de guardar-se en un lloc segur. BackupPHPWarning=La còpia de seguretat no pot ser garantida amb aquest mètode. És preferible utilitzar l'anterior RestoreDesc=Per restaurar una còpia de seguretat de Dolibarr, vostè ha de: -RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). -RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (%s). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreDesc2=Agafar l'arxiu (arxiu zip, per exemple) del directori dels documents i descomprimeix-lo en el directori dels documents d'una nova instal·lació de Dolibarr o a la carpeta dels documents d'aquesta instal·lació (%s). +RestoreDesc3=Restaurar l'arxiu del bolcat guardat a la base de dades de la nova instal·lació de Dolibarr o d'aquesta instal·lació (%s). Atenció, una vegada realitzada la restauració, tindra d'utilitzar un login/contrasenya d'administrador existent en el moment de la copia de seguretat per connectar-se. Per restaurar la base de dades de l'instal·lació actual, pot utilitzar l'assistent a continuació. RestoreMySQL=Importació MySQL ForcedToByAModule= Aquesta regla està forçada a %s per un dels mòduls activats PreviousDumpFiles=Arxius de còpia de seguretat de la base de dades disponibles @@ -1037,7 +1037,7 @@ SimpleNumRefModelDesc=Retorna el nombre sota el format %syymm-nnnn on yy és l'a ShowProfIdInAddress=Mostrar l'identificador professional en les direccions dels documents ShowVATIntaInAddress=Amaga el identificador IVA en les direccions dels documents TranslationUncomplete=Traducció parcial -SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden obtenir errors. Si detecta alguns, pot arreglar els arxius d'idiomes registrant-se a http://transifex.com/projects/p/dolibarr/. MenuUseLayout=Fer el menú esquerre ocultable (l'opció javascript no hauria de deshabilitar-se) MAIN_DISABLE_METEO=Deshabilitar la vista meteo TestLoginToAPI=Comprovar connexió a l'API @@ -1063,14 +1063,14 @@ ExtraFieldsSupplierOrders=Atributs complementaris (comandes) ExtraFieldsSupplierInvoices=AAtributs complementaris (factures) ExtraFieldsProject=Atributs complementaris (projets) ExtraFieldsProjectTask=Atributs complementaris (tâches) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=L'atribut %s té un valor no valid AlphaNumOnlyCharsAndNoSpace=només carateres alfanumèrics sense espais AlphaNumOnlyLowerCharsAndNoSpace=només alfanumèrics i caràcters en minúscula sense espai SendingMailSetup=Configuració de l'enviament per mail SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció -ba (paràmetre mail.force_extra_parameters a l'arxiu php.ini). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb mail.force_extra_parameters =-ba . PathToDocuments=Rutes d'accés a documents PathDirectory=Catàleg -SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +SendmailOptionMayHurtBuggedMTA=La funcionalitat d'enviar correus electrònics a través del "correu directe PHP" genera una sol·licitud que poden ser mal interpretats per alguns servidors de correu. Això és tradueix en missatges de correu electrònic illegibles per a les persones allotjades a aquestes plataformes. Aquest és el cas de clients en certs proveïdors de serveis d'internet (Ex: Orange). Això no és un problema ni de Dolibarr ni de PHP, però si del servidor de correu. Encara que, pot agregar la opció MAIN_FIX_FOR_BUGGED_MTA amb el valor 1 a la Configuració -> Varis per tractar que Dolibarr eviti l'error. Un altre solució (recomanada) és utilitzar el mètode d'enviament per SMTP que no té aquest inconvenient. TranslationSetup=Configuració traducció TranslationDesc=L'elecció de l'idioma mostrat en pantalla es modifica:
* A nivell global des del menú Inici - Configuració - Entorn
* De manera específica a l'usuari des de la pestanya interface usuari de la seva fitxa d'usuari (fer clic al seu login a la part superior esquerra de la pantalla). TotalNumberOfActivatedModules=Nombre total de mòduls activats: %s @@ -1089,10 +1089,10 @@ BrowserIsOK=Utilitza el navegador web %s. Aquest navegador està optimitzat per BrowserIsKO=Utilitza el navegador web %s. Aquest navegador és una mala opció per a la seguretat, rendiment i fiabilitat. Aconsellem fer servir Firefox, Chrome, Opera o Safari. XDebugInstalled=XDebug està carregat. XCacheInstalled=XCache cau està carregat. -AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +AddRefInList=Mostra codi de client/proveïdor en el llistat (i selectors) i enllaços. Els tercers apareixeran amb el nom "CC12345 - SC45678 - The big comany coorp", en comptes de "The big comany coorp". FieldEdition=Edició del camp %s FixTZ=Fixar zona horaria -FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +FillThisOnlyIfRequired=Exemple: +2 (Completi només si es registre una desviació del temps en l'exportació) GetBarCode=Obtenir codi de barres EmptyNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment. ##### Module password generation @@ -1115,11 +1115,11 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de
%s seguit del ModuleCompanyCodePanicum=Retorna un codi comptable buit. ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer. UseNotifications=Utilitza notificacions -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page. +NotificationsDesc=La funció de les notificacions permet enviar automàticament un e-mail per alguns esdeveniments de Dolibarr. Els destinataris de les notificacions poden definir-se:
* per contactes de tercers (clients o proveïdors), un tercer a la vegada.
* o configurant un destinatari global en la configuració del mòdul. ModelModules=Models de documents DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca d'aigua en els documents esborrany -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=Activar funció per autocompletar les línies de pagament a les entrades de pagament CompanyIdProfChecker=Règles sobre els ID professionals MustBeUnique=Ha de ser únic? MustBeMandatory=Obligatori per crear tercers? @@ -1181,12 +1181,12 @@ FreeLegalTextOnProposal=Text lliure en pressupostos WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost ##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +AskPriceSupplierSetup=Configuració del mòdul Sol·licituds a proveïdor +AskPriceSupplierNumberingModules=Mòdels de numeració de solicitut de preus a proveïdor +AskPriceSupplierPDFModules=Mòdels de docuements de solicituts de preus de proveïdors +FreeLegalTextOnAskPriceSupplier=Text lliure en sol·licituds de preus a proveïdors +WatermarkOnDraftAskPriceSupplier=Marca d'aigua en sol·licituds de preus a proveïdors (en cas de estar buit) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar per compte bancari per utilitzar en el pressupost ##### Orders ##### OrdersSetup=Configuració del mòdul comandes OrdersNumberingModules=Mòduls de numeració de les comandes @@ -1195,8 +1195,8 @@ HideTreadedOrders=Amaga les comandes processades o anul·lades del llistat ValidOrderAfterPropalClosed=Validar la comanda després del tancament del pressupost, permet no passar per la comanda provisional FreeLegalTextOnOrders=Text lliure en comandes WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit) -ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable -BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +ShippableOrderIconInList=Afegir una icona en el llistat de comandes que indica si la comanda és enviable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar pel compte bancari a l'utilitzar la comanda ##### Clicktodial ##### ClickToDialSetup=Configuració del mòdul Click To Dial ClickToDialUrlDesc=Url de trucada fent clic en la icona telèfon. Dans l'url, vous pouvez utiliser les balises
__PHONETO__ qui sera remplacé par le téléphone de l'appelé
__PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
__LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
__PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur). @@ -1211,7 +1211,7 @@ WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas ##### Contracts ##### ContractsSetup=Configuració del modul contractes/subscripcions ContractsNumberingModules=Mòduls de numeració dels contratos -TemplatePDFContracts=Contracts documents models +TemplatePDFContracts=Mòdels de documents de contractes FreeLegalTextOnContracts=Text lliure en contractes WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit) ##### Members ##### @@ -1336,8 +1336,8 @@ LDAPFieldCountry=Pais LDAPFieldCountryExample=Exemple : c LDAPFieldDescription=Descripció LDAPFieldDescriptionExample=Exemple : description -LDAPFieldNotePublic=Public Note -LDAPFieldNotePublicExample=Example : publicnote +LDAPFieldNotePublic=Nota publica +LDAPFieldNotePublicExample=Exemple: publicnote LDAPFieldGroupMembers= Membres del grup LDAPFieldGroupMembersExample= Exemple: uniqueMember LDAPFieldBirthdate=Data de naixement @@ -1362,7 +1362,7 @@ PerfDolibarr=Configuració rendiment/informe d'optimització YouMayFindPerfAdviceHere=En aquesta pàgina trobareu diverses proves i consells relacionats amb el rendiment. NotInstalled=No instal·lat, de manera que el servidor no baixa de rendiment amb això. ApplicativeCache=Aplicació memòria cau -MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. +MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.
Mes informació aquí http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Tingui en compte que alguns hostings no ofereixen servidors cache. MemcachedModuleAvailableButNotSetup=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa. MemcachedAvailableAndSetup=Modul de memoria cache dedicada a utilitzar el servidor memcached està habilitat. OPCodeCache=OPCode memòria cau @@ -1385,7 +1385,7 @@ ConfirmDeleteProductLineAbility=Confirmació d'eliminació d'una línia de produ ModifyProductDescAbility=Personalització de les descripcions dels productes en els formularis ViewProductDescInFormAbility=Visualització de les descripcions dels productes en els formularis ViewProductDescInThirdpartyLanguageAbility=Visualització de les descripcions de productes en l'idioma del tercer -UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProductTooltip=També si vostè té un gran número de productes (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. PRODUCT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (en lloc d'una llista desplegable). UseEcoTaxeAbility=Assumir ecotaxa (DEEE) SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes @@ -1434,12 +1434,12 @@ RSSUrlExample=Un flux RSS interessant MailingSetup=Configuració del mòdul E-Mailing MailingEMailFrom=E-Mail emissor (From) dels correus enviats per E-Mailing MailingEMailError=E-mail de resposta (Errors-to) per a les respostes sobre enviaments per e-mailing amb error. -MailingDelay=Seconds to wait after sending next message +MailingDelay=Segons d'espera despres d'enviar el missatge següent ##### Notification ##### NotificationSetup=Configuració del modul de notificació d'EMail NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions -ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) -FixedEmailTarget=Fixed email target +ListOfAvailableNotifications=Llistat d'esdeveniments que es poden configurar per notificar per cada tercer (entrar a la fitxa del tercer per configurar) o configurant un e-mail fixe (El llistat depèn dels mòduls activats) +FixedEmailTarget=Destinatari fixe ##### Sendings ##### SendingsSetup=Configuració del mòdul Expedicions SendingsReceiptModel=Model de notes de lliurament @@ -1457,7 +1457,7 @@ AdvancedEditor=Editor avançat ActivateFCKeditor=Activar editor avançat per a : FCKeditorForCompany=Creació/edició WYSIWIG de la descripció i notes dels tercers FCKeditorForProduct=Creació/edició WYSIWIG de la descripció i notes dels productes/serveis -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForProductDetails=Creació/edició WYSIWIG de les línies de detalls dels productes (comandes, pressupostos, factures, etc.). Atenció: L'ús d'aquesta opció no és recomanable, ja que pot crear problemes amb els caràcters especials i el formateix de pàgina al generar arxius PDF. FCKeditorForMailing= Creació/edició WYSIWIG dels E-Mails FCKeditorForUserSignature=Creació/edició WYSIWIG dela firma dels usuaris FCKeditorForMail=Creació/edició WYSIWIG de tots els E-mails (excepte Utilitats->E-Mailings) @@ -1469,7 +1469,7 @@ OSCommerceTestKo2=La connexió al servidor '%s' per l'usuari '%s' ha fallat. ##### Stock ##### StockSetup=Configuració del mòdul de magatzem UserWarehouse=Utilitzar els stocks personals d'usuaris -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +IfYouUsePointOfSaleCheckModule=Si utilitza un mòdul de Punt de Venda (mòdul TPV per defecte o un altre mòdul extern), aquesta configuració pot ser ignorada pel seu mòdul de Punt de Venda. La major part de mòduls TPV estan dissenyats per crear immediatament una factura i disminuir l'estoc amb qualsevol d'aquestes opcions. Per tant, si vostè necessita o no disminuir l'estoc en el registre d'una venda del seu punt de venda, controli també la configuració del seu mòdul de TPV. ##### Menu ##### MenuDeleted=Menú eliminat TreeMenu=Estructura dels menús @@ -1526,9 +1526,9 @@ AgendaSetup=Mòdul configuració d'accions i agenda PasswordTogetVCalExport=Clau d'autorització vCal export link PastDelayVCalExport=No exportar els esdeveniments de més de AGENDA_USE_EVENT_TYPE=Utilitza tipus d'esdeveniments (administrats en menú a Configuració -> Diccionari -> Tipus d'esdeveniments de l'agenda) -AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view -AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view -AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +AGENDA_DEFAULT_FILTER_TYPE=Establir per defecte aquest tipus d'esdeveniment en el filtre de cerca en la vista de la agenda +AGENDA_DEFAULT_FILTER_STATUS=Establir per defecte aquest estat de esdeveniments en el filtre de cerca en la vista de la agenda +AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Agenda ##### ClickToDial ##### ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de telèfon de contactes Dolibarr. Un clic en aquesta icona, Truca a un servidor amb un URL que s'indica a continuació. Això pot ser usat per anomenar al sistema centre de Dolibarr que pot trucar al número de telèfon en un sistema SIP, per exemple. ##### Point Of Sales (CashDesk) ##### @@ -1538,11 +1538,11 @@ CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa) CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). +CashDeskDoNotDecreaseStock=Desactivar disminució d'estoc si un venda es realitzada des de un Punt de Venda (si "no", la disminució d'estoc es realitza des del TPV, encara que sigui l'opció indicada en el modul Estoc). CashDeskIdWareHouse=Forçar i restringir el magatzem a usar l'stock a disminuir -StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +StockDecreaseForPointOfSaleDisabled=Disminució d'estoc des de TPV descativat +StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'estoc en el TPV no es compatible amb la gestió de lots +CashDeskYouDidNotDisableStockDecease=Vostè no ha desactivat la disminució d'estoc al fer una venda des del TPV. Així que es requereix un magatzem. ##### Bookmark ##### BookmarkSetup=Configuració del mòdul Bookmark BookmarkDesc=Aquest mòdul li permet gestionar els enllaços i accessos directes. També permet afegir qualsevol pàgina de Dolibarr o enllaç web al menú d'accés ràpid de l'esquerra. @@ -1567,7 +1567,7 @@ SuppliersSetup=Configuració del mòdul Proveïdors SuppliersCommandModel=Model de comandes a proveïdors complet (logo...) SuppliersInvoiceModel=Model de factures de proveïdors complet (logo...) SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor -IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval +IfSetToYesDontForgetPermission=Si esta seleccionat, no oblideu de modificar els permisos en els grups o usuaris per permetre la segona aprovació ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=Configuració del mòdul GeoIP Maxmind PathToGeoIPMaxmindCountryDataFile=Ruta de l'arxiu Maxmind que conté les conversions IP-> País.
Exemple: /usr/local/share/GeoIP/GeoIP.dat @@ -1597,7 +1597,7 @@ ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal? Opened=Obert Closed=Tancat AlwaysEditable=Sempre es pot editar -MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +MAIN_APPLICATION_TITLE=Forçar visibilitat del nom de l'aplicació (advertència: indicar el seu propi nom aquí pot trencar la característica d'auto-omple natge de l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid) NbMajMin=Nombre mínim de caràcters en majúscules NbNumMin=Nombre mínim de caràcters numèrics NbSpeMin=Nombre mínim de caràcters especials @@ -1606,19 +1606,19 @@ NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|", SalariesSetup=Configuració dels sous dels mòduls SortOrder=Ordre de classificació Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0: Pagament client, 1:Pagament proveïdor, 2:Tant pagament de client com de proveïdor IncludePath=Incloure ruta (que es defineix a la variable %s) -ExpenseReportsSetup=Setup of module Expense Reports -TemplatePDFExpenseReports=Document templates to generate expense report document -NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. -NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. -YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification". +ExpenseReportsSetup=Configuració del mòdul Informe de Despeses +TemplatePDFExpenseReports=Mòdels de documentació per generar informes de despeses +NoModueToManageStockDecrease=No esta activat el mòdul per gestionar automàticament la disminució d'estoc. La disminució d'estoc es realitzara només amb l'entrada manual +NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual +YouMayFindNotificationsFeaturesIntoModuleNotification=Pot trobar opcions per notificacions d'e-mail activant i configurant el mòdul "Notificacions" ListOfNotificationsPerContact=Llista de notificacions per contacte* -ListOfFixedNotifications=List of fixed notifications -GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses -Threshold=Threshold -BackupDumpWizard=Wizard to build database backup dump file -SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: -SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. -InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature. -ConfFileMuseContainCustom=Installing an external module from application save the module files into directory %s. To have this directory processed by Dolibarr, you must setup your conf/conf.php to have option
- $dolibarr_main_url_root_alt enabled to value $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt enabled to value "%s/custom" +ListOfFixedNotifications=Llistat de notificacions fixes +GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" de un contracte de tercers per afegir o eliminar notificacions per contactes/direccions +Threshold=Valor mínim/llindar +BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades +SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó: +SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis +InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu %s per habilitar aquesta funció +ConfFileMuseContainCustom=La instal·lació de mòduls externs des de l'aplicació guarda els arxius dels mòduls en el directori %s. Per disposar d'aquest directori a Dolibarr, té que configurar l'arxiu conf/conf.php per tenir l'opció
- $dolibarr_main_url_root_alt activat amb el valor $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt activat amb el valor diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 09836162cf5..e2eba6040c6 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - agenda -IdAgenda=ID event +IdAgenda=ID d'esdeveniments Actions=Esdeveniments ActionsArea=Àrea d'esdeveniments (accions i tasques) Agenda=Agenda Agendas=Agendes Calendar=Calendari Calendars=Calendaris -LocalAgenda=Internal calendar -ActionsOwnedBy=Event owned by +LocalAgenda=Calendari intern +ActionsOwnedBy=Esdeveniment propietat de AffectedTo=Assignada a DoneBy=Realitzat per -Event=Event +Event=Esdeveniment Events=Esdeveniments EventsNb=Nombre d'esdeveniments MyEvents=Els meus events @@ -23,20 +23,20 @@ MenuToDoActions=Esdeveniments incomplets MenuDoneActions=Esdeveniments acabats MenuToDoMyActions=Els meus esdeveniments incomplets MenuDoneMyActions=Els meus esdeveniments acabats -ListOfEvents=List of events (internal calendar) +ListOfEvents=Llista d'esdeveniments (calendari intern) ActionsAskedBy=Esdeveniments registrats per ActionsToDoBy=Esdeveniments assignats a ActionsDoneBy=Esdeveniments realitzats per -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group -ActionAssignedTo=Event assigned to +ActionsForUser=Esdeveniments del usuari +ActionsForUsersGroup=Esdeveniments per tots els usuaris del grup +ActionAssignedTo=Esdeveniment assignat a AllMyActions= Tots els meus esdeveniments/tasques AllActions= Tots els esdeveniments/tasques ViewList=Vista llistat ViewCal=Vista mensual ViewDay=Vista diària ViewWeek=Vista setmanal -ViewPerUser=Per user view +ViewPerUser=Vista d'usuaris ViewWithPredefinedFilters= Veure amb els filtres predefinits AutoActions= Inclusió automàtica a l'agenda AgendaAutoActionDesc= Indiqueu en aquesta pestanya els esdeveniments per els que desitja que Dolibarr creu automàticament una acció a l'agenda. Si no es marca cap cas (per defecte), només les accions manuals s'han d'incloure en l'agenda. @@ -45,15 +45,15 @@ AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica PropalValidatedInDolibarr=Pressupost %s validat InvoiceValidatedInDolibarr=Factura %s validada -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Factura %s validada al TPV InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador InvoiceDeleteDolibarr=Factura %s eliminada OrderValidatedInDolibarr=Comanda %s validada -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Comanda %s classificada com a enviada OrderCanceledInDolibarr=Commanda %s anul·lada -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Comanda %s classificada com a facturada OrderApprovedInDolibarr=Comanda %s aprovada -OrderRefusedInDolibarr=Order %s refused +OrderRefusedInDolibarr=Comanda %s rebutjada OrderBackToDraftInDolibarr=Comanda %s tordada a borrador OrderCanceledInDolibarr=Commanda %s anul·lada ProposalSentByEMail=Pressupost %s enviat per e-mail @@ -61,9 +61,9 @@ OrderSentByEMail=Comanda de client %s enviada per e-mail InvoiceSentByEMail=Factura a client %s enviada per e-mail SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail -ShippingSentByEMail=Shipment %s sent by EMail -ShippingValidated= Shipment %s validated -InterventionSentByEMail=Intervention %s sent by EMail +ShippingSentByEMail=Enviament %s enviat per email +ShippingValidated= Enviament %s validat +InterventionSentByEMail=Intervenció %s enviada per email NewCompanyToDolibarr= Tercer creat DateActionPlannedStart= Data d'inici prevista DateActionPlannedEnd= Data fi prevista @@ -72,27 +72,27 @@ DateActionDoneEnd= Data real de finalització DateActionStart= Data d'inici DateActionEnd= Data finalització AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida: -AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions2=login=%s per a restringir insercions a accions creades o realitzades per l'usuari %s. +AgendaUrlOptions3=logina=%s ​​per a restringir insercions a les accions creades per l'usuari %s. AgendaUrlOptions4=logint=%s per a restringir insercions a accions que afectin a l'usuari %s. -AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaUrlOptionsProject=project=PROJECT_ID per a restringir la sortida d'accions associades al projecta PROJECT_ID. AgendaShowBirthdayEvents=Mostra aniversari dels contactes AgendaHideBirthdayEvents=Amaga aniversari dels contacte Busy=Ocupat -ExportDataset_event1=List of agenda events -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +ExportDataset_event1=Llista d'esdeveniments de l'agenda +DefaultWorkingDays=Rang de dies de treball per defecte durant la setmana (Exemple: 1-5, 1-6) +DefaultWorkingHours=Hores de treball per defecte durant el dia (Exemple: 9-18) # External Sites ical ExportCal=Exportar calendari ExtSites=Calendaris externs -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Mostrar calendaris externs (definint a la configuració global) a l'agenda. No afecta als calendaris externs definits per l'usuari ExtSitesNbOfAgenda=Nombre de calendaris AgendaExtNb=Calendari nº %s ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical ExtSiteNoLabel=Sense descripció -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range -AddEvent=Create event -MyAvailability=My availability -ActionType=Event type -DateActionBegin=Start event date +WorkingTimeRange=Rang de temps de treball +WorkingDaysRange=Rang de dies de treball +AddEvent=Crear esdeveniment +MyAvailability=La meva disponibilitat +ActionType=Tipus d'esdeveniment +DateActionBegin=Data d'inici de l'esdeveniment diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang index 709b9e8250e..ed13b490920 100644 --- a/htdocs/langs/ca_ES/banks.lang +++ b/htdocs/langs/ca_ES/banks.lang @@ -163,5 +163,5 @@ LabelRIB=Etiqueta del codi BAN NoBANRecord=Codi BAN no registrat DeleteARib=Codi BAN eliminat ConfirmDeleteRib=Segur que vols eliminar aquest registre BAN? -StartDate=Start date -EndDate=End date +StartDate=Data d'inici +EndDate=Data final diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index d1078e9f3ce..ab76a683f19 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Factura Bills=Factures -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Factures a clients +BillsCustomer=Factures al client +BillsSuppliers=Factures de proveïdors +BillsCustomersUnpaid=Factures a clients pendents de cobrament BillsCustomersUnpaidForCompany=Factures a clients pendents de cobrament de %s BillsSuppliersUnpaid=Factures de proveïdors pendents de pagament BillsSuppliersUnpaidForCompany=Factures de proveïdors pendents de pagament de %s BillsLate=Retard en el pagament -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Estadístiques factures a clients +BillsStatisticsSuppliers=Estadístiques factures de proveïdors DisabledBecauseNotErasable=Desactivat per no ser eliminable InvoiceStandard=Factura estàndard InvoiceStandardAsk=Factura estàndard @@ -23,13 +23,13 @@ InvoiceProFormaAsk=Factura proforma InvoiceProFormaDesc=La factura proforma és la imatge d'una factura definitiva, però que no té cap valor comptable. InvoiceReplacement=Factura rectificativa InvoiceReplacementAsk=Factura rectificativa de la factura -InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceReplacementDesc=La factura rectificativa serveix per a cancel·lar i per substituir una factura existent sobre la qual encara no hi ha pagaments.

Nota: Només una factura sense cap pagament pot rectificar-se. Si aquesta última no està tancada, passarà automàticament al estat 'abandonada'. InvoiceAvoir=Abonament InvoiceAvoirAsk=Abonament per corregir la factura InvoiceAvoirDesc=El abonament és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple). -invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice -invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +invoiceAvoirWithLines=Crear abonament amb les línies de la factura d'origen +invoiceAvoirWithPaymentRestAmount=Crear abonament de la factura pendent de pagament +invoiceAvoirLineWithPaymentRestAmount=Abonament per a la quantitat restant no pagada ReplaceInvoice=Rectificar la factura %s ReplacementInvoice=Rectificació factura ReplacedByInvoice=Rectificada per la factura %s @@ -66,7 +66,7 @@ ConfirmConvertToReduc=Vol convertir aquest abonament en una reducció futura?
Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada. -HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és més alt que el que s'ha de pagar
Editeu l'entrada, en cas contrari confirmeu. ClassifyPaid=Classificar 'Pagat' ClassifyPaidPartially=Classificar 'Pagat parcialment' ClassifyCanceled=Classificar 'Abandonat' ClassifyClosed=Classificar 'Tancat' -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Classifiqueu 'facturar' CreateBill=Crear factura -AddBill=Create invoice or credit note +AddBill=Crear factura o abonament AddToDraftInvoices=Afegir a factura esborrany DeleteBill=Eliminar factura SearchACustomerInvoice=Cercar una factura a client @@ -100,7 +100,7 @@ DoPaymentBack=Emetre reembossament ConvertToReduc=Convertir en reducció futura EnterPaymentReceivedFromCustomer=Afegir pagament rebut de client EnterPaymentDueToCustomer=Fer pagament d'abonaments al client -DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0 Amount=Import PriceBase=Preu base BillStatus=Estat de la factura @@ -155,9 +155,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura %s? ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura? ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura %s com pagada? ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada? -ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar (%s %s) s'ha regularitzat (ja que l'article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar (%s %s) és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte +ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar (%s %s) és un descompte ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part ConfirmClassifyPaidPartiallyReasonOther=D'altra raó @@ -170,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Aquesta elecció serà possible, per ConfirmClassifyAbandonReasonOther=Altre ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa. ConfirmCustomerPayment=¿Confirmeu el procés d'aquest pagament de %s%s? -ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Confirmeu el procés d'aquest pagament de %s %s? ConfirmValidatePayment=Esteu segur de voler validar aquest pagament (cap modificació és possible un cop el pagament estigui validat)? ValidateBill=Validar factura UnvalidateBill=Tornar factura a esborrany @@ -190,15 +190,15 @@ AlreadyPaid=Ja pagat AlreadyPaidBack=Ja reemborsat AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes) Abandoned=Abandonada -RemainderToPay=Remaining unpaid -RemainderToTake=Remaining amount to take -RemainderToPayBack=Remaining amount to pay back +RemainderToPay=Queda per pagar +RemainderToTake=Queda per cobrar +RemainderToPayBack=Queda per reemborsar Rest=Pendent AmountExpected=Import reclamat ExcessReceived=Rebut en excés EscompteOffered=Descompte (pagament aviat) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Enviament de la factura %s +SendReminderBillRef=Recordatori de la factura %s StandingOrders=Domiciliacions StandingOrder=Domiciliació NoDraftBills=Cap factura esborrany @@ -218,18 +218,18 @@ NoInvoice=Cap factura ClassifyBill=Classificar la factura SupplierBillsToPay=Factures de proveïdors a pagar CustomerBillsUnpaid=Factures a clients pendents de cobrament -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Les factures redactades per processos mecànics estan exemptes de l'ordre en lletres NonPercuRecuperable=No percebut recuperable SetConditions=Definir condicions de pagament SetMode=Definir mode de pagament Billed=Facturat -RepeatableInvoice=Template invoice -RepeatableInvoices=Template invoices -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Convert into template invoice -CreateRepeatableInvoice=Create template invoice -CreateFromRepeatableInvoice=Create from template invoice +RepeatableInvoice=Factura recurrent +RepeatableInvoices=Factures recurrents +Repeatable=Recurrent +Repeatables=Recurrents +ChangeIntoRepeatableInvoice=Convertir en recurrent +CreateRepeatableInvoice=Crear factura recurrent +CreateFromRepeatableInvoice=Crear des de factura recurrent CustomersInvoicesAndInvoiceLines=Factures a clients i línies de factures CustomersInvoicesAndPayments=Factures a clients i pagaments ExportDataset_invoice_1=Factures a clients i línies de factura @@ -285,7 +285,7 @@ InvoiceNotChecked=Cap factura pendent està seleccionada CloneInvoice=Clonar factura ConfirmCloneInvoice=Esteu segur de voler clonar aquesta factura? DisabledBecauseReplacedInvoice=Acció desactivada perquè és una factura reemplaçada -DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +DescTaxAndDividendsArea=Aquesta pantalla resumeix la llista de tots els impostos i les càrregues socials exigides per a un any determinat. La data presa en compte és el període de pagament. NbOfPayments=Nº de pagaments SplitDiscount=Dividir el dte. en dos ConfirmSplitDiscount=Esteu segur de voler dividir el descompte de %s %s en 2 descomptes més petits? @@ -294,10 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes ConfirmRemoveDiscount=Esteu segur de voler eliminar aquest descompte? RelatedBill=Factura associada RelatedBills=Factures associades -RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +RelatedCustomerInvoices=Factures de clients relacionades +RelatedSupplierInvoices=Factures de proveïdors relacionades +LatestRelatedBill=Últimes factura associeades +WarningBillExist=Advertència, una o més factures ja existeixen +MergingPDFTool=Eina de fusió PDF # PaymentConditions PaymentConditionShortRECEP=A la recepció @@ -351,7 +352,7 @@ ChequeNumber=Xec nº ChequeOrTransferNumber=Xec/Transerència nº ChequeMaker=Emissor del xec ChequeBank=Banc del xec -CheckBank=Check +CheckBank=Xec NetToBePaid=Net a pagar PhoneNumber=Tel. FullPhoneNumber=Telèfon @@ -392,7 +393,7 @@ DisabledBecausePayments=No disponible ja que hi ha pagaments CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys una factura classificada com a pagada. ExpectedToPay=Esperant el pagament PayedByThisPayment=Pagada per aquest pagament -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidInvoicesAutomatically=Classificar com "Pagades" les factures rectificatives completament pagades. ClosePaidCreditNotesAutomatically=Classificar automàticament com "Pagats" els abonaments completament reemborsats AllCompletelyPayedInvoiceWillBeClosed=Totes les factures amb una resta a pagar 0 seran automàticament tancades a l'estat "Pagada". ToMakePayment=Pagar @@ -400,10 +401,10 @@ ToMakePaymentBack=Reemborsar ListOfYourUnpaidInvoices=Llistat de factures impagades NoteListOfYourUnpaidInvoices=Nota: Aquest llistat inclou només els tercers dels que vostè és comercial. RevenueStamp=Timbre fiscal -YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +YouMustCreateInvoiceFromThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "client" des de tercers PDFCrabeDescription=Model de factura complet (model recomanat per defecte) -TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0 +MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures proforma i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0 TerreNumRefModelError=Ja hi ha una factura amb $syymm i no és compatible amb aquest model de seqüència. Elimineu o renómbrela per poder activar aquest mòdul ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Responsable seguiment factura a client @@ -415,19 +416,19 @@ TypeContact_invoice_supplier_external_BILLING=Contacte proveïdor facturació TypeContact_invoice_supplier_external_SHIPPING=Contacte proveïdor entregues TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis # Situation invoices -InvoiceFirstSituationAsk=First situation invoice -InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. -InvoiceSituation=Situation invoice -InvoiceSituationAsk=Invoice following the situation -InvoiceSituationDesc=Create a new situation following an already existing one -SituationAmount=Situation invoice amount(net) -SituationDeduction=Situation subtraction -Progress=Progress -ModifyAllLines=Modify all lines -CreateNextSituationInvoice=Create next situation -NotLastInCycle=This invoice in not the last in cycle and must not be modified. -DisabledBecauseNotLastInCycle=The next situation already exists. -DisabledBecauseFinal=This situation is final. -CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. -NoSituations=No opened situations -InvoiceSituationLast=Final and general invoice +InvoiceFirstSituationAsk=Situació primera factura +InvoiceFirstSituationDesc=La situació de factures esta vinculades a situacions relacionades amb una progressió, per exemple, la progressió d'una construcció. Cada situació està lligada a una factura. +InvoiceSituation=Situació factures +InvoiceSituationAsk=Factura seguint una situació +InvoiceSituationDesc=Crear una nova situació seguint una existent +SituationAmount=Situació del import (sense IVA) de la factura +SituationDeduction=Situació d'exportació +Progress=Progrés +ModifyAllLines=Modificar totes les línies +CreateNextSituationInvoice=Crear següent situació +NotLastInCycle=Aquesta factura no es l'última en el cicle i no ha de ser modificada. +DisabledBecauseNotLastInCycle=Ja existeix la següent situació. +DisabledBecauseFinal=Aquesta situació és definitiva. +CantBeLessThanMinPercent=El progrés no pot ser menor que el seu valor en la situació anterior. +NoSituations=No hi ha situacions obertes +InvoiceSituationLast=Factura final i general diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index 449785f5895..d89e66e5a44 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -94,4 +94,4 @@ BoxProductDistributionFor=Distribució de %s per %s ForCustomersInvoices=Factures a clientes ForCustomersOrders=Comandes de clients ForProposals=Pressupostos -LastXMonthRolling=The last %s month rolling +LastXMonthRolling=L'ultim %s mes natural diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang index 4de38bfe254..45b7b4a888c 100644 --- a/htdocs/langs/ca_ES/categories.lang +++ b/htdocs/langs/ca_ES/categories.lang @@ -1,62 +1,62 @@ # Dolibarr language file - Source file is en_US - categories -Rubrique=Tag/Category -Rubriques=Tags/Categories -categories=tags/categories -TheCategorie=The tag/category -NoCategoryYet=No tag/category of this type created +Rubrique=Etiqueta/categoria +Rubriques=Etiquetes/categories +categories=etiquetes/categories +TheCategorie=La etiqueta/categoria +NoCategoryYet=Cap tipus d'aquesta etiqueta/categoria creada In=En AddIn=Afegir en modify=Modificar Classify=Classificar -CategoriesArea=Tags/Categories area -ProductsCategoriesArea=Products/Services tags/categories area -SuppliersCategoriesArea=Suppliers tags/categories area -CustomersCategoriesArea=Customers tags/categories area -ThirdPartyCategoriesArea=Third parties tags/categories area -MembersCategoriesArea=Members tags/categories area -ContactsCategoriesArea=Contacts tags/categories area -MainCats=Main tags/categories +CategoriesArea=Àrea d'etiquetes/categories +ProductsCategoriesArea=Àrea d'etiquetes/categories de productes/serveis +SuppliersCategoriesArea=Àrea d'etiquetes/categories de proveïdors +CustomersCategoriesArea=Àrea etiquetes/categories de clients +ThirdPartyCategoriesArea=Àrea etiquetes/categories de tercers +MembersCategoriesArea=Àrea etiquetes/categories de membres +ContactsCategoriesArea=Àrea etiquetes/categories de contactes +MainCats=Etiqutes/categories principals SubCats=Subcategories CatStatistics=Estadístiques -CatList=List of tags/categories -AllCats=All tags/categories -ViewCat=View tag/category -NewCat=Add tag/category -NewCategory=New tag/category -ModifCat=Modify tag/category -CatCreated=Tag/category created -CreateCat=Create tag/category -CreateThisCat=Create this tag/category +CatList=Llista d'etiquetes/categories +AllCats=Totes les etiquetes/categories +ViewCat=Veure etiqueta/categoria +NewCat=Afegir etiqueta/categoria +NewCategory=Nova etiqueta/categoria +ModifCat=Modificar etiqueta/categoria +CatCreated=Etiqueta/categoria creada +CreateCat=Crear etiqueta/categoria +CreateThisCat=Crear aquesta etiqueta/categoria ValidateFields=Validar els camps NoSubCat=Aquesta categoria no conté cap subcategoria SubCatOf=Subcategories -FoundCats=Found tags/categories -FoundCatsForName=Tags/categories found for the name : -FoundSubCatsIn=Subcategories found in the tag/category -ErrSameCatSelected=You selected the same tag/category several times -ErrForgotCat=You forgot to choose the tag/category +FoundCats=Etiquetes/categories trobades +FoundCatsForName=Etiquetes/categories trobades amb aquest nom: +FoundSubCatsIn=Etiquetes/categories trobades dintre de les subcategories +ErrSameCatSelected=Heu seleccionat la mateixa etiqueta/categoria varies vegades +ErrForgotCat=Ha oblidat escollir l'etiqueta/categoria ErrForgotField=Ha oblidat reassignar un camp ErrCatAlreadyExists=Aquest nom està sent utilitzat -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=Afegir aquest producte a una etiqueta/categoria? +ImpossibleAddCat=Impossible afegir l'etiqueta/categoria +ImpossibleAssociateCategory=Impossible associar l'etiqueta/categoria WasAddedSuccessfully=s'ha afegit amb èxit. -ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category. -CategorySuccessfullyCreated=This tag/category %s has been added with success. -ProductIsInCategories=Product/service owns to following tags/categories -SupplierIsInCategories=Third party owns to following suppliers tags/categories -CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories -CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories -MemberIsInCategories=This member owns to following members tags/categories -ContactIsInCategories=This contact owns to following contacts tags/categories -ProductHasNoCategory=This product/service is not in any tags/categories -SupplierHasNoCategory=This supplier is not in any tags/categories -CompanyHasNoCategory=This company is not in any tags/categories -MemberHasNoCategory=This member is not in any tags/categories -ContactHasNoCategory=This contact is not in any tags/categories -ClassifyInCategory=Classify in tag/category +ObjectAlreadyLinkedToCategory=L'element ja està enllaçat a aquesta etiqueta/categoria +CategorySuccessfullyCreated=L'etiqueta/categoria %s s'ha inserit correctament +ProductIsInCategories=Aquest producte/servei es troba en les següents etiquetes/categories +SupplierIsInCategories=Aquest proveïdors es troba en les següents etiquetes/categories +CompanyIsInCustomersCategories=Aquesta empresa es troba en les següents etiquetes/categories +CompanyIsInSuppliersCategories=Aquesta empresa es troba en les següents etiquetes/categories de proveïdors +MemberIsInCategories=Aquest membre es troba en les següents etiquetes/categories de membres +ContactIsInCategories=Aquest contacte es troba a les següents etiquetes/categories +ProductHasNoCategory=Aquest producte/servei no es troba en cap etiqueta/categoria en particular +SupplierHasNoCategory=Aquest proveïdor no es troba en cap etiqueta/categoria en particular +CompanyHasNoCategory=Aquesta empresa no es troba en cap etiqueta/categoria en particular +MemberHasNoCategory=Aquest membre no es troba en cap etiqueta/categoria en particular +ContactHasNoCategory=Aquest contacte no es troba a ninguna etiqueta/cateogria +ClassifyInCategory=Classificar en la etiqueta/categoria NoneCategory=Cap -NotCategorized=Without tag/category +NotCategorized=Sense etiqueta/categoria CategoryExistsAtSameLevel=Aquesta categoria ja existeix per aquesta referència ReturnInProduct=Tornar a la fitxa producte/servei ReturnInSupplier=Tornar a la fitxa proveïdor @@ -64,22 +64,22 @@ ReturnInCompany=Tornar a la fitxa client/client potencial ContentsVisibleByAll=El contingut serà visible per tots ContentsVisibleByAllShort=Contingut visible per tots ContentsNotVisibleByAllShort=Contingut no visible per tots -CategoriesTree=Tags/categories tree -DeleteCategory=Delete tag/category -ConfirmDeleteCategory=Are you sure you want to delete this tag/category ? -RemoveFromCategory=Remove link with tag/categorie -RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ? -NoCategoriesDefined=No tag/category defined -SuppliersCategoryShort=Suppliers tags/category -CustomersCategoryShort=Customers tags/category -ProductsCategoryShort=Products tags/category -MembersCategoryShort=Members tags/category -SuppliersCategoriesShort=Suppliers tags/categories -CustomersCategoriesShort=Customers tags/categories +CategoriesTree=Arbre d'etiquetes/categories +DeleteCategory=Eliminar etiqueta/categoria +ConfirmDeleteCategory=Eseu segur de voler eliminar aquesta etiqueta/categoria? +RemoveFromCategory=Suprimir l'enllaç amb etiqueta/categoria +RemoveFromCategoryConfirm=Esteu segur de voler suprimir el vincle entre la transacció i l'etiqueta/categoria +NoCategoriesDefined=Nova etiqueta/categoria definida +SuppliersCategoryShort=Etiquetes/categories de proveïdors +CustomersCategoryShort=Etiquetes/categories de clients +ProductsCategoryShort=Etiquetes/categories de productes +MembersCategoryShort=Etiquetes/categories de membres +SuppliersCategoriesShort=Etiquetes/categories de proveïdors +CustomersCategoriesShort=Etiquetes/categories de clients CustomersProspectsCategoriesShort=Categories clients -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +ProductsCategoriesShort=Etiquetes/categories de productes +MembersCategoriesShort=Etiquetes/categories de membres +ContactCategoriesShort=Etiquetes/categories de contactes ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte. ThisCategoryHasNoSupplier=Aquesta categoria no conté cap proveïdor. ThisCategoryHasNoCustomer=Aquesta categoria no conté cap client. @@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Aquesta categoria no conté contactes AssignedToCustomer=Assignar a un client AssignedToTheCustomer=Assignat a un client InternalCategory=Categoria interna -CategoryContents=Tag/category contents -CategId=Tag/category id -CatSupList=List of supplier tags/categories -CatCusList=List of customer/prospect tags/categories -CatProdList=List of products tags/categories -CatMemberList=List of members tags/categories -CatContactList=List of contact tags/categories and contact -CatSupLinks=Links between suppliers and tags/categories -CatCusLinks=Links between customers/prospects and tags/categories -CatProdLinks=Links between products/services and tags/categories -CatMemberLinks=Links between members and tags/categories -DeleteFromCat=Remove from tags/category -DeletePicture=Picture delete -ConfirmDeletePicture=Confirm picture deletion? -ExtraFieldsCategories=Complementary attributes -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically -CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory -AddProductServiceIntoCategory=Add the following product/service -ShowCategory=Show tag/category +CategoryContents=Contingut de l'etiqueta/categoria +CategId=ID d'etiquetes/categoria +CatSupList=Llistat de les etiquetes/categories de proveïdors +CatCusList=Llistat de les etiquetes/categories de clients +CatProdList=Llistat de les etiquetes/categories de productes +CatMemberList=Llistat de les etiquetes/categories dels membres +CatContactList=Llistat de etiquetes/categories i contactes +CatSupLinks=Enllaços entre proveïdors i etiquetes/categories +CatCusLinks=Enllaços entre clients/clients potencials i etiquetes/categories +CatProdLinks=Enllaços entre productes/serveis i etiquetes/categories +CatMemberLinks=Enllaços entre membres i etiquetes/categories +DeleteFromCat=Eliminar de l'etiqueta/categoria +DeletePicture=Eliminar imatge +ConfirmDeletePicture=Confirmar l'eliminació de la imatge? +ExtraFieldsCategories=Atributs complementaris +CategoriesSetup=Configuració d'etiquetes/categories +CategorieRecursiv=Enllaçar amb l'etiqueta/categoria automàticament +CategorieRecursivHelp=Si esta activat, el producte s'enllaçara a la categoria pare si l'afegim a una subcategoria +AddProductServiceIntoCategory=Afegir el següent producte/servei +ShowCategory=Mostrar etiqueta/categoria diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index 89bb4b65237..46953d02459 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -4,7 +4,7 @@ AccountancyCard=Fitxa comptable Treasury=Tresoreria MenuFinancial=Financera TaxModuleSetupToModifyRules=Anar a configuració mòdul impostos per modificar les regles de càlcul -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Anar a la configuració de l'Empresa per modificar les regles de càlcul OptionMode=Opció de gestió comptable OptionModeTrue=Opció Ingressos-Despeses OptionModeVirtual=Opció Crèdits-Deutes @@ -12,7 +12,7 @@ OptionModeTrueDesc=En aquest mètode, el balanç es calcula sobre la base de les OptionModeVirtualDesc=En aquest mètode, el balanç es calcula sobre la base de les factures validades. Pagades o no, apareixen en el resultat quant siguin disposades. FeatureIsSupportedInInOutModeOnly=Funció disponible només en el mode comptes CREDITS-DEUTES (Veure la configuració del mòdul comptes) VATReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració del mòdul Impostos. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració de l'Empresa Param=Parametrizaje RemainingAmountPayment=Import restant del pagament : AmountToBeCharged=Import total a pagar : @@ -29,7 +29,7 @@ ReportTurnover=Volum de vendes PaymentsNotLinkedToInvoice=Pagaments vinculats a cap factura, per la qual cosa sense tercer PaymentsNotLinkedToUser=Pagaments no vinculats a un usuari Profit=Benefici -AccountingResult=Accounting result +AccountingResult=Resultat comptable Balance=Saldo Debit=Dèbit Credit=Crèdit @@ -43,25 +43,25 @@ VATReceived=IVA repercutit VATToCollect=IVA compres VATSummary=Balanç d'IVA LT2SummaryES=Balanç d'IRPF -LT1SummaryES=RE Balance +LT1SummaryES=Balanç del RE VATPaid=IVA Pagat -SalaryPaid=Salary paid +SalaryPaid=Pagament salari LT2PaidES=IRPF Pagat -LT1PaidES=RE Paid +LT1PaidES=RE pagat LT2CustomerES=IRPF Vendes LT2SupplierES=IRPF compres -LT1CustomerES=RE sales -LT1SupplierES=RE purchases +LT1CustomerES=Vendes RE +LT1SupplierES=Compres RE VATCollected=IVA recuperat ToPay=A pagar ToGet=A tornar -SpecialExpensesArea=Area for all special payments +SpecialExpensesArea=Àrea per tots els pagaments especials TaxAndDividendsArea=Àrea impostos, càrregues socials i dividends SocialContribution=Càrrega social SocialContributions=Càrregues socials -MenuSpecialExpenses=Special expenses +MenuSpecialExpenses=Pagaments especials MenuTaxAndDividends=Impostos i càrregues -MenuSalaries=Salaries +MenuSalaries=Salaris MenuSocialContributions=Càrregues socials MenuNewSocialContribution=Nova càrrega NewSocialContribution=Nova càrrega social @@ -74,21 +74,21 @@ PaymentCustomerInvoice=Cobrament factura a client PaymentSupplierInvoice=Pagament factura de proveïdor PaymentSocialContribution=Pagament càrrega social PaymentVat=Pagament IVA -PaymentSalary=Salary payment +PaymentSalary=Pagament salario ListPayment=Llistat de pagaments ListOfPayments=Llistat de pagaments ListOfCustomerPayments=Llistat de pagaments de clients ListOfSupplierPayments=Llistat de pagaments a proveïdors DatePayment=Data de pagament -DateStartPeriod=Date start period -DateEndPeriod=Date end period +DateStartPeriod=Data d'inici del periode +DateEndPeriod=Data final del periode NewVATPayment=Nou pagament d'IVA newLT2PaymentES=Nou pagament d'IRPF -newLT1PaymentES=New RE payment +newLT1PaymentES=Nou pagament de RE LT2PaymentES=Pagament IRPF LT2PaymentsES=Pagaments IRPF -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments +LT1PaymentES=Pagament de RE +LT1PaymentsES=Pagaments de RE VATPayment=Pagament IVA VATPayments=Pagaments IVA SocialContributionsPayments=Pagaments càrregues socials @@ -109,7 +109,7 @@ ErrorWrongAccountancyCodeForCompany=Codi comptable incorrecte per a %s SuppliersProductsSellSalesTurnover=Volum de vendes generat per la venda dels productes dels proveïdors CheckReceipt=Llista de remeses CheckReceiptShort=Remeses -LastCheckReceiptShort=Last %s check receipts +LastCheckReceiptShort=%s Ultimes remeses NewCheckReceipt=Nova remesa NewCheckDeposit=Nou ingrés NewCheckDepositOn=Crear nova remesa al compte: %s @@ -125,12 +125,12 @@ CalcModeVATDebt=Mode d'%sIVA sobre comptabilitat de compromís%s . CalcModeVATEngagement=Mode d'%sIVA sobre ingressos-despeses%s. CalcModeDebt=Mode %sReclamacions-Deutes%s anomenada Comptabilitad de compromís. CalcModeEngagement=Mode %sIngressos-Despeses%s anomenada Comptabilitad de caixa. -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s -CalcModeLT1Debt=Mode %sRE on customer invoices%s -CalcModeLT1Rec= Mode %sRE on suppliers invoices%s -CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s -CalcModeLT2Debt=Mode %sIRPF on customer invoices%s -CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +CalcModeLT1= Metode %sRE factures a clients - factures de proveïdors%s +CalcModeLT1Debt=Metode %sRE a factures a clients%s +CalcModeLT1Rec= Metode %sRE a factures de proveïdors%s +CalcModeLT2= Metode %sIRPF a factures a clients - factures de proveïdors%s +CalcModeLT2Debt=Metode %sIRPF a factures a clients%s +CalcModeLT2Rec= Metode %sIRPF a factures de proveïdors%s AnnualSummaryDueDebtMode=Saldo d'ingressos i despeses, resum anual AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual AnnualByCompaniesDueDebtMode=Balanç d'ingressos i despeses, desglossat per tercers, en mode %sCrèdits-Deutes%s anomenada comptabilitat de compromís. @@ -145,15 +145,15 @@ RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.
- Es ba DepositsAreNotIncluded=- Les factures de bestreta no estan incloses DepositsAreIncluded=- Les factures de bestreta estan incloses LT2ReportByCustomersInInputOutputModeES=Informe per tercer del IRPF -LT1ReportByCustomersInInputOutputModeES=Report by third party RE +LT1ReportByCustomersInInputOutputModeES=Informe de RE per tercers VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat -LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +LT1ReportByQuartersInInputOutputMode=informe de RE per tassa +LT2ReportByQuartersInInputOutputMode=Informe de IRPF per tassa VATReportByQuartersInDueDebtMode=Informe per tipus d'IVA cobrat i pagat -LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +LT1ReportByQuartersInDueDebtMode=Informe de RE per tassa +LT2ReportByQuartersInDueDebtMode=Informe de IRPF per tassa SeeVATReportInInputOutputMode=Veure l'informe %sIVA pagat%s per a un mode de càlcul estàndard SeeVATReportInDueDebtMode=Veure l'informe %s IVA degut%s per a un mode de càlcul amb l'opció sobre el degut RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament. @@ -189,7 +189,7 @@ AccountancyDashboard=Resum financer ByProductsAndServices=Per productes i serveis RefExt=Ref. externa ToCreateAPredefinedInvoice=Per crear una factura predefinida, creu una factura estàndard llavors, sense validar, feu clic al botó "Convertir la factura predefinida". -LinkedOrder=Link to order +LinkedOrder=Enllaçar a una comanda ReCalculate=Recalcular Mode1=Mètode 1 Mode2=Mètode 2 @@ -197,11 +197,11 @@ CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:
M CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per aplicar la mateixa regla de càlcul per obtenir el resultat esperat pel seu proveïdor. TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode comptabilitat de caixa no és rellevant. Aquest informe només està disponible quan s'utilitza el mode compromís comptable(consulteu la configuració del mòdul de comptabilitat). CalculationMode=Mode de càlcul -AccountancyJournal=Accountancy code journal -ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT -ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +AccountancyJournal=Codi comptable diari +ACCOUNTING_VAT_ACCOUNT=Codi comptable per defecte per l'IVA repercutit +ACCOUNTING_VAT_BUY_ACCOUNT=Codi comptable per defecte per l'IVA soportat +ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable per defecte per a clients +ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable per defecte per a proveïdors +CloneTax=Clonar una càrrega social +ConfirmCloneTax=Confirma la clonació de la càrrega social +CloneTaxForNextMonth=Clonar-la pel pròxim mes diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang index 584698000fd..0331f92ef1f 100644 --- a/htdocs/langs/ca_ES/cron.lang +++ b/htdocs/langs/ca_ES/cron.lang @@ -14,11 +14,11 @@ URLToLaunchCronJobs=URL per llançar les tasques automàtiques OrToLaunchASpecificJob=O per llançar una tasca específica KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques FileToLaunchCronJobs=Ordre per llançar les tasques automàtiques -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts +CronExplainHowToRunWin=En entorns Microsoft (tm) Windows, pot utilitzar l'eina 'tareas programadas' per executar la comanda cada 5 minuts # Menu CronJobs=Tasques programades -CronListActive=List of active/scheduled jobs +CronListActive=Llistat de tasques actives/programades CronListInactive=Llistat de tasques planificades inactives # Page list CronDateLastRun=Últim llançament @@ -26,13 +26,13 @@ CronLastOutput=Última sortida CronLastResult=Últim codi tornat CronListOfCronJobs=Llista de tasques programades CronCommand=Comando -CronList=Scheduled job -CronDelete=Delete scheduled jobs -CronConfirmDelete=Are you sure you want to delete this scheduled jobs ? -CronExecute=Launch scheduled jobs -CronConfirmExecute=Are you sure to execute this scheduled jobs now ? -CronInfo=Scheduled job module allow to execute job that have been planned -CronWaitingJobs=Waiting jobs +CronList=Tasca programada +CronDelete=Eliminar tasca programada +CronConfirmDelete=Estàs segur de voler eliminar aquesta tasca programada? +CronExecute=Llançar tasques programades +CronConfirmExecute=Estàs segur de voler executar aquesta tasca ara? +CronInfo=Tasques programades li permet executar tasques que han sigut programades +CronWaitingJobs=Treballs en espera CronTask=Tasca CronNone=Ningún CronDtStart=Data inici @@ -75,7 +75,7 @@ CronObjectHelp=El nombre del objeto a crear.
Por ejemplo para llamar el mé CronMethodHelp=El método a lanzar.
Por ejemplo para llamar el método fetch del objeto Product de Dolibarr /htdocs/product/class/product.class.php, el valor del método es fecth CronArgsHelp=Los argumentos del método.
Por ejemplo para usar el método fetch del objeto Product deDolibarr /htdocs/product/class/product.class.php, el valor del parámetro podría ser 0, RefProduit CronCommandHelp=El comando del sistema a executar -CronCreateJob=Create new Scheduled Job +CronCreateJob=Crear nova tasca programada # Info CronInfoPage=Informació # Common @@ -84,5 +84,5 @@ CronType_method=Mètode d'una classe d'un mòdul Dolibarr CronType_command=Comando Shell CronMenu=Cron CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s -UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. -TaskDisabled=Task disabled +UseMenuModuleToolsToAddCronJobs=Anar a "inici - Utilitats mòduls - Llista de tasques Cron" per veure i editar tasques programades +TaskDisabled=Tasca deshabilitada diff --git a/htdocs/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang index 819aac2a9cf..16d94fd9191 100644 --- a/htdocs/langs/ca_ES/deliveries.lang +++ b/htdocs/langs/ca_ES/deliveries.lang @@ -23,4 +23,6 @@ GoodStatusDeclaration=He rebut la mercaderia en bon estat, Deliverer=Destinatari : Sender=Orige Recipient=Destinatari -ErrorStockIsNotEnough=There's not enough stock +ErrorStockIsNotEnough=No hi han suficient stock +Shippable=Enviable +NonShippable=No enviable diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang index d5d71b3053b..caf0a0eff63 100644 --- a/htdocs/langs/ca_ES/dict.lang +++ b/htdocs/langs/ca_ES/dict.lang @@ -6,7 +6,7 @@ CountryES=Espanya CountryDE=Alemanya CountryCH=Suïssa CountryGB=Regne Unit -CountryUK=United Kingdom +CountryUK=Regne unit CountryIE=Irlanda CountryCN=Xina CountryTN=Tunísia @@ -290,6 +290,8 @@ CurrencySingXOF=Franc CFA BCEAO CurrencyXPF=Francs CFP CurrencySingXPF=Franc CFP CurrencyCentSingEUR=cèntim +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=mil·lèsim #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang index e17aaece32f..e1687c25e6f 100644 --- a/htdocs/langs/ca_ES/donations.lang +++ b/htdocs/langs/ca_ES/donations.lang @@ -4,10 +4,10 @@ Donations=Donacións DonationRef=Ref. donació Donor=Donant Donors=Donants -AddDonation=Create a donation +AddDonation=Crear una donació NewDonation=Nova donació -DeleteADonation=Delete a donation -ConfirmDeleteADonation=Are you sure you want to delete this donation ? +DeleteADonation=Eliminar una donació +ConfirmDeleteADonation=Estàs segur de voler eliminar aquesta donació? ShowDonation=Mostrar donació DonationPromise=Promesa de donació PromisesNotValid=Promeses no validades @@ -23,8 +23,8 @@ DonationStatusPaid=Donació pagada DonationStatusPromiseNotValidatedShort=No validada DonationStatusPromiseValidatedShort=Validada DonationStatusPaidShort=Pagada -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Rebut de la donació +DonationDatePayment=Data de pagament ValidPromess=Validar promesa DonationReceipt=Rebut de donació BuildDonationReceipt=Crear rebut @@ -34,10 +34,10 @@ SearchADonation=Cercar una donació DonationRecipient=Beneficiari ThankYou=Moltes gràcies IConfirmDonationReception=El beneficiari confirma la recepció, com a donació, de la següent quantitat -MinimumAmount=Minimum amount is %s -FreeTextOnDonations=Free text to show in footer -FrenchOptions=Options for France -DONATION_ART200=Show article 200 from CGI if you are concerned -DONATION_ART238=Show article 238 from CGI if you are concerned -DONATION_ART885=Show article 885 from CGI if you are concerned -DonationPayment=Donation payment +MinimumAmount=L'import mínim és %s +FreeTextOnDonations=Text lliure a mostrar a peu de pàgina +FrenchOptions=Opcions per a França +DONATION_ART200=Mostrar article 200 del CGI si s'està interessat +DONATION_ART238=Mostrar article 238 del CGI si s'està interessat +DONATION_ART885=Mostrar article 885 del CGI si s'està interssat +DonationPayment=Pagament de la donació diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index e465e49b673..5100c45ae79 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -25,11 +25,11 @@ ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferen ErrorBadThirdPartyName=Nom de tercer incorrecte ErrorProdIdIsMandatory=El %s es obligatori ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta -ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorBadBarCodeSyntax=Sintaxi erroni pel codi de barres. És possible que hagi assignat un tipus de codi de barres o definit una mascara de codi de barres per numerar que no coincideixen amb el valor escanejat ErrorCustomerCodeRequired=Codi client obligatori -ErrorBarCodeRequired=Bar code required +ErrorBarCodeRequired=Codi de barres requerit ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat -ErrorBarCodeAlreadyUsed=Bar code already used +ErrorBarCodeAlreadyUsed=El codi de barres ja és utilitzat ErrorPrefixRequired=Prefix obligatori ErrorUrlNotValid=L'adreça del lloc web és incorrecta ErrorBadSupplierCodeSyntax=La sintaxi del codi proveïdor és incorrecta @@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=Codi proveïdor obligatori ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat ErrorBadParameters=Paràmetres incorrectes ErrorBadValueForParameter=Valor '%s' incorrecte per al paràmetre '%s' -ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) +ErrorBadImageFormat=L'arxiu de la imatge no és un format suportat (El seu PHP no suporta les funciones de conversió d'aquest format d'imatge) ErrorBadDateFormat=El valor '%s' té un format de data no reconegut -ErrorWrongDate=Date is not correct! +ErrorWrongDate=La data no es correcta! ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s ErrorFoundBadEmailInFile=Trobada sintaxi incorrecta en email a %s línies en fitxer (exemple linia %s amb email=%s) ErrorUserCannotBeDelete=L'usuari no pot ser eliminat. Potser estigui associat a elements de Dolibarr. @@ -65,21 +65,21 @@ ErrorNoValueForCheckBoxType=Els valors de la llista han de ser indicats ErrorNoValueForRadioType=Els valors de la llista han de ser indicats ErrorBadFormatValueList=Els valors de la llista no peudo contenir més d'una coma: %s , però necessita una: clau, valors ErrorFieldCanNotContainSpecialCharacters=El camp %s no ha de contenir caràcters especials -ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=El camp %s no ha de contenir majúscules ni caràcters especials ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat -ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta. ErrorLDAPMakeManualTest=S'ha creat un arxiu .ldif a la carpeta %s. Tracti de carregar manualment aquest arxiu des de la línia de comandes per obtenir més informació sobre l'error. ErrorCantSaveADoneUserWithZeroPercentage=No es pot canviar una acció al estat no començada si teniu un usuari realitzant de l'acció. ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix ErrorPleaseTypeBankTransactionReportName=Introduïu el nom del registre bancari sobre el qual l'escrit està constatat (format AAAAMM o AAAMMJJ) ErrorRecordHasChildren=No es pot esborrar el registre perquè té registrses fills. -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. S'està utilitzant o incloent en un altre objecte. ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, aneu al menú Inici->Configuració->Entorn. ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail %s, indicant el codi d'error %s en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina. ErrorWrongValueForField=Valor incorrecte per al camp número %s (el valor '%s' no compleix amb la regla %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldValueNotIn=Valor incorrecte pel camp número %s (el valor '%s' no es un valor en el camp %s de la taula %s = %s) ErrorFieldRefNotIn=Valor incorrecte per al camp nombre %s (el valor '%s' no és una referència existent en %s) ErrorsOnXLines=Errors a %s línies font ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)! @@ -91,8 +91,8 @@ ErrorModuleSetupNotComplete=La configuració del mòdul sembla incompleta. Aneu ErrorBadMask=Error en la màscara ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara ErrorBadMaskBadRazMonth=Error, valor de tornada a 0 incorrecte -ErrorMaxNumberReachForThisMask=Max number reach for this mask -ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorMaxNumberReachForThisMask=Capacitat màxima assolit per aquesta mascara +ErrorCounterMustHaveMoreThan3Digits=El comptador ha de tenir més de 3 dígits ErrorSelectAtLeastOne=Error. Seleccioneu com a mínim una entrada. ErrorProductWithRefNotExist=La referència de producte '%s' no existeix ErrorDeleteNotPossibleLineIsConsolidated=Eliminació impossible ja que el registre està enllaçat a una transacció bancària conciliada @@ -116,7 +116,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de %s no s'ha trobat. ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar. ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ... ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius -ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative +ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a clients no poden ser negatives ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web %s no disposa dels permisos per això ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive @@ -132,44 +132,44 @@ ErrorToConnectToMysqlCheckInstance=Error de connexió amb el servidor de la base ErrorFailedToAddContact=Error en l'addició del contacte ErrorDateMustBeBeforeToday=La data no pot ser superior a avui ErrorPaymentModeDefinedToWithoutSetup=S'ha establert la forma de pagament al tipus %s però a la configuració del mòdul de factures no s'ha indicat la informació per mostrar aquesta forma de pagament. -ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. -ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s -ErrorWarehouseMustDiffers=Source and target warehouses must differs -ErrorBadFormat=Bad format! -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. -ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. -ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated -ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed -ErrorPriceExpression1=Cannot assign to constant '%s' -ErrorPriceExpression2=Cannot redefine built-in function '%s' -ErrorPriceExpression3=Undefined variable '%s' in function definition -ErrorPriceExpression4=Illegal character '%s' -ErrorPriceExpression5=Unexpected '%s' -ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) -ErrorPriceExpression8=Unexpected operator '%s' -ErrorPriceExpression9=An unexpected error occured -ErrorPriceExpression10=Iperator '%s' lacks operand -ErrorPriceExpression11=Expecting '%s' -ErrorPriceExpression14=Division by zero -ErrorPriceExpression17=Undefined variable '%s' -ErrorPriceExpression19=Expression not found -ErrorPriceExpression20=Empty expression -ErrorPriceExpression21=Empty result '%s' -ErrorPriceExpression22=Negative result '%s' -ErrorPriceExpressionInternal=Internal error '%s' -ErrorPriceExpressionUnknown=Unknown error '%s' -ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs -ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information -ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action -ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action -ErrorGlobalVariableUpdater0=HTTP request failed with error '%s' -ErrorGlobalVariableUpdater1=Invalid JSON format '%s' -ErrorGlobalVariableUpdater2=Missing parameter '%s' -ErrorGlobalVariableUpdater3=The requested data was not found in result -ErrorGlobalVariableUpdater4=SOAP client failed with error '%s' -ErrorGlobalVariableUpdater5=No global variable selected -ErrorFieldMustBeANumeric=Field %s must be a numeric value -ErrorFieldMustBeAnInteger=Field %s must be an integer +ErrorPHPNeedModule=Error, el seu PHP ha de tenir instal·lat el mòdul %s per utilitzar aquesta funcionalitat. +ErrorOpenIDSetupNotComplete=Ha configurat Dolibarr per acceptar l'autentificació OpenID, però la URL del servei OpenID no es troba definida a la constant %s +ErrorWarehouseMustDiffers=El magatzem d'origen i destí han de ser diferents +ErrorBadFormat=El format és incorrecte! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, aquest membre encara no estar enllaçat a un tercer. Enllaci el membre a un tercer existent o creï un tercer nou abans de crear la subscripció amb la factura. +ErrorThereIsSomeDeliveries=Error, hi ha entrades vinculades a aquest enviament. No es pot eliminar +ErrorCantDeletePaymentReconciliated=No es pot eliminar un pagament que ha generat una transacció bancaria que es troba conciliada +ErrorCantDeletePaymentSharedWithPayedInvoice=No es pot eliminar un pagament de vàries factures amb alguna factura amb l'estat Pagada +ErrorPriceExpression1=No es pot assignar a la constant '%s' +ErrorPriceExpression2=No es pot redefinir la funció incorporada'%s' +ErrorPriceExpression3=Variable '%s' no definida a la definició de la funció +ErrorPriceExpression4=Caràcter '%s' il·legal +ErrorPriceExpression5=No s'esperava '%s' +ErrorPriceExpression6=Nombre d'arguments inadequats (%s dades, %s esperats) +ErrorPriceExpression8=Operador '%s' no esperat +ErrorPriceExpression9=Ha succeït un error no esperat +ErrorPriceExpression10=Operador '%s' no té operant +ErrorPriceExpression11=S'esperava '%s' +ErrorPriceExpression14=Divisió per zero +ErrorPriceExpression17=Variable '%s' indefinida +ErrorPriceExpression19=Expressió no trobada +ErrorPriceExpression20=Expressió buida +ErrorPriceExpression21=Resultat '%s' buit +ErrorPriceExpression22=Resultat'%s' negatiu +ErrorPriceExpressionInternal=Error intern '%s' +ErrorPriceExpressionUnknown=Error desconegut '%s' +ErrorSrcAndTargetWarehouseMustDiffers=Els magatzems d'origen i destí han de ser diferents +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta fer un moviment d'estoc sense indicar lot/serie, en un producte que requereix lot/serie +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Totes les recepcions han de verificar-se primer (acceptades o denegades) abans per realitzar aquesta acció +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Totes les recepcions han de verificar-se (acceptades) abans per poder-se realitzar a aquesta acció +ErrorGlobalVariableUpdater0=Petició HTTP fallida amb error '%s' +ErrorGlobalVariableUpdater1=Format JSON '%s' invalid +ErrorGlobalVariableUpdater2=Falta el paràmetre '%s' +ErrorGlobalVariableUpdater3=No s'han trobat les dades sol·licitades +ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s' +ErrorGlobalVariableUpdater5=Sense variable global seleccionada +ErrorFieldMustBeANumeric=El camp %s ha de contenir un valor numèric +ErrorFieldMustBeAnInteger=El camp %s ha de ser un enter # Warnings WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits @@ -187,6 +187,6 @@ WarningCloseAlways=Avís, el tancament és realitzat encara que la quantitat tot WarningUsingThisBoxSlowDown=Atenció, l'ús d'aquest panell provoca serioses alentiments en les pàgines que mostren aquest panell. WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al compte d'usuari no està completa (vegeu la pestanya ClickToDial en la seva fitxa d'usuari) WarningNotRelevant=Operació irrellevant per a aquest conjunt de dades -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. -WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat desactivada quant la configuració de visualització és optimitzada per a persones cegues o navegadors de text. +WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s. +WarningTooManyDataPleaseUseMoreFilters=Masses dades. Utilitzi més filtres. diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang index 7a234510913..3ba2889b994 100644 --- a/htdocs/langs/ca_ES/externalsite.lang +++ b/htdocs/langs/ca_ES/externalsite.lang @@ -2,4 +2,4 @@ ExternalSiteSetup=Configuració de l'enllaç al lloc web extern ExternalSiteURL=URL del lloc extern ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament. -ExampleMyMenuEntry=My menu entry +ExampleMyMenuEntry=La meva entrada del menú diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index 87309561946..6bcb7534e1a 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RRHH -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Dies lliures +CPTitreMenu=Dies lliures MenuReportMonth=Estat mensual -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Realitzar una petició de dies lliures +NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina +NotConfigModCP=Ha de configurar el mòdul Dies lliures retribuïts per veure aquesta pàgina. Per configurar-lo, faci clic aquí . +NoCPforUser=No té peticions de dies lliures +AddCP=Realitzar una petició de dies lliures Employe=Empleat DateDebCP=Data inici DateFinCP=Data fi @@ -18,24 +18,24 @@ ApprovedCP=Aprovada CancelCP=Anul·lada RefuseCP=Rebutjada ValidatorCP=Validador -ListeCP=List of leaves +ListeCP=Llista de dies lliures ReviewedByCP=Serà revisada per DescCP=Descripció -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Enviar la petició de dies lliures +DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys %s dies abans. +MenuConfCP=Definir els dies lliures +UpdateAllCP=Actualitzar els dies lliures +SoldeCPUser=El seu saldo de dies lliures es de %s dies ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici. ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de dies lliures no existeix ReturnCP=Tornar a la pàgina anterior -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=No esta autoritzat a llegir aquesta petició de dies lliures. +InfosCP=Informació de la petició de dies lliures InfosWorkflowCP=Informació del workflow RequestByCP=Comandada per -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Fitxa de dies lliures +NbUseDaysCP=Nombre de dies lliures consumits EditCP=Modificar DeleteCP=Eliminar ActionValidCP=Validar @@ -43,25 +43,25 @@ ActionRefuseCP=Rebutjar ActionCancelCP=Anul·lar StatutCP=Estat SendToValidationCP=Enviar validació -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Eliminar la petició de dies lliures +ConfirmDeleteCP=Estàs segur de voler eliminar aquesta petició de dies lliures? +ErrorCantDeleteCP=Error, no te permisos per eliminar aquesta petició de dies lliures +CantCreateCP=Note permisos per realitzar peticions de dies lliures +InvalidValidatorCP=Ha d'indicar un validador per la seva petició de dies lliures +CantUpdate=No pot actualitzar aquesta petició de dies lliures. NoDateDebut=Ha d'indicar una data d'inici. NoDateFin=Ha d'indicar una data de fi. -ErrorDureeCP=Your leave request does not contain working day. -TitleValidCP=Approve the leave request -ConfirmValidCP=Are you sure you want to approve the leave request? +ErrorDureeCP=La seva petició de dies lliures no conté cap dia hàbil +TitleValidCP=Aprovar la petició de dies lliures +ConfirmValidCP=Estàs segur de voler validar aquesta petició de dies lliures? DateValidCP=Data de validació -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the leave request -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +TitleToValidCP=Enviar la petició de dies lliures +ConfirmToValidCP=Estàs segur de voler enviar la petició de dies lliures? +TitleRefuseCP=Rebutjar la petició de dies lliures +ConfirmRefuseCP=Estàs segur de voler rebutjar la petició de dies lliures? NoMotifRefuseCP=Ha de seleccionar un motiu per rebutjar aquesta petició. -TitleCancelCP=Cancel the leave request -ConfirmCancelCP=Are you sure you want to cancel the leave request? +TitleCancelCP=Cancel·lar la petició de dies lliures +ConfirmCancelCP=Estàs segur de voler cancel·lar la petició de dies lliures? DetailRefusCP=Motiu del rebuig DateRefusCP=Data del rebuig DateCancelCP=Data de l'anul·lació @@ -71,42 +71,42 @@ MotifCP=Motiu UserCP=Usuari ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional. AddEventToUserOkCP=S'ha afegit el permís excepcional. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Veure l'historial de dies lliures +LogCP=Historial d'actualizacions de dies lliures ActionByCP=Realitzat per UserUpdateCP=Per a l'usuari PrevSoldeCP=Saldo anterior NewSoldeCP=Nou saldo -alreadyCPexist=A leave request has already been done on this period. +alreadyCPexist=Ha s'ha efectuat una petició de dies lliures per aquest periode UserName=Nom Cognoms Employee=Empleat -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Primer dia lliure +LastDayOfHoliday=Últim dia lliures HolidaysMonthlyUpdate=Actualització mensual ManualUpdate=Actualització manual -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Anulació de dies lliures ## Configuration du Module ## -ConfCP=Configuration of leave request module +ConfCP=Configuració del mòdul de dies lliures retribuïts DescOptionCP=Descripció de l'opció ValueOptionCP=Valor -GroupToValidateCP=Group with the ability to approve leave requests +GroupToValidateCP=Grup amb possibilitat d'aprobar els dies lliures ConfirmConfigCP=Validar la configuració -LastUpdateCP=Last automatic update of leaves allocation +LastUpdateCP=Última actualització automàticament de dies lliures UpdateConfCPOK=Actualització efectuada correctament. ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar. -AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. -DelayForSubmitCP=Deadline to make a leave requests -AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of leave days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of leave request -TitleOptionEventCP=Settings of leave requets for events +AddCPforUsers=Afegeix els saldos de dies lliures dels usuaris fent clic aquí. +DelayForSubmitCP=Data límit per realitzar peticions de dies lliures +AlertapprobatortorDelayCP=Advertir al validar si la petició no correspon a la data límit +AlertValidatorDelayCP=Advertir a l'usuari validador si la petició no respecte el límit previst +AlertValidorSoldeCP=Advertir a l'usuari validador si l'usuari demana dies lliures superiors al seu saldo +nbUserCP=Nombre d'usuaris tinguts en compte en el mòdul de dies lliures retribuïts +nbHolidayDeductedCP=Nombre de dies retribuïts a deduir per dia lliure +nbHolidayEveryMonthCP=Nombre de dies lliures afegits per mes +Module27130Name= Gestió de dies lliures +Module27130Desc= Gestió de dies lliures +TitleOptionMainCP=Ajustaments principals de dies lliures +TitleOptionEventCP=Ajustaments de dies lliures enllaçats a esdeveniments ValidEventCP=Validar UpdateEventCP=Actualitzar els esdeveniments CreateEventCP=Crear @@ -126,23 +126,23 @@ UpdateEventOptionCP=Actualitzar ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic: NoCPforMonth=Sense vacances aquest mes. nbJours=Número de dies -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Configuració dels dies lliures retribuïts #Messages Hello=Hola -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Dies lliures retribuïts a validar +HolidaysToValidateBody=A continuació trobara una sol·licitud de dies lliures retribuïts per validar +HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies. +HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles +HolidaysValidated=Dies lliures retribuïts valids +HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada. +HolidaysRefused=Dies lliures retribuïts denegats +HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut denegada per el següent motiu: +HolidaysCanceled=Dies lliures retribuïts cancel·lats +HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada. +Permission20000=Llegir els seus propis dies lliures retribuïts +Permission20001=Crear/modificar els seus dies lliures retribuïts +Permission20002=Crear/modificar dies lliures retribuïts per a tots +Permission20003=Eliminar peticions de dies lliures retribuïts +Permission20004=Configurar dies lliures retribuïts d'usuaris +Permission20005=Consultar l'historial de modificacions de dies lliures retribuïts +Permission20006=Llegir informe mensual de dies lliures retribuïts diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 67cde06844a..70ab70cec0a 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activació impossible PacificNumRefModelDesc1=Retorna el número amb el format %syymm-nnnn on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense quedar a 0 PacificNumRefModelError=Una factura que comença per # $$syymm existeix en base i és incompatible amb aquesta numeració. Elemínela o renombrela per activar aquest mòdul. PrintProductsOnFichinter=Mostrar els productes a la fitxa d'intervenció -PrintProductsOnFichinterDetails=interventions generated from orders +PrintProductsOnFichinterDetails=Intervencions generades des de comandes diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang index 5305476affb..e2ab8c4f50a 100644 --- a/htdocs/langs/ca_ES/mails.lang +++ b/htdocs/langs/ca_ES/mails.lang @@ -79,14 +79,14 @@ MailtoEMail=mailto email (hyperlink) ActivateCheckRead=Activar confirmació de lectura i opció de Desubscripció ActivateCheckReadKey=Clau usada per xifrar la URL de la confirmació de lectura i la funció de desubscripció EMailSentToNRecipients=E-Mail enviat a %s destinataris. -XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) -NoRemindSent=No EMail reminder sent -ResultOfMassSending=Result of mass EMail reminders sending +XTargetsAdded=%s destinataris agregats a la llista +EachInvoiceWillBeAttachedToEmail=Es creara i adjuntara a cada e-mail un document usant el model de factura per defecte. +MailTopicSendRemindUnpaidInvoices=Recordatori de la factura %s (%s) +SendRemind=Enviar recordatoris per e-mail +RemindSent=%s recodatori(s) enviats +AllRecipientSelectedForRemind=Tots els tercers seleccionats i si hi han e-mails definits (s'enviara un e-mail per factura) +NoRemindSent=no s'han enviat recordatoris per e-mail +ResultOfMassSending=Resultat del enviament de recordatoris # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contactes de tercers (clients potencials, clients, proveïdors ...) @@ -115,12 +115,12 @@ SentBy=Enviat por MailingNeedCommand=Per raons de seguretat, l'enviament d'un E-Mailing en massa es pot fer en línia de comandes. Demani al seu administrador que llanci la comanda següent per per enviar la correspondència a tots els destinataris: MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis ConfirmSendingEmailing=Confirma l'enviament de l'e-mailing? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Nota: L'enviament de e-mailings des de l'interfície web es realitza en tandes per raons de seguretat i "timeouts", s'enviaran a %s destinataris per tanda TargetsReset=Buidar llista ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació NbOfEMailingsReceived=E-Mailings en massa rebuts -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=E-mailing massius enviats IdRecord=ID registre DeliveryReceipt=Justificant de recepció YouCanUseCommaSeparatorForSeveralRecipients=Podeu usar el caràcter de separació coma per especificar múltiples destinataris. @@ -133,11 +133,11 @@ Notifications=Notificacions NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa ANotificationsWillBeSent=1 notificació serà enviada per e-mail SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail -AddNewNotification=Activate a new email notification target -ListOfActiveNotifications=List all active email notification targets +AddNewNotification=Activar una de notificació per correu electrònic +ListOfActiveNotifications=Llista de les sol·licituds de notificacions actives ListOfNotificationsDone=Llista de notificacions d'e-mails enviades -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. -YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor) -NbOfTargetedContacts=Current number of targeted contact emails +MailSendSetupIs=La configuració de e-mailings esta a '%s'. Aquest mètode no pot ser usat per enviar e-mails massius +MailSendSetupIs2=Abans tindrà que, amb un compte d'administrador, en el menú %sinici - Configuració - E-Mails%s, camviar el paràmetre '%s' per usar el mètode '%s'. Amb aquest metode pot configurar un servidor SMTP del seu proveïdor de serveis d'internet. +MailSendSetupIs3=Si te preguntes de com configurar el seu servidor SMTP, pot contactar amb %s. +YouCanAlsoUseSupervisorKeyword=També pot afegir l'etiqueta __SUPERVISOREMAIL__ per tenir un e-mail enviat pel supervisor a l'usuari (només funciona si un e-mail és definit per aquest supervisor) +NbOfTargetedContacts=Número actual de contactes destinataris d'e-mails diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 05c93f2874a..f38b9536289 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -220,7 +220,7 @@ Next=Següent Cards=Fitxes Card=Fitxa Now=Ara -HourStart=Start hour +HourStart=Hora d'inici Date=Data DateAndHour=Data i hora DateStart=Data inici @@ -243,8 +243,8 @@ DatePlanShort=Data Planif. DateRealShort=Data real DateBuild=Data generació de l'informe DatePayment=Data pagament -DateApprove=Approving date -DateApprove2=Approving date (second approval) +DateApprove=Data d'aprovació +DateApprove2=Data d'aprovació (segona aprobació) DurationYear=any DurationMonth=mes DurationWeek=setmana @@ -301,7 +301,7 @@ UnitPriceHT=Preu base UnitPriceTTC=Preu unitari total PriceU=P.U. PriceUHT=P.U. -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=P.U. solicitat PriceUTTC=P.U. Total Amount=Import AmountInvoice=Import factura @@ -411,8 +411,8 @@ OtherInformations=Altres informacions Quantity=Quantitat Qty=Qt. ChangedBy=Modificat per -ApprovedBy=Approved by -ApprovedBy2=Approved by (second approval) +ApprovedBy=Aprovat per +ApprovedBy2=Aprovat per (segona aprovació) ReCalculate=Recalcular ResultOk=Èxit ResultKo=Error @@ -701,8 +701,8 @@ SelectElementAndClickRefresh=Seleccioneu un element i feu clic a Actualitza PrintFile=%s arxius a imprimir ShowTransaction=Mostra transacció GoIntoSetupToChangeLogo=Anar a Inici->Configuració->Empresa per canviar el logotip o anar a Inici->Configuració->Visualització per amagar. -Deny=Deny -Denied=Denied +Deny=Denegar +Denied=Denegad # Week day Monday=Dilluns Tuesday=Dimarts diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang index 628f4022620..e8431ab5dcf 100644 --- a/htdocs/langs/ca_ES/margins.lang +++ b/htdocs/langs/ca_ES/margins.lang @@ -15,8 +15,8 @@ margesSetup=Configuració de la gestió de marges MarginDetails=Detalls de marges realitzats ProductMargins=Marges per producte CustomerMargins=Marges per client -SalesRepresentativeMargins=Sales representative margins -UserMargins=User margins +SalesRepresentativeMargins=Marges per comercial +UserMargins=Marges de l'usuari ProductService=Producte o servei AllProducts=Tots els productes i serveis ChooseProduct/Service=Trieu el producte o servei @@ -39,7 +39,7 @@ BuyingCost=Costos UnitCharges=Càrrega unitària Charges=Càrreges AgentContactType=Tipus de contacte comissionat -AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative -rateMustBeNumeric=Rate must be a numeric value -markRateShouldBeLesserThan100=Mark rate should be lower than 100 -ShowMarginInfos=Show margin infos +AgentContactTypeDetails=Indica quin tipus de contracte (enllaçat a les factures) serà l'utilitzat per l'informe de marges d'agents comercials. +rateMustBeNumeric=El marge té que ser un valor numèric +markRateShouldBeLesserThan100=El marge té que ser menor que 100 +ShowMarginInfos=Mostrar info de marges diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang index 19b7a054e6e..8e4d110b952 100644 --- a/htdocs/langs/ca_ES/opensurvey.lang +++ b/htdocs/langs/ca_ES/opensurvey.lang @@ -1,18 +1,18 @@ # Dolibarr language file - Source file is en_US - opensurvey -# Survey=Poll -# Surveys=Polls -# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... -# NewSurvey=New poll -# NoSurveysInDatabase=%s poll(s) into database. -# OpenSurveyArea=Polls area -# AddACommentForPoll=You can add a comment into poll... +Survey=Enquesta +Surveys=Enquestes +OrganizeYourMeetingEasily=Organitzi les seves reunions i enquestes fàcilment. Primer seleccioneu el tipus d'enquesta... +NewSurvey=Nova enquesta +NoSurveysInDatabase=%s enquesta(s) a la base de dades. +OpenSurveyArea=Àrea enquestes +AddACommentForPoll=Pot afegir un comentari a l'enquesta... AddComment=Afegir comentari CreatePoll=Crear enquesta PollTitle=Títol de l'enquesta -# ToReceiveEMailForEachVote=Receive an email for each vote +ToReceiveEMailForEachVote=Rebre un correu electrònic per cada vot TypeDate=Tipus de data TypeClassic=Tipus estándar -# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +OpenSurveyStep2=Seleccioneu les dates entre els dies lliures (en gris). Els dies seleccionats són de color verd. Vostè pot cancel·lar la selecció d'un dia prèviament seleccionat fent clic de nou sobre el mateix RemoveAllDays=Eliminar tots els dies CopyHoursOfFirstDay=Copia hores del primer dia RemoveAllHours=Eliminar totes les hores @@ -20,14 +20,14 @@ SelectedDays=Dies seleccionats TheBestChoice=Actualment la millor opció és TheBestChoices=Actualment les millors opcions són with=amb -# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +OpenSurveyHowTo=Si està d'acord per votar en aquesta enquesta, ha de donar el seu nom, triar els valors que s'ajusten millor per a vostè i validi amb el botó de més al final de la línia. CommentsOfVoters=Comentaris dels votants ConfirmRemovalOfPoll=Està segur que desitja eliminar aquesta enquesta (i tots els vots) RemovePoll=Eliminar enquesta -# UrlForSurvey=URL to communicate to get a direct access to poll -# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: -# CreateSurveyDate=Create a date poll -# CreateSurveyStandard=Create a standard poll +UrlForSurvey=URL per indicar l'accés directe a l'enquesta +PollOnChoice=Està creant una enquesta amb múltiples opcions. Primer introdueixi totes les opcions possibles per aquesta enquesta: +CreateSurveyDate=Crear una enquesta de data +CreateSurveyStandard=Crear una enquesta estàndard CheckBox=Checkbox simple YesNoList=Llista (buit/sí/no) PourContreList=Llista (buit/a favor/en contra) @@ -35,7 +35,7 @@ AddNewColumn=Afegir nova columna TitleChoice=Títol de l'opció ExportSpreadsheet=Exportar resultats a un full de càlcul ExpireDate=Data límit -# NbOfSurveys=Number of polls +NbOfSurveys=Número d'enquestes NbOfVoters=Núm. de votants SurveyResults=Resultats PollAdminDesc=Està autoritzat per canviar totes les línies de l'enquesta amb el botó "Editar". Pot, també, eliminar una columna o una línia amb %s. També podeu afegir una nova columna amb %s. @@ -53,14 +53,14 @@ AddEndHour=Afegir hora de fi votes=vot(s) NoCommentYet=Cap comentari ha estat publicat per a aquesta enquesta CanEditVotes=Podeu canviar el vot d'altres -# CanComment=Voters can comment in the poll -# CanSeeOthersVote=Voters can see other people's vote +CanComment=Els votants poden comentar a l'enquesta +CanSeeOthersVote=Els votants poden veure els vots d'altres SelectDayDesc=Per a cada dia seleccionat, pot triar, o no, les hores de reunió en el següent format:
- buit,
- "8h", "8H" o "8:00" per proporcionar una hora d'inici de la reunió,
- "8-11", "8h-11h", "8H-11H" o "8:00-11:00" per proporcionar una hora d'inici i de fi de la reunió,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" per el mateix però amb minuts. BackToCurrentMonth=Tornar al mes actual -# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation -# ErrorOpenSurveyOneChoice=Enter at least one choice -# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD -# ErrorInsertingComment=There was an error while inserting your comment -# MoreChoices=Enter more choices for the voters -# SurveyExpiredInfo=The voting time of this poll has expired. -# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +ErrorOpenSurveyFillFirstSection=No ha emplenat la primera secció de la creació de l'enquesta +ErrorOpenSurveyOneChoice=Introdueixi almenys una opció +ErrorOpenSurveyDateFormat=La data té que ser amb el format YYYY-MM-DD +ErrorInsertingComment=S'ha produït un error ha l'inserir el seu comentari +MoreChoices=Introdueixi més opcions pels votants +SurveyExpiredInfo=El temps per votar en aquesta enquesta s'ha acabat +EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 5571c384c34..71f502ffa6b 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -16,20 +16,20 @@ SupplierOrder=Comanda a proveïdor SuppliersOrders=Comandes a proveïdors SuppliersOrdersRunning=Comandes a proveïdors en curs CustomerOrder=Comada de client -CustomersOrders=Customers orders +CustomersOrders=Comandes de clients CustomersOrdersRunning=Comandes de clients en curs CustomersOrdersAndOrdersLines=Comandes de clients i línies de comanda -OrdersToValid=Customers orders to validate -OrdersToBill=Customers orders delivered -OrdersInProcess=Customers orders in process -OrdersToProcess=Customers orders to process +OrdersToValid=Comandes de clients a validar +OrdersToBill=Comandes de clients a facturar +OrdersInProcess=Comandes de clients en procés +OrdersToProcess=Comandes de clients a processar SuppliersOrdersToProcess=Comandes a proveïdors a processar StatusOrderCanceledShort=Anul·lada StatusOrderDraftShort=Esborrany StatusOrderValidatedShort=Validada StatusOrderSentShort=Expedició en curs StatusOrderSent=Enviament en curs -StatusOrderOnProcessShort=Ordered +StatusOrderOnProcessShort=Comanda StatusOrderProcessedShort=Processada StatusOrderToBillShort=Emès StatusOrderToBill2Short=A facturar @@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Rebuda StatusOrderCanceled=Anul-lada StatusOrderDraft=Esborrany (a validar) StatusOrderValidated=Validada -StatusOrderOnProcess=Ordered - Standby reception -StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderOnProcess=Comanda - En espera de recepció +StatusOrderOnProcessWithValidation=Comanda - A l'espera de rebre o validar StatusOrderProcessed=Processada StatusOrderToBill=Emès StatusOrderToBill2=A facturar @@ -51,26 +51,26 @@ StatusOrderRefused=Rebutjada StatusOrderReceivedPartially=Rebuda parcialment StatusOrderReceivedAll=Rebuda ShippingExist=Existeix una expedició -ProductQtyInDraft=Product quantity into draft orders -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +ProductQtyInDraft=Cantitats a comandes esborrany +ProductQtyInDraftOrWaitingApproved=Quantitats en comandes esborrany o aprovades, però no realitzades DraftOrWaitingApproved=Esborrany o aprovat encara no controlat DraftOrWaitingShipped=Esborrany o validada encara no expedida MenuOrdersToBill=Comandes a facturar -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Comandes facturables SearchOrder=Cercar una comanda -SearchACustomerOrder=Search a customer order -SearchASupplierOrder=Search a supplier order +SearchACustomerOrder=Cerca una comanda de client +SearchASupplierOrder=Cerca una comanda a proveïdor ShipProduct=Enviar producte Discount=Descompte CreateOrder=Crear comanda RefuseOrder=Rebutjar la comanda -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Aprobar comanda +Approve2Order=Aprovar comanda (segon nivell) ValidateOrder=Validar la comanda UnvalidateOrder=Desvalidar la comanda DeleteOrder=Eliminar la comanda CancelOrder=Anul·lar la comanda -AddOrder=Create order +AddOrder=Crear comanda AddToMyOrders=afegir a les meves comandes AddToOtherOrders=Afegir a altres comandes AddToDraftOrders=Afegir a comanda esborrany @@ -79,9 +79,9 @@ NoOpenedOrders=Cap comanda esborrany NoOtherOpenedOrders=Cap altra comanda esborrany NoDraftOrders=Sense comandes esborrany OtherOrders=Altres comandes -LastOrders=Last %s customer orders -LastCustomerOrders=Last %s customer orders -LastSupplierOrders=Last %s supplier orders +LastOrders=Últimes %s comandes de clients +LastCustomerOrders=Últimes %s comandes de clients +LastSupplierOrders=Últimes %s comandes a proveïdors LastModifiedOrders=Les %s darreres comandes modificades LastClosedOrders=Les %s darreres comandes tancades AllOrders=Totes les comandes @@ -105,8 +105,8 @@ ClassifyBilled=Classificar facturat ComptaCard=Fitxa comptable DraftOrders=Comandes esborrany RelatedOrders=Comandes adjuntes -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Comandes de clients relacionades +RelatedSupplierOrders=Comandes a clients relacionades OnProcessOrders=Comandes en procés RefOrder=Ref. comanda RefCustomerOrder=Ref. comanda client @@ -123,7 +123,7 @@ PaymentOrderRef=Pagament comanda %s CloneOrder=Clonar comanda ConfirmCloneOrder=Esteu segur de voler clonar aquesta comanda %s? DispatchSupplierOrder=Recepció de la comanda a proveïdor %s -FirstApprovalAlreadyDone=First approval already done +FirstApprovalAlreadyDone=Primera aprovació realitzada ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Responsable seguiment comanda client TypeContact_commande_internal_SHIPPING=Responsable enviament comanda client @@ -154,7 +154,7 @@ AddDeliveryCostLine=Afegir una línia de despeses de ports indicant el pes de la # Documents models PDFEinsteinDescription=Model de comanda complet (logo...) PDFEdisonDescription=Model de comanda simple -PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=Una factura proforma completa (logo...) # Orders modes OrderByMail=Correu OrderByFax=Fax @@ -169,4 +169,4 @@ Ordered=Comandat OrderCreated=Les seves comandes han estat creats OrderFail=S'ha produït un error durant la creació de les seves comandes CreateOrders=Crear comandes -ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s". diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index 3b60ef60815..825b196a8b5 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -12,61 +12,61 @@ Notify_FICHINTER_VALIDATE=Validació fitxa intervenció Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail Notify_BILL_VALIDATE=Validació factura Notify_BILL_UNVALIDATE=Devalidació factura a client -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Comanda a proveïdor registrada Notify_ORDER_SUPPLIER_APPROVE=Aprovació comanda a proveïdor Notify_ORDER_SUPPLIER_REFUSE=Rebuig comanda a proveïdor Notify_ORDER_VALIDATE=Validació comanda client Notify_PROPAL_VALIDATE=Validació pressupost client -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=Pressupost tancat com a firmat +Notify_PROPAL_CLOSE_REFUSED=Pressupost tancat com a rebutjat Notify_WITHDRAW_TRANSMIT=Transmissió domiciliació Notify_WITHDRAW_CREDIT=Abonament domiciliació Notify_WITHDRAW_EMIT=Emissió domiciliació Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail Notify_COMPANY_CREATE=Creació tercer -Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_COMPANY_SENTBYMAIL=E-mails enviats des de la fitxa del tercer Notify_PROPAL_SENTBYMAIL=Enviament pressupost per e-mail Notify_BILL_PAYED=Cobrament factura a client Notify_BILL_CANCEL=Cancel·lació factura a client Notify_BILL_SENTBYMAIL=Enviament factura a client per e-mail -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Comanda a proveïdor registrada Notify_ORDER_SUPPLIER_SENTBYMAIL=Enviament comanda a proveïdor per e-mail Notify_BILL_SUPPLIER_VALIDATE=Validació factura de proveïdor Notify_BILL_SUPPLIER_PAYED=Pagament factura de proveïdor Notify_BILL_SUPPLIER_SENTBYMAIL=Enviament factura de proveïdor per e-mail -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_BILL_SUPPLIER_CANCELED=Factura del proveïdor cancel·lada Notify_CONTRACT_VALIDATE=Validació contracte Notify_FICHEINTER_VALIDATE=Validació intervenció Notify_SHIPPING_VALIDATE=Validació enviament Notify_SHIPPING_SENTBYMAIL=Enviament expedició per e-mail Notify_MEMBER_VALIDATE=Validació membre -Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_MODIFY=Membre modificat Notify_MEMBER_SUBSCRIPTION=Afiliació membre Notify_MEMBER_RESILIATE=Baixa membre Notify_MEMBER_DELETE=Eliminació membre -Notify_PROJECT_CREATE=Project creation -Notify_TASK_CREATE=Task created -Notify_TASK_MODIFY=Task modified -Notify_TASK_DELETE=Task deleted -SeeModuleSetup=See setup of module %s +Notify_PROJECT_CREATE=Creació d'un projecte +Notify_TASK_CREATE=Tasca creada +Notify_TASK_MODIFY=Tasca modificada +Notify_TASK_DELETE=Tasca eliminada +SeeModuleSetup=Vegi la configuració del mòdul %s NbOfAttachedFiles=Número arxius/documents adjunts TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts MaxSize=Tamany màxim AttachANewFile=Adjuntar nou arxiu/document LinkedObject=Objecte adjuntat Miscellaneous=Diversos -NbOfActiveNotifications=Number of notifications (nb of recipient emails) +NbOfActiveNotifications=Nombre de notificacions (nº de destinataris) PredefinedMailTest=Això és un correu de prova.\nLes 2 línies estan separades per un retorn de carro a la línia. PredefinedMailTestHtml=Això és un e-mail de prova (la paraula prova ha d'estar en negreta).
Les 2 línies estan separades per un retorn de carro en la línia -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVolem recordar-li que la seva factura __FACREF__ sembla estar pendent de pagament. Li adjuntem la factura en cuestio, com a recordatori.\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLi adjuntem el pressupost __PROPREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLi adjuntem la comanda __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLi adjuntem la nostre comanda __ORDERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLi adjuntem l'enviament __SHIPPINGREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLi adjuntem l'intervenció __FICHINTERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr és un programari per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que inclogui tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls. A més, té disponibles diversos tipus de perfils de demostració. ChooseYourDemoProfil=Seleccioneu el perfil de demostració que millor correspongui a la seva activitat ... @@ -82,16 +82,16 @@ ModifiedBy=Modificat per %s ValidatedBy=Validat per %s CanceledBy=Anul·lat per %s ClosedBy=Tancat per %s -CreatedById=User id who created -ModifiedById=User id who made last change -ValidatedById=User id who validated -CanceledById=User id who canceled -ClosedById=User id who closed -CreatedByLogin=User login who created -ModifiedByLogin=User login who made last change -ValidatedByLogin=User login who validated -CanceledByLogin=User login who canceled -ClosedByLogin=User login who closed +CreatedById=ID d'usuari que ha creat +ModifiedById=ID d'usuari que ha realitzat l'últim canvi +ValidatedById=ID d'usuari que a validat +CanceledById=ID d'usuari que ha cancel·lat +ClosedById=ID d'usuari que a tancat +CreatedByLogin=Login d'usuari que a creat +ModifiedByLogin=Login d'usuari que ha realitzat l'últim canvi +ValidatedByLogin=Login d'usuari que ha validat +CanceledByLogin=Login d'usuari que ha cancel·lat +ClosedByLogin=Login d'usuari que a tancat FileWasRemoved=L'arxiu %s s'ha eliminat DirWasRemoved=La carpeta %s s'ha eliminat FeatureNotYetAvailableShort=Disponible en una propera versió @@ -164,14 +164,14 @@ NumberOfSupplierInvoices=Nombre de factures de proveïdors en els darrers 12 mes NumberOfUnitsProposals=Nombre d'unitats en els pressupostos en els darrers 12 mesos NumberOfUnitsCustomerOrders=Nombre d'unitats en les comandes de clients en els darrers 12 mesos NumberOfUnitsCustomerInvoices=Nombre d'unitats en les factures a clients en els darrers 12 mesos -NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierOrders=Nombre d'unitats a les comandes a proveïdors en els últims 12 mesos NumberOfUnitsSupplierInvoices=Nombre d'unitats en les comandes a proveïdors en els darrers 12 mesos EMailTextInterventionValidated=Fitxa intervenció %s validada EMailTextInvoiceValidated=Factura %s validada EMailTextProposalValidated=El pressupost %s que el concerneix ha estat validat. EMailTextOrderValidated=La comanda %s que el concerneix ha estat validada. EMailTextOrderApproved=Comanda %s aprovada -EMailTextOrderValidatedBy=The order %s has been recorded by %s. +EMailTextOrderValidatedBy=La comanda %s ha sigut registrada per %s. EMailTextOrderApprovedBy=Comanda %s aprovada per %s EMailTextOrderRefused=Comanda %s rebutjada EMailTextOrderRefusedBy=Comanda %s rebutjada per %s @@ -197,36 +197,36 @@ StartUpload=Transferir CancelUpload=Cancel·lar transferència FileIsTooBig=L'arxiu és massa gran PleaseBePatient=Preguem esperi uns instants... -RequestToResetPasswordReceived=A request to change your Dolibarr password has been received -NewKeyIs=This is your new keys to login -NewKeyWillBe=Your new key to login to software will be -ClickHereToGoTo=Click here to go to %s -YouMustClickToChange=You must however first click on the following link to validate this password change -ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. -IfAmountHigherThan=If amount higher than %s +RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la contrasenya de Dolibarr +NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió +NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà +ClickHereToGoTo=Faci clic aquí per anar a %s +YouMustClickToChange=però, primer ha de fer clic en el següent enllaç per validar aquest canvi de contrasenya +ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura +IfAmountHigherThan=si l'import es major que %s ##### Calendar common ##### AddCalendarEntry=Afegir entrada al calendari -NewCompanyToDolibarr=Company %s added -ContractValidatedInDolibarr=Contract %s validated -ContractCanceledInDolibarr=Contract %s canceled -ContractClosedInDolibarr=Contract %s closed -PropalClosedSignedInDolibarr=Proposal %s signed -PropalClosedRefusedInDolibarr=Proposal %s refused -PropalValidatedInDolibarr=Proposal %s validated -PropalClassifiedBilledInDolibarr=Proposal %s classified billed -InvoiceValidatedInDolibarr=Invoice %s validated -InvoicePaidInDolibarr=Invoice %s changed to paid -InvoiceCanceledInDolibarr=Invoice %s canceled -PaymentDoneInDolibarr=Payment %s done -CustomerPaymentDoneInDolibarr=Customer payment %s done -SupplierPaymentDoneInDolibarr=Supplier payment %s done -MemberValidatedInDolibarr=Member %s validated -MemberResiliatedInDolibarr=Member %s resiliated -MemberDeletedInDolibarr=Member %s deleted -MemberSubscriptionAddedInDolibarr=Subscription for member %s added -ShipmentValidatedInDolibarr=Shipment %s validated -ShipmentDeletedInDolibarr=Shipment %s deleted +NewCompanyToDolibarr=Empresa %s afegida +ContractValidatedInDolibarr=Contracte %s validat +ContractCanceledInDolibarr=Contracte %s cancel·lat +ContractClosedInDolibarr=Contracte %s tancat +PropalClosedSignedInDolibarr=Pressupost %s firmat +PropalClosedRefusedInDolibarr=Pressupost %s rebutjat +PropalValidatedInDolibarr=Pressupost %s validat +PropalClassifiedBilledInDolibarr=Pressupost %s classificat facturat +InvoiceValidatedInDolibarr=Factura %s validat +InvoicePaidInDolibarr=Factura %s passada a pagada +InvoiceCanceledInDolibarr=Factura %s cancel·lada +PaymentDoneInDolibarr=Pagament %s realitzat +CustomerPaymentDoneInDolibarr=Pagament de client %s realitzat +SupplierPaymentDoneInDolibarr=Pagament a proveïdor %s realitzat +MemberValidatedInDolibarr=membre %s validat +MemberResiliatedInDolibarr=Membre %s donat de baixa +MemberDeletedInDolibarr=membre %s eliminat +MemberSubscriptionAddedInDolibarr=Subscripció de membre %s afegida +ShipmentValidatedInDolibarr=Expedició %s validada +ShipmentDeletedInDolibarr=Expedició %s eliminada ##### Export ##### Export=Exportació ExportsArea=Àrea d'exportacions diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang index 352b631f646..a61e731b25a 100644 --- a/htdocs/langs/ca_ES/paybox.lang +++ b/htdocs/langs/ca_ES/paybox.lang @@ -35,6 +35,6 @@ MessageKO=Missatge a la pàgina de retorn de pagament cancel·lat NewPayboxPaymentReceived=Nou pagament Paybox rebut NewPayboxPaymentFailed=Nou intent de pagament Paybox sense èxit PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +PAYBOX_PBX_SITE=Valor per PBX SITE +PAYBOX_PBX_RANG=valor per PBX Rang +PAYBOX_PBX_IDENTIFIANT=Valor per PBX ID diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang index ba68e4829f9..eb123ba68c9 100644 --- a/htdocs/langs/ca_ES/paypal.lang +++ b/htdocs/langs/ca_ES/paypal.lang @@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Actualment es troba en mode "sandbox" NewPaypalPaymentReceived=Nou pagament Paypal rebut NewPaypalPaymentFailed=Nou intent de pagament Paypal sense èxit PAYPAL_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no) -ReturnURLAfterPayment=Return URL after payment -ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed -PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed +ReturnURLAfterPayment=URL de retorn després del pagament +ValidationOfPaypalPaymentFailed=La validació del pagament Paypal ha fallat +PaypalConfirmPaymentPageWasCalledButFailed=La pàgina de configuració de pagament per Paypal ha sigut trucada per Paypal per la confirmació ha fallat diff --git a/htdocs/langs/ca_ES/printipp.lang b/htdocs/langs/ca_ES/printipp.lang index 835e6827f12..1ea5fce8f89 100644 --- a/htdocs/langs/ca_ES/printipp.lang +++ b/htdocs/langs/ca_ES/printipp.lang @@ -1,14 +1,14 @@ # Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server +PrintIPPSetup=Configuració del mòdul Impressió Directe +PrintIPPDesc=Aquest mòdul afegeix un boto per enviar documents directament a una impressora. Es necessari un SO Linux amb CUPS instal·lat. +PRINTIPP_ENABLED=Mostrar icona "Impressió directe" en els llistats de documents +PRINTIPP_HOST=Servidor d'impressió PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server +PRINTIPP_USER=Usuari +PRINTIPP_PASSWORD=Contrasenya +NoPrinterFound=No es pot trobar impressores (Comprovi la configuració del CUPS) +FileWasSentToPrinter=L'arxiu %s ha sigut enviat a l'impressora +NoDefaultPrinterDefined=No hi han impressores definides per defecte +DefaultPrinter=Impresores per defecte +Printer=Impressora +CupsServer=Servidor CUPS diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang index 85b1d27f3a6..8438ddea768 100644 --- a/htdocs/langs/ca_ES/productbatch.lang +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -1,22 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use lot/serial number -ProductStatusOnBatch=Yes (lot/serial required) -ProductStatusNotOnBatch=No (lot/serial not used) -ProductStatusOnBatchShort=Yes +ManageLotSerial=Utilitzar numeració per lots/series +ProductStatusOnBatch=Si (es necessita lot/serie) +ProductStatusNotOnBatch=No (no s'utilitza lot/serie) +ProductStatusOnBatchShort=Si ProductStatusNotOnBatchShort=No -Batch=Lot/Serial -atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number -batch_number=Lot/Serial number -BatchNumberShort=Lot/Serial -l_eatby=Eat-by date -l_sellby=Sell-by date -DetailBatchNumber=Lot/Serial details -DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) -printBatch=Lot/Serial: %s -printEatby=Eat-by: %s -printSellby=Sell-by: %s -printQty=Qty: %d -AddDispatchBatchLine=Add a line for Shelf Life dispatching -BatchDefaultNumber=Undefined -WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. -ProductDoesNotUseBatchSerial=This product does not use batch/serial number +Batch=Lot/Serie +atleast1batchfield=Data de caducitat o Data de venda o Lot/Numero de Serie +batch_number=Número de Lot/Serie +BatchNumberShort=Lot/Serie +l_eatby=Data de caducitat +l_sellby=Data límit de venda +DetailBatchNumber=Detalls del lot/serie +DetailBatchFormat=Lot/Serie: %s - Caducitat: %s - Límit de venda: %s (Estoc: %d) +printBatch=Lot/Serie %s +printEatby=Caducitat: %s +printSellby=Límit venda: %s +printQty=Quant.: %d +AddDispatchBatchLine=Afegir una línia per despatx per caducitat +BatchDefaultNumber=Indefinit +WhenProductBatchModuleOnOptionAreForced=Si el mòdul de Lot/Serie esta activat, l'increment/disminució d'estoc esta forçada a l'últim escollit i no pot editar-se. Altres opcions poden definir-se si es necessita +ProductDoesNotUseBatchSerial=Aquest producte no utilitza numeració per lot/series diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang index 3714e0bff6a..2323a3d7b46 100644 --- a/htdocs/langs/ca_ES/products.lang +++ b/htdocs/langs/ca_ES/products.lang @@ -13,25 +13,25 @@ NewProduct=Nou producte NewService=Nou servei ProductCode=Codi producte ServiceCode=Codi servei -ProductVatMassChange=Mass VAT change -ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. -MassBarcodeInit=Mass barcode init -MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductVatMassChange=Canvi d'IVA massiu +ProductVatMassChangeDesc=Pot utilitzar aquesta pàgina per modificar la tassa d'IVA definida en els productes o serveis d'un valor a un altre. Atenció, ja aquest canvi es realitzara en tota la base de dades. +MassBarcodeInit=Inicialització massiu de codis de barres +MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat ProductAccountancyBuyCode=Codi comptable compres ProductAccountancySellCode=Código contable vendes ProductOrService=Producte o servei ProductsAndServices=Productes i serveis ProductsOrServices=Productes o serveis -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesOnSell=Productes i serveis en vende o compra +ProductsAndServicesNotOnSell=Productes i Serveis fora de venda ProductsAndServicesStatistics=Estadístiques productes i serveis ProductsStatistics=Estadístiques productes -ProductsOnSell=Product for sale or for pruchase -ProductsNotOnSell=Product out of sale and out of purchase -ProductsOnSellAndOnBuy=Products for sale and for purchase -ServicesOnSell=Services for sale or for purchase -ServicesNotOnSell=Services out of sale -ServicesOnSellAndOnBuy=Services for sale and for purchase +ProductsOnSell=Producte en vende o compra +ProductsNotOnSell=Producte fora de venda i compra +ProductsOnSellAndOnBuy=Productes en vende o en compra +ServicesOnSell=Serveis en venda o compra +ServicesNotOnSell=Serveis fora de venda +ServicesOnSellAndOnBuy=Serveis en vende o en compra InternalRef=Referència interna LastRecorded=Ultims productes/serveis en venda registrats LastRecordedProductsAndServices=Els %s darrers productes/serveis registrats @@ -72,20 +72,20 @@ PublicPrice=Preu públic CurrentPrice=Preu actual NewPrice=Nou preu MinPrice=Preu de venda min. -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) +MinPriceHT=Preu mínim de vende (a.i.) +MinPriceTTC=Preus mínim de venda (i.i.) CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran. ContractStatus=Estat de contracte ContractStatusClosed=Tancat ContractStatusRunning=En servei ContractStatusExpired=Expirat ContractStatusOnHold=Fora de servei -ContractStatusToRun=To get running +ContractStatusToRun=A l'iniciar ContractNotRunning=Aquest contracte no està en servei ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix. ErrorProductBadRefOrLabel=El valor de la referència o etiqueta és incorrecte ErrorProductClone=S'ha produït un error en intentar clonar el producte o servei. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Error, el preu no pot ser menor que el preu mínim. Suppliers=Proveïdors SupplierRef=Ref. producte proveïdor ShowProduct=Mostrar producte @@ -114,15 +114,15 @@ BarcodeValue=Valor del codi de barres NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.) CreateCopy=Crear còpia ServiceLimitedDuration=Si el servei és de durada limitada: -MultiPricesAbility=Several level of prices per product/service +MultiPricesAbility=Diversos nivells de preus per producte/servei MultiPricesNumPrices=Nº de preus MultiPriceLevelsName=Categoria de preus -AssociatedProductsAbility=Activate the virtual package feature -AssociatedProducts=Package product -AssociatedProductsNumber=Number of products composing this virtual package product -ParentProductsNumber=Number of parent packaging product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product +AssociatedProductsAbility=Activar la funcionalitat de productes compostos +AssociatedProducts=Producte compost +AssociatedProductsNumber=Nº de productes que componen aquest producte +ParentProductsNumber=Nº de productes que aquest compon +IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte compost +IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no pot ser utilitzat per cap producte compost EditAssociate=Compondre Translation=Traducció KeywordFilter=Filtre per clau @@ -132,7 +132,7 @@ AddDel=Adjuntar/Retirar Quantity=Quantitat NoMatchFound=No s'han trobat resultats ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició -ProductParentList=List of package products/services with this product as a component +ProductParentList=Llistat de productes/serveis amb aquest producte com a component ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs DeleteProduct=Eliminar un producte/servei ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei? @@ -151,22 +151,22 @@ NoStockForThisProduct=No hi ha stock d'aquest producte NoStock=Sense stock Restock=Reposar ProductSpecial=Especial -QtyMin=Minimum Qty +QtyMin=Quantitat mínima PriceQty=Preu per la quantitat -PriceQtyMin=Price for this min. qty (w/o discount) +PriceQtyMin=Preu per aquesta quantitat mínima (sense descompte) VATRateForSupplierProduct=Taxa IVA (per aquest producte/proveïdor) -DiscountQtyMin=Default discount for qty +DiscountQtyMin=Descompte per defecte per aquesta quantitat NoPriceDefinedForThisSupplier=Cap preu/quant. definit per a aquest proveïdor/producte NoSupplierPriceDefinedForThisProduct=Cap preu/quant. proveïdor definit per a aquest producte RecordedProducts=Productes en venda RecordedServices=Serveis en venda RecordedProductsAndServices=Productes/serveis en venda -PredefinedProductsToSell=Predefined products to sell -PredefinedServicesToSell=Predefined services to sell -PredefinedProductsAndServicesToSell=Predefined products/services to sell -PredefinedProductsToPurchase=Predefined product to purchase -PredefinedServicesToPurchase=Predefined services to purchase -PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +PredefinedProductsToSell=Productes predefinits per vendre +PredefinedServicesToSell=Serveis predefinits per vendre +PredefinedProductsAndServicesToSell=Productes/serveis predefinits per vendre +PredefinedProductsToPurchase=Producte predefinit per comprar +PredefinedServicesToPurchase=Serveis predefinits per comprar +PredefinedProductsAndServicesToPurchase=Productes/serveis predefinits per comprar GenerateThumb=Generar l'etiqueta ProductCanvasAbility=Utilitzar les extensions especials "canvas" ServiceNb=Servei nº %s @@ -179,18 +179,18 @@ CloneProduct=Clonar producte/servei ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei %s ? CloneContentProduct=Clonar només la informació general del producte/servei ClonePricesProduct=Clonar la informació general i els preus -CloneCompositionProduct=Clone packaged product/services +CloneCompositionProduct=Clonar productes/serveis compostos ProductIsUsed=Aquest producte és utilitzat NewRefForClone=Ref. del nou producte/servei CustomerPrices=Preus clients SuppliersPrices=Preus proveïdors -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +SuppliersPricesOfProductsOrServices=Preus de proveïdors (productes o serveis) CustomCode=Codi duaner CountryOrigin=País d'origen HiddenIntoCombo=Ocult en les llistes Nature=Naturalesa -ProductCodeModel=Product ref template -ServiceCodeModel=Service ref template +ProductCodeModel=Model de ref. del producte +ServiceCodeModel=Model de ref. del servei AddThisProductCard=Crear fitxa producte HelpAddThisProductCard=Aquesta opció permet crear o clonar una fitxa de producte en cas que no hi hagi AddThisServiceCard=Crear fitxa servei @@ -198,7 +198,7 @@ HelpAddThisServiceCard=Aquesta opció permet crear o clonar una fitxa de servei CurrentProductPrice=Preu actual AlwaysUseNewPrice=Utilitzar sempre el preu actual AlwaysUseFixedPrice=Utilitzar el preu fixat -PriceByQuantity=Different prices by quantity +PriceByQuantity=Preus diferents per quantitat PriceByQuantityRange=Rang de quantitats ProductsDashboard=Resum productes/serveis UpdateOriginalProductLabel=Canviar etiqueta original @@ -214,56 +214,56 @@ CostPmpHT=Cost de compra ProductUsedForBuild=Auto consumit per producció ProductBuilded=Producció completada ProductsMultiPrice=Producte multi-preu -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) -ProductSellByQuarterHT=Products turnover quarterly VWAP -ServiceSellByQuarterHT=Services turnover quarterly VWAP -Quarter1=1st. Quarter -Quarter2=2nd. Quarter -Quarter3=3rd. Quarter -Quarter4=4th. Quarter -BarCodePrintsheet=Print bar code -PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. -NumberOfStickers=Number of stickers to print on page -PrintsheetForOneBarCode=Print several stickers for one barcode -BuildPageToPrint=Generate page to print -FillBarCodeTypeAndValueManually=Fill barcode type and value manually. -FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. -FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. -DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. -DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. -BarCodeDataForProduct=Barcode information of product %s : -BarCodeDataForThirdparty=Barcode information of thirdparty %s : -ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) -PriceByCustomer=Different price for each customer -PriceCatalogue=Unique price per product/service -PricingRule=Rules for customer prices -AddCustomerPrice=Add price by customers -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries -PriceByCustomerLog=Price by customer log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s -PriceExpressionEditor=Price expression editor -PriceExpressionSelected=Selected price expression -PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions -PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# -PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# -PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# -PriceExpressionEditorHelp5=Available global values: -PriceMode=Price mode -PriceNumeric=Number -DefaultPrice=Default price -ComposedProductIncDecStock=Increase/Decrease stock on parent change -ComposedProduct=Sub-product -MinSupplierPrice=Minimum supplier price -DynamicPriceConfiguration=Dynamic price configuration -GlobalVariables=Global variables -GlobalVariableUpdaters=Global variable updaters -GlobalVariableUpdaterType0=JSON data -GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value, -GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} -GlobalVariableUpdaterType1=WebService data -GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method -GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} -UpdateInterval=Update interval (minutes) -LastUpdated=Last updated -CorrectlyUpdated=Correctly updated +ProductsOrServiceMultiPrice=Preus a clients (productes o serveis, multi-preus) +ProductSellByQuarterHT=Vendes de productes base imposable +ServiceSellByQuarterHT=Vendes de serveis base imposable +Quarter1=1º trimestre +Quarter2=2º trimestre +Quarter3=3º trimestre +Quarter4=4º trimestre +BarCodePrintsheet=Imprimir codi de barres +PageToGenerateBarCodeSheets=Amb aquesta eina, pots imprimir fulles d'etiquetes de codi de barres. Esculli el format de la pàgina de l'etiqueta, el tipus i el valor del codi de barres, a continuació, faci clic en el boto %s. +NumberOfStickers=Nùmero d'etiquetes per imprimir a la pàgina +PrintsheetForOneBarCode=Imprimir varies etiquetes per codi de barres +BuildPageToPrint=Generar pàgines a imprimir +FillBarCodeTypeAndValueManually=Emplenar tipus i valor del codi de barres manualment +FillBarCodeTypeAndValueFromProduct=Emplenar tipus i valor del codi de barres d'un producte +FillBarCodeTypeAndValueFromThirdParty=Emplenar tipus i valor del codi de barres d'un tercer +DefinitionOfBarCodeForProductNotComplete=Definir el tipus o valor de codi de barres incomplet del producte %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definir el tipus o valor de codi de barres incomplet del tercer %s. +BarCodeDataForProduct=Informació del codi de barres del producte %s: +BarCodeDataForThirdparty=informació del codi de barres del tercer %s: +ResetBarcodeForAllRecords=Definir codis de barres per tots els registres (pica els valors de codis de barres ja registrats) +PriceByCustomer=Preus diferents per cada client +PriceCatalogue=Preus únics per producte/servei +PricingRule=Regles per preus a clients +AddCustomerPrice=Afegir preus per client +ForceUpdateChildPriceSoc=Establir el mateix preu a les filials dels clients +PriceByCustomerLog=Log de preus per clients +MinimumPriceLimit=El preu mínim no pot ser menor de %s +MinimumRecommendedPrice=El preu mínim recomenat es: %s +PriceExpressionEditor=Editor de expresió de preus +PriceExpressionSelected=Expressió de preus seleccionat +PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per configurar un preu. Utilitzi ; per separar expresions +PriceExpressionEditorHelp2=Pot accedir als atributs addicionals amb variables com #extrafield_myextrafieldkey# i variables globals amb #global_mycode# +PriceExpressionEditorHelp3=Amb productes i serveis, i preus de proveïdor estan disponibles les següents variables
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=Només en els preus de productes i serveis: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp5=Valors globals disponibles: +PriceMode=Mètode de preu +PriceNumeric=Número +DefaultPrice=Preu per defecte +ComposedProductIncDecStock=Incrementar/Disminueix estoc en canviar el seu pare +ComposedProduct=Sub-producte +MinSupplierPrice=Preu mínim de proveïdor +DynamicPriceConfiguration=Configuració de preu dinàmic +GlobalVariables=Variables globals +GlobalVariableUpdaters=Actualitzacions de variables globals +GlobalVariableUpdaterType0=Dades JSON +GlobalVariableUpdaterHelp0=Analitza dades JSON des de l'URL especificada, el valor especifica l'ubicació de valor rellevant +GlobalVariableUpdaterHelpFormat0=El format es {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=Dades WebService +GlobalVariableUpdaterHelp1=Analitza dades WebService de l'URL especificada, NS especifica el namespace, VALUE especifica l'ubicació del valor pertinent, DATA conter les dades a enviar i METHOD és el mètode WS a trucar +GlobalVariableUpdaterHelpFormat1=el format es {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Interval d'actualizació (minuts) +LastUpdated=Última actualització +CorrectlyUpdated=Actualitzat correctament diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index d1706c8c5bc..9f78eb88bbd 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -1,23 +1,23 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project -ProjectId=Project Id +RefProject=Ref. projecte +ProjectId=ID projecte Project=Projecte Projects=Projectes -ProjectStatus=Project status +ProjectStatus=Estat el projecte SharedProject=Projecte compartit PrivateProject=Contactes del projecte MyProjectsDesc=Aquesta vista projecte es limita als projectes en què vostè és un contacte afectat (qualsevol tipus). ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat. -ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa). MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus). -OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +OnlyOpenedProject=Només són visibles els projectes oberts (els projectes amb estat esborrany o tancat no són visibles) TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat. TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa). -AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. +AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a aquests projectes són visibles, però introduir temps només per a la tasca que tingui assignada. ProjectsArea=Àrea projectes NewProject=Nou projecte -AddProject=Create project +AddProject=Crear projecte DeleteAProject=Eliminar un projecte DeleteATask=Eliminar una tasca ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte? @@ -32,27 +32,27 @@ NoProject=Cap projecte definit NbOpenTasks=Nº Tasques obertes NbOfProjects=Nº de projectes TimeSpent=Temps dedicat -TimeSpentByYou=Time spent by you -TimeSpentByUser=Time spent by user +TimeSpentByYou=Temps dedicat per vostè +TimeSpentByUser=Temps dedicat per usuari TimesSpent=Temps dedicats RefTask=Ref. tasca LabelTask=Etiqueta tasca -TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date -TasksOnOpenedProject=Tasks on opened projects -WorkloadNotDefined=Workload not defined +TaskTimeSpent=Temps dedicat a les tasques +TaskTimeUser=Usuari +TaskTimeNote=Nota +TaskTimeDate=Data +TasksOnOpenedProject=Tasques en projectes oberts +WorkloadNotDefined=Carga de treball no definida NewTimeSpent=Nou temps dedicat MyTimeSpent=El meu temps dedicat MyTasks=Les meves tasques Tasks=Tasques Task=Tasca -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Data d'inici +TaskDateEnd=Data de finalització +TaskDescription=Descripció de tasca NewTask=Nova tasca -AddTask=Create task +AddTask=Crear tasca AddDuration=Indicar durada Activity=Activitat Activities=Tasques/activitats @@ -61,8 +61,8 @@ MyActivities=Les meves tasques/activitats MyProjects=Els meus projectes DurationEffective=Durada efectiva Progress=Progressió -ProgressDeclared=Declared progress -ProgressCalculated=Calculated progress +ProgressDeclared=Progressió declarada +ProgressCalculated=Progressió calculada Time=Temps ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte ListOrdersAssociatedProject=Llistat de comandes associades al projecte @@ -72,8 +72,8 @@ ListSupplierOrdersAssociatedProject=Llistat de comandes a proveïdors associades ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associades al projecte ListContractAssociatedProject=Llistatde contractes associats al projecte ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Llistat d'informes de despeses associades al projecte +ListDonationsAssociatedProject=Llistat de donacions associades al projecte ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana ActivityOnProjectThisMonth=Activitat en el projecte aquest mes @@ -93,13 +93,13 @@ ActionsOnProject=Esdeveniments del projecte YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat DeleteATimeSpent=Eliminació de temps dedicat ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Veure també tasques no assignades a mi +ShowMyTasksOnly=Veure nomes tasques assignades a mi TaskRessourceLinks=Recursos afectats ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer NoTasks=Cap tasca per a aquest projecte LinkedToAnotherCompany=Enllaçat a una altra empresa -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Tasca no assignada a vostè ErrorTimeSpentIsEmpty=No s'ha establert el temps consumit ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (%s tasques) i els seus temps dedicats. IfNeedToUseOhterObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers. @@ -107,40 +107,40 @@ CloneProject=Clonar el projecte CloneTasks=Clonar les tasques CloneContacts=Clonar els contactes CloneNotes=Clonar les notes -CloneProjectFiles=Clone project joined files -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) -CloneMoveDate=Update project/tasks dates from now ? +CloneProjectFiles=Clonar els arxius adjunts del projecte +CloneTaskFiles=Clonar els arxius adjunts de la(es) tasca(ques) (si es clonen les tasques) +CloneMoveDate=Actualitzar les dates dels projectes/tasques? ConfirmCloneProject=Esteu segur que voleu clonar aquest projecte? ProjectReportDate=Canviar les dates de les tasques en funció de la data d'inici del projecte ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques ProjectsAndTasksLines=Projectes i tasques ProjectCreatedInDolibarr=Projecte %s creat -TaskCreatedInDolibarr=Task %s created -TaskModifiedInDolibarr=Task %s modified -TaskDeletedInDolibarr=Task %s deleted +TaskCreatedInDolibarr=La tasca %s a sigut creada +TaskModifiedInDolibarr=La tasca %s a sigut modificada +TaskDeletedInDolibarr=La tasca %s a sigut eliminada ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Cap de projecte TypeContact_project_external_PROJECTLEADER=Cap de projecte -TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor -TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_internal_PROJECTCONTRIBUTOR=Participant +TypeContact_project_external_PROJECTCONTRIBUTOR=Participant TypeContact_project_task_internal_TASKEXECUTIVE=Responsable TypeContact_project_task_external_TASKEXECUTIVE=Responsable -TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor -TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor -SelectElement=Select element -AddElement=Link to element -UnlinkElement=Unlink element +TypeContact_project_task_internal_TASKCONTRIBUTOR=Participant +TypeContact_project_task_external_TASKCONTRIBUTOR=Participant +SelectElement=Seleccioni element +AddElement=Vincular a element +UnlinkElement=Desvincular element # Documents models DocumentModelBaleine=Model d'informe de projecte complet (logo...) PlannedWorkload=Càrrega de treball prevista -PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation +PlannedWorkloadShort=Carrega de treball +WorkloadOccupation=Assignació de carrega de treball ProjectReferers=Objectes vinculats -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerDay=Input per day -InputPerWeek=Input per week -InputPerAction=Input per action -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +SearchAProject=Cercar un projecte +ProjectMustBeValidatedFirst=El projecte primer ha de ser validat +ProjectDraft=Projectes esborrany +FirstAddRessourceToAllocateTime=Associar un recurs per assignar el temps consumit +InputPerDay=Entrada per dia +InputPerWeek=Entrada per setmana +InputPerAction=Entrada per acció +TimeAlreadyRecorded=Temps dedicat ja registrat per aquesta tasca/dia i usuari %s diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang index 32bdd92f884..5d13807e2d5 100644 --- a/htdocs/langs/ca_ES/resource.lang +++ b/htdocs/langs/ca_ES/resource.lang @@ -1,34 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning -DeleteResource=Delete resource -ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +MenuResourceIndex=Recursos +MenuResourceAdd=Nou recurs +MenuResourcePlanning=Planificació de recursos +DeleteResource=Eliminar recurs +ConfirmDeleteResourceElement=Estàs segur de voler eliminar el recurs d'aquest element? +NoResourceInDatabase=Sense recursos a la base de dades. +NoResourceLinked=Sense recursos enllaçats -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Llistat de recursos +ResourceSingular=Recurs +ResourceCard=Fitxa de recurs +AddResource=Crear un recurs +ResourceFormLabel_ref=Nom de recurs +ResourceType=Tipus de recurs +ResourceFormLabel_description=Descripció de recurs -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Recurs enllaçat a element -ShowResourcePlanning=Show resource planning -GotoDate=Go to date +ShowResourcePlanning=Veure planificació de recursos +GotoDate=Anar a la data -ResourceElementPage=Element resources -ResourceCreatedWithSuccess=Resource successfully created -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated -ResourceLinkedWithSuccess=Resource linked with success +ResourceElementPage=Elements de recursos +ResourceCreatedWithSuccess=Recurs creat correctament +RessourceLineSuccessfullyDeleted=Línia de recurs eliminada correctament +RessourceLineSuccessfullyUpdated=Línia de recurs actualitzada correctament +ResourceLinkedWithSuccess=Recurs enllaçat correntament -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Fitxa de recurs +ConfirmDeleteResource=Estàs segur de voler eliminar aquest element? +RessourceSuccessfullyDeleted=Recurs eliminat correctament +DictionaryResourceType=Tipus de recurs -SelectResource=Select resource +SelectResource=Seleccionar recurs diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang index 6c4a42fa77f..894e8f6adc1 100644 --- a/htdocs/langs/ca_ES/salaries.lang +++ b/htdocs/langs/ca_ES/salaries.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - users -SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments -SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Codi comptable pagament de salaris +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codi comptable càrregues financeres Salary=Sou Salaries=Sous Employee=Empleat @@ -8,6 +8,6 @@ NewSalaryPayment=Nou pagament de sous SalaryPayment=Pagament de sous SalariesPayments=Pagaments de sous ShowSalaryPayment=Veure pagament de sous -THM=Average hourly price -TJM=Average daily price -CurrentSalary=Current salary +THM=Preu mig per hora +TJM=Preu mig per dia +CurrentSalary=Salari actual diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang index 3fafdaa9e63..6ab0eba8acc 100644 --- a/htdocs/langs/ca_ES/sendings.lang +++ b/htdocs/langs/ca_ES/sendings.lang @@ -2,11 +2,11 @@ RefSending=Ref enviament Sending=Enviament Sendings=Enviaments -AllSendings=All Shipments +AllSendings=Tots els enviaments Shipment=Enviament Shipments=Enviaments -ShowSending=Show Sending -Receivings=Receipts +ShowSending=Mostrar enviament +Receivings=Recepcions SendingsArea=Àrea enviaments ListOfSendings=Llista d'enviaments SendingMethod=Mètode d'enviament @@ -16,7 +16,7 @@ SearchASending=Cerca enviament StatisticsOfSendings=Estadístiques d'enviaments NbOfSendings=Nombre d'enviaments NumberOfShipmentsByMonth=Nombre d'enviaments per mes -SendingCard=Shipment card +SendingCard=Fitxa d'enviament NewSending=Nuevo envío CreateASending=Crear un enviament CreateSending=Crear enviament @@ -24,7 +24,7 @@ QtyOrdered=Qt. demanada QtyShipped=Qt. enviada QtyToShip=Qt. a enviar QtyReceived=Qt. rebuda -KeepToShip=Remain to ship +KeepToShip=Resta a enviar OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda DateSending=Data d'expedició DateSendingShort=Data d'expedició @@ -39,7 +39,7 @@ StatusSendingCanceledShort=Anul.lat StatusSendingDraftShort=Esborrany StatusSendingValidatedShort=Validat StatusSendingProcessedShort=Processat -SendingSheet=Shipment sheet +SendingSheet=Nota d'entrga Carriers=Transportistes Carrier=Transportista CarriersArea=Àrea transportistes @@ -56,19 +56,19 @@ StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les ex DateDeliveryPlanned=Data prevista de lliurament DateReceived=Data real de recepció SendShippingByEMail=Enviament d'expedició per e-mail -SendShippingRef=Submission of shipment %s +SendShippingRef=Enviament de l'expedició %s ActionsOnShipping=Events sobre l'expedició LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda. -RelatedShippings=Related shipments +RelatedShippings=Expedicions asociades ShipmentLine=Línia d'expedició CarrierList=Llistat de transportistes -SendingRunning=Product from ordered customer orders -SuppliersReceiptRunning=Product from ordered supplier orders -ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders -ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders -ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent -ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received +SendingRunning=Producte de comandes de clients +SuppliersReceiptRunning=Producte de comandes a proveïdors +ProductQtyInCustomersOrdersRunning=Quantitat de comandes de clients obertes +ProductQtyInSuppliersOrdersRunning=Quantitat de comandes a proveïdors obertes +ProductQtyInShipmentAlreadySent=Quantitat de comandes de clients ja enviats +ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de comandes a proveïdors ja rebudes # Sending methods SendingMethodCATCH=Recollit pel client @@ -82,5 +82,5 @@ SumOfProductVolumes=Suma del volum dels productes SumOfProductWeights=Suma del pes dels productes # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Detalls del magatzem +DetailWarehouseFormat= Alm.:%s (Quant. : %d) diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index c312f676481..6b60723b94f 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -16,7 +16,7 @@ CancelSending=Anul·lar enviament DeleteSending=Eliminar enviament Stock=Estoc Stocks=Estocs -StocksByLotSerial=Stock by lot/serial +StocksByLotSerial=Estoc per lot/serie Movement=Moviment Movements=Moviments ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori @@ -24,20 +24,20 @@ ErrorWarehouseLabelRequired=L'etiqueta del magatzem és obligatòria CorrectStock=Corregir estoc ListOfWarehouses=Llistat de magatzems ListOfStockMovements=Llistat de moviments de estoc -StocksArea=Warehouses area +StocksArea=Àrea de magatzems Location=Lloc LocationSummary=Nom curt del lloc -NumberOfDifferentProducts=Number of different products +NumberOfDifferentProducts=Nombre de productes diferents NumberOfProducts=Nombre total de productes LastMovement=Últim moviment LastMovements=Ultims moviments Units=Unitats Unit=Unitat StockCorrection=Correcció estoc -StockTransfer=Stock transfer +StockTransfer=Transferencia d'estoc StockMovement=Transferència StockMovements=Moviments d'estoc -LabelMovement=Movement label +LabelMovement=Etiqueta del moviment NumberOfUnit=Nombre de peces UnitPurchaseValue=Preu de compra unitari TotalStock=Total en estoc @@ -48,10 +48,10 @@ PMPValue=Valor (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valor d'estocs UserWarehouseAutoCreate=Crea automàticament existències/magatzem propi de l'usuari en la creació de l'usuari -IndependantSubProductStock=Product stock and subproduct stock are independant +IndependantSubProductStock=Estoc del producte i estoc del subproducte són independents QtyDispatched=Quantitat desglossada -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Quant. rebuda +QtyToDispatchShort=Quant. a enviar OrderDispatch=Recepció d'estocs RuleForStockManagementDecrease=Regla de gestió de decrements d'estoc RuleForStockManagementIncrease=Regla de gestió d'increments d'estoc @@ -63,11 +63,11 @@ ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a prove ReStockOnDispatchOrder=Incrementa els estocs físics en el desglossament manual de la recepció de les comandes a proveïdors en els magatzems ReStockOnDeleteInvoice=Incrementa els estocs físics en l'eliminació de factures OrderStatusNotReadyToDispatch=La comanda encara no està o no té un estat que permeti un desglossament d'estoc. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Motiu de la diferència entre valors físics i teòrics NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte. Per tant no es pot realitzar un desglossament d'estoc. DispatchVerb=Desglossar -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Límit per l'alerta +StockLimit=Estoc límit per les alertes PhysicalStock=Estoc físic RealStock=Estoc real VirtualStock=Estoc virtual @@ -79,7 +79,7 @@ IdWarehouse=Id. magatzem DescWareHouse=Descripció magatzem LieuWareHouse=Localització magatzem WarehousesAndProducts=Magatzems i productes -WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) +WarehousesAndProductsBatchDetail=Magatzems i productes (amb detalls per lot/serie) AverageUnitPricePMPShort=Preu mitjà ponderat (PMP) AverageUnitPricePMP=Preu mitjà ponderat (PMP) d'aquisició SellPriceMin=Preu de venda unitari @@ -99,41 +99,41 @@ DesiredStock=Stock desitjat StockToBuy=A demanar Replenishment=Reaprovisionament ReplenishmentOrders=Ordres de reaprovisionament -VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs -UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature -UseVirtualStock=Use virtual stock -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode -CurentlyUsingVirtualStock=Virtual stock -CurentlyUsingPhysicalStock=Physical stock +VirtualDiffersFromPhysical=D'acord amb les opcions de decrement/increment d'estoc, l'estoc físic i l'estoc virtual (físic + comandes actuals) poden diferir +UseVirtualStockByDefault=Utilitzar estoc virtual per defecte, en lloc d'estoc físic, per la funció d'aprovisionament +UseVirtualStock=Utilitzar estoc virtual +UsePhysicalStock=Utilitzar estoc físic +CurentSelectionMode=Mètode de selecció actual +CurentlyUsingVirtualStock=Estoc virtual +CurentlyUsingPhysicalStock=Estoc físic RuleForStockReplenishment=Regla per al reaprovisionament de stcok -SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier -AlertOnly= Alerts only -WarehouseForStockDecrease=The warehouse %s will be used for stock decrease -WarehouseForStockIncrease=The warehouse %s will be used for stock increase -ForThisWarehouse=For this warehouse -ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. -Replenishments=Replenishments -NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) -NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) -MassMovement=Mass movement -MassStockMovement=Mass stock movement -SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". -RecordMovement=Record transfert -ReceivingForSameOrder=Receipts for this order -StockMovementRecorded=Stock movements recorded -RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order -StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment -MovementLabel=Label of movement -InventoryCode=Movement or inventory code -IsInPackage=Contained into package -ShowWarehouse=Show warehouse -MovementCorrectStock=Stock content correction for product %s -MovementTransferStock=Stock transfer of product %s into another warehouse -WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. -InventoryCodeShort=Inv./Mov. code -NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order -ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). +SelectProductWithNotNullQty=Seleccioni almenys un producte amb la quantitat diferent de 0 i un proveïdor +AlertOnly= Només alertes +WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem %s +WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem %s +ForThisWarehouse=Per aquest magatzem +ReplenishmentStatusDesc=Aquesta és la llista de tots els productes amb un estoc menor que l'estoc desitjat (o menor que el valor de l'alerta si el checkbox "només alertes" esta marcat) i que suggereixi crear comandes de proveïdor per emplenar la diferencia +ReplenishmentOrdersDesc=Aquest és el llistat de totes les comandes a proveïdors amb productes predefinits. Només són visibles comandes obertes amb productes que poden afectar l'estoc +Replenishments=reaprovisionament +NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s) +NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s) +MassMovement=Moviments en massa +MassStockMovement=Moviments d'estoc en massa +SelectProductInAndOutWareHouse=Seleccioni un producte, una quantitat, un magatzem origen i un magatzem destí, seguidament faci clic "%s". Una vegada seleccionats tots els moviments, faci clic en "%s". +RecordMovement=Registrar transferencies +ReceivingForSameOrder=Recepcions d'aquesta comanda +StockMovementRecorded=Moviments d'estoc registrat +RuleForStockAvailability=Regles de requeriment d'estoc +StockMustBeEnoughForInvoice=El nivell d'existencies ha de ser suficient per afegir productes/serveis a factures +StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegir productes/serveis a comandes +StockMustBeEnoughForShipment= El nivell d'existències ha de ser suficient per afegir productes/serveis a enviaments +MovementLabel=Etiqueta del moviment +InventoryCode=Moviments o codi d'inventari +IsInPackage=Contingut del paquet +ShowWarehouse=Mostrar magatzem +MovementCorrectStock=Correcció d'estoc del producte %s +MovementTransferStock=Transferencia d'estoc del producte %s a un altre magatzem +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=S'ha de definir aquí un magatzem origen quant el mòdul de lots estar actiu. S'utilitza per augmentar lots/series disponibles del producte per realitzar un moviment. Si desitja enviar productes de diferents magatzems, simplement faci l'enviament amb diversos passos +InventoryCodeShort=Codi Inv./Mov. +NoPendingReceptionOnSupplierOrder=o existeixen recepcions pendent, ja que la comanda esta oberta +ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie () ja existeix, però amb una data de caducitat o venda diferent (trobat %s però ha introduït %s). diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang index 248eeb557cc..2bf7b390f0f 100644 --- a/htdocs/langs/ca_ES/suppliers.lang +++ b/htdocs/langs/ca_ES/suppliers.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Proveïdors -AddSupplier=Create a supplier +AddSupplier=Crear un proveïdor SupplierRemoved=Proveïdor eliminat SuppliersInvoice=Factura proveïdor NewSupplier=Nou proveïdor @@ -11,8 +11,8 @@ OrderDate=Data comanda BuyingPrice=Preu de compra BuyingPriceMin=Preu mínim de compra BuyingPriceMinShort=Preu mín compra -TotalBuyingPriceMin=Total of subproducts buying prices -SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Total dels preus de compra dels subproductes +SomeSubProductHaveNoPrices=Alguns subproductes no tenen preus definits AddSupplierPrice=Afegir preu de proveïdor ChangeSupplierPrice=Canviar preu de proveïdor ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor @@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Factures proveïdors i pagaments ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda ApproveThisOrder=Aprovar aquesta comanda ConfirmApproveThisOrder=Esteu segur de voler aprovar la comanda a proveïdor %s? -DenyingThisOrder=Deny this order +DenyingThisOrder=Denegar aquesta comanda ConfirmDenyingThisOrder=Esteu segur de voler denegar la comanda a proveïdor %s? ConfirmCancelThisOrder=Esteu segur de voler cancel·lar la comanda a proveïdor %s? AddCustomerOrder=Crear comanda de client @@ -39,8 +39,8 @@ AddSupplierInvoice=Crear factura de proveïdor ListOfSupplierProductForSupplier=Llistat de productes i preus del proveïdor %s NoneOrBatchFileNeverRan=Cap o lot %s no s'ha executat recentment SentToSuppliers=Enviat a proveïdors -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice -NbDaysToDelivery=Delivery delay in days -DescNbDaysToDelivery=The biggest delay is display among order product list -UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) +ListOfSupplierOrders=Llista de comandes a proveïdors +MenuOrdersSupplierToBill=Comandes a proveïdors a facturar +NbDaysToDelivery=Temps d'entrega en dies +DescNbDaysToDelivery=El major plaç es visualitza en el llistat de comandes de productes +UseDoubleApproval=Usar aprovació doble (la segona aprovació pot ser realitzada per un usuari amb el permís dedicat) diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang index 9796f4d1115..6c93a4d8d1c 100644 --- a/htdocs/langs/ca_ES/users.lang +++ b/htdocs/langs/ca_ES/users.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area +HRMArea=Àrea de Recursos humans UserCard=Fitxa usuari ContactCard=Fitxa contacte GroupCard=Fitxa grup @@ -86,7 +86,7 @@ MyInformations=La meva informació ExportDataset_user_1=Usuaris Dolibarr i atributs DomainUser=Usuari de domini Reactivate=Reactivar -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=Aquest formulari li permet crear un usuari intern de la seva empresa/fundació. Per crear un usuari extern (clients, proveïdors, ...), utilitzeu el botó 'Crear usuari de Dolibarr' a la targeta de contacte del tercer. InternalExternalDesc=Un usuari intern és un usuari que pertany a la seva empresa/institució.
Un usuariextern és un usuari client, proveïdor o un altre.
En els 2 casos, els permisos d'usuari defineixen els drets d'accés, però l'usuari extern pot a més tenir un gestor de menús diferent a l'usuari intern (vegeu Inici->Configuració->Visualització) PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari. Inherited=Heretat @@ -102,7 +102,7 @@ UserDisabled=Usuari %s deshabilitat UserEnabled=Usuari %s activat UserDeleted=Usuari %s eliminat NewGroupCreated=Grup %s creat -GroupModified=Group %s modified +GroupModified=Grup %s modificat GroupDeleted=Grup %s eliminat ConfirmCreateContact=Esteu segur de voler crear un compte Dolibarr per a aquest contacte? ConfirmCreateLogin=Esteu segur que voleu crear un compte Dolibarr per a aquest membre? @@ -116,7 +116,7 @@ DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin HierarchicalResponsible=Supervisor HierarchicView=Vista jeràrquica UseTypeFieldToChange=Modificar el camp Tipus per canviar -OpenIDURL=OpenID URL -LoginUsingOpenID=Use OpenID to login -WeeklyHours=Weekly hours -ColorUser=Color of the user +OpenIDURL=URL d'OpenID +LoginUsingOpenID=Utilitzeu OpenID per iniciar sessió +WeeklyHours=Hores setmanals +ColorUser=Color d'usuari diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 5469d2437ce..52ec233a026 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -14,13 +14,13 @@ WithdrawalReceiptShort=Ordre LastWithdrawalReceipts=Les %s últimes ordres de domiciliacions WithdrawedBills=Factures domiciliades WithdrawalsLines=Línies de domiciliació -RequestStandingOrderToTreat=Request for standing orders to process -RequestStandingOrderTreated=Request for standing orders processed -NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +RequestStandingOrderToTreat=Peticions de domiciliacions a processar +RequestStandingOrderTreated=Peticions de domiciliacions processades +NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies CustomersStandingOrders=Domiciliacions de clients CustomerStandingOrder=Domiciliació client -NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +NbOfInvoiceToWithdraw=Nº de factures pendents de domiciliació +NbOfInvoiceToWithdrawWithInfo=Nombre de factures a l'espera de domiciliació per a clients que tenen número de compte definit InvoiceWaitingWithdraw=Factures en espera de domiciliació AmountToWithdraw=Quantitat a domiciliar WithdrawsRefused=Domiciliacions retornades @@ -47,7 +47,7 @@ RefusedData=Data de devolució RefusedReason=Motiu de devolució RefusedInvoicing=Facturació de la devolució NoInvoiceRefused=No facturar la devolució -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Factura rebutjada (Carregar les despeses al client) Status=Estat StatusUnknown=Desconegut StatusWaiting=En espera @@ -76,14 +76,14 @@ WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT BankToReceiveWithdraw=Compte bancari receptor de les domiciliacions CreditDate=Abonada el -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +WithdrawalFileNotCapable=No és possible generar el fitxer bancari de domiciliació pel país %s (El país no esta suportat) ShowWithdraw=Veure domiciliació IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +DoStandingOrdersBeforePayments=Aquesta pestanya li permet realitzar una petició de domiciliacions. Una vegada realitzades les peticions, vagi al menú Bancs -> Domiciliacions per gestionar-les. En tancar una domiciliació, els pagaments de les factures s'enregistraran automàticament, i les factures completament pagades seran tancades WithdrawalFile=Arxiu de la domiciliació SetToStatusSent=Classificar com "Arxiu enviat" ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades -StatisticsByLineStatus=Statistics by status of lines +StatisticsByLineStatus=Estadístiques per estats de línies ### Notifications InfoCreditSubject=Abonament de domiciliació %s pel banc @@ -93,5 +93,5 @@ InfoTransMessage=L'ordre de domiciliació %s ha estat enviada al banc per %s %s. InfoTransData=Import: %s
Mètode: %s
Data: %s InfoFoot=Aquest és un missatge automàtic enviat per Dolibarr InfoRejectSubject=Domiciliació tornada -InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s +InfoRejectMessage=Bon dia:

la domiciliació de la factura %s per compte de l'empresa %s, amb un import de %s ha sigut retornada pel banc.

--
%s ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang index cbb45da0552..807af682c2d 100644 --- a/htdocs/langs/ca_ES/workflow.lang +++ b/htdocs/langs/ca_ES/workflow.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Configuració del mòdul workflow -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +WorkflowDesc=Aquest modul li permet canviar el comportament de les accions automàticament en l'aplicació. De forma predeterminada, el workflow esta obert (configuri segons les seves necessitats). Activi les accions automàtiques que li interessin. ThereIsNoWorkflowToModify=No hi ha workflow modificable per als mòduls que té activats. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear una comanda de client automàticament a la signatura d'un pressupost descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a client automàticament a la signatura d'un pressupost descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear una factura a client automàticament a la validació d'un contracte descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear una factura a client automàticament al tancament d'una comanda de client descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar com facturat el pressupost quan la comanda de client relacionada es classifiqui com pagada -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificar com facturades les comanda(es) quan la factura relacionada es classifiqui com a pagada +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificar com a facturades les comanda(es) de clients relacionats quan la factura sigui validada diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 0d7c1c4f99b..86dab5ab3e1 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervence ověřena Notify_FICHINTER_SENTBYMAIL=Intervence poštou Notify_BILL_VALIDATE=Zákazník faktura ověřena Notify_BILL_UNVALIDATE=Zákazník faktura unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Dodavatel aby schválila Notify_ORDER_SUPPLIER_REFUSE=Dodavatel aby odmítl Notify_ORDER_VALIDATE=Zákazníka ověřena diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 4d9f0fcae4c..b2bf7fc9c7c 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Valider intervention Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Valider regningen Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Leverandør for godkendt Notify_ORDER_SUPPLIER_REFUSE=Leverandør For nægtes Notify_ORDER_VALIDATE=Kundeordre valideret diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index 0cfce637f4a..8d21e402e1a 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -24,7 +24,6 @@ ErrorLogoFileNotFound=Logo-Datei '%s' kann nicht gefunden werden ErrorGoToGlobalSetup=Bitte wechseln Sie zu den 'Firma/Stiftung"-Einstellungen um das Problem zu beheben ErrorFailedToSendMail=Fehler beim Senden des Mails (Absender=%s, Empfänger=%s) ErrorAttachedFilesDisabled=Die Dateianhangsfunktion ist auf diesem Server deaktiviert -ErrorInternalErrorDetected=Interner Fehler entdeckt ErrorDuplicateField=Dieser Wert muß einzigartig sein LevelOfFeature=Funktions-Level PreviousConnexion=Vorherige Verbindung diff --git a/htdocs/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang index 5d348ab99b6..3504dd431ff 100644 --- a/htdocs/langs/de_AT/other.lang +++ b/htdocs/langs/de_AT/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other ToolsDesc=Dieser Bereich ist zur Gruppe diverse Werkzeuge nicht verfügbar in andere Menüeinträge gewidmet.

Diese Tools können aus dem Menü auf der Seite zu erreichen. DateToBirth=Geburtstdatum -Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte Notify_WITHDRAW_TRANSMIT=Transmission Rückzug Notify_WITHDRAW_CREDIT=Kreditkarten Rückzug Notify_WITHDRAW_EMIT=Isue Rückzug @@ -11,6 +10,7 @@ Notify_PROPAL_SENTBYMAIL=Gewerbliche Vorschlag per Post Notify_BILL_PAYED=Kunden Rechnung bezahlt Notify_BILL_CANCEL=Kunden Rechnung storniert Notify_BILL_SENTBYMAIL=Kunden Rechnung per Post geschickt +Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferant Bestellung per Post geschickt Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung validiert Notify_BILL_SUPPLIER_SENTBYMAIL=Lieferant Rechnung per Post geschickt diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 42e60123ff7..728834fdd4a 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -61,8 +61,8 @@ UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwen ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind. UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings. UseSearchToSelectContact=Suchfeld statt Listenansicht für Kontaktauswahl verwenden. -DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) -DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +DelaiedFullListToSelectCompany=Warten bis Taste gedrückt bevor der Inhalt der Address Combo Liste geladen wird (Dies kann die Leistung erhöhen, wenn Sie eine große Anzahl von Adressen haben) +DelaiedFullListToSelectContact=Warten bis Taste gedrückt bevor der Inhalt der Kontakt Combo Liste geladen wird (Dies kann die Leistung erhöhen, wenn Sie eine große Anzahl von Kontakten haben) SearchFilter=Suchfilter Optionen NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s ViewFullDateActions=Zeige alle Terminaktionen in der Partneransicht @@ -468,7 +468,7 @@ Module75Name=Reise- und Fahrtspesen Module75Desc=Reise- und Fahrtspesenverwaltung Module80Name=Lieferungen Module80Desc=Versand und Lieferauftragsverwaltung -Module85Name=Banken und Geld +Module85Name=Banken und Kassen Module85Desc=Verwaltung von Bank- oder Bargeldkonten Module100Name=Externe Website Module100Desc=Erlaubt die Einbindung einer externen Website in die Menüs von dolibarr und die Anzeige der Seite innerhalb eines Frames @@ -503,7 +503,7 @@ Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mai Module700Name=Spenden Module700Desc=Spendenverwaltung Module770Name=Spesenabrechnung -Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module770Desc=Management Reisen und Spesen Report (Transport, Essen, ...) Module1120Name=Lieferant-Angebote Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise Module1200Name=Mantis @@ -527,7 +527,7 @@ Module2500Desc=Speicherung und Verteilung von Dokumenten Module2600Name=WebServices Module2600Desc=Aktivieren Sie Verwendung von Webservices Module2650Name=WebServices (Client) -Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2650Desc=Aktiviere den Dolibarr Web Services Client (kann verwendet werden um Daten / Anforderungen an externe Server zu schicken. Nur Lieferantenbestellungen werden derzeit unterstützt) Module2700Name=Gravatar Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung Module2800Desc=FTP-Client @@ -542,7 +542,7 @@ Module6000Desc=Workflow management Module20000Name=Urlaubsantrags-Verwaltung Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten. Module39000Name=Produkt Menge -Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +Module39000Desc=Chargen oder Seriennummer, Haltbarkeitsdatum und Verfallsdatum auf Produkte Module50000Name=PayBox Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen Module50100Name=Kasse @@ -610,7 +610,7 @@ Permission104=Auslieferungen freigeben Permission106=Auslieferungen exportieren Permission109=Auslieferungen löschen Permission111=Finanzkonten einsehen -Permission112=Transaktionen anlegen/ändern/löschen und vergleichen +Permission112=Transaktionen erstellen/ändern/löschen und vergleichen Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten) Permission114=Transaktionen ausgleichen Permission115=Transaktionen und Kontoauszüge exportieren @@ -788,8 +788,8 @@ Permission50202=Transaktionen importieren Permission54001=Drucken Permission55001=Abstimmungen einsehen Permission55002=Abstimmung erstellen/ändern -Permission59001=Margen einsehen -Permission59002=Margen definieren +Permission59001=Gewinnspanne einsehen +Permission59002=Gewinspanne definieren Permission59003=Lesen aller Benutzer Margen DictionaryCompanyType=Partnertyp DictionaryCompanyJuridicalType=Gesellschaftsformen von Drittanbietern @@ -947,7 +947,7 @@ ShowWorkBoard=Zeige 'Aufgabenübersicht' auf der Startseite Alerts=Benachrichtigungen Delays=Verspätungen DelayBeforeWarning=Frist bis zur Benachrichtigung -DelaysBeforeWarning=Fristen bis zur Benachrichtigung +DelaysBeforeWarning=Fristen bis zur Warnung DelaysOfToleranceBeforeWarning=Toleranz für die Frist vor Benachrichtigungen DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird. Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über die noch nicht erledigte, geplante Maßnahme @@ -1165,7 +1165,7 @@ EnableEditDeleteValidInvoice=Aktivieren Sie die Möglichkeit, freigegebene Rechn SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen SuggestPaymentByChequeToAddress=Zahlung per Scheck vorschlagen FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen -WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (keins, falls leer) +WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer) ##### Proposals ##### PropalSetup=Angebotsmoduleinstellungen CreateForm=Formular erstellen @@ -1178,15 +1178,15 @@ AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig FreeLegalTextOnProposal=Freier Rechtstext für Angebote -WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer) -BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot ##### AskPriceSupplier ##### AskPriceSupplierSetup=Lieferanten Preisauskunft Moduleinstellungen AskPriceSupplierNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten AskPriceSupplierPDFModules=Lieferanten Preisauskunft Dokumentvorlagen FreeLegalTextOnAskPriceSupplier=Freier Text auf Preisauskunft Lieferanten -WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Entwürfen von Lieferanten Preisauskunft (keins, wenn leer) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Lieferanten-Preisauskunft Entwurf (keines, wenn leer) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fragen Sie nach Bankkonto Bestimmungsort von der Preisauskunft ##### Orders ##### OrdersSetup=Bestellverwaltungseinstellungen OrdersNumberingModules=Bestellnumerierungs-Module @@ -1194,7 +1194,7 @@ OrdersModelModule=Bestellvorlagenmodule HideTreadedOrders=Ausblenden von bearbeiteten oder abgebrochenen Angeboten in der Liste ValidOrderAfterPropalClosed=Zur Freigabe der Bestellung nach Schließung des Angebots (überspringt vorläufige Bestellung) FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen -WatermarkOnDraftOrders=Wasserzeichen auf Entwürfen von Aufträgen (keins, wenn leer) +WatermarkOnDraftOrders=Wasserzeichen auf Bestellungs-Entwurf (keines, wenn leer) ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung ##### Clicktodial ##### @@ -1207,13 +1207,13 @@ InterventionsSetup=Servicemoduleinstellungen FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument FicheinterNumberingModules=Intervention Nummerierung Module TemplatePDFInterventions=Intervention Karte Dokumenten Modelle -WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer) +WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keines, wenn leer) ##### Contracts ##### ContractsSetup=Verträge/Abonnements-Modul Einstellungen ContractsNumberingModules=Verträge Nummerierung Module TemplatePDFContracts=Vertragsvorlagen -FreeLegalTextOnContracts=Freier Text auf Verträgen -WatermarkOnDraftContractCards=Wasserzeichen auf Entwürfen von Verträgen (keins, wenn leer) +FreeLegalTextOnContracts=Freier Text in Verträgen +WatermarkOnDraftContractCards=Wasserzeichen auf Vertrags-Entwurf (keines, wenn leer) ##### Members ##### MembersSetup=Mitglieder-Modul Setup MemberMainOptions=Haupteinstellungen @@ -1363,7 +1363,7 @@ YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt. ApplicativeCache=Applicative Cache MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. -MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. +MemcachedModuleAvailableButNotSetup=Module memcached für applicative Cache gefunden, aber Setup-Modul ist nicht vollständig. MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.. OPCodeCache=OPCode cache NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). @@ -1541,7 +1541,7 @@ CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen v CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen StockDecreaseForPointOfSaleDisabled=Verringerung des Lagerbastandes durch Point of Sale deaktivert -StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management +StockDecreaseForPointOfSaleDisabledbyBatch=Auf Rückgang der POS ist nicht mit viel Sparfunktionen CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem POS durchführen.\nAuch ist ein Lager/Standort notwendig. ##### Bookmark ##### BookmarkSetup=Lesezeichenmoduleinstellungen @@ -1567,7 +1567,7 @@ SuppliersSetup=Lieferantenmoduleinstellungen SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...) SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..) SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell -IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval +IfSetToYesDontForgetPermission=Wenn auf Ja gesetzt, vergessen Sie nicht, die Berechtigungen den dafür erlaubten Gruppen oder Benutzern auch das Recht für die zweite Zustimmung zu geben. ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP-zu-Land Übersetzung.
Beispiele:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoOP.dat @@ -1609,7 +1609,7 @@ Format=Format TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ IncludePath=Include-Pfad (in Variable '%s' definiert) ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung -TemplatePDFExpenseReports=Document templates to generate expense report document +TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen NoModueToManageStockDecrease=Kein Modul zur automatische Bestandsverkleinerung ist aktiviert. Lager Bestandsverkleinerung kann nur durch manuelle Eingabe erfolgen. NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen. YouMayFindNotificationsFeaturesIntoModuleNotification=Sie können Optionen für E-Mail-Benachrichtigungen von Aktivierung und Konfiguration des Moduls "Benachrichtigung" finden. @@ -1618,7 +1618,7 @@ ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses Threshold=Schwellenwert BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei -SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: +SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich: SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann. InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature. ConfFileMuseContainCustom=Installation eines externen Modul aus der Anwendung speichern Sie die Modul-Dateien in Verzeichnis %s. Zu haben dieses Verzeichnis durch Dolibarr verarbeitet, müssen Sie das Setup Ihrer conf/conf.php Option haben
- - $dolibarr_main_url_root_alt auf <$dolibarr_main_url_root_alt="/custom" enabled = "/custom"
- $dolibarr_main_document_root_alt zu Wert aktiviert "%s/custom" diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang index 45a14eb64f3..54e1cbd9d45 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -25,11 +25,11 @@ MenuToDoMyActions=Meine offenen Termine MenuDoneMyActions=Meine abgeschlossenen Termine ListOfEvents=Liste der Termine (Internetkalender) ActionsAskedBy=Termine eingetragen von -ActionsToDoBy=Termine zugewiesen an +ActionsToDoBy=Ereignisse zugewiesen an ActionsDoneBy=Termine erledigt von ActionsForUser=Maßnahmen für Benutzer ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe -ActionAssignedTo=Maßnahme zugewiesen an +ActionAssignedTo=Ereignis zugewiesen an AllMyActions= Alle meine Termine/Aufgaben AllActions= Alle Termine / Aufgaben ViewList=Listenansicht diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index 6e1c47d2165..7b6f04e41b8 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -53,7 +53,7 @@ BankAccountCountry=Bankkonto Land BankAccountOwner=Kontoinhaber BankAccountOwnerAddress=Kontoinhaber-Adresse RIBControlError=Prüfung auf Vollständigkeit fehlgeschlagen. Informationen zu Bankkonto sind nicht vollständig oder falsch (Land überprüfen, Zahlen und IBAN). -CreateAccount=Konto anlegen +CreateAccount=Konto erstellen NewAccount=Neues Konto NewBankAccount=Neues Bankkonto NewFinancialAccount=Neues Finanzkonto diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index eebbf4aa13b..f97ba9e646e 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -74,9 +74,9 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen PaymentsBackAlreadyDone=Rückzahlungen bereits erledigt PaymentRule=Zahlungsregel PaymentMode=Zahlungsart -PaymentTerm=Payment term -PaymentConditions=Payment terms -PaymentConditionsShort=Payment terms +PaymentTerm=Zahlungskonditionen +PaymentConditions=Zahlungsbedingungen +PaymentConditionsShort=Zahlungsbedingungen PaymentAmount=Zahlungsbetrag ValidatePayment=Zahlung freigeben PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung @@ -218,7 +218,7 @@ NoInvoice=Keine Rechnung ClassifyBill=Rechnung einordnen SupplierBillsToPay=Zu zahlende Lieferantenrechnungen CustomerBillsUnpaid=Offene Kundenrechnungen -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Bei den generierten Rechnungen wird auf die alphabetische Sortierreihenfolge verzichtet NonPercuRecuperable=Nicht erstattungsfähig SetConditions=Zahlungskonditionen einstellen SetMode=Definiere Zahlungsart @@ -280,7 +280,7 @@ InvoiceNote=Hinweis zur Rechnung InvoicePaid=Rechnung bezahlt PaymentNumber=Zahlung Nr. RemoveDiscount=Rabatt entfernen -WatermarkOnDraftBill=Wasserzeichen auf den Rechnungsentwürfen (nichts, falls leer) +WatermarkOnDraftBill=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer) InvoiceNotChecked=Keine Rechnung ausgewählt CloneInvoice=Rechnung duplizieren ConfirmCloneInvoice=Möchten sie die Rechnung %s wirklich duplizieren? @@ -294,10 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu d ConfirmRemoveDiscount=Sind Sie sicher, dass Sie diesen Rabatt entfernen möchten? RelatedBill=Ähnliche Rechnung RelatedBills=Ähnliche Rechnungen -RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices +RelatedCustomerInvoices=Ähnliche Rechnungen +RelatedSupplierInvoices=Ähnliche Rechnungen LatestRelatedBill=Letzte ähnliche Rechnung WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung +MergingPDFTool=Merging PDF Tool # PaymentConditions PaymentConditionShortRECEP=Prompt @@ -415,19 +416,19 @@ TypeContact_invoice_supplier_external_BILLING=Lieferantenrechnung Kontakt TypeContact_invoice_supplier_external_SHIPPING=Lieferantenversand Kontakt TypeContact_invoice_supplier_external_SERVICE=Lieferantenservice Kontakt # Situation invoices -InvoiceFirstSituationAsk=First situation invoice -InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. -InvoiceSituation=Situation invoice -InvoiceSituationAsk=Invoice following the situation -InvoiceSituationDesc=Create a new situation following an already existing one -SituationAmount=Situation invoice amount(net) -SituationDeduction=Situation subtraction -Progress=Progress +InvoiceFirstSituationAsk=Erste Situation Rechnung +InvoiceFirstSituationDesc=Die Situation Rechnungen auf Situationen zu einer Progression bezogen gebunden, beispielsweise das Fortschreiten einer Konstruktion. Jede Situation ist mit einer Rechnung gebunden. +InvoiceSituation=Situation Rechnung +InvoiceSituationAsk=Rechnung folgende Situation +InvoiceSituationDesc=Erstellen Sie eine neue Situation im Anschluss an eine bereits bestehende +SituationAmount=Situation Rechnungsbetrag (ohne MwSt.) +SituationDeduction=Situation Subtraktion +Progress=Fortschritt ModifyAllLines=Bearbeite alle Zeilen -CreateNextSituationInvoice=Create next situation -NotLastInCycle=This invoice in not the last in cycle and must not be modified. -DisabledBecauseNotLastInCycle=The next situation already exists. -DisabledBecauseFinal=This situation is final. -CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. -NoSituations=No opened situations +CreateNextSituationInvoice=Erstelle nächsten Position +NotLastInCycle=Diese Rechnung ist nicht die letzte im Zyklus und darf nicht geändert werden. +DisabledBecauseNotLastInCycle=Der folgende Situation ist bereits vorhanden. +DisabledBecauseFinal=Diese Situation ist vollständig. +CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als sein bisheriger Wert werden. +NoSituations=Keine offenen Positionen InvoiceSituationLast=Allgemeine Endrechnung diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang index 3376004cdd2..ea6180a6542 100644 --- a/htdocs/langs/de_DE/boxes.lang +++ b/htdocs/langs/de_DE/boxes.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=RSS-Informationen -BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen +BoxLastProducts=Letzte %s bearbeitete Produkte/Leistungen BoxProductsAlertStock=Lagerbestands-Warnungen -BoxLastProductsInContract=%s zuletzt verkaufte Waren auf Verträgen +BoxLastProductsInContract=Letzte %s verkaufte Waren in Verträgen BoxLastSupplierBills=Zuletzt bearbeitete Lieferantenrechnungen BoxLastCustomerBills=Zuletzt bearbeitete Kundenrechnungen BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen @@ -26,13 +26,13 @@ BoxTotalUnpaidSuppliersBills=Summe offener Lieferantenrechnungen BoxTitleLastBooks=Letzte %s aufgezeichnet Bücher BoxTitleNbOfCustomers=Nombre de-Client BoxTitleLastRssInfos=%s letzte Neuigkeiten aus %s -BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Leistungen +BoxTitleLastProducts=Letzte %s bearbeitete Produkte/Leistungen BoxTitleProductsAlertStock=Lagerbestands-Warnungen BoxTitleLastCustomerOrders=Letzte %s Kundenaufträge BoxTitleLastModifiedCustomerOrders=Letzte %s bearbeiteten Kundenaufträge BoxTitleLastSuppliers=%s zuletzt erfasste Lieferanten BoxTitleLastCustomers=%s zuletzt erfasste Kunden -BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten +BoxTitleLastModifiedSuppliers=Letzte %s bearbeitete Lieferanten BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden BoxTitleLastCustomersOrProspects=Letzte %s Kunden oder Leads BoxTitleLastPropals=Letzte %s Angebote diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang index 5805c602b95..81b3a207484 100644 --- a/htdocs/langs/de_DE/commercial.lang +++ b/htdocs/langs/de_DE/commercial.lang @@ -11,7 +11,7 @@ DeleteAction=Maßnahme / Aufgabe löschen NewAction=Neue Maßnahme / Aufgabe AddAction=Maßnahme/Aufgabe erstellen AddAnAction=Maßnahme/Aufgabe erstellen -AddActionRendezVous=Treffen anlegen +AddActionRendezVous=erstelle Termin Rendez-Vous=Treffen ConfirmDeleteAction=Möchten Sie diese Aufgabe wirklich löschen? CardAction=Maßnahmenkarte @@ -51,7 +51,7 @@ StatusActionToDo=Zu erledigen StatusActionDone=Abgeschlossen MyActionsAsked=Selbst angelegte Maßnahmen MyActionsToDo=Meine To-Do-Liste -MyActionsDone=Meine abgeschlossenen Maßnahmen +MyActionsDone=Meine abgeschlossenen Ereignisse StatusActionInProcess=In Bearbeitung TasksHistoryForThisContact=Maßnahmen zu diesem Kontakt LastProspectDoNotContact=Nicht kontaktieren @@ -62,7 +62,7 @@ LastProspectContactDone=Kontaktaufnahme erledigt DateActionPlanned=Geplantes Erledigungsdatum DateActionDone=Echtes Erledigungsdatum ActionAskedBy=Maßnahme erbeten von -ActionAffectedTo=Event assigned to +ActionAffectedTo=Ereignis zugewiesen an ActionDoneBy=Maßnahme erledigt von ActionUserAsk=Aufgenommen durch ErrorStatusCantBeZeroIfStarted=Ist das Feld 'Echtes Erledigungsdatum' ausgefüllt, so wurde die Aktion bereits gestartet (oder beendet) und der 'Status' kann nicht 0%% sein. diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang index 509d06ea3de..715434bc44f 100644 --- a/htdocs/langs/de_DE/companies.lang +++ b/htdocs/langs/de_DE/companies.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - companies ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen. -ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Wählen Sie einen anderen. +ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Bitte wählen Sie einen anderen. ErrorSetACountryFirst=Wähle zuerst das Land SelectThirdParty=Wähle einen Partner DeleteThirdParty=Lösche einen Partner @@ -16,11 +16,11 @@ MenuNewPrivateIndividual=Neue Privatperson MenuSocGroup=Gruppen NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten) NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten) -NewSocGroup=Neue Firmengruppe +NewSocGroup=Neue Unternehmensgruppe NewPrivateIndividual=Neue Privatperson (Lead, Kunde, Lieferant) CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant) ProspectionArea=Übersicht Geschäftsanbahnung -SocGroup=Gruppe von Unternehmen +SocGroup=Unternehmensgruppe IdThirdParty=Partner ID IdCompany=Unternehmens ID IdContact=Kontakt ID diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index ecebc150e03..7b70ba6c288 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -33,7 +33,7 @@ AccountingResult=Buchhaltungsergebnis Balance=Bilanz Debit=Soll Credit=Haben -Piece=Accounting Doc. +Piece=Beleg Withdrawal=Entnahme Withdrawals=Entnahmen AmountHTVATRealReceived=Einnahmen (netto) diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang index 12744e135d5..b9771b15595 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -14,7 +14,7 @@ URLToLaunchCronJobs=URL zum Prüfen und Starten von Cronjobs wenn nötig OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen # Menu CronJobs=Geplante Jobs @@ -75,7 +75,7 @@ CronObjectHelp=The object name to load.
For exemple to fetch method of Doli CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=Die auszuführende System-Kommandozeile -CronCreateJob=Create new Scheduled Job +CronCreateJob=Erstelle neuen cronjob # Info CronInfoPage=Information # Common @@ -85,4 +85,4 @@ CronType_command=Shell-Befehl CronMenu=Cron CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden UseMenuModuleToolsToAddCronJobs=Rufe Menu "Home - Modules tools - Job Liste" auf um geplante Aufgaben zu sehen und zu verändern. -TaskDisabled=Task disabled +TaskDisabled=Aufgabe deaktiviert diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang index 25321506c79..d3cf80f0e8e 100644 --- a/htdocs/langs/de_DE/dict.lang +++ b/htdocs/langs/de_DE/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Herr CivilityMLE=Fräulein CivilityMTRE=Professor CivilityDR=Doktor - ##### Currencies ##### Currencyeuros=Euro CurrencyAUD=AU Dollar @@ -290,10 +289,10 @@ CurrencyXOF=CFA Francs BCEAO CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=CFP Francs CurrencySingXPF=CFP Franc - CurrencyCentSingEUR=Cent +CurrencyCentINR=Paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=Tausendstel - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Rundschreiben @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Mund-zu-Mund-Propaganda DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Angestellter DemandReasonTypeSRC_SPONSORING=Sponsoring - #### Paper formats #### PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang index 1cfb67f4cd8..32b619cc51c 100644 --- a/htdocs/langs/de_DE/ecm.lang +++ b/htdocs/langs/de_DE/ecm.lang @@ -11,28 +11,28 @@ DocsInvoices=Rechnungsdokumente ECMNbOfDocs=Anzahl der Dokumente im Verzeichnis ECMNbOfDocsSmall=Anz. Dok. ECMSection=Verzeichnis -ECMSectionManual=Manuelles Verzeichnis -ECMSectionAuto=Automatisches Verzeichnis +ECMSectionManual=Manuelle Ordner +ECMSectionAuto=Automatische Ordner ECMSectionsManual=Manuelle Hierarchie ECMSectionsAuto=Automatische Hierarchie -ECMSections=Verzeichnis +ECMSections=Ordner ECMRoot=Stammordner -ECMNewSection=Neues Verzeichnis -ECMAddSection=Verzeichnis hinzufügen +ECMNewSection=Neuer Ordner +ECMAddSection=Ordner hinzufügen ECMNewDocument=Neues Dokument ECMCreationDate=Erstellungsdatum -ECMNbOfFilesInDir=Anzahl der Dateien im Verzeichnis -ECMNbOfSubDir=Anzahl der Unterverzeichnisse -ECMNbOfFilesInSubDir=Anzahl Dateien in Unterverzeichnissen -ECMCreationUser=Author +ECMNbOfFilesInDir=Anzahl der Dateien in Ordner +ECMNbOfSubDir=Anzahl der Unterordner +ECMNbOfFilesInSubDir=Anzahl Dateien in Unterordnern +ECMCreationUser=Autor ECMArea=EDM-Übersicht -ECMAreaDesc=Das EDM (Elektronisches Dokumenten Management)-System erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von allen Dokumenten in Dolibarr. +ECMAreaDesc=Das EDM (Elektronisches Dokumenten Management)-System erlaubt Ihnen Speichern, Teilen und rasches Auffinden von allen Dokumenten im Dolibarr. ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugeten Dokumente abgelegt.
* Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen. -ECMSectionWasRemoved=Das Verzeichnis %s wurde gelöscht. -ECMDocumentsSection=Dokument des Verzeichnisses -ECMSearchByKeywords=Suche nach Stichwörtern +ECMSectionWasRemoved=Der Ordner %s wurde gelöscht. +ECMDocumentsSection=Dokumente des Ordners +ECMSearchByKeywords=Suche nach Stichwörter ECMSearchByEntity=Suche nach Objekt -ECMSectionOfDocuments=Dokumentenverzeichnisse +ECMSectionOfDocuments=Dokumentenordner ECMTypeManual=Manuell ECMTypeAuto=Automatisch ECMDocsBySocialContributions=Mit Sozialabgaben verbundene Dokumente @@ -43,15 +43,15 @@ ECMDocsByContracts=Mit Verträgen verknüpfte Dokumente ECMDocsByInvoices=Mit Kundenrechnungen verknüpfte Dokumente ECMDocsByProducts=Mit Produkten verknüpfte Dokumente ECMDocsByProjects=Mit Projekten verknüpfte Dokumente -ECMDocsByUsers=Documents linked to users -ECMDocsByInterventions=Documents linked to interventions -ECMNoDirectoryYet=Noch kein Verzeichnis erstellt -ShowECMSection=Zeige Verzeichnis -DeleteSection=Lösche Verzeichnis +ECMDocsByUsers=Mit Benutzern verknüpfte Dokumente +ECMDocsByInterventions=Mit Eingriffen verknüpfte Dokumente +ECMNoDirectoryYet=Noch kein Ordner erstellt +ShowECMSection=Ordner anzeigen +DeleteSection=Ordner löschen ConfirmDeleteSection=Möchten Sie das Verzeichnis %s wirklich löschen? ECMDirectoryForFiles=Relatives Verzeichnis für Dateien -CannotRemoveDirectoryContainsFiles=Entfernen des Verzeichnisses nicht möglich, da es noch Dateien enthält +CannotRemoveDirectoryContainsFiles=Entfernen des Ordners nicht möglich, da dieser noch Dateien enthält ECMFileManager=Dateiverwaltung -ECMSelectASection=Wählen Sie ein Verzeichnis aus der Baumansicht auf der linken Seite... +ECMSelectASection=Wähle einen Ordner aus der Baumansicht links ... DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint ausserhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssten auf den "Refresh"-Button klicken um den Inhalt der Festplatte mit der Datenbank zu synchronisieren. diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index ea186ca174c..cd447809292 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -161,7 +161,7 @@ ErrorPriceExpressionUnknown=Unbekannter Fehler '%s' ErrorSrcAndTargetWarehouseMustDiffers=Quelle und Ziel-Lager müssen unterschiedlich sein ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action -ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Alle gespeicherten Empfänge müssen erst überprüft werden (zugelassen), bevor es ihm gestattet ist diese Aktion zu tun ErrorGlobalVariableUpdater0=HTTP-Anforderung ist mit dem Fehler '%s' fehlgeschlagen ErrorGlobalVariableUpdater1=JSON format '%s' ungültig ErrorGlobalVariableUpdater2=Parameter '%s' fehlt diff --git a/htdocs/langs/de_DE/ftp.lang b/htdocs/langs/de_DE/ftp.lang index 3fdecaded45..8e055a015ea 100644 --- a/htdocs/langs/de_DE/ftp.lang +++ b/htdocs/langs/de_DE/ftp.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - ftp FTPClientSetup=FTP-Verbindungseinstellungen -NewFTPClient=Neue FTP-Verbindung +NewFTPClient=Neue FTP-Verbindungseinstellungen FTPArea=FTP-Übersicht FTPAreaDesc=Dieser Bildschirm zeigt Ihnen den Inhalt eines FTP-Servers SetupOfFTPClientModuleNotComplete=Die Einstellungen des FTP-Verbindungsmoduls scheinen unvollständig zu sein. diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index b1d2282b609..06db7c0d046 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -20,7 +20,7 @@ ConfirmDeleteIntervention=Möchten Sie diesen Eingriff wirklich löschen? ConfirmValidateIntervention=Möchten Sie diesen Eingriff wirklich freigeben? ConfirmModifyIntervention=Sind Sie sicher, dass Sie ändern möchten diese Intervention? ConfirmDeleteInterventionLine=Möchten Sie diese Eingriffszeile wirklich löschen? -NameAndSignatureOfInternalContact=Name und Unterschrift des internen Kontakts: +NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiter: NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden: DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang index 32b0c88a89f..466203312d1 100644 --- a/htdocs/langs/de_DE/languages.lang +++ b/htdocs/langs/de_DE/languages.lang @@ -3,7 +3,7 @@ Language_ar_AR=Arabisch Language_ar_SA=Arabisch Language_bg_BG=Bulgarisch -Language_bs_BA=Bosnier +Language_bs_BA=Bosnisch Language_ca_ES=Katalanisch Language_cs_CZ=Tschechisch Language_da_DA=Dänisch @@ -30,7 +30,7 @@ Language_es_PY=Spanisch (Paraguay) Language_es_PE=Spanisch (Peru) Language_es_PR=Spanisch (Puerto Rico) Language_et_EE=Estnisch -Language_eu_ES=Baske +Language_eu_ES=Baskisch Language_fa_IR=Persisch Language_fi_FI=Fins Language_fr_BE=Französisch (Belgien) diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index c5c5a57353d..b4e7985d55e 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -43,7 +43,7 @@ ErrorGoToModuleSetup=Bitte wechseln Sie zu den Moduleinstellungen um das Problem ErrorFailedToSendMail=Fehler beim Senden der E-Mail (Absender=%s, Empfänger=%s) ErrorAttachedFilesDisabled=Dateianhänge sind auf diesem Server deaktiviert ErrorFileNotUploaded=Die Datei konnte nicht hochgeladen werden. Stellen Sie sicher dass die Dateigröße nicht den gesetzten Maximalwert übersteigt, das Zielverzeichnis über genügend freien Speicherplatz verfügt und noch keine Datei mit gleichem Namen existiert. -ErrorInternalErrorDetected=Internen Fehler entdeckt +ErrorInternalErrorDetected=Interner Fehler entdeckt ErrorNoRequestRan=Abfrage ist nicht erfolgreich gelaufen ErrorWrongHostParameter=Ungültige Host-Parameter ErrorYourCountryIsNotDefined=Ihr Land ist nicht definiert. Bitte vervollständigen Sie das Profil unter Home-Einstellungen-Bearbeiten. @@ -85,7 +85,7 @@ HomeArea=Home LastConnexion=Letzte Verbindung PreviousConnexion=Letzte Anmeldung ConnectedOnMultiCompany=Mit Entität verbunden -ConnectedSince=Verbunden seit +ConnectedSince=Angemeldet seit AuthenticationMode=Authentifizierung-Modus RequestedUrl=Angeforderte URL DatabaseTypeManager=Datenbanktyp-Verwaltung @@ -102,7 +102,7 @@ NotePrivate=Anmerkung (privat) PrecisionUnitIsLimitedToXDecimals=Stückpreisgenauigkeit im System auf %s Dezimalstellen beschränkt. DoTest=Testen ToFilter=Filtern -WarningYouHaveAtLeastOneTaskLate=Achtung: Mindestens eine Ihrer Maßnahmen hat ihr Fälligkeitsdatum überschritten. +WarningYouHaveAtLeastOneTaskLate=Achtung: Mindestens ein Element hat sein Fälligkeitsdatum überschritten. yes=ja Yes=Ja no=nein @@ -124,7 +124,7 @@ Closed2=Geschlossen Enabled=Aktiviert Deprecated=Veraltet Disable=Deaktivieren -Disabled=Deaktivert +Disabled=Deaktiviert Add=Hinzufügen AddLink=Link hinzufügen Update=Aktualisieren @@ -215,8 +215,8 @@ NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizier Connection=Verbindung Setup=Einstellungen Alert=Warnung -Previous=Zurück -Next=Vor +Previous=Voriger +Next=Nächster Cards=Karten Card=Karte Now=Jetzt @@ -249,8 +249,8 @@ DurationYear=Jahr DurationMonth=Monat DurationWeek=Woche DurationDay=Tag -DurationYears=Jahr -DurationMonths=Monat +DurationYears=Jahre +DurationMonths=Monate DurationWeeks=Wochen DurationDays=Tage Year=Jahr @@ -264,7 +264,7 @@ Years=Jahre Months=Monate Days=Tage days=Tage -Hours=Stunde +Hours=Stunden Minutes=Minuten Seconds=Sekunden Weeks=Wochen @@ -322,7 +322,7 @@ PriceQtyMinHT=Mindestmengenpreis (netto) PriceQtyTTC=Preis für diese Menge (brutto) PriceQtyMinTTC=Mindestmengenpreis (brutto) Percentage=Prozentbetrag -Total=Gesamtbetrag +Total=Gesamt SubTotal=Zwischensumme TotalHTShort=Nettosumme TotalTTCShort=Gesamtbetrag (inkl. MwSt.) @@ -373,7 +373,7 @@ ActionDoneShort=Abgeschlossen ActionUncomplete=unvollständig CompanyFoundation=Firma/Stiftung ContactsForCompany=Ansprechpartner/Adressen dieses Partners -ContactsAddressesForCompany=Ansprechpartner / Adressen zu dieser Firma +ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner AddressesForCompany=Adressen für den Partner ActionsOnCompany=Maßnahmen zu diesem Partner ActionsOnMember=Aktionen zu diesem Mitglied @@ -409,7 +409,7 @@ Other=Andere Others=Andere OtherInformations=Zusatzinformationen Quantity=Menge -Qty=Menge +Qty=Anz. ChangedBy=Geändert von ApprovedBy=genehmigt von ApprovedBy2=Genehmige von (zweite Genehmigung) @@ -471,7 +471,7 @@ AugustMin=Aug SeptemberMin=Sep OctoberMin=Okt NovemberMin=Nov -DecemberMin=Deu +DecemberMin=Dez Month01=Januar Month02=Februar Month03=März @@ -524,8 +524,8 @@ NbOfThirdParties=Anzahl der Partner NbOfCustomers=Anzahl der Kunden NbOfLines=Anzahl der Positionen NbOfObjects=Anzahl der Objekte -NbOfReferers=Anzahl der Verweise -Referers=Bezugnahmen +NbOfReferers=Anzahl Verknüpfungen +Referers=Verknüpfte Objekte TotalQuantity=Gesamtmenge DateFromTo=Von %s bis %s DateFrom=Von %s @@ -568,7 +568,7 @@ Priority=Wichtigkeit SendByMail=Per E-Mail versenden MailSentBy=E-Mail Absender TextUsedInTheMessageBody=E-Mail Text -SendAcknowledgementByMail=Kenntnisnahme per E-Mail bestätigen +SendAcknowledgementByMail=sende Bestätigung per E-Mail NoEMail=Keine E-Mail NoMobilePhone=Kein Handy Owner=Eigentümer @@ -615,7 +615,7 @@ CurrentMenuManager=Aktuelle Menüverwaltung DisabledModules=Deaktivierte Module For=Für ForCustomer=Für Kunden -Signature=Unterschrift +Signature=E-Mail-Signatur HidePassword=Sichere Passworteingabe (Zeichen nicht angezeigt) UnHidePassword=Passwort in Klartext anzeigen Root=Stammordner @@ -673,7 +673,7 @@ ByMonthYear=Von Monat / Jahr ByYear=Bis zum Jahresende ByMonth=Nach Monat ByDay=Bei Tag -BySalesRepresentative=Durch Vertriebsmitarbeiter +BySalesRepresentative=Nach Vertriebsmitarbeiter LinkedToSpecificUsers=Mit Kontakt verknüpft DeleteAFile=Datei löschen ConfirmDeleteAFile=Sind Sie sicher dass Sie diese Datei löschen möchten? diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index ea4ecead17b..f5deec7c003 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Eingriff freigegeben Notify_FICHINTER_SENTBYMAIL=Service per E-Mail versendet Notify_BILL_VALIDATE=Rechnung freigegeben Notify_BILL_UNVALIDATE=Rechnung nicht freigegeben -Notify_ORDER_SUPPLIER_VALIDATE=freigegebene Lieferantenbestellung Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt Notify_ORDER_VALIDATE=Kundenbestellung freigegeben diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang index 96ab7031e2b..fd8fcba4236 100644 --- a/htdocs/langs/de_DE/paybox.lang +++ b/htdocs/langs/de_DE/paybox.lang @@ -35,6 +35,6 @@ MessageKO=Nachrichtenseite für abgebrochene Zahlung NewPayboxPaymentReceived=Neue Paybox-Zahlung erhalten NewPayboxPaymentFailed=Neue Paybox-Zahlungen probiert, aber fehlgeschlagen PAYBOX_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht) -PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_SITE=Wert für PayBox Seite PAYBOX_PBX_RANG=Value for PBX Rang PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 03be2b92867..5dc2f4c9229 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -35,7 +35,7 @@ ServicesOnSellAndOnBuy=Services für Ein- und Verkauf InternalRef=Interne Referenz LastRecorded=Zuletzt erfasste, verfügbare Produkte/Leistungen LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Leistungen -LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Leistungen +LastModifiedProductsAndServices=Letzte %s bearbeitete Produkte/Leistungen LastRecordedProducts=%s zuletzt erfasste Produkte LastRecordedServices=%s zuletzt erfasste Leistungen LastProducts=Neueste Produkte @@ -245,9 +245,9 @@ MinimumRecommendedPrice=Minimaler empfohlener Preis: %s PriceExpressionEditor=Preis Ausdrucks Editor PriceExpressionSelected=Ausgewählter Preis Ausdruck PriceExpressionEditorHelp1="Preis = 2 + 2" oder "2 + 2" für die Einstellung der Preis. \nVerwende ; um Ausdrücke zu trennen -PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# -PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# -PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp2=Sie können auf die ExtraFields mit Variablen wie #extrafield_myextrafieldkey# und globale Variablen mit #global_mycode# zugreifen +PriceExpressionEditorHelp3=In Produkt/Leistung und Lieferantenpreise stehen diese Variablen zur Verfügung:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In Produkt/Leistung Preis nur: #supplier_min_price#
In Lieferantenpreise nur: #supplier_quantity# et #supplier_tva_tx# PriceExpressionEditorHelp5=verfügbare globale Werte: PriceMode=Preisfindungs-Methode PriceNumeric=Nummer diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index c10a451e940..40549046770 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -81,7 +81,7 @@ ActivityOnProjectThisYear=Projektaktivitäten dieses Jahres ChildOfTask=Kindelement von Projekt/Aufgabe NotOwnerOfProject=Nicht Eigner des privaten Projekts AffectedTo=Zugewiesen an -CantRemoveProject=Löschen des Projekts auf Grund verbundener Elemente (Rechnungen, Bestellungen oder andere) nicht möglich. Näheres finden Sie in der Verweiskarte. +CantRemoveProject=Löschen des Projekts auf Grund verbundener Elemente (Rechnungen, Bestellungen oder andere) nicht möglich. Näheres finden Sie unter dem Reiter Bezugnahmen. ValidateProject=Projekt freigeben ConfirmValidateProject=Möchten Sie dieses Projekt wirklich freigeben? CloseAProject=Projekt schließen @@ -135,7 +135,7 @@ DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) PlannedWorkload=Geplante Auslastung PlannedWorkloadShort=Workload WorkloadOccupation=Workloadzuordnung -ProjectReferers=Bezugnahmen +ProjectReferers=Verknüpfte Objekte SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden ProjectDraft=Projekt-Entwürfe diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang index 99a6577b352..a21c2a45e21 100644 --- a/htdocs/langs/de_DE/propal.lang +++ b/htdocs/langs/de_DE/propal.lang @@ -55,7 +55,7 @@ NoOpenedPropals=Keine offenen Angebote NoOtherOpenedPropals=Keine offene Angebote Dritter RefProposal=Angebots-Nr. SendPropalByMail=Angebot per E-Mail senden -AssociatedDocuments=Dokumente mit Bezug zum Angebot: +AssociatedDocuments=Dokumente verknüpft mit dem Angebot: ErrorCantOpenDir=Verzeichnis kann nicht geöffnet werden DatePropal=Angebotsdatum DateEndPropal=Gültig bis diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index b375868359c..a9d5e75d4e7 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -79,7 +79,7 @@ IdWarehouse=Warenlager ID DescWareHouse=Beschreibung Warenlager LieuWareHouse=Standort Warenlager WarehousesAndProducts=Warenlager und Produkte -WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) +WarehousesAndProductsBatchDetail=Warenlager und Produkte (mit Detail per lot / serial) AverageUnitPricePMPShort=Gewichteter Durchschnitts-Einkaufspreis AverageUnitPricePMP=Gewichteter Durchschnitts-Eingangspreis SellPriceMin=Verkaufspreis diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang index ed15b19c592..cb02512e739 100644 --- a/htdocs/langs/de_DE/suppliers.lang +++ b/htdocs/langs/de_DE/suppliers.lang @@ -13,7 +13,7 @@ BuyingPriceMin=Minimaler Kaufpreis BuyingPriceMinShort=Min. Kaufpreis TotalBuyingPriceMin=Summe der Einkaufspreise der Unterprodukte SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis -AddSupplierPrice=Lieferantenpreis anlegen +AddSupplierPrice=Lieferantenpreis erfassen ChangeSupplierPrice=Lieferantenpreis ändern ErrorQtyTooLowForThisSupplier=Bestellmenge für diesen Lieferanten zu gering oder fehlender Lieferantenpreis für dieses Produkt ErrorSupplierCountryIsNotDefined=Zu diesem Lieferant ist kein Land definiert. Bitte korrigieren Sie dies zuerst. diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang index 84a4eef229f..f6a3d526efd 100644 --- a/htdocs/langs/de_DE/trips.lang +++ b/htdocs/langs/de_DE/trips.lang @@ -20,7 +20,7 @@ ListToApprove=Warten auf Bestätigung ExpensesArea=Spesenabrechnungen SearchATripAndExpense=Suche nach einer Spesenabrechnung ClassifyRefunded=Als 'rückerstattet' markieren -ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApproval=Eine neue Reisekostenabrechnung ist zur Genehmigung vorgelegt worden ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s TripId=Id expense report AnyOtherInThisListCanValidate=Person für die Validierung zu informieren . @@ -29,7 +29,7 @@ TripSalarie=Mitarbeiter TripNDF=Hinweise Spesenabrechnung DeleteLine=Enferne eine Zeile von der Spesenabrechnung ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen? -PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +PDFStandardExpenseReports=Standard-Vorlage, um ein PDF-Dokument für die Spesenabrechnung zu erzeugen ExpenseReportLine=Spesenabrechnung Zeile TF_OTHER=Andere TF_TRANSPORTATION=Spedition @@ -56,7 +56,7 @@ ModePaiement=Zahlungsart Note=Hinweis Project=Projekt -VALIDATOR=User to inform for approbation +VALIDATOR=Benutzer über die Genehmigung informieren VALIDOR=genehmigt durch AUTHOR=gespeichert von AUTHORPAIEMENT=einbezahlt von @@ -97,6 +97,6 @@ BrouillonnerTrip=Gehen Sie zurück Spesenabrechnung zu Status "Entwurf" ConfirmBrouillonnerTrip=Möchten Sie den Status dieser Reisekostenabrechnung auf "Entwurf" ändern? SaveTrip=Bestätige Spesenabrechnung -ConfirmSaveTrip=Are you sure you want to validate this expense report ? +ConfirmSaveTrip=Sind Sie sicher, dass Sie diese Spesenabrechnung überprüfen wollen? NoTripsToExportCSV=Keine Spesenabrechnung für diesen Zeitraum zu exportieren. diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang index e7f84a4c27f..b8c4133d5f0 100644 --- a/htdocs/langs/de_DE/users.lang +++ b/htdocs/langs/de_DE/users.lang @@ -35,7 +35,7 @@ ConfirmEnableGroup=Möchten Sie diese Gruppe %s wirklich aktivieren? ConfirmReinitPassword=Möchten Sie das Passwort für Benutzer %s wirklich zurücksetzen ConfirmSendNewPassword=Möchten Sie für diesen Benutzer %s wirklich ein neues Passwort generieren und diesem per Mail zusenden? NewUser=Neuer Benutzer -CreateUser=Benutzer anlegen +CreateUser=Benutzer erstellen SearchAGroup=Suche Gruppe SearchAUser=Suche Benutzer LoginNotDefined=Benutzername ist nicht gesetzt. @@ -76,7 +76,7 @@ LinkedToDolibarrUser=Mit Systembenutzer verknüpft LinkedToDolibarrThirdParty=Mit Partner verknüpft CreateDolibarrLogin=Benutzerkonto erstellen CreateDolibarrThirdParty=Neuen Partner erstellen -LoginAccountDisable=Benutzerkonto deaktiviert. Zum Aktivieren bitte neuen Login anlegen. +LoginAccountDisable=Benutzerkonto deaktiviert. Zum aktivieren bitte neuen Benutzer erstellen. LoginAccountDisableInDolibarr=Benutzerkonto im System deaktiviert. LoginAccountDisableInLdap=Benutzerkonto in dieser Domäne deaktiviert. UsePersonalValue=Eigenen Wert verwenden diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index d31096d2b20..2f2b5ce1cb4 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -83,7 +83,7 @@ DoStandingOrdersBeforePayments=This tab allows you to request a standing order. WithdrawalFile=Datei abbuchen SetToStatusSent=Setze in Status "Datei versandt" ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren -StatisticsByLineStatus=Statistics by status of lines +StatisticsByLineStatus=Statistiken nach Statuszeilen ### Notifications InfoCreditSubject=Zahlung des Dauerauftrags %s diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index 48bee132033..4730e410ae4 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου Notify_BILL_VALIDATE=Το τιμολόγιο πελάτη επικυρώθηκε Notify_BILL_UNVALIDATE=Τιμολόγιο του Πελάτη μη επικυρωμένο -Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε Notify_ORDER_SUPPLIER_APPROVE=Η παραγγελία προμηθευτή εγγρίθηκε Notify_ORDER_SUPPLIER_REFUSE=Η παραγγελία προμηθευτή απορρίφθηκε Notify_ORDER_VALIDATE=Η παραγγελία πελάτη επικυρώθηκε diff --git a/htdocs/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang new file mode 100644 index 00000000000..4b5c7e95999 --- /dev/null +++ b/htdocs/langs/en_GB/mails.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - mails +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f6041a2abf0..09aafd228f7 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1422,6 +1422,8 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 +BarcodeDescDATAMATRIX=Barcode of type Datamatrix +BarcodeDescQRCODE=Barcode of type QR code GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers diff --git a/htdocs/langs/en_US/incoterm.lang b/htdocs/langs/en_US/incoterm.lang index 0a3f3c677d8..4fce5519c3a 100644 --- a/htdocs/langs/en_US/incoterm.lang +++ b/htdocs/langs/en_US/incoterm.lang @@ -1,5 +1,5 @@ -Module210009Name=Incoterm -Module210009Desc=Add features to manage Incoterm +Module62000Name=Incoterm +Module62000Desc=Add features to manage Incoterm IncotermLabel=Incoterms IncotermSetupTitle1=Feature IncotermSetupTitle2=Status diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 7f2902a96e6..e418b5ec2b9 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -75,6 +75,7 @@ AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order ShowOrder=Show order +OrdersOpened=Orders to process NoOpenedOrders=No open orders NoOtherOpenedOrders=No other open orders NoDraftOrders=No draft orders diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index d86e998cf50..b4956e59c01 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - printing -Module112000Name=Direct Printing -Module112000Desc=Enable Direct Printing System +Module64000Name=Direct Printing +Module64000Desc=Enable Direct Printing System PrintingSetup=Setup of Direct Printing System PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. ModuleDriverSetup=Setup Module Driver diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 8ad095f4169..9ceef0033c0 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found -ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductAssociationList=List of products/services that are component of this virtual product/package ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 924878973bb..69b0027139b 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -95,7 +95,8 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase NoStockAction=No stock action LastWaitingSupplierOrders=Orders waiting for receptions -DesiredStock=Desired stock +DesiredStock=Desired minimum stock +DesiredMaxStock=Desired maximum stock StockToBuy=To order Replenishment=Replenishment ReplenishmentOrders=Replenishment orders diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang new file mode 100644 index 00000000000..4b5c7e95999 --- /dev/null +++ b/htdocs/langs/es_AR/mails.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - mails +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang new file mode 100644 index 00000000000..4b5c7e95999 --- /dev/null +++ b/htdocs/langs/es_CO/mails.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - mails +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index 1299312d12c..622c5c91c39 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -29,7 +29,6 @@ Notify_PROPAL_SENTBYMAIL=Envío presupuesto por e-mail Notify_BILL_PAYED=Cobro factura a cliente Notify_BILL_CANCEL=Cancelación factura a cliente Notify_BILL_SENTBYMAIL=Envío factura a cliente por e-mail -Notify_ORDER_SUPPLIER_VALIDATE=Pedido a proveedor registrado Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail Notify_BILL_SUPPLIER_VALIDATE=Validación factura de proveedor Notify_BILL_SUPPLIER_PAYED=Pago factura de proveedor diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index eab9c51be72..ec294842f2b 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Sekkumine kinnitatud Notify_FICHINTER_SENTBYMAIL=Sekkumine saadetud postiga Notify_BILL_VALIDATE=Müügiarve kinnitatud Notify_BILL_UNVALIDATE=Müügiarve avatud -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Ostutellimus heaks kiidetud Notify_ORDER_SUPPLIER_REFUSE=Ostutellimus tagasi lükatud Notify_ORDER_VALIDATE=Müügitellimus kinnitatud diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index 391adaa8c6c..2b1d9928099 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=مداخله اعتبار Notify_FICHINTER_SENTBYMAIL=مداخله با پست Notify_BILL_VALIDATE=صورت حساب به مشتری اعتبار Notify_BILL_UNVALIDATE=صورت حساب به مشتری unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=منظور تامین کننده تایید Notify_ORDER_SUPPLIER_REFUSE=منظور تامین کننده خودداری کرد Notify_ORDER_VALIDATE=سفارش مشتری معتبر diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index d1386b4dd21..d49a1e3d5e1 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Validate interventioelimen Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Validate bill Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Toimittaja jotta hyväksytty Notify_ORDER_SUPPLIER_REFUSE=Toimittaja jotta evätty Notify_ORDER_VALIDATE=Asiakas tilaa validoitu diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index a42189e3127..6894764e394 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -94,4 +94,4 @@ BoxProductDistributionFor=Répartition des %s pour les %s ForCustomersInvoices=Factures clients ForCustomersOrders=Commandes clients ForProposals=Propositions commerciales -LastXMonthRolling=The last %s month rolling +LastXMonthRolling=Les %s derniers mois tournant diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 4d63a116d17..5836c7725f8 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -1,110 +1,110 @@ # Dolibarr language file - Source file is en_US - categories -Rubrique=Label/Catégorie -Rubriques=Libellés/Catégories -categories=libellés/catégories -TheCategorie=Le label/Catégorie -NoCategoryYet=Aucun label/catégorie de ce type n'a été créé +Rubrique=Tag/Catégorie +Rubriques=Tags/Catégories +categories=tags/catégories +TheCategorie=Le tag/catégorie +NoCategoryYet=Aucun tag/catégorie de ce type n'a été créé In=Dans AddIn=Ajouter dans modify=modifier Classify=Classer -CategoriesArea=Espace libellés/catégories -ProductsCategoriesArea=Espace libellés/catégories de produits/services -SuppliersCategoriesArea=Espace libellés/catégories de fournisseurs -CustomersCategoriesArea=Espace libellés/catégories de clients -ThirdPartyCategoriesArea=Espace libellés/catégories de tiers -MembersCategoriesArea=Espace libellés/catégories de membres -ContactsCategoriesArea=Espace libellés/catégories de contacts -MainCats=Libellés/catégories principaux(ales) +CategoriesArea=Espace tags/catégories +ProductsCategoriesArea=Espace tags/catégories de produits/services +SuppliersCategoriesArea=Espace tags/catégories de fournisseurs +CustomersCategoriesArea=Espace tags/catégories de clients +ThirdPartyCategoriesArea=Espace tags/catégories de tiers +MembersCategoriesArea=Espace tags/catégories de membres +ContactsCategoriesArea=Espace tags/catégories de contacts +MainCats=Tags/catégories principaux(ales) SubCats=Sous-catégories CatStatistics=Statistiques -CatList=Liste des libellés/catégories -AllCats=Tous les libellés/catégories +CatList=Liste des tags/catégories +AllCats=Tous les tags/catégories ViewCat=Consulter libellé/catégorie -NewCat=Ajouter libellé/catégorie -NewCategory=Nouveau(elle) libellé/catégorie -ModifCat=Modifier libellé/catégorie -CatCreated=Libellé/catégorie créé(e) -CreateCat=Créer libellé/catégorie -CreateThisCat=Créer ce(tte) libellé/catégorie +NewCat=Ajouter tag/catégorie +NewCategory=Nouveau tag/catégorie +ModifCat=Modifier tag/catégorie +CatCreated=Tags/catégorie créé(e) +CreateCat=Créer tag/catégorie +CreateThisCat=Créer ce(tte) tag/catégorie ValidateFields=Valider les champs NoSubCat=Cette catégorie ne contient aucune sous-catégorie. SubCatOf=Sous-catégorie -FoundCats=Libellés/catégories trouvé(e)s -FoundCatsForName=Libellés/catégories trouvé(e)s pour le nom : -FoundSubCatsIn=Sous-catégorie trouvée dans le(a) libellé/catégorie -ErrSameCatSelected=Vous avez sélectionné le(a) même libellé/catégorie plusieurs fois -ErrForgotCat=Vous avez oublié de choisir le(a) libellé/catégorie +FoundCats=Tags/catégories trouvé(e)s +FoundCatsForName=Tags/catégories trouvé(e)s pour le nom : +FoundSubCatsIn=Sous-catégorie trouvée dans le(a) tag/catégorie +ErrSameCatSelected=Vous avez sélectionné le(a) même tags/catégorie plusieurs fois +ErrForgotCat=Vous avez oublié de choisir le(a) tag/catégorie ErrForgotField=Vous avez oublié de renseigner un champ ErrCatAlreadyExists=Ce nom est déjà utilisé -AddProductToCat=Ajouter ce produit à un(e) libellé/catégorie -ImpossibleAddCat=Impossible d'ajouter le(a) libellé/catégorie -ImpossibleAssociateCategory=Impossible d'associer le(a) libellé/catégorie à +AddProductToCat=Ajouter ce produit à un(e) tag/catégorie +ImpossibleAddCat=Impossible d'ajouter le(a) tag/catégorie +ImpossibleAssociateCategory=Impossible d'associer le(a) tag/catégorie à WasAddedSuccessfully=%s a été ajouté avec succès. -ObjectAlreadyLinkedToCategory=L'élément est déjà lié à ce(tte) libellé/catégorie -CategorySuccessfullyCreated=Ce(tte) libellé/catégorie %s a été ajouté avec succès -ProductIsInCategories=Produit/service appartient aux libellés/catégories suivant(e)s +ObjectAlreadyLinkedToCategory=L'élément est déjà lié à ce(tte) tag/catégorie +CategorySuccessfullyCreated=Ce(tte) tag/catégorie %s a été ajouté avec succès +ProductIsInCategories=Produit/service appartient aux tags/catégories suivant(e)s SupplierIsInCategories=Tiers appartient aux libellés/catégories fournisseurs suivant(e)s: -CompanyIsInCustomersCategories=Ce tiers appartient aux libellés/catégories de clients/prospects suivant(e)s -CompanyIsInSuppliersCategories=Ce tiers appartient aux libellés/catégories de fournisseurs suivant(e)s -MemberIsInCategories=Ce membre appartient aux libellés/catégories suivant(e)s -ContactIsInCategories=Ce contact appartient aux libellés/catégories suivant(e)s -ProductHasNoCategory=Ce produit/service n'appartient à aucun(e) libellé/catégorie -SupplierHasNoCategory=Ce fournisseur n'appartient à aucun(e) libellé/catégorie -CompanyHasNoCategory=Ce tiers n'appartient à aucun(e) libellé/catégorie -MemberHasNoCategory=Ce membre n'appartient à aucun(e) libellé/catégorie -ContactHasNoCategory=Ce contact n'appartient à aucun(e) libellé/catégorie -ClassifyInCategory=Classer dans le(a) libellé/catégorie +CompanyIsInCustomersCategories=Ce tiers appartient aux tags/catégories de clients/prospects suivant(e)s +CompanyIsInSuppliersCategories=Ce tiers appartient aux tags/catégories de fournisseurs suivant(e)s +MemberIsInCategories=Ce membre appartient aux tags/catégories suivant(e)s +ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s +ProductHasNoCategory=Ce produit/service n'appartient à aucun(e) tag/catégorie +SupplierHasNoCategory=Ce fournisseur n'appartient à aucun(e) tag/catégorie +CompanyHasNoCategory=Ce tiers n'appartient à aucun tag/catégorie +MemberHasNoCategory=Ce membre n'appartient à aucun(e) tag/catégorie +ContactHasNoCategory=Ce contact n'appartient à aucun(e) tag/catégorie +ClassifyInCategory=Classer dans le(a) tag/catégorie NoneCategory=Aucune -NotCategorized=Sans libellé/catégorie -CategoryExistsAtSameLevel=Cette catégorie existe déjà pour cette référence +NotCategorized=Sans tag/catégorie +CategoryExistsAtSameLevel=Ce tag existe déjà avec cette référence ReturnInProduct=Retour sur la fiche produit/service ReturnInSupplier=Retour sur la fiche fournisseur ReturnInCompany=Retour sur la fiche client/prospect ContentsVisibleByAll=Le contenu sera visible par tous ContentsVisibleByAllShort=Contenu visible par tous ContentsNotVisibleByAllShort=Contenu non visible par tous -CategoriesTree=Arbre des libellés/catégories +CategoriesTree=Arbre des tags/catégories DeleteCategory=Effacer le(a) libellé/catégorie -ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer ce(tte) libellé/catégorie ? -RemoveFromCategory=Supprimer le lien avec le(a) libellé/catégorie -RemoveFromCategoryConfirm=Êtes-vous sûr de vouloir supprimer le lien entre la transaction et le(a) libellé/catégorie ? -NoCategoriesDefined=Aucun(e) libellé/catégorie défini(e) -SuppliersCategoryShort=Libellés/catégories de fournisseurs -CustomersCategoryShort=Libellés/catégories de clients -ProductsCategoryShort=Libellés/catégories de produits -MembersCategoryShort=Libellés/catégories de membres -SuppliersCategoriesShort=Libellés/catégories de fournisseurs -CustomersCategoriesShort=Libellés/catégories de clients -CustomersProspectsCategoriesShort=Catégories clients/prosp. -ProductsCategoriesShort=Libellés/catégories de produits -MembersCategoriesShort=Libellés/catégories de membres -ContactCategoriesShort=Libellés/catégories de contacts -ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit. -ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur. -ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client. -ThisCategoryHasNoMember=Cette catégorie ne contient aucun adhérent. -ThisCategoryHasNoContact=Cette catégorie ne contient aucun contact. +ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer ce tag/catégorie ? +RemoveFromCategory=Supprimer le lien avec le tag/catégorie +RemoveFromCategoryConfirm=Êtes-vous sûr de vouloir supprimer le lien entre la transaction et le(a) tag/catégorie ? +NoCategoriesDefined=Aucun(e) tag/catégorie défini(e) +SuppliersCategoryShort=Tags/catégories de fournisseurs +CustomersCategoryShort=Tags/catégories de clients +ProductsCategoryShort=Tags/catégories de produits +MembersCategoryShort=Tags/catégories de membres +SuppliersCategoriesShort=Tags/catégories de fournisseurs +CustomersCategoriesShort=Tags/catégories de clients +CustomersProspectsCategoriesShort=Tags clients/prosp. +ProductsCategoriesShort=Tags/catégories de produits +MembersCategoriesShort=Tags/catégories de membres +ContactCategoriesShort=Tags/catégories de contacts +ThisCategoryHasNoProduct=Ce tag/catégorie ne contient aucun produit. +ThisCategoryHasNoSupplier=Ce tag/catégorie ne contient aucun fournisseur. +ThisCategoryHasNoCustomer=Ce tag/catégorie ne contient aucun client. +ThisCategoryHasNoMember=Ce tag/catégorie ne contient aucun adhérent. +ThisCategoryHasNoContact=Ce tag/catégorie ne contient aucun contact. AssignedToCustomer=Attribuer à un client AssignedToTheCustomer=Attribué au client -InternalCategory=Catégorie interne -CategoryContents=Contenu du(de la) libellé/catégorie -CategId=ID du(de la) libellé/catégorie -CatSupList=Liste des libellés/catégories de fournisseurs -CatCusList=Liste des libellés/catégories de clients/prospects -CatProdList=Liste des libellés/catégories de produits/services -CatMemberList=Liste des libellés/catégories de membres -CatContactList=Liste des libellés/catégories de contact -CatSupLinks=Liens entre fournisseurs et libellés/catégories -CatCusLinks=Liens entre clients/prospects et libellés/catégories -CatProdLinks=Liens entre produits/services et libellés/catégories +InternalCategory=Tag/catégorie interne +CategoryContents=Contenu du(de la) tag/catégorie +CategId=ID du(de la) tag/catégorie +CatSupList=Liste des tags/catégories de fournisseurs +CatCusList=Liste des tags/catégories de clients/prospects +CatProdList=Liste des tags/catégories de produits/services +CatMemberList=Liste des tags/catégories de membres +CatContactList=Liste des tags/catégories de contact +CatSupLinks=Liens entre fournisseurs et tags/catégories +CatCusLinks=Liens entre clients/prospects et tags/catégories +CatProdLinks=Liens entre produits/services et tags/catégories CatMemberLinks=Liens entre membres et libellés/catégories -DeleteFromCat=Enlever des libellés/catégories +DeleteFromCat=Enlever des tags/catégories DeletePicture=Supprimer image ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ? ExtraFieldsCategories=Attributs supplémentaires -CategoriesSetup=Configuration des libellés/catégories -CategorieRecursiv=Lier automatiquement avec le(a) libellé/catégorie parent(e) +CategoriesSetup=Configuration des tags/catégories +CategorieRecursiv=Lier automatiquement avec le(a) tag/catégorie parent(e) CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes AddProductServiceIntoCategory=Ajouter le produit/service suivant -ShowCategory=Show tag/category +ShowCategory=Afficher tag/catégorie diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang index 02dd54275f6..a3d92b071fb 100644 --- a/htdocs/langs/fr_FR/deliveries.lang +++ b/htdocs/langs/fr_FR/deliveries.lang @@ -25,4 +25,4 @@ Sender=Expéditeur Recipient=Destinataire ErrorStockIsNotEnough=Le stock est insuffisant Shippable=Expédiable -NonShippable=Non Expédiable +NonShippable=Non expédiable diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index cb3260e6108..3fd221d58b6 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -296,7 +296,7 @@ CurrencyThousandthSingTND=millime #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campagne Publipostage -DemandReasonTypeSRC_CAMP_EMAIL=Campagne EMailing +DemandReasonTypeSRC_CAMP_EMAIL=Campagne d'emailing DemandReasonTypeSRC_CAMP_PHO=Campagne Téléphonique DemandReasonTypeSRC_CAMP_FAX=Campagne Fax DemandReasonTypeSRC_COMM=Contact commercial diff --git a/htdocs/langs/fr_FR/ftp.lang b/htdocs/langs/fr_FR/ftp.lang index 4b3f3190eb2..30b302e3585 100644 --- a/htdocs/langs/fr_FR/ftp.lang +++ b/htdocs/langs/fr_FR/ftp.lang @@ -4,7 +4,7 @@ NewFTPClient=Nouvelle configuration de connexion FTP FTPArea=Espace FTP FTPAreaDesc=Cet écran vous présente une vue de serveur FTP SetupOfFTPClientModuleNotComplete=La configuration du module Client FTP semble incomplète -FTPFeatureNotSupportedByYourPHP=Votre PHP ne supporte pas les fonctions FTP +FTPFeatureNotSupportedByYourPHP=Votre PHP ne prend pas en charge les fonctions FTP FailedToConnectToFTPServer=Échec de connexion au serveur FTP (serveur: %s, port %s) FailedToConnectToFTPServerWithCredentials=Échec de connexion avec l'identifiant/mot de passe FTP configuré FTPFailedToRemoveFile=Échec suppression fichier %s. diff --git a/htdocs/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang index 7a91cc50164..dc408bf495a 100644 --- a/htdocs/langs/fr_FR/help.lang +++ b/htdocs/langs/fr_FR/help.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - help CommunitySupport=Assistance Forums et Wiki -EMailSupport=Assistance Emails +EMailSupport=Assistance par email RemoteControlSupport=Assistance en ligne temps réel OtherSupport=Autres type d'assistance ToSeeListOfAvailableRessources=Pour contacter/voir les ressources disponibles : diff --git a/htdocs/langs/fr_FR/mailmanspip.lang b/htdocs/langs/fr_FR/mailmanspip.lang index 75407187b22..80924eb7a42 100644 --- a/htdocs/langs/fr_FR/mailmanspip.lang +++ b/htdocs/langs/fr_FR/mailmanspip.lang @@ -14,7 +14,7 @@ DescADHERENT_MAILMAN_LISTS=Liste(s) pour inscription automatique de nouveaux mem SPIPTitle=Interfacer avec le sytème de gestion de contenu SPIP DescADHERENT_SPIP_SERVEUR=Serveur SPIP DescADHERENT_SPIP_DB=Nom base SPIP -DescADHERENT_SPIP_USER=Login connexion base SPIP +DescADHERENT_SPIP_USER=Identifiant de connexion base SPIP DescADHERENT_SPIP_PASS=Mot de passe connexion base SPIP AddIntoSpip=Ajouter dans SPIP AddIntoSpipConfirmation=Êtes-vous sur de vouloir ajouter cet adhérent dans SPIP? diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang index e1a6b04512a..5ce50f9a66f 100644 --- a/htdocs/langs/fr_FR/opensurvey.lang +++ b/htdocs/langs/fr_FR/opensurvey.lang @@ -62,5 +62,5 @@ ErrorOpenSurveyOneChoice=Saisissez au moins un choix ErrorOpenSurveyDateFormat=La date doit avoir le format YYYY-MM-DD ErrorInsertingComment=Il y a eu une erreur à l'enregistrement de votre commentaire MoreChoices=Entrez plus de choix pour les votants -SurveyExpiredInfo=Le délai de cote de ce sondage a expiré. +SurveyExpiredInfo=L'heure des votes de ce sondage a expiré. EmailSomeoneVoted=%s a rempli une ligne.\nVous pouvez trouver le sondage via le lien:\n%s diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang index 55b899fdcf9..f997d1b55f5 100644 --- a/htdocs/langs/fr_FR/paypal.lang +++ b/htdocs/langs/fr_FR/paypal.lang @@ -19,7 +19,7 @@ PredefinedMailContentLink=Vous pouvez cliquer sur le lien sécurisé ci-dessous YouAreCurrentlyInSandboxMode=Vous êtes actuellement dans le mode "sandbox" NewPaypalPaymentReceived=Nouveau paiement Paypal reçu NewPaypalPaymentFailed=Nouveau paiement Paypal tenté mais en échec -PAYPAL_PAYONLINE_SENDEMAIL=EMail à prévenir en cas de paiement (succès ou non) -ReturnURLAfterPayment=Return URL after payment -ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed -PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed +PAYPAL_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non) +ReturnURLAfterPayment=URL de retour de paiement +ValidationOfPaypalPaymentFailed=Echéc de validation du paiement Paypal +PaypalConfirmPaymentPageWasCalledButFailed=La page de confirmation de paiement Paypal a été appelé par Paypal mais cette confirmation a échouée diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang index 4d6cee75748..5db3b16d441 100644 --- a/htdocs/langs/fr_FR/salaries.lang +++ b/htdocs/langs/fr_FR/salaries.lang @@ -10,4 +10,4 @@ SalariesPayments=Règlements des salaires ShowSalaryPayment=Afficher règlement de salaire THM=Tarif horaire moyen TJM=Tarif journalier moyen -CurrentSalary=Current salary +CurrentSalary=Salaire courant diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index a9af539f1d9..131cbe63486 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -21,16 +21,16 @@ ExpensesArea=Espace notes de frais SearchATripAndExpense=Rechercher une note de frais ClassifyRefunded=Classer 'Remboursé' ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation -ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été soumise et est en attente de validation.\n- Utilisateur: %s\n- Période: %s\nCliquer ici pour valider: %s TripId=Id note de frais -AnyOtherInThisListCanValidate=Person to inform for validation. +AnyOtherInThisListCanValidate=Personne à informer pour la validation. TripSociete=Information société TripSalarie=Informations utilisateur TripNDF=Informations note de frais DeleteLine=Effacer une ligne de note de frais -ConfirmDeleteLine=Are you sure you want to delete this line ? -PDFStandardExpenseReports=Standard template to generate a PDF document for expense report -ExpenseReportLine=Expense report line +ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne ? +PDFStandardExpenseReports=Modèle de note de frais PDF standard +ExpenseReportLine=Ligne de la note de frais TF_OTHER=Autre TF_TRANSPORTATION=Transport TF_LUNCH=Repas @@ -43,7 +43,7 @@ TF_ESSENCE=Carburant TF_HOTEL=Hôtel TF_TAXI=Taxi -ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire. ListTripsAndExpenses=Liste des notes de frais AucuneNDF=Pas de note de frais trouvées avec ces critères AucuneLigne=Aucune note de frais déclarée @@ -70,33 +70,33 @@ DATE_REFUS=Date refus DATE_SAVE=Date validation DATE_VALIDE=Date validation DATE_CANCEL=Date annulation -DATE_PAIEMENT=Payment date +DATE_PAIEMENT=Date de paiement TO_PAID=Payer -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +BROUILLONNER=Réouvrir +SendToValid=Envoyer a l'approbation +ModifyInfoGen=Editer +ValidateAndSubmit=Valider et envoyer pour approbation -NOT_VALIDATOR=You are not allowed to approve this expense report -NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. +NOT_VALIDATOR=Vous n'êtes pas autorisé a approuver cette note de frais +NOT_AUTHOR=Vous n'êtes pas l'auteur de cette note de frais. Opération annulé. -RefuseTrip=Deny an expense report -ConfirmRefuseTrip=Are you sure you want to deny this expense report ? +RefuseTrip=Refuser une note de frais +ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser cette note de frais ? ValideTrip=Approuver note de frais ConfirmValideTrip=Êtes-vous sûr de vouloir approuver cette note de frais ? PaidTrip=Payer note de frais -ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? +ConfirmPaidTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Payé" ? CancelTrip=Annuler note de frais -ConfirmCancelTrip=Are you sure you want to cancel this expense report ? +ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler cette note de frais ? BrouillonnerTrip=Move back expense report to status "Draft"n -ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? +ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Brouillon" ? -SaveTrip=Validate expense report -ConfirmSaveTrip=Are you sure you want to validate this expense report ? +SaveTrip=Valider note de frais +ConfirmSaveTrip=Êtes-vous sûr de vouloir valider cette note de frais ? NoTripsToExportCSV=Pas de note de frais à exporter dans cette période diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index 3b5c7913fb7..47ed25edcec 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index caee8f2a0d6..f28a5a2b778 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Beavatkozás validált Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Ügyfél számla hitelesített Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Szállító érdekében elfogadott Notify_ORDER_SUPPLIER_REFUSE=Szállító érdekében hajlandó Notify_ORDER_VALIDATE=Ügyfél érdekében érvényesített diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index a212c579e78..53d17128e9b 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index 5355b9fe869..c777197bdfe 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention staðfestar Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Viðskiptavinur Reikningar staðfestar Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Birgir röð samþykkt Notify_ORDER_SUPPLIER_REFUSE=Birgir þess neitaði Notify_ORDER_VALIDATE=Viðskiptavinur til setja í gildi diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index 77e78cfbdf1..b45819f1962 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervento convalidato Notify_FICHINTER_SENTBYMAIL=Intervento inviato per posta Notify_BILL_VALIDATE=Convalida fattura attiva Notify_BILL_UNVALIDATE=Ricevuta cliente non convalidata -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Ordine fornitore approvato Notify_ORDER_SUPPLIER_REFUSE=Ordine fornitore rifiutato Notify_ORDER_VALIDATE=Ordine cliente convalidato diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index 87ebc28f416..6cee92e2d0a 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=介入は、検証 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=顧客への請求書が検証さ Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=サプライヤーの順序は、承認さ Notify_ORDER_SUPPLIER_REFUSE=サプライヤーのオーダーが拒否されました Notify_ORDER_VALIDATE=検証済みの顧客の注文 diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/ka_GE/other.lang +++ b/htdocs/langs/ka_GE/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/kn_IN/other.lang +++ b/htdocs/langs/kn_IN/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index 8b695b497bb..5a0094277c9 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/lo_LA/other.lang +++ b/htdocs/langs/lo_LA/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index b982fa0521a..084e67f7575 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervencija patvirtinta Notify_FICHINTER_SENTBYMAIL=Intervencija nusiųsta paštu Notify_BILL_VALIDATE=Kliento sąskaita-faktūra patvirtinta Notify_BILL_UNVALIDATE=Kliento sąskaita-faktūra nepatvirtinta -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Tiekėjo užsakymas patvirtintas Notify_ORDER_SUPPLIER_REFUSE=Tiekėjo užsakymas atmestas Notify_ORDER_VALIDATE=Kliento užsakymas patvirtintas diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index 9f7d9fb26cc..41434a93b84 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Godkjenn intervention Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Godkjenn faktura Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Leverandør bestill godkjent Notify_ORDER_SUPPLIER_REFUSE=Leverandør bestill nektet Notify_ORDER_VALIDATE=Kundeordre validert diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index 1e013a5b4f5..3ac896537f8 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Interventie gevalideerd Notify_FICHINTER_SENTBYMAIL=Interventie via mail verzonden Notify_BILL_VALIDATE=Klant factuur gevalideerd Notify_BILL_UNVALIDATE=Klantenfactuur niet gevalideerd -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Leverancier te zijn goedgekeurd Notify_ORDER_SUPPLIER_REFUSE=Leverancier bestellen geweigerd Notify_ORDER_VALIDATE=Bestelling van de klant gevalideerd diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 351a7223594..df4bce98ad5 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -758,33 +758,33 @@ Permission1201=Wygeneruj wyniki eksportu Permission1202=Utwórz / modyfikuj eksport Permission1231=Czytaj faktury dostawcy Permission1232=Tworzenie / modyfikacja faktur dostawcy -Permission1233=Sprawdź dostawcę faktur -Permission1234=Usuń dostawcy faktur +Permission1233=Walidacja faktur dostawcy +Permission1234=Usuń faktury dostawcy Permission1235=Wyślij faktury dostawców za pośrednictwem poczty elektronicznej -Permission1236=Eksport faktury dostawcy, atrybuty i płatności -Permission1237=Zamówienia dostawca Eksport i ich szczegóły -Permission1251=Uruchom masowego importu danych do zewnętrznych baz danych (dane obciążenia) -Permission1321=Eksport klienta faktury, atrybuty i płatności -Permission1421=Eksport zamówień i atrybuty +Permission1236=Eksport faktur dostawcy, atrybutów i płatności +Permission1237=Eksport zamówień dostawcy oraz ich szczegółów +Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywanie danych) +Permission1321=Eksport faktur klienta, atrybutów oraz płatności +Permission1421=Eksport zamówień oraz atrybutów klienta Permission23001=Czytaj Zaplanowane zadania -Permission23002=Tworzenie / aktualizacja Zaplanowane zadania -Permission23003=Usuwanie zaplanowanego zadania -Permission23004=Wykonanie zaplanowanego zadania -Permission2401=Czytaj działań (zdarzeń lub zadań) związane z jego konta -Permission2402=Tworzenie / modyfikować / usuwać działań (zdarzeń lub zadań) związane z jego konta -Permission2403=Czytaj działań (zdarzeń lub zadań) innych -Permission2411=Przeczytaj działań (zdarzeń i zadań) innych osób -Permission2412=Tworzenie / modyfikowanie działań (zdarzeń i zadań) innych osób -Permission2413=Usuń działań (zdarzeń i zadań) innych osób -Permission2501=Przeczytaj dokumenty -Permission2502=Prześlij dokumenty lub usunąć -Permission2503=Wyślij lub usuwanie dokumentów +Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań +Permission23003=Usuwanie Zaplanowanego zadania +Permission23004=Wykonanie Zaplanowanego zadania +Permission2401=Czytaj działania (zdarzenia lub zadania) związane z jego kontem +Permission2402=Tworzenie / modyfikacja działań (zdarzeń lub zadań) związanych z jego kontem +Permission2403=Usuwanie działań (zdarzeń lub zadań) związanych z jego kontem +Permission2411=Czytaj działania (zdarzenia lub zadania) innych osób +Permission2412=Tworzenie / modyfikacja działań (zdarzeń lub zadań) innych osób +Permission2413=Usuwanie działań (zdarzeń lub zadań) innych osób +Permission2501=Czytaj / Pobierz dokumenty +Permission2502=Pobierz dokumenty +Permission2503=Potwierdź lub usuń dokumenty Permission2515=Konfiguracja katalogów dokumentów -Permission2801=Za pomocą klienta FTP w trybie odczytu (przeglądać i pobierać tylko) -Permission2802=Korzystanie z klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików) -Permission50101=Zastosowanie Punkt sprzedaży -Permission50201=Przeczytaj transakcji -Permission50202=Transakcji importowych +Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobieranie) +Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików) +Permission50101=Zastosowanie Punktów sprzedaży +Permission50201=Czytaj transakcje +Permission50202=Import transakcji Permission54001=Druk Permission55001=Czytaj ankiet Permission55002=Tworzenie / modyfikacja ankiet @@ -820,36 +820,36 @@ DictionaryEMailTemplates=Szablony wiadomości e-mail SetupSaved=Konfiguracja zapisana BackToModuleList=Powrót do listy modułów BackToDictionaryList=Powrót do listy słowników -VATReceivedOnly=Specjalne stawki nie obciążają +VATReceivedOnly=Specjalna stawka nie obciążona VATManagement=Zarządzanie VAT VATIsUsedDesc=Stawka VAT domyślnie podczas tworzenia perspektywy, faktur, zamówień itp wykonaj standardową zasadę czynnego:
Jeśli sprzedający nie poddaje opodatkowaniu podatkiem VAT, to podatek VAT domyślnie = 0. Koniec rządów.
Jeśli (sprzedaż kraj = zakupem kraj), a następnie domyślnie = VAT VAT produktu w kraju sprzedaży. Koniec rządów.
Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i towarów są produkty transportu (samochód, statek, samolot), domyślny VAT = 0 (VAT powinny być wypłacane przez kupującego na customoffice swojego kraju, a nie sprzedawcy). Koniec rządów.
Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej, a kupujący nie jest spółką, a następnie domyślnie = VAT VAT sprzedawanych produktów. Koniec rządów.
Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i kupującego jest firma, to VAT domyślnie = 0. Koniec rządów.
Else proponowany domyślny VAT = 0. Koniec rządów. -VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0, które mogą być wykorzystane w przypadkach takich jak stowarzyszeń, osób fizycznych lub małych firm. -VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje o rzeczywistym systemu fiskalnego (uproszczony rzeczywistym lub normalnej rzeczywistym). A system, w którym VAT jest deklarowana. +VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0. Może być wykorzystany w przypadku takich stowarzyszeń, osób fizycznych lub małych firm. +VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje wykorzystujące rzeczywisty system fiskalny (uproszczony rzeczywisty lub normalny rzeczywisty). System, w którym VAT jest deklarowany. VATIsNotUsedExampleFR=We Francji, oznacza to stowarzyszenia, które nie są zgłoszone VAT lub firm, organizacji i wolnych zawodów, które wybrały mikro przedsiębiorstw systemu fiskalnego (VAT w franczyzy) i wypłaciła franszyzowej VAT bez deklaracji VAT. Ten wybór będzie wyświetlany odniesienie "Nie dotyczy podatku VAT - art-293B z CGI" na fakturach. ##### Local Taxes ##### LTRate=Stawka LocalTax1IsUsed=Użyj drugiego podatku LocalTax1IsNotUsed=Nie należy używać drugiego podatku -LocalTax1IsUsedDesc=Użyj drugi typ podatków (innych niż VAT) +LocalTax1IsUsedDesc=Użyj drugi typ podatku (innego niż VAT) LocalTax1IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT) LocalTax1Management=Drugi rodzaj podatku LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= -LocalTax2IsUsed=Użyj trzeci podatku -LocalTax2IsNotUsed=Nie używać trzeci podatku -LocalTax2IsUsedDesc=Użyj trzeci rodzaj podatku (poza VAT) +LocalTax2IsUsed=Użyj trzeciego podatku +LocalTax2IsNotUsed=Nie używaj trzeciego podatku +LocalTax2IsUsedDesc=Użyj trzeciego rodzaju podatku (innego niż VAT) LocalTax2IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT) LocalTax2Management=Trzeci rodzaj podatku LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= LocalTax1ManagementES= RE Management LocalTax1IsUsedDescES= RE stawki domyślnie podczas tworzenia perspektyw, faktury, zamówienia itp. postępuj zgodnie z aktywnych zasadę:
Jeśli te kupujący nie podlega RE, RE domyślnie = 0. Koniec panowania.
Jeśli kupujący jest poddawany RE następnie RE domyślnie. Koniec panowania.
-LocalTax1IsNotUsedDescES= Domyślnie proponowana jest 0 RE. Koniec panowania. +LocalTax1IsNotUsedDescES= Domyślnie proponowany RE wynosi 0. Koniec zasady. LocalTax1IsUsedExampleES= W Hiszpanii są specjaliści z zastrzeżeniem niektórych szczególnych grup hiszpański IAE. LocalTax1IsNotUsedExampleES= W Hiszpanii są zawodowej i społecznej oraz z zastrzeżeniem pewnych odcinkach hiszpański IAE. LocalTax2ManagementES= IRPF Management LocalTax2IsUsedDescES= RE stawki domyślnie podczas tworzenia perspektyw, faktury, zamówienia itp. postępuj zgodnie z aktywnych zasadę:
Jeśli sprzedający nie jest poddawany IRPF, a następnie IRPF domyślnie = 0. Koniec panowania.
Jeżeli sprzedający jest poddawany IRPF następnie IRPF domyślnie. Koniec panowania.
-LocalTax2IsNotUsedDescES= Domyślnie proponowana jest 0 IRPF. Koniec panowania. +LocalTax2IsNotUsedDescES= Domyślnie proponowany IRPF wynosi 0. Koniec zasady. LocalTax2IsUsedExampleES= W Hiszpanii, freelancerów i przedstawicieli wolnych zawodów, którzy świadczą usługi i przedsiębiorstwa, którzy wybrali system podatkowy modułów. LocalTax2IsNotUsedExampleES= W Hiszpanii nie są one przedmiotem Bussines modułów systemu podatkowego. CalcLocaltax=Raporty odnośnie podatków lokalnych @@ -864,95 +864,95 @@ LabelOnDocuments=Etykieta na dokumenty NbOfDays=Nb dni AtEndOfMonth=Na koniec miesiąca Offset=Offset -AlwaysActive=Zawsze aktywnych -UpdateRequired=Your system needs to be updated. To do this, click on Aktualizuj teraz. +AlwaysActive=Zawsze aktywne +UpdateRequired=Twój system wymaga aktualizacji. Aby tego dokonać wybierz Aktualizuj teraz. Upgrade=Uaktualnij -MenuUpgrade=Upgrade / Extend -AddExtensionThemeModuleOrOther=Dodaj rozszerzenie (temat, modułu, ...) -WebServer=Web server -DocumentRootServer=Web serwera katalogu -DataRootServer=Dane plików katalogu -IP=OD +MenuUpgrade=Uaktualnij / Rozszerz +AddExtensionThemeModuleOrOther=Dodaj rozszerzenie (temat, moduł, ...) +WebServer=Serwer sieciowy +DocumentRootServer=Katalog główny serwera sieciowego +DataRootServer=Katalogi plików danych +IP=IP Port=Port -VirtualServerName=Wirtualne nazwy serwera +VirtualServerName=Nazwa wirtualnego serwera AllParameters=Wszystkie parametry OS=OS PhpEnv=Env PhpModules=Moduły -PhpConf=Conf. +PhpConf=Conf PhpWebLink=Web-Php link Pear=Pear PearPackages=Pear Packages Browser=Przeglądarka Server=Serwer -Database=Baza -DatabaseServer=Database host +Database=Baza danych +DatabaseServer=Host bazy danych DatabaseName=Nazwa bazy danych -DatabasePort=Baza portu -DatabaseUser=Baza danych użytkownika +DatabasePort=Port bazy danych +DatabaseUser=Użytkownik bazy danych DatabasePassword=Hasło bazy danych -DatabaseConfiguration=Baza danych konfiguracji +DatabaseConfiguration=Konfiguracja bazy danych Tables=Tabele TableName=Nazwa tabeli -TableLineFormat=Linia formacie -NbOfRecord=Nb rekordów -Constraints=Constraints -ConstraintsType=Constraint Typ -ConstraintsToShowOrNotEntry=Constraint pokazać też nie menu -AllMustBeOk=Wszystkie te muszą być sprawdzone +TableLineFormat=Format linii +NbOfRecord=Liczna rekordów +Constraints=Ograniczenia +ConstraintsType=Typy ogrniczeń +ConstraintsToShowOrNotEntry=Wpis menu dotyczący pokazywania / nie pokazywania ogrniczeń +AllMustBeOk=Wszystkie te opcje muszą zostać sprawdzone Host=Serwer -DriverType=Sterownik typu -SummarySystem=System informacji podsumowanie -SummaryConst=Lista wszystkich Dolibarr konfiguracji parametrów -SystemUpdate=System aktualizacji -SystemSuccessfulyUpdate=System został zaktualizowany successfuly +DriverType=Typ sterownika +SummarySystem=Podsumowanie informacji systemowych +SummaryConst=Lista wszystkich parametrów konfiguracji Dolibarr +SystemUpdate=Aktualizacja systemu +SystemSuccessfulyUpdate=Aktualizacja systemu przebiegła pomyślnie MenuCompanySetup=Firma / Fundacja MenuNewUser=Nowy użytkownik -MenuTopManager=Górne menu menedżera -MenuLeftManager=Lewe menu menedżera -MenuManager=Menedżer menu -MenuSmartphoneManager=Smartphone menedżer menu -DefaultMenuTopManager=Górne menu menedżera -DefaultMenuLeftManager=Lewe menu menedżera -DefaultMenuManager= Standardowy menedżer menu -DefaultMenuSmartphoneManager=Smartphone menedżer menu -Skin=Skóra tematu -DefaultSkin=Domyślny motyw skóry -MaxSizeList=Maks. długość listy -DefaultMaxSizeList=Domyślny maks. długość listy +MenuTopManager=Menedżer górnego menu +MenuLeftManager=Menedżer lewego menu +MenuManager=Menu menedżera +MenuSmartphoneManager=Menedżer menu Smartphona +DefaultMenuTopManager=Menedżer górnego menu +DefaultMenuLeftManager=Menedżer lewego menu +DefaultMenuManager= Menedżer standardowego menu +DefaultMenuSmartphoneManager=Menedżer menu Smartphona +Skin=Skórka +DefaultSkin=Domyślna skórka +MaxSizeList=Maksymalna długość listy +DefaultMaxSizeList=Domyślna maksymalna długość listy MessageOfDay=Wiadomość dnia -MessageLogin=Strona logowania wiadomość -PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu +MessageLogin=Wiadomość strona logowania +PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu DefaultLanguage=Domyślny język do użytku (kod języka) EnableMultilangInterface=Włącz wielojęzyczny interfejs -EnableShowLogo=logo Pokaż na menu po lewej stronie +EnableShowLogo=Pokaż logo w menu po lewej stronie EnableHtml5=Włącz HTML5 (Developement - Dostępna tylko na Eldy szablonu) -SystemSuccessfulyUpdated=System został zaktualizowany -CompanyInfo=Firma / fundacja informacji -CompanyIds=Firma / fundament tożsamości -CompanyName=Nazwa Firmy +SystemSuccessfulyUpdated=System został zaktualizowany pomyślnie +CompanyInfo=Informacja o firmie / fundacji +CompanyIds=Tożsamości firmy / fundacji +CompanyName=Nazwa firmy CompanyAddress=Adres CompanyZip=Kod pocztowy CompanyTown=Miasto CompanyCountry=Kraj -CompanyCurrency=Główne waluty +CompanyCurrency=Główna waluta Logo=Logo DoNotShow=Nie pokazuj -DoNotSuggestPaymentMode=Nie wskazują -NoActiveBankAccountDefined=Brak aktywnego konta bankowego zdefiniowane +DoNotSuggestPaymentMode=Nie proponuj +NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego OwnerOfBankAccount=Właściciel konta bankowego %s -BankModuleNotActive=Rachunki bankowe modułu nie aktywny +BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny ShowBugTrackLink=Pokaż link "Zgłoś błąd" -ShowWorkBoard=Pokaż "roboczego" na stronie głównej +ShowWorkBoard=Pokaż "warsztat" na stronie głównej Alerts=Alarmy Delays=Opóźnienia -DelayBeforeWarning=Opóźnienie ostrzeżenie przed -DelaysBeforeWarning=Opóźnienia ostrzeżenie przed -DelaysOfToleranceBeforeWarning=Tolerancja opóźnień ostrzeżenie przed +DelayBeforeWarning=Opóźnienie przed ostrzeżeniem +DelaysBeforeWarning=Opóźnienia przed ostrzeżeniem +DelaysOfToleranceBeforeWarning=Tolerancja opóźnień przed ostrzeżeniem DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed uruchomieniem alarmu na ekranie z pictogramami %s dla każdego opóźnionego elementu. -Delays_MAIN_DELAY_ACTIONS_TODO=Opóźnienie tolerancji (w dniach) przed wpisu na temat planowanych działań nie został jeszcze zrealizowany -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Opóźnienie tolerancji (w dniach) przed wpisu dotyczącego zamówień jeszcze nie -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancja opóźnienie (w dniach) przed wpisem na dostawców zamówień jeszcze nie przetworzonych +Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancja opóźnienia (w dniach) przed alarmem dotyczącym planowanych działań niezrealizowanych +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancja opóźnienia (w dniach) przed alarmem dotyczącym planowanych działań nieprzetworzonych +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancja opóźnienia (w dniach) przed alarmem dotyczącym zamówień dostawców nieprzetworzonych Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć Delays_MAIN_DELAY_PROPALS_TO_BILL=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić @@ -966,22 +966,22 @@ SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalaj SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony: SetupDescription3=Firma / fundacji konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju). SetupDescription4=Moduły konfiguracji jest wymagane, ponieważ Dolibarr nie jest proste ERP / CRM, ale suma kilku modułów, wszystkie mniej lub bardziej niezależne. To dopiero po aktywacji modułów jesteś interesująca, widać cechy pojawiły się w Dolibarr menu. -SetupDescription5=Inne pozycje menu Zarządzaj opcjonalne parametry. +SetupDescription5=Inne pozycje menu zarządzają opcjonalnymi parametrami. EventsSetup=Konfiguracja dzienników zdarzeń -LogEvents=Audyt bezpieczeństwa imprez +LogEvents=Zdarzenia audytu bezpieczeństwa Audit=Audyt InfoDolibarr=Informacje Dolibarr InfoBrowser=Informacje o przeglądarce InfoOS=Informacje OS InfoWebServer=Informacje serwer WWW -InfoDatabase=Informacje o bazie +InfoDatabase=Informacje o bazie danych InfoPHP=Informacje o PHP InfoPerf=Informacje o występy BrowserName=Nazwa przeglądarki BrowserOS=Przeglądarka OS -ListEvents=Audyt wydarzenia -ListOfSecurityEvents=Lista Dolibarr bezpieczeństwa imprez -SecurityEventsPurged=Zdarzenia zabezpieczeń oczyszczone +ListEvents=Zdarzenia audytu +ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr +SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. Administratorzy mogą wtedy zobaczyć jego zawartość za pomocą menu Narzędzia systemowe - Audyt. Ostrzeżenie: Funkcja ta może zużywają duże ilości danych w bazie danych. AreaForAdminOnly=Cechy te mogą być używane tylko przez administratora użytkowników. Administrator cechy i pomóc w Dolibarr są określone przez następujące picto: SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów. diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index bea44f2a008..7d5e57fab69 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Validate interwencji Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą Notify_BILL_VALIDATE=Sprawdź rachunki Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane -Notify_ORDER_SUPPLIER_VALIDATE=Kolejność Dostawca rejestrowane Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index dfe61017de8..7f4744141e2 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio Notify_BILL_VALIDATE=Validação factura Notify_BILL_UNVALIDATE=Fatura do cliente não validada -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado Notify_ORDER_VALIDATE=Pedido do cliente validado diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index d185c69bb00..a3b3b6ed3a0 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Validate intervenţie Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail Notify_BILL_VALIDATE=Factura client validată Notify_BILL_UNVALIDATE=Factura client nevalidată -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat Notify_ORDER_VALIDATE=Comandă client validată diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index 2b96b19c813..9d09fec50a1 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Посредничество подтверждено Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Проверка векселя Notify_BILL_UNVALIDATE=Счёт клиента не подтверждён -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Поставщик утвердил порядок Notify_ORDER_SUPPLIER_REFUSE=Поставщик порядке отказалась Notify_ORDER_VALIDATE=Kundeordre validert diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index 5b146c97086..78aaab510cd 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervencie overená Notify_FICHINTER_SENTBYMAIL=Intervencie poštou Notify_BILL_VALIDATE=Zákazník faktúra overená Notify_BILL_UNVALIDATE=Zákazník faktúra unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Dodávateľská objednávka zaznamenaná Notify_ORDER_SUPPLIER_APPROVE=Dodávateľ aby schválila Notify_ORDER_SUPPLIER_REFUSE=Dodávateľ aby odmietol Notify_ORDER_VALIDATE=Zákazníka overená diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index da07def671e..fb069d54112 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Potrjena intervencija Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu Notify_BILL_VALIDATE=Potrjen račun Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen -Notify_ORDER_SUPPLIER_VALIDATE=Naročilo pri dobavitelju je shranjeno Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju Notify_ORDER_VALIDATE=Potrjeno naročilo kupca diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 623bba60ef2..d314a81ea92 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validerade Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post Notify_BILL_VALIDATE=Kundfaktura validerade Notify_BILL_UNVALIDATE=Kundfakturan Fraktpris saknas -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Leverantör för godkänd Notify_ORDER_SUPPLIER_REFUSE=Leverantör för vägrat Notify_ORDER_VALIDATE=Kundorder validerade diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/sw_SW/other.lang +++ b/htdocs/langs/sw_SW/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 75998b5e64e..0ecef063e94 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -15,7 +15,7 @@ FileCheckDolibarr=Dolibarr Dosya Bütünlüğünü Denetle XmlNotFound=Dolibarr Bütünlüğü Xml Dosyası Bulınamadı SessionId=Oturum Kimliği SessionSaveHandler=Oturum kayıt yürütücüsü -SessionSavePath=Oturum kayıt konumu +SessionSavePath=Kayıt oturumu konumlandırma PurgeSessions=Oturum Temizleme ConfirmPurgeSessions=Tüm oturumları gerçekten temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir. NoSessionListWithThisHandler=PHP nizde yapılandırılmış olan oturum kayıt işlemcisi çalışmakta olan tüm oturumların listelenmesine izin vermiyor. diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index 257f4b46653..038fc8c0b09 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -25,8 +25,8 @@ InvoiceReplacement=Fatura değiştirme InvoiceReplacementAsk=Fatura değiştirme yapılacak fatura InvoiceReplacementDesc=Fatura değiştirme henüz tahsilat yapılmamış bir faturanın iptal edilmesi ve tamamen değiştirilmesi için kullanılır.

Not: Yalnızca ödeme yapılmamış faturalar değiştirilebilir. Değiştirdiğiniz fatura eğer henüz kapataılmamışsa, kullanılmamak üzere otomatik olarak kapatılacaktır. InvoiceAvoir=İade faturası -InvoiceAvoirAsk=İade faturası fatura düzeltmek için kullanılır -InvoiceAvoirDesc=İade Faturası bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden). +InvoiceAvoirAsk=Fatura düzeltmek için iade faturası +InvoiceAvoirDesc=İade Faturası bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade etmiştir). invoiceAvoirWithLines=İlk faturadan alınan kalemlerle İade Faturası oluştur invoiceAvoirWithPaymentRestAmount=İlk faturanın ödenmemiş bakiyeli İade Faturası invoiceAvoirLineWithPaymentRestAmount=Ödenmemiş kalan tutar için İade Faturası diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang index 752f0f18da9..a7b45308d55 100644 --- a/htdocs/langs/tr_TR/categories.lang +++ b/htdocs/langs/tr_TR/categories.lang @@ -9,7 +9,7 @@ AddIn=Eklenti modify=değiştir Classify=Sınıflandır CategoriesArea=Etiketler/Kategoriler alanı -ProductsCategoriesArea=Ürünler/Hizmetler etiketleri/kategorileri alanı +ProductsCategoriesArea=Ürün/Hizmet etiketleri/kategorileri alanı SuppliersCategoriesArea=Tedarikçi etiketleri/kategorileri alanı CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı ThirdPartyCategoriesArea=Üçüncü parti etiketleri/kategorileri alanı @@ -43,7 +43,7 @@ ImpossibleAssociateCategory=Etiketin/kategorinin şununla ilişkilendirilmesi ol WasAddedSuccessfully=%s başarıyla eklendi. ObjectAlreadyLinkedToCategory=Öğe zaten bu etiketle/kategoriyle ilişkilendirilmiş CategorySuccessfullyCreated=Bu etiket/kategori %s başarıyla eklendi -ProductIsInCategories=Ürün/hizmet bu etikete/kategoriye sahip +ProductIsInCategories=Ürün/hizmet bu etikete/kategoriye sahiptir SupplierIsInCategories=Üçüncü parti bu tedarikçi etiketine/kategorisine sahip CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday etiketlerine/kategorilerine sahiptir CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine sahiptir diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index b190d694cac..bb53436d74f 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -630,7 +630,7 @@ FreeLineOfType=Türe göre serbest giriş CloneMainAttributes=Nesneyi ana öznitelikleri ile klonla PDFMerge=PDF Birleştir Merge=Birleştir -PrintContentArea=Sayfa yazdırılacak ana içerik alanını göster +PrintContentArea=Yazdırılıcak Sayfanın ana içerik alanını göster MenuManager=Menu yöneticisi NoMenu=Alt menü yok WarningYouAreInMaintenanceMode=Uyarı, bakım modundasınız, şu anda uygulamayı kullanmak için yalnızca %s girişine izin veriliyor. @@ -678,7 +678,7 @@ LinkedToSpecificUsers=Belirli bir kullanıcı kişisine bağlantılı DeleteAFile=Bir dosya sil ConfirmDeleteAFile=Dosya silmek istediğinizden emin misiniz NoResults=Sonuç yok -ModulesSystemTools=Modul araçları +ModulesSystemTools=Modül araçları Test=Deneme Element=Unsur NoPhotoYet=Henüz resim yok diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index 52c073cce17..2791df31cfc 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Müdahale doğrulandı Notify_FICHINTER_SENTBYMAIL=Müdahale posta ile gönderildi Notify_BILL_VALIDATE=Müşteri faturası onaylandı Notify_BILL_UNVALIDATE=Müşteri faturasından doğrulama kaldırıldı -Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi siparişi kaydedildi. Notify_ORDER_SUPPLIER_APPROVE=Tedarikçi siparişi onaylandı Notify_ORDER_SUPPLIER_REFUSE=Tedarikçi siparişi reddedildi Notify_ORDER_VALIDATE=Müşteri siparişi onaylandı diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang index 014996eee65..288f54be283 100644 --- a/htdocs/langs/uk_UA/bills.lang +++ b/htdocs/langs/uk_UA/bills.lang @@ -1,321 +1,322 @@ # Dolibarr language file - Source file is en_US - bills -Bill=Invoice -Bills=Invoices -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices -BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s -BillsSuppliersUnpaid=Unpaid supplier's invoices -BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s -BillsLate=Late payments -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics -DisabledBecauseNotErasable=Disabled because can not be erased -InvoiceStandard=Standard invoice -InvoiceStandardAsk=Standard invoice -InvoiceStandardDesc=This kind of invoice is the common invoice. -InvoiceDeposit=Deposit invoice -InvoiceDepositAsk=Deposit invoice -InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. -InvoiceProForma=Proforma invoice -InvoiceProFormaAsk=Proforma invoice -InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. -InvoiceReplacement=Replacement invoice -InvoiceReplacementAsk=Replacement invoice for invoice +Bill=Рахунок-фактура +Bills=Рахунки-фактури +BillsCustomers=Рахунки-фактури клієнтів +BillsCustomer=Рахунок-фактура клієнта +BillsSuppliers=Рахунки-фактури постачальників +BillsCustomersUnpaid=Несплачені рахунки-фактури клієнтів +BillsCustomersUnpaidForCompany=Неоплачені рахунки-фактури Покупців для %s +BillsSuppliersUnpaid=Несплачені рахунки-фактури постачальників +BillsSuppliersUnpaidForCompany=Неоплачені рахунки-фактури постачальнику для %s +BillsLate=Прострочені платежі +BillsStatistics=Статистика рахунків клієнтів +BillsStatisticsSuppliers=Статистика рахунків постачальників +DisabledBecauseNotErasable=Неактивні, тому що не можуть бути стерті +InvoiceStandard=Стандартний рахунок-фактура +InvoiceStandardAsk=Стандартний рахунок-фактура +InvoiceStandardDesc=Такий вид рахунку є загальним. +InvoiceDeposit=Депозитна накладна +InvoiceDepositAsk=Депозитна накладна +InvoiceDepositDesc=Цей вид рахунку-фактури оформляється при отриманні внеску. +InvoiceProForma=Рахунок проформа +InvoiceProFormaAsk=Рахунок проформа +InvoiceProFormaDesc=Рахунок проформа є образом оригінального рахунку, але не має бухгалтерського облікового запису. +InvoiceReplacement=Заміна рахунка-фактури +InvoiceReplacementAsk=Заміна рахунка-фактури на інший InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. -InvoiceAvoir=Credit note -InvoiceAvoirAsk=Credit note to correct invoice +InvoiceAvoir=Кредитове авізо +InvoiceAvoirAsk=Кредитове авізо для коригування рахунка-фактури InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). -invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice +invoiceAvoirWithLines=Створити кредитове авізо зі строками з оригінального рахунка invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount -ReplaceInvoice=Replace invoice %s +ReplaceInvoice=Замінити рахунок-фактуру %s ReplacementInvoice=Replacement invoice -ReplacedByInvoice=Replaced by invoice %s -ReplacementByInvoice=Replaced by invoice -CorrectInvoice=Correct invoice %s -CorrectionInvoice=Correction invoice -UsedByInvoice=Used to pay invoice %s -ConsumedBy=Consumed by -NotConsumed=Not consumed +ReplacedByInvoice=Заміщенний рахунком-фактурою %s +ReplacementByInvoice=Заміщенний рахунком-фактурою +CorrectInvoice=Правильний рахунок %s +CorrectionInvoice=Коригуючий рахунок +UsedByInvoice=Використаний для сплати рахунку-фактури %s +ConsumedBy=Використаний +NotConsumed=Не використаний NoReplacableInvoice=No replacable invoices -NoInvoiceToCorrect=No invoice to correct -InvoiceHasAvoir=Corrected by one or several invoices -CardBill=Invoice card +NoInvoiceToCorrect=Немає рахунків-фактур для коригування +InvoiceHasAvoir=Виправлений одним або декількома рахунками-фактурами +CardBill=Карта рахунка-фактури PredefinedInvoices=Predefined Invoices -Invoice=Invoice -Invoices=Invoices -InvoiceLine=Invoice line -InvoiceCustomer=Customer invoice -CustomerInvoice=Customer invoice -CustomersInvoices=Customers invoices -SupplierInvoice=Supplier invoice -SuppliersInvoices=Suppliers invoices -SupplierBill=Supplier invoice -SupplierBills=suppliers invoices -Payment=Payment -PaymentBack=Payment back -Payments=Payments -PaymentsBack=Payments back -PaidBack=Paid back -DatePayment=Payment date -DeletePayment=Delete payment -ConfirmDeletePayment=Are you sure you want to delete this payment ? +Invoice=Рахунок-фактура +Invoices=Рахунки-фактури +InvoiceLine=Рядок рахунку-фактури +InvoiceCustomer=Рахунок клієнта +CustomerInvoice=Рахунок клієнта +CustomersInvoices=Рахунки-фактури покупців +SupplierInvoice=Рахунок постачальника +SuppliersInvoices=Рахунки-фактури постачальників +SupplierBill=Рахунок постачальника +SupplierBills=рахунки-фактури постачальників +Payment=Платіж +PaymentBack=Повернення платежу +Payments=Платежі +PaymentsBack=Повернення платежів +PaidBack=Повернення платежу +DatePayment=Дата платежу +DeletePayment=Видалити платіж +ConfirmDeletePayment=Ви упевнені, що хочете видалити цей платіж? ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. -SupplierPayments=Suppliers payments -ReceivedPayments=Received payments -ReceivedCustomersPayments=Payments received from customers -PayedSuppliersPayments=Payments payed to suppliers -ReceivedCustomersPaymentsToValid=Received customers payments to validate -PaymentsReportsForYear=Payments reports for %s -PaymentsReports=Payments reports -PaymentsAlreadyDone=Payments already done -PaymentsBackAlreadyDone=Payments back already done -PaymentRule=Payment rule -PaymentMode=Payment type -PaymentTerm=Payment term -PaymentConditions=Payment terms -PaymentConditionsShort=Payment terms -PaymentAmount=Payment amount -ValidatePayment=Validate payment -PaymentHigherThanReminderToPay=Payment higher than reminder to pay +SupplierPayments=Платежі Постачальникам +ReceivedPayments=Отримані платежі +ReceivedCustomersPayments=Платежі, отримані від покупців +PayedSuppliersPayments=Плетежі, відправлені постачальникам +ReceivedCustomersPaymentsToValid=Отримані платежі покупців для підтвердження +PaymentsReportsForYear=Звіти про платежі за %s +PaymentsReports=Звіти про платежі +PaymentsAlreadyDone=Платежі вже зроблені +PaymentsBackAlreadyDone=Повернення платежу вже зроблене +PaymentRule=Правила оплати +PaymentMode=Тип платежу +PaymentTerm=Умови платежу +PaymentConditions=Умови платежу +PaymentConditionsShort=Умови платежу +PaymentAmount=Сума платежу +ValidatePayment=Підтвердити платіж +PaymentHigherThanReminderToPay=Платіж більший, ніж в нагадуванні про оплату HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. -ClassifyPaid=Classify 'Paid' -ClassifyPaidPartially=Classify 'Paid partially' -ClassifyCanceled=Classify 'Abandoned' -ClassifyClosed=Classify 'Closed' +ClassifyPaid=Класифікувати як 'Сплачений' +ClassifyPaidPartially=Класифікувати як 'Сплачений частково' +ClassifyCanceled=Класифікувати як 'Анулюваний' +ClassifyClosed=Класифікувати як 'Закритий' ClassifyUnBilled=Classify 'Unbilled' -CreateBill=Create Invoice -AddBill=Create invoice or credit note +CreateBill=Створити рахунок-фактуру +AddBill=Створити рахунок або кредитне авізо AddToDraftInvoices=Add to draft invoice -DeleteBill=Delete invoice -SearchACustomerInvoice=Search for a customer invoice -SearchASupplierInvoice=Search for a supplier invoice -CancelBill=Cancel an invoice -SendRemindByMail=Send reminder by EMail -DoPayment=Do payment -DoPaymentBack=Do payment back -ConvertToReduc=Convert into future discount -EnterPaymentReceivedFromCustomer=Enter payment received from customer +DeleteBill=Видалити рахунок-фактуру +SearchACustomerInvoice=Пошук рахунку-фактури Покупця +SearchASupplierInvoice=Пошук рахунку-фактури Постачальника +CancelBill=Відмінити рахунок-фактуру +SendRemindByMail=Відправити нагадування по EMail +DoPayment=Вчинити платіж +DoPaymentBack=Повернути платіж +ConvertToReduc=Перетворити в майбутню знижку +EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero -Amount=Amount -PriceBase=Price base -BillStatus=Invoice status -BillStatusDraft=Draft (needs to be validated) -BillStatusPaid=Paid -BillStatusPaidBackOrConverted=Paid or converted into discount -BillStatusConverted=Paid (ready for final invoice) -BillStatusCanceled=Abandoned -BillStatusValidated=Validated (needs to be paid) -BillStatusStarted=Started -BillStatusNotPaid=Not paid -BillStatusClosedUnpaid=Closed (unpaid) -BillStatusClosedPaidPartially=Paid (partially) -BillShortStatusDraft=Draft -BillShortStatusPaid=Paid -BillShortStatusPaidBackOrConverted=Processed -BillShortStatusConverted=Processed -BillShortStatusCanceled=Abandoned -BillShortStatusValidated=Validated -BillShortStatusStarted=Started -BillShortStatusNotPaid=Not paid -BillShortStatusClosedUnpaid=Closed -BillShortStatusClosedPaidPartially=Paid (partially) -PaymentStatusToValidShort=To validate -ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined -ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. -ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes -ErrorBillNotFound=Invoice %s does not exist +DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою +Amount=Сума +PriceBase=Цінова база +BillStatus=Статус рахунку-фактури +BillStatusDraft=Проект (має бути підтверджений) +BillStatusPaid=Сплачений +BillStatusPaidBackOrConverted=Сплачений або конвертований в знижку +BillStatusConverted=Сплачений (готовий для завершального рахунка-фактури) +BillStatusCanceled=Анулюваний +BillStatusValidated=Підтверджений (необхідно сплатити) +BillStatusStarted=Розпочатий +BillStatusNotPaid=Неоплачений +BillStatusClosedUnpaid=Закритий (неоплачений) +BillStatusClosedPaidPartially=Сплачений (частково) +BillShortStatusDraft=Проект +BillShortStatusPaid=Сплачений +BillShortStatusPaidBackOrConverted=Оброблений +BillShortStatusConverted=Оброблений +BillShortStatusCanceled=Анулюваний +BillShortStatusValidated=Підтверджений +BillShortStatusStarted=Розпочатий +BillShortStatusNotPaid=Неоплачений +BillShortStatusClosedUnpaid=Закритий +BillShortStatusClosedPaidPartially=Сплачений (частково) +PaymentStatusToValidShort=На підтвердженні +ErrorVATIntraNotConfigured=Номер платника ПДВ ще не встановлений +ErrorNoPaiementModeConfigured=Режим оплати за умовчанням не встановлений. Перейдіть в налаштування модуля Рахунків-фактур для виправлення цієї ситуації. +ErrorCreateBankAccount=Створіть банківський рахунок, а потім перейдіть до панелі налаштування модуля Рахунків-фактур для установки способів оплати +ErrorBillNotFound=Рахунок %s не існує ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. -ErrorDiscountAlreadyUsed=Error, discount already used -ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount -ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount -ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status -BillFrom=From -BillTo=To -ActionsOnBill=Actions on invoice -NewBill=New invoice -LastBills=Last %s invoices -LastCustomersBills=Last %s customers invoices -LastSuppliersBills=Last %s suppliers invoices -AllBills=All invoices -OtherBills=Other invoices -DraftBills=Draft invoices -CustomersDraftInvoices=Customers draft invoices -SuppliersDraftInvoices=Suppliers draft invoices -Unpaid=Unpaid -ConfirmDeleteBill=Are you sure you want to delete this invoice ? +ErrorDiscountAlreadyUsed=Помилка, знижка вже використовується +ErrorInvoiceAvoirMustBeNegative=Помилка, правильний рахунок-фактура повинен мати негативну суму +ErrorInvoiceOfThisTypeMustBePositive=Помилка, такий тип рахунку-фактури повинен мати позитивну суму +ErrorCantCancelIfReplacementInvoiceNotValidated=Помилка, неможливо відмінити рахунок-фактуру, який був замінений на іншій рахунок-фактуру, що знаходиться в статусі проекту +BillFrom=Продавець +BillTo=Покупець +ActionsOnBill=Дії з рахунком-фактурою +NewBill=Новий рахунок-фактура +LastBills=Останні %s рахунків-фактур +LastCustomersBills=Останні %s рахунків-фактур Покупців +LastSuppliersBills=Останні %s рахунків-фактур Постачальників +AllBills=Усі рахунки-фактури +OtherBills=Інші рахунки-фактури +DraftBills=Проекти рахунків-фактур +CustomersDraftInvoices=Проекти рахунків-фактур Покупців +SuppliersDraftInvoices=Проекти рахунків-фактур Постачальників +Unpaid=Неоплачений +ConfirmDeleteBill=Ви упевнені, що хочете видалити цей рахунок-фактуру? ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? -ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? -ConfirmCancelBill=Are you sure you want to cancel invoice %s ? -ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? -ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? -ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? +ConfirmClassifyPaidBill=Ви упевнені, що хочете змінити статус рахунка-фактури %s на 'Сплачений'? +ConfirmCancelBill=Ви упевнені, що хочете відмінити рахунок-фактуру %s? +ConfirmCancelBillQuestion=Чому ви хочете класифікувати цей рахунок-фактуру як 'Анулюваний'? +ConfirmClassifyPaidPartially=Ви упевнені, що хочете змінити статус рахунка-фактури %s на 'Сплачений'? +ConfirmClassifyPaidPartiallyQuestion=Цей рахунок-фактура не сплачений повністю. Вкажіть причини закриття рахунку-фактури? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. -ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer -ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned -ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason -ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») -ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. -ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit -ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. -ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned -ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. -ConfirmClassifyAbandonReasonOther=Other -ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. -ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? +ConfirmClassifyPaidPartiallyReasonBadCustomer=Поганий Покупець +ConfirmClassifyPaidPartiallyReasonProductReturned=Продукція частково повернена +ConfirmClassifyPaidPartiallyReasonOther=Сума, анульована з інших причин +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Такий вибір можливий, тільки якщо рахунок-фактура був забезпечений необхідним коментарем. (Наприклад, "Тільки податок, що відповідає фактично сплаченій ціні, надає права на вирахування") +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=У деяких країнах, цей вибір може бути можливим тільки, якщо ваш рахунок-фактура містить правильні відомості. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Використайте цей вибір, якщо усі інші не підходять +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Поганий Покупець - це замовник, який відмовляється оплачувати свої борги. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Цей вибір використовується при неповній оплаті, коли деяка продукція була повернена +ConfirmClassifyPaidPartiallyReasonOtherDesc=Використайте цей вибір, якщо усі інші не підходять, наприклад, в наступній ситуації:
- оплата не завершена, оскільки деякі товари були відправлені назад
- заявлена сума дуже важлива, тому що знижка була забута
У всіх випадках надмірно заявлена сума має бути виправлена в системі бухгалтерського обліку шляхом створення кредитних авізо. +ConfirmClassifyAbandonReasonOther=Інший +ConfirmClassifyAbandonReasonOtherDesc=Цей вибір використовуватиметься в усіх інших випадках. Наприклад, тому, що ви плануєте створити замінюючий рахунок-фактуру. +ConfirmCustomerPayment=Ви підтверджуєте введення цього платежу на %s %s? ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? -ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. -ValidateBill=Validate invoice +ConfirmValidatePayment=Ви упевнені, що хочете підтвердити цей платіж? Змінити одного разу підтверджений платіж неможливо. +ValidateBill=Підтвердити рахунок-фактуру UnvalidateBill=Unvalidate invoice -NumberOfBills=Nb of invoices -NumberOfBillsByMonth=Nb of invoices by month -AmountOfBills=Amount of invoices -AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) -ShowSocialContribution=Show social contribution -ShowBill=Show invoice -ShowInvoice=Show invoice -ShowInvoiceReplace=Show replacing invoice -ShowInvoiceAvoir=Show credit note -ShowInvoiceDeposit=Show deposit invoice -ShowPayment=Show payment -File=File -AlreadyPaid=Already paid +NumberOfBills=К-ть рахунків-фактур +NumberOfBillsByMonth=К-ть рахунків-фактур по місяцях +AmountOfBills=Сума рахунків-фактур +AmountOfBillsByMonthHT=Сума рахунків-фактур за місяць (за вирахуванням податку) +ShowSocialContribution=Показати соціальний внесок +ShowBill=Показати рахунок-фактуру +ShowInvoice=Показати рахунок-фактуру +ShowInvoiceReplace=Показати замінюючий рахунок-фактуру +ShowInvoiceAvoir=Показати кредитое авізо +ShowInvoiceDeposit=Показати рахунок-фактуру на внесок +ShowPayment=Показати платіж +File=Файл +AlreadyPaid=Вже сплачений AlreadyPaidBack=Already paid back -AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) +AlreadyPaidNoCreditNotesNoDeposits=Вже сплачений (без кредитових авізо і внесків) Abandoned=Abandoned -RemainderToPay=Remaining unpaid +RemainderToPay=Залишити неоплаченим RemainderToTake=Remaining amount to take RemainderToPayBack=Remaining amount to pay back -Rest=Pending -AmountExpected=Amount claimed -ExcessReceived=Excess received -EscompteOffered=Discount offered (payment before term) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) -StandingOrders=Standing orders -StandingOrder=Standing order -NoDraftBills=No draft invoices -NoOtherDraftBills=No other draft invoices +Rest=В очікуванні +AmountExpected=Заявлена сума +ExcessReceived=Отриманий надлишок +EscompteOffered=Надана знижка (за достроковий платіж) +SendBillRef=Представлення рахунку %s +SendReminderBillRef=Представлення рахунку %s (нагадування) +StandingOrders=Регламенти +StandingOrder=Регламент +NoDraftBills=Немає проектів рахунків-фактур +NoOtherDraftBills=Немає інших проектів рахунків-фактур NoDraftInvoices=No draft invoices RefBill=Invoice ref -ToBill=To bill -RemainderToBill=Remainder to bill -SendBillByMail=Send invoice by email -SendReminderBillByMail=Send reminder by email -RelatedCommercialProposals=Related commercial proposals -MenuToValid=To valid -DateMaxPayment=Payment due before -DateEcheance=Due date limit -DateInvoice=Invoice date -NoInvoice=No invoice -ClassifyBill=Classify invoice -SupplierBillsToPay=Suppliers invoices to pay -CustomerBillsUnpaid=Unpaid customers invoices +ToBill=Для виставляння +RemainderToBill=Залишок до виставляння +SendBillByMail=Відправити рахунок-фактуру по email +SendReminderBillByMail=Відправити нагадування по email +RelatedCommercialProposals=Пов'язані комерційні пропозиції +MenuToValid=Для перевірки +DateMaxPayment=Оплата до +DateEcheance=Гранична дата оплати +DateInvoice=Дата рахунку-фактури +NoInvoice=Немає рахунків-фактур +ClassifyBill=Класифікувати рахунок-фактуру +SupplierBillsToPay=Рахунки-фактури Постачальників до оплати +CustomerBillsUnpaid=Неоплачені Покупцем рахунки-фактури DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters -NonPercuRecuperable=Non-recoverable -SetConditions=Set payment terms -SetMode=Set payment mode -Billed=Billed -RepeatableInvoice=Template invoice -RepeatableInvoices=Template invoices -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Convert into template invoice -CreateRepeatableInvoice=Create template invoice -CreateFromRepeatableInvoice=Create from template invoice +NonPercuRecuperable=Не підлягає стягненню +SetConditions=Встановити умови оплати +SetMode=Встановити режим оплати +Billed=Виставлений +RepeatableInvoice=Шаблон рахунку +RepeatableInvoices=Шаблони рахунків +Repeatable=Шаблон +Repeatables=Шаблони +ChangeIntoRepeatableInvoice=Конвертувати в шаблон рахунки +CreateRepeatableInvoice=Створити шаблон рахунка-фактури +CreateFromRepeatableInvoice=Створити з шаблону рахунок-фактуру CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines -CustomersInvoicesAndPayments=Customer invoices and payments +CustomersInvoicesAndPayments=Рахунки-фактури і платежі Покупця ExportDataset_invoice_1=Customer invoices list and invoice's lines -ExportDataset_invoice_2=Customer invoices and payments +ExportDataset_invoice_2=Рахунки-фактури і платежі Покупця ProformaBill=Proforma Bill: -Reduction=Reduction -ReductionShort=Reduc. -Reductions=Reductions -ReductionsShort=Reduc. -Discount=Discount -Discounts=Discounts -AddDiscount=Create discount -AddRelativeDiscount=Create relative discount -EditRelativeDiscount=Edit relative discount -AddGlobalDiscount=Create absolute discount -EditGlobalDiscounts=Edit absolute discounts -AddCreditNote=Create credit note -ShowDiscount=Show discount -ShowReduc=Show the deduction -RelativeDiscount=Relative discount -GlobalDiscount=Global discount -CreditNote=Credit note -CreditNotes=Credit notes -Deposit=Deposit -Deposits=Deposits -DiscountFromCreditNote=Discount from credit note %s -DiscountFromDeposit=Payments from deposit invoice %s -AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation -CreditNoteDepositUse=Invoice must be validated to use this king of credits +Reduction=Скорочення +ReductionShort=Скороч. +Reductions=Скорочення +ReductionsShort=Скороч. +Discount=Знижка +Discounts=Знижки +AddDiscount=Створити абсолютну знижку +AddRelativeDiscount=Створити відносну знижку +EditRelativeDiscount=Відредагувати відносну знижку +AddGlobalDiscount=Додати знижку +EditGlobalDiscounts=Редагувати абсолютні знижки +AddCreditNote=Створити кредитове авізо +ShowDiscount=Показати знижку +ShowReduc=Показати вирахування +RelativeDiscount=Відносна знижка +GlobalDiscount=Глобальна знижка +CreditNote=Кредитове авізо +CreditNotes=Кредитове авізо +Deposit=Внесок +Deposits=Внески +DiscountFromCreditNote=Знижка з кредитового авізо %s +DiscountFromDeposit=Платежі з депозитного рахунка-фактури %s +AbsoluteDiscountUse=Такий тип кредиту може бути використаний по рахунку-фактурі до його підтвердження +CreditNoteDepositUse=Рахунок-фактура має бути підтверджений, щоб використати цей тип кредиту NewGlobalDiscount=New absolute discount NewRelativeDiscount=New relative discount -NoteReason=Note/Reason -ReasonDiscount=Reason -DiscountOfferedBy=Granted by -DiscountStillRemaining=Discounts still remaining -DiscountAlreadyCounted=Discounts already counted -BillAddress=Bill address -HelpEscompte=This discount is a discount granted to customer because its payment was made before term. -HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. -HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) -IdSocialContribution=Social contribution id -PaymentId=Payment id -InvoiceId=Invoice id +NoteReason=Примітка / Підстава +ReasonDiscount=Підстава +DiscountOfferedBy=Надана +DiscountStillRemaining=Залишок знижки +DiscountAlreadyCounted=Знижка вже розрахована +BillAddress=Адреса виставляння +HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж. +HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою. +HelpAbandonOther=Від цієї суми відмовилися через помилку (наприклад, неправильний клієнт або рахунок-фактура був замінений на іншій) +IdSocialContribution=Код соціальних внесків +PaymentId=Код платежу +InvoiceId=Код рахунку-фактури InvoiceRef=Invoice ref. -InvoiceDateCreation=Invoice creation date -InvoiceStatus=Invoice status -InvoiceNote=Invoice note -InvoicePaid=Invoice paid -PaymentNumber=Payment number -RemoveDiscount=Remove discount +InvoiceDateCreation=Дата створення рахунку-фактури +InvoiceStatus=Статус рахунку-фактури +InvoiceNote=Примітка до рахунку-фактури +InvoicePaid=Рахунок-фактура сплачений +PaymentNumber=Номери платежу +RemoveDiscount=Видалити знижку WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) -InvoiceNotChecked=No invoice selected -CloneInvoice=Clone invoice -ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? -DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced -DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. -NbOfPayments=Nb of payments -SplitDiscount=Split discount in two -ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? -TypeAmountOfEachNewDiscount=Input amount for each of two parts : -TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. -ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +InvoiceNotChecked=Рахунок-фактура не вибраний +CloneInvoice=Дублювати рахунок-фактуру +ConfirmCloneInvoice=Ви упевнені, що хочете дублювати цей рахунок-фактуру %s? +DisabledBecauseReplacedInvoice=Дії відключені оскільки рахунок-фактура був замінений +DescTaxAndDividendsArea=Ця зона представляє сумарну інформацію по платежах на спеціальні витрати. Тут будуть показані лише записи з платежами протягом фіксованого року. +NbOfPayments=К-ть платежів +SplitDiscount=Розділити знижку на дві +ConfirmSplitDiscount=Ви упевнені, що хочете розділити цю знижку %s %s на 2 менших знижки? +TypeAmountOfEachNewDiscount=Введіть суму кожної з двох частин: +TotalOfTwoDiscountMustEqualsOriginal=Сума двох нових знижок має дорівнювати розміру первинної знижки. +ConfirmRemoveDiscount=Ви впевнені, що хочте видалити цю знижку? RelatedBill=Related invoice RelatedBills=Related invoices RelatedCustomerInvoices=Related customer invoices RelatedSupplierInvoices=Related supplier invoices LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +WarningBillExist=Попередження! Рахунок чи рахунки вже існують +MergingPDFTool=Merging PDF tool # PaymentConditions -PaymentConditionShortRECEP=Immediate -PaymentConditionRECEP=Immediate -PaymentConditionShort30D=30 days -PaymentCondition30D=30 days +PaymentConditionShortRECEP=Негайно +PaymentConditionRECEP=Негайно +PaymentConditionShort30D=30 днів +PaymentCondition30D=30 днів PaymentConditionShort30DENDMONTH=30 days end of month PaymentCondition30DENDMONTH=30 days end of month -PaymentConditionShort60D=60 days -PaymentCondition60D=60 days +PaymentConditionShort60D=60 днів +PaymentCondition60D=60 днів PaymentConditionShort60DENDMONTH=60 days end of month PaymentCondition60DENDMONTH=60 days end of month -PaymentConditionShortPT_DELIVERY=Delivery +PaymentConditionShortPT_DELIVERY=Доставка PaymentConditionPT_DELIVERY=On delivery PaymentConditionShortPT_ORDER=On order PaymentConditionPT_ORDER=On order PaymentConditionShortPT_5050=50-50 -PaymentConditionPT_5050=50%% in advance, 50%% on delivery +PaymentConditionPT_5050=50%% аванс, 50%% після доставки FixAmount=Fix amount VarAmount=Variable amount (%% tot.) # PaymentType @@ -323,54 +324,54 @@ PaymentTypeVIR=Bank deposit PaymentTypeShortVIR=Bank deposit PaymentTypePRE=Bank's order PaymentTypeShortPRE=Bank's order -PaymentTypeLIQ=Cash -PaymentTypeShortLIQ=Cash -PaymentTypeCB=Credit card -PaymentTypeShortCB=Credit card -PaymentTypeCHQ=Check -PaymentTypeShortCHQ=Check +PaymentTypeLIQ=Готівка +PaymentTypeShortLIQ=Готівка +PaymentTypeCB=Кредитна картка +PaymentTypeShortCB=Кредитна картка +PaymentTypeCHQ=Чек +PaymentTypeShortCHQ=Чек PaymentTypeTIP=TIP PaymentTypeShortTIP=TIP -PaymentTypeVAD=On line payment +PaymentTypeVAD=Он-лайн платіж PaymentTypeShortVAD=On line payment PaymentTypeTRA=Bill payment PaymentTypeShortTRA=Bill -BankDetails=Bank details -BankCode=Bank code +BankDetails=Банківські реквізити +BankCode=Код банку DeskCode=Desk code -BankAccountNumber=Account number -BankAccountNumberKey=Key -Residence=Domiciliation -IBANNumber=IBAN number +BankAccountNumber=Номер рахунка +BankAccountNumberKey=Ключ +Residence=Доміцилізація +IBANNumber=Номер IBAN IBAN=IBAN BIC=BIC/SWIFT -BICNumber=BIC/SWIFT number -ExtraInfos=Extra infos +BICNumber=Номер BIC/SWIFT +ExtraInfos=Додаткова інформація RegulatedOn=Regulated on -ChequeNumber=Check N° +ChequeNumber=Чек № ChequeOrTransferNumber=Check/Transfer N° -ChequeMaker=Check transmitter -ChequeBank=Bank of Check -CheckBank=Check -NetToBePaid=Net to be paid -PhoneNumber=Tel -FullPhoneNumber=Telephone -TeleFax=Fax +ChequeMaker=Перевірте відправника +ChequeBank=Банк чека +CheckBank=Перевірити +NetToBePaid=Чистими до сплати +PhoneNumber=Тел. +FullPhoneNumber=Телефон +TeleFax=Факс PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. IntracommunityVATNumber=Intracommunity number of VAT PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to PaymentByChequeOrderedToShort=Check payment (including tax) are payable to -SendTo=sent to +SendTo=відправлено PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI LawApplicationPart1=By application of the law 80.335 of 12/05/80 -LawApplicationPart2=the goods remain the property of +LawApplicationPart2=товари залишаються у власності LawApplicationPart3=the seller until the complete cashing of LawApplicationPart4=their price. LimitedLiabilityCompanyCapital=SARL with Capital of -UseLine=Apply -UseDiscount=Use discount -UseCredit=Use credit +UseLine=Застосувати +UseDiscount=Використати знижку +UseCredit=Використати кредит UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit MenuChequeDeposits=Checks deposits MenuCheques=Checks @@ -379,15 +380,15 @@ NewChequeDeposit=New deposit ChequesReceipts=Checks receipts ChequesArea=Checks deposits area ChequeDeposits=Checks deposits -Cheques=Checks +Cheques=Чеки CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices -ShowUnpaidAll=Show all unpaid invoices -ShowUnpaidLateOnly=Show late unpaid invoices only -PaymentInvoiceRef=Payment invoice %s -ValidateInvoice=Validate invoice -Cash=Cash -Reported=Delayed +ShowUnpaidAll=Показати усі несплачені рахунки-фактури +ShowUnpaidLateOnly=Паказати лише прострочені несплачені рахунки-фактури +PaymentInvoiceRef=Оплата рахунка-фактури %s +ValidateInvoice=Підтвердити рахунок-фактуру +Cash=Готівка +Reported=Затриман DisabledBecausePayments=Not possible since there are some payments CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid ExpectedToPay=Expected payment @@ -396,8 +397,8 @@ ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replac ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". ToMakePayment=Pay -ToMakePaymentBack=Pay back -ListOfYourUnpaidInvoices=List of unpaid invoices +ToMakePaymentBack=Повернення платежу +ListOfYourUnpaidInvoices=Список неоплачених рахунків NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. RevenueStamp=Revenue stamp YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty @@ -408,7 +409,7 @@ TerreNumRefModelError=A bill starting with $syymm already exists and is not comp ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice TypeContact_facture_external_BILLING=Customer invoice contact -TypeContact_facture_external_SHIPPING=Customer shipping contact +TypeContact_facture_external_SHIPPING=Зверніться в службу доставки TypeContact_facture_external_SERVICE=Customer service contact TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact @@ -422,12 +423,12 @@ InvoiceSituationAsk=Invoice following the situation InvoiceSituationDesc=Create a new situation following an already existing one SituationAmount=Situation invoice amount(net) SituationDeduction=Situation subtraction -Progress=Progress -ModifyAllLines=Modify all lines +Progress=Прогрес +ModifyAllLines=Змінити усі строки CreateNextSituationInvoice=Create next situation NotLastInCycle=This invoice in not the last in cycle and must not be modified. DisabledBecauseNotLastInCycle=The next situation already exists. DisabledBecauseFinal=This situation is final. CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. NoSituations=No opened situations -InvoiceSituationLast=Final and general invoice +InvoiceSituationLast=Фінальний і основний рахунок diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index 6b60f5eac97..819005d4f4a 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 519eac4bf92..63de4507754 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=Can thiệp xác nhận Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 206356048d5..3cb14b26008 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=干预验证 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预 Notify_BILL_VALIDATE=客户发票验证 Notify_BILL_UNVALIDATE=未经验证客户发票 -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=供应商为了批准 Notify_ORDER_SUPPLIER_REFUSE=供应商的订单被拒绝 Notify_ORDER_VALIDATE=验证客户订单 diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang index 32bdd92f884..c712ba4929f 100644 --- a/htdocs/langs/zh_CN/resource.lang +++ b/htdocs/langs/zh_CN/resource.lang @@ -1,13 +1,13 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning +MenuResourceIndex=资源 +MenuResourceAdd=新资源 +MenuResourcePlanning=资源计划 DeleteResource=Delete resource ConfirmDeleteResourceElement=Confirm delete the resource for this element NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +NoResourceLinked=无资源链接 -ResourcePageIndex=Resources list +ResourcePageIndex=资源列表 ResourceSingular=Resource ResourceCard=Resource card AddResource=Create a resource diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index d4b58709afb..e2d017e24c2 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -12,7 +12,6 @@ Notify_FICHINTER_VALIDATE=幹預驗證 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=客戶發票驗證 Notify_BILL_UNVALIDATE=Customer invoice unvalidated -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=供應商為了批準 Notify_ORDER_SUPPLIER_REFUSE=供應商的訂單被拒絕 Notify_ORDER_VALIDATE=驗證客戶訂單 diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index b359287d24f..b9bd6e5099d 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -263,7 +263,7 @@ if ($result) $product_static->type=$objp->fk_product_type; $product_static->id=$objp->rowid; $product_static->ref=$objp->ref; - $product_static->libelle=$objp->label; + $product_static->label=$objp->label; $text=$product_static->getNomUrl(1); print $text.= ' - '.$objp->label; print "\n"; diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index eb3ac32c424..d3c53eb9e2e 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f7da56da39c..4a6af7b855e 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -169,7 +169,7 @@ if (empty($reshook)) { $error=0; - if (! GETPOST('libelle')) + if (! GETPOST('label')) { setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), 'errors'); $action = "create"; @@ -187,7 +187,7 @@ if (empty($reshook)) $units = GETPOST('units', 'int'); $object->ref = $ref; - $object->libelle = GETPOST('libelle'); + $object->label = GETPOST('label'); $object->price_base_type = GETPOST('price_base_type'); if ($object->price_base_type == 'TTC') @@ -315,7 +315,7 @@ if (empty($reshook)) $object->oldcopy=dol_clone($object); $object->ref = $ref; - $object->libelle = GETPOST('libelle'); + $object->label = GETPOST('label'); $object->description = dol_htmlcleanlastbr(GETPOST('desc')); $object->url = GETPOST('url'); $object->note = dol_htmlcleanlastbr(GETPOST('note')); @@ -822,7 +822,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // On sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; @@ -1085,7 +1085,7 @@ else print ''.$langs->trans("Ref").''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // Status To sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; @@ -1341,7 +1341,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; $nblignes=7; if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++; @@ -1586,7 +1586,7 @@ else // Categories print ''.$langs->trans("Categories").''; - print $form->showCategories($object->id,'product'); + print $form->showCategories($object->id,'product',1); print ""; print "\n"; @@ -1686,7 +1686,7 @@ if (empty($reshook)) } } -print "\n

\n"; +print "\n\n"; /* @@ -1712,14 +1712,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($otherprop) && count($otherprop)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftProposals").''; $html .= $form->selectarray("propalid", $otherprop, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftProposals").''; $html .= $langs->trans("NoDraftProposals"); $html .= ''; } @@ -1737,14 +1738,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($othercom) && count($othercom)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftOrders").''; $html .= $form->selectarray("commandeid", $othercom, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftOrders").''; $html .= $langs->trans("NoDraftOrders"); $html .= ''; } @@ -1762,14 +1764,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($otherinvoice) && count($otherinvoice)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftInvoices").''; $html .= $form->selectarray("factureid", $otherinvoice, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftInvoices").''; $html .= $langs->trans("NoDraftInvoices"); $html .= ''; } @@ -1784,7 +1787,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) print load_fiche_titre($langs->trans("Add"),'',''); - $html .= ''.$langs->trans("Quantity").' '; + $html .= ''.$langs->trans("Quantity").' '; $html .= ''.$langs->trans("ReductionShort").'(%) '; $html .= ''; $html .= ''; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index bfb1a660b55..fc46435a32a 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -59,8 +59,21 @@ class Product extends CommonObject var $id ; //! Ref var $ref; - var $libelle; // TODO deprecated + /** + * Product label + * @var string + * @deprecated use $label + */ + var $libelle; + /** + * Product label + * @var string + */ var $label; + /** + * Product descripion + * @var string + */ var $description; /** @@ -232,7 +245,7 @@ class Product extends CommonObject if (dol_strlen(trim($this->ref)) == 0) $err++; - if (dol_strlen(trim($this->libelle)) == 0) + if (dol_strlen(trim($this->label)) == 0) $err++; if ($err > 0) @@ -260,7 +273,7 @@ class Product extends CommonObject // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); - $this->libelle = trim($this->libelle); + $this->label = trim($this->label); $this->price_ttc=price2num($this->price_ttc); $this->price=price2num($this->price); $this->price_min_ttc=price2num($this->price_min_ttc); @@ -312,7 +325,7 @@ class Product extends CommonObject $this->barcode=trim($this->barcode); // Check parameters - if (empty($this->libelle)) + if (empty($this->label)) { $this->error='ErrorMandatoryParametersNotProvided'; return -1; @@ -397,7 +410,7 @@ class Product extends CommonObject $sql.= ", ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null"); $sql.= ", ".price2num($price_min_ht); $sql.= ", ".price2num($price_min_ttc); - $sql.= ", ".(! empty($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null"); + $sql.= ", ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null"); $sql.= ", ".$user->id; $sql.= ", ".$this->type; $sql.= ", ".price2num($price_ht); @@ -588,11 +601,11 @@ class Product extends CommonObject $error=0; // Check parameters - if (! $this->libelle) $this->libelle = 'MISSING LABEL'; + if (! $this->label) $this->label = 'MISSING LABEL'; // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); - $this->libelle = trim($this->libelle); + $this->label = trim($this->label); $this->description = trim($this->description); $this->note = (isset($this->note) ? trim($this->note) : null); $this->weight = price2num($this->weight); @@ -667,7 +680,7 @@ class Product extends CommonObject if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code); $sql = "UPDATE ".MAIN_DB_PREFIX."product"; - $sql.= " SET label = '" . $this->db->escape($this->libelle) ."'"; + $sql.= " SET label = '" . $this->db->escape($this->label) ."'"; $sql.= ", ref = '" . $this->ref ."'"; $sql.= ", ref_ext = ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null"); $sql.= ", tva_tx = " . $this->tva_tx; @@ -958,7 +971,7 @@ class Product extends CommonObject if ($this->db->num_rows($result)) // if there is already a description line for this language { $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang"; - $sql2.= " SET label='".$this->db->escape($this->libelle)."',"; + $sql2.= " SET label='".$this->db->escape($this->label)."',"; $sql2.= " description='".$this->db->escape($this->description)."',"; $sql2.= " note='".$this->db->escape($this->note)."'"; $sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'"; @@ -966,7 +979,7 @@ class Product extends CommonObject else { $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description, note)"; - $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->libelle); + $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label); $sql2.= "','".$this->db->escape($this->description); $sql2.= "','".$this->db->escape($this->note)."')"; } @@ -1535,7 +1548,6 @@ class Product extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->ref; $this->ref_ext = $obj->ref_ext; - $this->libelle = $obj->label; // TODO deprecated $this->label = $obj->label; $this->description = $obj->description; $this->url = $obj->url; @@ -2815,16 +2827,16 @@ class Product extends CommonObject /** * Return all Father products fo current product * - * @return array prod + * @return array Array of product * @see getParent */ function getFather() { - $sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type"; + $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec"; $sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,"; $sql.= " ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE p.rowid = pa.fk_product_pere"; - $sql.= " AND pa.fk_product_fils=".$this->id; + $sql.= " AND pa.fk_product_fils = ".$this->id; $res = $this->db->query($sql); if ($res) @@ -2832,8 +2844,11 @@ class Product extends CommonObject $prods = array (); while ($record = $this->db->fetch_array($res)) { - $prods[$record['id']]['id'] = $record['rowid']; - $prods[$record['id']]['label'] = $this->db->escape($record['label']); + $prods[$record['id']]['id'] = $record['rowid']; + $prods[$record['id']]['ref'] = $record['ref']; + $prods[$record['id']]['label'] = $record['label']; + $prods[$record['id']]['qty'] = $record['qty']; + $prods[$record['id']]['incdec'] = $record['incdec']; $prods[$record['id']]['fk_product_type'] = $record['fk_product_type']; } return $prods; @@ -2854,7 +2869,7 @@ class Product extends CommonObject */ function getParent() { - $sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type"; + $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty"; $sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,"; $sql.= " ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE p.rowid = pa.fk_product_pere"; @@ -3409,7 +3424,7 @@ class Product extends CommonObject function is_photo_available($sdir) { include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; - + global $conf; $dir = $sdir; @@ -3805,7 +3820,7 @@ class Product extends CommonObject // Initialize parameters $this->id=0; $this->ref = 'PRODUCT_SPEC'; - $this->libelle = 'PRODUCT SPECIMEN'; + $this->label = 'PRODUCT SPECIMEN'; $this->description = 'PRODUCT SPECIMEN '.dol_print_date($now,'dayhourlog'); $this->specimen=1; $this->country_id=1; diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 773d08fae72..fd6bdc2de0f 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -255,37 +255,59 @@ if ($id > 0 || ! empty($ref)) // Number of parent virtual products - print $form->textwithpicto($langs->trans("ParentProductsNumber").': '.count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); + //print $form->textwithpicto($langs->trans("ParentProductsNumber").': '.count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); - if (count($prodsfather) > 0) - { - print $langs->trans("ProductParentList").'
'; - print ''; - foreach($prodsfather as $value) + //if (count($prodsfather) > 0) + //{ + print_fiche_titre($langs->trans("ProductParentList"),'','').'
'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + if (count($prodsfather) > 0) + { + $class='pair'; + + foreach($prodsfather as $value) + { + $idprod= $value["id"]; + $productstatic->id=$idprod;// $value["id"]; + $productstatic->type=$value["fk_product_type"]; + $productstatic->ref=$value['ref']; + $productstatic->label=$value['label']; + + $class=($class=='impair')?'pair':'impair'; + print ''; + + print ''; + print ''; + print ''; + print ''; + } + } + else { - $idprod= $value["id"]; - $productstatic->id=$idprod;// $value["id"]; - $productstatic->type=$value["fk_product_type"]; - $productstatic->ref=$value['label']; print ''; - print ''; + print ''; print ''; } print '
'.$langs->trans('ParentProduct').''.$langs->trans('Label').''.$langs->trans('Qty').'
'.$productstatic->getNomUrl(1,'composition').''.$productstatic->label.''.$value['qty'].'
'.$productstatic->getNomUrl(1,'composition').''.$langs->trans("None").'
'; - } + //} print '
'."\n"; // Number of subproducts - print $form->textwithpicto($langs->trans("AssociatedProductsNumber").': '.(empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)?$nbofsubproducts:$nbofsubsubproducts), $langs->trans('IfZeroItIsNotAVirtualProduct')); + //print $form->textwithpicto($langs->trans("AssociatedProductsNumber").': '.(empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)?$nbofsubproducts:$nbofsubsubproducts), $langs->trans('IfZeroItIsNotAVirtualProduct')); // List of subproducts - if (count($prods_arbo) > 0) - { + //if (count($prods_arbo) > 0) + //{ $atleastonenotdefined=0; - print $langs->trans("ProductAssociationList").'
'; + print_fiche_titre($langs->trans("ProductAssociationList"),'','').'
'; print ''; print ''; @@ -302,6 +324,8 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans('ComposedProductIncDecStock').''; print ''."\n"; + $class='pair'; + foreach($prods_arbo as $value) { $productstatic->id=$value['id']; @@ -409,7 +433,7 @@ if ($id > 0 || ! empty($ref)) }*/ print ''; - } + //} // Form with product to add if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer)) @@ -500,7 +524,7 @@ if ($id > 0 || ! empty($ref)) print "\n"; $productstatic->id=$objp->rowid; $productstatic->ref=$objp->ref; - $productstatic->libelle=$objp->label; + $productstatic->label=$objp->label; $productstatic->type=$objp->type; print ''.$productstatic->getNomUrl(1,'',24).''; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 615f4accf70..8f05cb92697 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -191,7 +191,7 @@ if ($object->id) print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index abeb8fdf995..750158d4e8d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -280,7 +280,7 @@ if ($id || $ref) print ''; // Label - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; // Minimum Price print ''.$langs->trans("BuyingPriceMin").''; diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index c6245cf203c..f1fd687890d 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -126,7 +126,7 @@ if ($object->id) print ''; // Libelle - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2c9ab9a7794..ce8ad104a1f 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -368,7 +368,7 @@ print ''; print ''; // Label -print '' . $langs->trans("Label") . '' . $object->libelle . ''; +print '' . $langs->trans("Label") . '' . $object->label . ''; $isphoto = $object->is_photo_available($conf->product->multidir_output [$object->entity]); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index ce161a1af60..60e3cba31e3 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -83,7 +83,7 @@ if (! empty($id) || ! empty($ref)) print ''; // Label - print ''.$langs->trans("Label").''.$object->libelle.''; + print ''.$langs->trans("Label").''.$object->label.''; // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 7dcf6139534..2dd349d3a34 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index e6ced5ad905..e7a803c299c 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -115,7 +115,7 @@ if ($id > 0 || ! empty($ref)) { print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index d098ca3399b..3e897888893 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1f4e9b985e5..22f28cd2303 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print ''.$langs->trans("Label").''.$product->libelle.''; + print ''.$langs->trans("Label").''.$product->label.''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index debb0698c44..de9c4cee29a 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -109,7 +109,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 1776ba571e0..3bb44436d43 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Libelle - print '' . $langs->trans("Label") . '' . $product->libelle . ''; + print '' . $langs->trans("Label") . '' . $product->label . ''; print ''; // Status (to sell) diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 8d9ee5b6d64..37f39010659 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -308,7 +308,7 @@ else // Value print ''.$langs->trans("EstimatedStockValueShort").''; - print empty($calcproducts['value'])?'0':$calcproducts['value']; + print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency); print ""; // Last movement @@ -387,8 +387,8 @@ else print_liste_field_titre($langs->trans("EstimatedStockValueShort"),"", "","&id=".$id,"",'align="right"',$sortfield,$sortorder); if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellPriceMin"),"", "p.price","&id=".$id,"",'align="right"',$sortfield,$sortorder); if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&id=".$id,"",'align="right"',$sortfield,$sortorder); - if ($user->rights->stock->mouvement->creer) print ' '; - if ($user->rights->stock->creer) print ' '; + if ($user->rights->stock->mouvement->creer) print_liste_field_titre(''); + if ($user->rights->stock->creer) print_liste_field_titre(''); print ""; $totalunit=0; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 271da598b6b..5a8050612e4 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -415,7 +415,7 @@ class Entrepot extends CommonObject { $ret=array(); - $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ps.pmp) as value"; + $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value"; $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps"; $sql.= ", ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE ps.fk_entrepot = ".$this->id; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 7b3d41c9911..da1053245d2 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $langs->load("products"); $langs->load("stocks"); $langs->load("orders"); +$langs->load("productbatch"); // Security check if ($user->societe_id) { diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 51c0f0a6113..82c8ded066f 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -86,27 +86,69 @@ if ($cancel) $action=''; // Protection to avoid action for all cancel buttons // Correct stock if ($action == "correct_stock") { - if (is_numeric($_POST["nbpiece"]) && $product_id) - { - $product = new Product($db); - $result=$product->fetch($product_id); + $product = new Product($db); + if (! empty($product_id)) $result=$product->fetch($product_id); - $result=$product->correct_stock( - $user, - $id, - $_POST["nbpiece"], - $_POST["mouvement"], - $_POST["label"], - 0 - ); // We do not change value of stock for a correction + $error=0; + + if (empty($product_id)) + { + $error++; + setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), 'errors'); + $action='correction'; + } + if (! is_numeric($_POST["nbpiece"])) + { + $error++; + setEventMessage($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentitiesnoconv("NumberOfUnit")), 'errors'); + $action='correction'; + } + + if (! $error) + { + if ($product->hasbatch()) + { + $batch=GETPOST('batch_number'); + $eatby=GETPOST('eatby'); + $sellby=GETPOST('sellby'); + $result=$product->correct_stock_batch( + $user, + $id, + GETPOST("nbpiece",'int'), + GETPOST("mouvement"), + GETPOST("label",'san_alpha'), + GETPOST('unitprice'), + $eatby,$sellby,$batch, + GETPOST('inventorycode') + ); // We do not change value of stock for a correction + } + else + { + $result=$product->correct_stock( + $user, + $id, + GETPOST("nbpiece",'int'), + GETPOST("mouvement"), + GETPOST("label",'san_alpha'), + GETPOST('unitprice'), + GETPOST('inventorycode') + ); // We do not change value of stock for a correction + } if ($result > 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; } + else + { + $error++; + setEventMessages($product->error, $product->errors, 'errors'); + $action='correction'; + } } - else $action=''; + + if (! $error) $action=''; } @@ -165,6 +207,7 @@ $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit+1, $offset); //print $sql; + $resql = $db->query($sql); if ($resql) { @@ -254,7 +297,7 @@ if ($resql) // Value print ''.$langs->trans("EstimatedStockValueShort").''; - print empty($calcproducts['value'])?'0':$calcproducts['value']; + print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency); print ""; // Last movement @@ -285,13 +328,34 @@ if ($resql) print ""; - print ''; + dol_fiche_end(); } + /* + * Correct stock + */ + if ($action == "correction") + { + if ($id) $object=$entrepot; + include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php'; + print '
'; + } + + /* + * Transfer of units + */ + if ($action == "transfert") + { + if ($id) $object=$entrepot; + include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php'; + print '
'; + } + /* * Correct stock */ + /* if ($action == "correction") { print_titre($langs->trans("StockCorrection")); @@ -300,7 +364,7 @@ if ($resql) print ''; print ''; - // Warehouse + // Product print ''; print ''; print ''; // Product label print ''; // Batch if (! empty($conf->productbatch->enabled)) diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 50b43c4cab6..dfa94910625 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -124,7 +124,7 @@ if ($action == "correct_stock" && ! $cancel) if (! $error) { - $priceunit=price2num(GETPOST("price")); + $priceunit=price2num(GETPOST("unitprice")); if (is_numeric(GETPOST("nbpiece")) && $id) { if (empty($product)) { @@ -403,7 +403,7 @@ if ($id > 0 || $ref) print ''; // Label - print ''; + print ''; print ''; // Status (to sell) @@ -598,83 +598,8 @@ if ($id > 0 || $ref) */ if ($action == "correction") { - print ''; - - print_titre($langs->trans("StockCorrection")); - print ''."\n"; - print ''; - print ''; - print ''; - print '
'.$langs->trans("Product").''; @@ -333,10 +397,6 @@ if ($resql) print ''; } - /* - * Transfer of units - */ - /* if ($action == "transfert") { print_titre($langs->trans("Transfer")); @@ -454,7 +514,7 @@ if ($resql) print ''; - print ''; + print ''; print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Label").''.$product->label.'
'; - - // Warehouse - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - // Purchase price - print ''; - print ''; - print ''; - print ''; - - // Eat-by date - if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) - { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - - // Label of mouvement of id of inventory - $valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementCorrectStock", $product->ref)); - print ''; - print ''; - print ''; - print ''; - print ''; - - print '
'.$langs->trans("Warehouse").''; - print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')),'id_entrepot','',1); - print ''; - print ''.$langs->trans("NumberOfUnit").'
'.$langs->trans("UnitPurchaseValue").'
'.$langs->trans("batch_number").''; - print ''; - print '
'.$langs->trans("l_eatby").''; - $form->select_date('','eatby','','',1,""); - print ''.$langs->trans("l_sellby").''; - $form->select_date('','sellby','','',1,""); - print '
'.$langs->trans("MovementLabel").''; - print ''; - print ''.$langs->trans("InventoryCode").'
'; - - print '
'; - print ''; - print '     '; - print ''; - print '
'; - print ''; + include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php'; + print '
'; } /* @@ -682,89 +607,8 @@ if ($id > 0 || $ref) */ if ($action == "transfert") { - $pdluoid=GETPOST('pdluoid','int'); - - $pdluo = new Productbatch($db); - - if ($pdluoid > 0) - { - $result=$pdluo->fetch($pdluoid); - - if ($result > 0) - { - $pdluoid=$pdluo->id; - } - else - { - dol_print_error($db); - } - } - - print_titre($langs->trans("StockTransfer")); - print '
'."\n"; - print ''; - print ''; - print ''; - if ($pdluoid) - { - print ''; - } - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - - // Eat-by date - if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) - { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - - // Label - $valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $product->ref)); - print ''; - print ''; - print ''; - print ''; - print ''; - - print '
'.$langs->trans("WarehouseSource").''; - if ($pdluoid > 0) - { - print $formproduct->selectWarehouses($pdluo->warehouseid,'id_entrepot_source','',1,1); - } - else - { - print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot_source')?GETPOST('id_entrepot_source','int'):'ifone')),'id_entrepot_source','',1); - } - print ''.$langs->trans("WarehouseTarget").''; - print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1); - print ''.$langs->trans("NumberOfUnit").'
'.$langs->trans("batch_number").''; - print ' 0 ? ' disabled="true"':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled - print '
'.$langs->trans("l_eatby").''; - print $form->select_date(($d_eatby?$d_eatby:$pdluo->eatby),'eatby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled - print ''.$langs->trans("l_sellby").''; - print $form->select_date(($d_sellby?$d_sellby:$pdluo->sellby),'sellby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled - print '
'.$langs->trans("MovementLabel").''; - print ''; - print ''.$langs->trans("InventoryCode").'
'; - - print '
'; - print ''; - print '     '; - print ''; - print '
'; - - print '
'; + include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php'; + print '
'; } /* diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php new file mode 100644 index 00000000000..8f656045ee3 --- /dev/null +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -0,0 +1,119 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * $object must be defined + * $product can be defined + */ +?> + + +load("productbatch"); + + if (empty($id)) $id = $object->id; + + print ''; + + print_titre($langs->trans("StockCorrection")); + print '
'."\n"; + print ''; + print ''; + print ''; + print ''; + + // Warehouse or product + print ''; + if ($object->element == 'product') + { + print ''; + print ''; + } + if ($object->element == 'stock') + { + print ''; + print ''; + } + print ''; + print ''; + print ''; + + // Purchase price + print ''; + print ''; + print ''; + print ''; + + // Eat-by date + if ((! empty($conf->productbatch->enabled)) && is_object($product) && $product->hasbatch()) + { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + // Label of mouvement of id of inventory + $valformovementlabel=((GETPOST("label") && (GETPOST('label') != $langs->trans("MovementCorrectStock",''))) ? GETPOST("label") : $langs->trans("MovementCorrectStock", $product->ref)); + print ''; + print ''; + print ''; + print ''; + print ''; + + print '
'.$langs->trans("Warehouse").''; + print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')),'id_entrepot','',1); + print ''.$langs->trans("Product").''; + print $form->select_produits(GETPOST('product_id'),'product_id',(empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':'')); + print ''; + print ''.$langs->trans("NumberOfUnit").'
'.$langs->trans("UnitPurchaseValue").'
'.$langs->trans("batch_number").''; + print ''; + print '
'.$langs->trans("l_eatby").''; + $eatbyselected=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear')); + $form->select_date($eatbyselected,'eatby','','',1,""); + print ''.$langs->trans("l_sellby").''; + $sellbyselected=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear')); + $form->select_date($sellbyselected,'sellby','','',1,""); + print '
'.$langs->trans("MovementLabel").''; + print ''; + print ''.$langs->trans("InventoryCode").'
'; + + print '
'; + print ''; + print '     '; + print ''; + print '
'; + print '
'; + +?> + \ No newline at end of file diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php new file mode 100644 index 00000000000..6325939a01e --- /dev/null +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -0,0 +1,107 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * $product must be defined + * $backtopage + */ +?> + + + 0) + { + $result=$pdluo->fetch($pdluoid); + if ($result > 0) + { + $pdluoid=$pdluo->id; + } + else + { + dol_print_error($db,$pdluo->error,$pdluo->errors); + } + } + + print_titre($langs->trans("StockTransfer")); + print '
'."\n"; + print ''; + print ''; + print ''; + if ($pdluoid) + { + print ''; + } + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + // Eat-by date + if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) + { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + // Label + $valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $product->ref)); + print ''; + print ''; + print ''; + print ''; + print ''; + + print '
'.$langs->trans("WarehouseSource").''; + if ($pdluoid > 0) + { + print $formproduct->selectWarehouses($pdluo->warehouseid,'id_entrepot_source','',1,1); + } + else + { + print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot_source')?GETPOST('id_entrepot_source','int'):'ifone')),'id_entrepot_source','',1); + } + print ''.$langs->trans("WarehouseTarget").''; + print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1); + print ''.$langs->trans("NumberOfUnit").'
'.$langs->trans("batch_number").''; + print ' 0 ? ' disabled="true"':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled + print '
'.$langs->trans("l_eatby").''; + print $form->select_date(($d_eatby?$d_eatby:$pdluo->eatby),'eatby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled + print ''.$langs->trans("l_sellby").''; + print $form->select_date(($d_sellby?$d_sellby:$pdluo->sellby),'sellby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled + print '
'.$langs->trans("MovementLabel").''; + print ''; + print ''.$langs->trans("InventoryCode").'
'; + + print '
'; + print ''; + print '     '; + print ''; + print '
'; + + print '
'; +?> + \ No newline at end of file diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 0213ee7f6fa..e7a0b258986 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -558,7 +558,7 @@ if (GETPOST("source") == 'contractline' && $valid) $text=''.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).''; if ($contractline->fk_product) { - $text.='
'.$product->ref.($product->libelle?' - '.$product->libelle:''); + $text.='
'.$product->ref.($product->label?' - '.$product->label:''); } if ($contractline->description) $text.='
'.dol_htmlentitiesbr($contractline->description); //if ($contractline->date_fin_validite) { diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 8c66f6157ba..d1ed853eb5d 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -695,7 +695,7 @@ if (GETPOST("source") == 'contractline' && $valid) $text=''.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).''; if ($contractline->fk_product) { - $text.='
'.$product->ref.($product->libelle?' - '.$product->libelle:''); + $text.='
'.$product->ref.($product->label?' - '.$product->label:''); } if ($contractline->description) $text.='
'.dol_htmlentitiesbr($contractline->description); //if ($contractline->date_fin_validite) { diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 93144e155c9..897fab2d676 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1278,12 +1278,14 @@ class Societe extends CommonObject /** * Delete a third party from database and all its dependencies (contacts, rib...) * - * @param int $id Id of third party to delete + * @param int $id Id of third party to delete + * @param User $user User who ask to delete thirparty + * @param int $call_trigger 0=No, 1=yes * @return int <0 if KO, 0 if nothing done, >0 if OK */ - function delete($id) + function delete($id, $user='', $call_trigger=1) { - global $user, $langs, $conf; + global $langs, $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -1298,10 +1300,14 @@ class Societe extends CommonObject { $this->db->begin(); - // Call trigger - $result=$this->call_trigger('COMPANY_DELETE',$user); - if ($result < 0) $error++; - // End call triggers + // User is mandatory for trigger call + if ($user && $call_trigger) + { + // Call trigger + $result=$this->call_trigger('COMPANY_DELETE',$user); + if ($result < 0) $error++; + // End call triggers + } if (! $error) { diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 20ebdca3ba2..ab52249166a 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -95,8 +95,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e if (empty($reshook)) { - if ($action == 'confirm_merge' && $confirm == 'yes') { - + if ($action == 'confirm_merge' && $confirm == 'yes') + { $errors = 0; $soc_origin_id = GETPOST('soc_origin', 'int'); $soc_origin = new Societe($db); @@ -169,7 +169,7 @@ if (empty($reshook)) if (!$errors) { //We finally remove the old thirdparty - if ($soc_origin->delete($soc_origin->id) < 1) { + if ($soc_origin->delete($soc_origin->id, $user) < 1) { $db->rollback(); $errors++; } @@ -598,7 +598,7 @@ if (empty($reshook)) if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer) { $object->fetch($socid); - $result = $object->delete($socid); + $result = $object->delete($socid, $user); if ($result > 0) { @@ -2291,7 +2291,11 @@ else $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; - if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID)) + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='thi'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set { include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c8e0e46cf0e..613f49b5fc1 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -172,15 +172,15 @@ $colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2)); $tmppart=explode(',',$colorbackhmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) $colortextbackhmenu='FFF'; -else $colortextbackhmenu='444'; +else $colortextbackhmenu='222'; $tmppart=explode(',',$colorbackvmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) { $colortextbackvmenu='FFF'; } -else { $colortextbackvmenu='444'; } +else { $colortextbackvmenu='222'; } $tmppart=explode(',',$colorbacktitle1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) { $colortexttitle='FFF'; $colorshadowtitle='888'; } -else { $colortexttitle='444'; $colorshadowtitle='FFF'; } +else { $colortexttitle='222'; $colorshadowtitle='FFF'; } $tmppart=explode(',',$colorbacktabcard1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 340) { $colortextbacktab='FFF'; } @@ -998,7 +998,7 @@ a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } a.vmenu:link, a.vmenu:visited { color: #; } -a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } +a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } font.vsmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #93a5aa; } a.vsmenu:link, a.vsmenu:visited { color: #; } font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } diff --git a/htdocs/theme/md_exp/img/sort_asc.png b/htdocs/theme/md_exp/img/sort_asc.png index e327d952fa4..aca0f6eb77a 100644 Binary files a/htdocs/theme/md_exp/img/sort_asc.png and b/htdocs/theme/md_exp/img/sort_asc.png differ diff --git a/htdocs/theme/md_exp/img/sort_asc_disabled.png b/htdocs/theme/md_exp/img/sort_asc_disabled.png index e327d952fa4..d87652c2cc3 100644 Binary files a/htdocs/theme/md_exp/img/sort_asc_disabled.png and b/htdocs/theme/md_exp/img/sort_asc_disabled.png differ diff --git a/htdocs/theme/md_exp/img/sort_desc.png b/htdocs/theme/md_exp/img/sort_desc.png index db99fd9ad47..57c1ad0fcb4 100644 Binary files a/htdocs/theme/md_exp/img/sort_desc.png and b/htdocs/theme/md_exp/img/sort_desc.png differ diff --git a/htdocs/theme/md_exp/img/title_accountancy.png b/htdocs/theme/md_exp/img/title_accountancy.png new file mode 100644 index 00000000000..6e7c2a412c6 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_accountancy.png differ diff --git a/htdocs/theme/md_exp/img/title_bank.png b/htdocs/theme/md_exp/img/title_bank.png new file mode 100644 index 00000000000..034a8d0c5e4 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_bank.png differ diff --git a/htdocs/theme/md_exp/img/title_commercial.png b/htdocs/theme/md_exp/img/title_commercial.png new file mode 100644 index 00000000000..46394177698 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_commercial.png differ diff --git a/htdocs/theme/md_exp/img/title_companies.png b/htdocs/theme/md_exp/img/title_companies.png new file mode 100644 index 00000000000..b2539dba849 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_companies.png differ diff --git a/htdocs/theme/md_exp/img/title_generic.png b/htdocs/theme/md_exp/img/title_generic.png new file mode 100644 index 00000000000..ae224327549 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_generic.png differ diff --git a/htdocs/theme/md_exp/img/title_home.png b/htdocs/theme/md_exp/img/title_home.png new file mode 100644 index 00000000000..e9273e727f5 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_home.png differ diff --git a/htdocs/theme/md_exp/img/title_products.png b/htdocs/theme/md_exp/img/title_products.png new file mode 100644 index 00000000000..d3c5b125bbe Binary files /dev/null and b/htdocs/theme/md_exp/img/title_products.png differ diff --git a/htdocs/theme/md_exp/img/title_project.png b/htdocs/theme/md_exp/img/title_project.png new file mode 100644 index 00000000000..05d8ea630b8 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_project.png differ diff --git a/htdocs/theme/md_exp/img/title_setup.png b/htdocs/theme/md_exp/img/title_setup.png new file mode 100644 index 00000000000..d7548d28709 Binary files /dev/null and b/htdocs/theme/md_exp/img/title_setup.png differ diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index 4b8ebe8d178..739f26ce1de 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -97,14 +97,14 @@ $colorbackvmenu1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmen $colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5); // title of array $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card +$colorbacktabcard1='255,255,255'; // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair -$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair -$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair -$colorbacklinepair1='255,255,255'; // line pair -$colorbacklinepair2='255,255,255'; // line pair +$colorbacklineimpair1='255,255,255'; // line impair +$colorbacklineimpair2='255,255,255'; // line impair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair +$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair $colorbackbody='#f0f0f0'; $colortext='40,40,40'; @@ -115,9 +115,7 @@ $fontsizesmaller='11'; if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { // 90A4AE, 607D8B, 455A64, 37474F - //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474f')); // topmenu #607D8B $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu #607D8B - //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('000')); // topmenu #607D8B $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) @@ -135,12 +133,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_TEXT='50,50,130'; - if ($dol_use_jmobile) - { - $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu - $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245'; - $conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245'; - } } $colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); @@ -198,11 +190,6 @@ if ($tmpval <= 340) { $colortextbacktab='FFF'; } else { $colortextbacktab='111'; } -$usecss3=true; -if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; -elseif ($conf->browser->name == 'iceweasel') $usecss3=false; -elseif ($conf->browser->name == 'epiphany') $usecss3=false; - print '/*'."\n"; print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n"; print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n"; @@ -212,7 +199,6 @@ print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n"; print 'colorbacklinepair1='.$colorbacklinepair1."\n"; print 'colorbacklinepair2='.$colorbacklinepair2."\n"; print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; -print 'usecss3='.$usecss3."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; @@ -260,7 +246,7 @@ textarea.cke_source:focus box-shadow: none; } -input, input.flat, textarea, textarea.flat, form.flat select, select.flat { +input, input.flat, textarea, textarea.flat, form.flat select select, select.flat, .dataTables_length label select { font-size: px; font-family: ; background: #FDFDFD; @@ -613,6 +599,11 @@ display : table; margin : 0px auto; } +#pictotitle { + margin-right: 8px; + margin-bottom: 4px; +} + /* ============================================================================== */ /* Menu top et 1ere ligne tableau */ @@ -631,17 +622,12 @@ div#tmenu_tooltip { /* padding-: 100px; */ background: ; /*box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;*/ - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) ); - - background-image: rgb(); - border-bottom: 1px solid #CCC; - } @@ -702,19 +688,12 @@ ul.tmenu { /* t r b l */ ul.tmenu li { background: rgb(); - - /* background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - */ - - background-image: rgb(); - border-bottom: 1px solid #CCC; - } li.tmenu, li.tmenusel { @@ -1078,6 +1057,7 @@ div.vmenu, td.vmenu { } .menu_contenu { padding-top: 4px; padding-bottom: 3px;} +#menu_contenu_logo { padding-right: 4px; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } @@ -1102,28 +1082,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks padding-top: 3px; padding-bottom: 3px; margin: 1px 0px 8px 0px; -/* - - - background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 3px); - background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: linear-gradient(bottom, rgb() 0px, rgb() 3px); - - - background-position:top; - background-repeat:repeat-x; - - border-left: 1px solid #AAA; - border-right: 1px solid #BBB; - border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB; - border-radius: 5px; - -moz-border-radius: 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD;*/ padding-bottom: 10px; border-bottom: 1px solid #DDD; @@ -1140,26 +1098,6 @@ div.blockvmenusearch padding-top: 3px; padding-bottom: 3px; margin: 1px 0px 8px 0px; -/* - background: #E3E6E8; - - background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); - - - border-left: 1px solid #AAA; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - border-top: 1px solid #CCC; - border-radius: 5px; - -moz-border-radius: 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; -*/ padding-bottom: 10px; border-bottom: 1px solid #DDD; @@ -1229,13 +1167,12 @@ td.photo { /* ============================================================================== */ .largebutton { - background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; - + background: #FFF; background-repeat: repeat-x !important; border: 1px solid #CCC !important; @@ -1485,23 +1422,14 @@ div.tabBar { border-left: 1px solid #BBB; border-top: 1px solid #CCC; width: auto; - + background: rgb(); - /* - background-image: -o-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -moz-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -webkit-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -ms-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - */ - - background: rgb(); - - + + -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; - + } div.tabsAction { @@ -1547,16 +1475,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { border-top: 1px solid #D8D8D8; */ - /* - - background: rgb(); - /*background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);*/ - - */ background-image: none !important; } @@ -1573,14 +1491,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1); - background: rgb() !important; -/* border-bottom: 1px solid rgb() !important; - background: rgba(, 0.5) url() 50% 0 repeat-x; */ - - background: rgb() url() 50% 0 repeat-x; - - /*background-image: none !important; */ color: #; } a.tab:hover @@ -1789,6 +1700,10 @@ End bootstrap */ margin: 0px !important; padding: 0px !important; } +tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd +{ + border: 0px; +} .notopnoleft { border-collapse: collapse; @@ -1816,6 +1731,13 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord padding: 1px 2px 1px 3px; /* t r b l */ } +.border tbody tr, .border tbody tr td { + height: 20px; +} +div.tabBar table.border tr { + height: 20px; +} + table.border td, div.border div div.tagtd { padding: 2px 2px 2px 2px; border: 1px solid #D0D0D0; @@ -1849,11 +1771,6 @@ table.noborder, table.formdoc, div.noborder { border-right-color: #CCC; border-right-style: solid; -/* - border-bottom-width: 1px; - border-bottom-color: #BBBBBB; - border-bottom-style: solid; -*/ border-left-width: 1px; border-left-color: #CCC; border-left-style: solid; @@ -1892,11 +1809,21 @@ table.nobordernopadding { } table.nobordernopadding tr { border: 0px !important; - padding: 0px 0px; + padding: 0px 0px !important; } -table.nobordernopadding td { - border: 0px !important; - padding: 0px 0px; +table.nobordernopadding tr td { + border: 0px; + padding: 0 3px 0 0 !important; +} +table.border tr td table.nobordernopadding tr td { + padding-top: 0px; + padding-bottom: 0px; +} +td.borderright { + border: none; /* to erase value for table.nobordernopadding td */ + border-right-width: 1px !important; + border-right-color: #BBB !important; + border-right-style: solid !important; } /* For lists */ @@ -1963,62 +1890,47 @@ table.liste td { */ .impair:hover, td.nohover { - + 0) { ?> background: rgb(); - background: #fafafa; + background: rgba(0, 0, 0, 0.05) !important; - border: 0px; } -.impair, .nohover .impair:hover, tr.impair td.nohover { - - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - - background: #eaeaea; - +.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover { font-family: ; border: 0px; margin-bottom: 1px; color: #202020; min-height: 18px; /* seems to not be used */ -} - -.pair:hover { - - background: rgb(); - - background: #fafafa; - - border: 0px; -} - -.pair, .nohover .pair:hover, tr.pair td.nohover { -/* - - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - + background: #ffffff; - -*/ +} + +.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover { font-family: ; border: 0px; margin-bottom: 1px; color: #202020; + background-color: #f9f9f9; } -tr.pair td, tr.impair td { - padding: 4px; +table.dataTable tr.odd { + background-color: #f9f9f9 !important; +} +table.dataTable td { + padding: 5px 2px 5px 3px !important; +} +tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd { + padding: 5px 2px 5px 3px; border-bottom: 1px solid #ddd; } +tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td { + border-bottom: 0px !important; +} +td.nobottom, td.nobottom { + border-bottom: 0px !important; +} div.liste_titre .tagtd { vertical-align: middle; } @@ -2033,26 +1945,27 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list { background: rgb(); background-repeat: repeat-x; - - /* - background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); - */ font-weight: bold; - + color: #; font-family: ; border-bottom: 1px solid #FDFFFF; text-align: ; } +tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre +{ + border-bottom: 1px solid #FDFFFF; +} tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre { font-family: ; font-weight: bold; - border-bottom: 1px solid #FDFFFF; text-shadow: 1px 0px 1px #; vertical-align: middle; } @@ -2092,7 +2005,11 @@ input.liste_titre { .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { - background: none; + //background: none; + background: #FFF; +} +.tableforservicepart1 tbody tr td, .tableforservicepart2 tbody tr td { + border-bottom: none; } .margintable td { @@ -2117,18 +2034,6 @@ div.tabBar .noborder { * Boxes */ -.tdboxstats { - - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - - background: #ffffff !important; - -} - .boxstats { margin: 3px; @@ -2160,16 +2065,6 @@ tr.box_titre { height: 26px !important; background: rgb(); background-repeat: repeat-x; - - /* - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - */ - color: #; text-shadow: 1px 0px 1px #; font-family: , sans-serif; @@ -2183,28 +2078,21 @@ tr.box_titre td.boxclose { } tr.box_impair { - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - - background: #eaeaea; - font-family: ; } tr.box_pair { - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - - background: #ffffff; - + font-family: ; background-color: #f9f9f9; @@ -2581,6 +2469,8 @@ table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px min-height: 20px; } table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } +table.cal_event td.cal_event { padding: 4px 4px !important; } +table.cal_event td.cal_event_right { padding: 4px 4px !important; } ul.cal_event { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; } li.cal_event { border: none; list-style-type: none; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } @@ -3115,10 +3005,23 @@ a span.select2-chosen .select2-container .select2-choice { background-image: none; } +.select2-choices .select2-search-choice { + border: 1px solid #aaa !important; +} .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit { background: #FFFFFF; } +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #FFFFFF; + background-image: none; + border: none; + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice { + margin-top: 2px; + margin-bottom: 2px; +} /* ============================================================================== */ @@ -3244,14 +3147,14 @@ ul.ulmenu { border: 1px solid #5f5f7a !important; background: rgb(); background-repeat: repeat-x; - + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); font-weight: bold; - + color: # !important; } .alilevel0 { diff --git a/htdocs/user/card.php b/htdocs/user/card.php index d444dbb9393..a1c371770ad 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -615,10 +615,10 @@ if (($action == 'create') || ($action == 'adduserldap')) print_fiche_titre($langs->trans("NewUser")); - print $langs->trans("CreateInternalUserDesc"); - print "
"; + print $langs->trans("CreateInternalUserDesc")."
\n"; print "
"; + if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')) { /* @@ -707,7 +707,6 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'; } - print dol_set_focus('#lastname'); print '
'; print ''; @@ -715,6 +714,10 @@ if (($action == 'create') || ($action == 'adduserldap')) if (! empty($ldap_sid)) print ''; print ''; + dol_fiche_head('', '', '', 0, ''); + + print dol_set_focus('#lastname'); + print ''; print ''; @@ -1025,7 +1028,9 @@ if (($action == 'create') || ($action == 'adduserldap')) print "
\n"; - print '
'; + dol_fiche_end(); + + print '
'; print "
"; } @@ -1090,9 +1095,7 @@ else // Show tabs $head = user_prepare_head($object); - $title = $langs->trans("User"); - dol_fiche_head($head, 'user', $title, 0, 'user'); /* * Confirmation reinitialisation mot de passe @@ -1139,6 +1142,8 @@ else */ if ($action != 'edit') { + dol_fiche_head($head, 'user', $title, 0, 'user'); + $rowspan=19; print ''; @@ -1451,7 +1456,7 @@ else print "
\n"; - print "\n"; + dol_fiche_end(); /* @@ -1669,7 +1674,14 @@ else */ if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id))) { - $rowspan=16; + print '
'; + print ''; + print ''; + print ''; + + dol_fiche_head($head, 'user', $title, 0, 'user'); + + $rowspan=16; if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++; @@ -1677,13 +1689,9 @@ else if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3; if (! empty($conf->agenda->enabled)) $rowspan++; - print ''; - print ''; - print ''; - print ''; print ''; - print ''; + print ''; print ''; @@ -2141,15 +2149,15 @@ else print '
'.$langs->trans("Ref").'
'.$langs->trans("Ref").''; print $object->id; print '
'; - print '
'; + dol_fiche_end(); + + print '
'; print ''; - print '     '; + print '     '; print ''; print '
'; print ''; - - print '
'; } if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close; diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 341d40f8dfe..3ecff112b73 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2011 Laurent Destailleur + * Copyright (C) 2005-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011 Herve Prot * Copyright (C) 2012 Florian Henry @@ -230,9 +230,12 @@ if ($action == 'create') print ''; print ''; + dol_fiche_head('', '', '', 0, ''); + print ''; - print "".''; + print ""; + print ''; print ''; // Multicompany @@ -250,7 +253,7 @@ if ($action == 'create') } } - print "".'".'
'.$langs->trans("Name").'
'.$langs->trans("Name").'
'.$langs->trans("Note").''; + print "
'.$langs->trans("Description").''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); @@ -266,7 +269,9 @@ if ($action == 'create') print "
\n"; - print '
'; + dol_fiche_end(); + + print '
'; print ""; } @@ -283,12 +288,8 @@ else { $object->fetch($id); - /* - * Affichage onglets - */ $head = group_prepare_head($object); $title = $langs->trans("Group"); - dol_fiche_head($head, 'group', $title, 0, 'group'); /* * Confirmation suppression @@ -304,6 +305,8 @@ else if ($action != 'edit') { + dol_fiche_head($head, 'group', $title, 0, 'group'); + print ''; // Ref @@ -332,7 +335,7 @@ else } // Note - print ''; + print ''; print ''; print "\n"; @@ -346,7 +349,8 @@ else print "
'.$langs->trans("Note").'
'.$langs->trans("Description").''.dol_htmlentitiesbr($object->note).' 
\n"; - print ''; + dol_fiche_end(); + /* * Barre d'actions @@ -501,6 +505,8 @@ else print ''; print ''; + dol_fiche_head($head, 'group', $title, 0, 'group'); + print ''; print ''; print ''; + print ''; print '
'.$langs->trans("Name").''; @@ -521,7 +527,7 @@ else } } - print '
'.$langs->trans("Note").'
'.$langs->trans("Description").''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); @@ -538,11 +544,11 @@ else print "
\n"; - print '
'; + dol_fiche_end(); + + print '
'; print ''; - - print ''; } } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 57c65cbe893..97c93316330 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -41,6 +41,9 @@ if ($user->societe_id > 0) $sall=GETPOST('sall','alpha'); $search_user=GETPOST('search_user','alpha'); +$search_login=GETPOST('search_login','alpha'); +$search_lastname=GETPOST('search_lastname','alpha'); +$search_firstname=GETPOST('search_firstname','alpha'); $search_statut=GETPOST('search_statut','alpha'); $sortfield = GETPOST('sortfield','alpha'); @@ -65,7 +68,9 @@ $form = new Form($db); llxHeader('',$langs->trans("ListOfUsers")); -print_fiche_titre($langs->trans("ListOfUsers"), '
'); +$buttonviewhierarchy='
'; + +print_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy); $sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login,"; $sql.= " u.datec,"; @@ -90,6 +95,9 @@ if (! empty($search_user)) { $sql.= " AND (u.login LIKE '%".$db->escape($search_user)."%' OR u.lastname LIKE '%".$db->escape($search_user)."%' OR u.firstname LIKE '%".$db->escape($search_user)."%')"; } +if ($search_login != '') $sql.= natural_search("u.login", $search_login); +if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname); +if ($search_firstname != '') $sql.= natural_search("u.firstname", $search_firstname); if ($search_statut != '' && $search_statut >= 0) { $sql.= " AND (u.statut=".$search_statut.")"; @@ -122,13 +130,16 @@ if ($result) print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="center"',$sortfield,$sortorder); - print ' '; + print_liste_field_titre(''); print "\n"; // SearchBar - $colspan=7; + $colspan=4; if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++; print ''; + print ''; + print ''; + print ''; print ' '; // Status diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index e74a0d815d3..b7af224ff52 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -505,7 +505,7 @@ function createProductOrService($authentication,$product) $newobject->ref=$product['ref']; $newobject->ref_ext=$product['ref_ext']; $newobject->type=$product['type']; - $newobject->libelle=$product['label']; // TODO deprecated + $newobject->libelle=$product['label']; // @deprecated $newobject->label=$product['label']; $newobject->description=$product['description']; $newobject->note=$product['note']; @@ -675,7 +675,7 @@ function updateProductOrService($authentication,$product) if (isset($product['ref'])) $newobject->ref=$product['ref']; if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext']; $newobject->type=$product['type']; - $newobject->libelle=$product['label']; // TODO deprecated + $newobject->libelle=$product['label']; // @deprecated $newobject->label=$product['label']; $newobject->description=$product['description']; $newobject->note=$product['note']; diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index 01424d81796..3a19b195b7c 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -416,7 +416,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase $this->assertNull($localobject->fk_soc); //Now we remove the third party - $result = $thirdparty->delete($thirdparty->id); + $result = $thirdparty->delete($thirdparty->id,$user); $this->assertEquals($result, 1); return $localobject; diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php index 34fdee385f7..8bcfb247365 100755 --- a/test/phpunit/SocieteTest.php +++ b/test/phpunit/SocieteTest.php @@ -365,7 +365,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase $localobject=new Societe($this->savdb); $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $result=$localobject->delete($id, $user); print __METHOD__." id=".$id." result=".$result."\n"; $this->assertLessThan($result, 0);