Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php

ChangeLog

@@ -220,6 +220,8 @@ Dolibarr better:
 - Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
 - Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
 - Fix: [ bug #1830 ] Salaries payment only allows checking accounts
+- Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
+- Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
@@ -386,6 +388,7 @@ Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 0
 Fix: [ bug #1757 ] Sorting breaks product/service statistics
 Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
+Fix: [ bug #1846 ] Browser IE11 not detected
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973

htdocs/admin/notification.php

@@ -33,6 +33,7 @@ $langs->load("orders");
 $langs->load("propal");
 $langs->load("bills");
 $langs->load("errors");
+$langs->load("mails");
 
 // Security check
 if (!$user->admin)
@@ -76,7 +77,9 @@ if ($action == 'setvalue' && $user->admin)
  *	View
  */
 
-llxHeader();
+$form=new Form($db);
+
+llxHeader('',$langs->trans("NotificationSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
@@ -132,9 +135,19 @@ foreach($listofnotifiedevents as $notifiedevent)
     print '<td>'.$elementLabel.'</td>';
     print '<td>'.$notifiedevent['code'].'</td>';
     print '<td>'.$label.'</td>';
+    print '<td>';
     $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'];
-    print '<td><input type="email" size="32" name="'.$param.'" value="'.dol_escape_htmltag(GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param).'">';
+    $value=GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param;
-	if (! empty($conf->global->$param) && ! isValidEmail($conf->global->$param)) print ' '.img_warning($langs->trans("ErrorBadEMail"));
+    $s='<input type="text" size="32" name="'.$param.'" value="'.dol_escape_htmltag($value).'">';		// Do not use type="email" here, we must be able to enter a list of email with , separator.
+    $arrayemail=explode(',',$value);
+	$showwarning=0;
+	foreach($arrayemail as $key=>$valuedet)
+	{
+		$valuedet=trim($valuedet);
+		if (! empty($valuedet) && ! isValidEmail($valuedet)) $showwarning++;
+	}
+    if ((! empty($conf->global->$param)) && $showwarning) $s.=' '.img_warning($langs->trans("ErrorBadEMail"));
+    print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
     print '</td>';
     print '</tr>';
 }

htdocs/admin/supplierinvoice_extrafields.php

@@ -31,6 +31,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
+$langs->load("orders");
 
 if (!$user->admin)
 	accessforbidden();

htdocs/comm/action/class/ical.class.php

@@ -23,10 +23,11 @@
  *       \ingroup    agenda
  *       \brief      File of class to parse ical calendars
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
 
 
 /**
- *		Class to parse ICal calendars
+ *		Class to read/parse ICal calendars
  */
 class ICal
 {
@@ -107,6 +108,7 @@ class ICal
         if (!stristr($this->file_text[0],'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
         $insidealarm=0;
+        $tmpkey='';$tmpvalue='';
         foreach ($this->file_text as $text)
         {
             $text = trim($text); // trim one line
@@ -137,7 +139,7 @@ class ICal
                     case "BEGIN:DAYLIGHT":
                     case "BEGIN:VTIMEZONE":
                     case "BEGIN:STANDARD":
-                        $type = $value; // save tu array under value key
+                        $type = $value; // save array under value key
                         break;
 
                     case "END:VTODO": // end special text - goto VCALENDAR key
@@ -159,8 +161,31 @@ class ICal
                         $insidealarm=0;
                         break;
 
-                    default: // no special string
+                    default: // no special string (SUMMARY, DESCRIPTION, ...)
-                        if (! $insidealarm) $this->add_to_array($type, $key, $value); // add to array
+						if ($tmpvalue)
+						{
+							$tmpvalue .= $text;
+							if (! preg_match('/=$/',$text))	// No more lines
+							{
+								$key=$tmpkey;
+								$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
+								$tmpkey='';
+								$tmpvalue='';
+							}
+						}
+                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
+                    	{
+                    		if (preg_match('/=$/',$value))
+                    		{
+                    			$tmpkey=$key;
+                    			$tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
+                    		}
+                    		else
+                    		{
+                    			$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
+                    		}
+                    	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
+                    	if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
                         break;
                 }
             }

htdocs/comm/action/index.php

@@ -361,6 +361,7 @@ if (! empty($conf->use_javascript_ajax))
 		foreach ($showextcals as $val)
 		{
 			$htmlname = dol_string_nospecial($val['name']);
+			$htmlname = dol_string_nospecial($htmlname,'_',array("\.","#"));
 			$s.='<script type="text/javascript">' . "\n";
 			$s.='jQuery(document).ready(function () {' . "\n";
 			$s.='		jQuery("#check_' . $htmlname . '").click(function() {';

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -897,7 +897,7 @@ class BonPrelevement extends CommonObject
 
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";
 				$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
-				$sql.= " WHERE ref LIKE '%".$ref."%'";
+				$sql.= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
 				$sql.= " AND entity = ".$conf->entity;
 				$sql.= " ORDER BY ref DESC LIMIT 1";
 
@@ -935,13 +935,13 @@ class BonPrelevement extends CommonObject
 	                else
 	                {
 	                    $error++;
-	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->error(), LOG_ERR);
+	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 	                }
 				}
 				else
 				{
 					$error++;
-					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->error(), LOG_ERR);
+					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
             }
 
@@ -975,10 +975,7 @@ class BonPrelevement extends CommonObject
                             $error++;
                         }
 
-                        /*
+                        // Update invoice requests as done
-                         * Update orders
-                         *
-                         */
                         $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
                         $sql.= " SET traite = 1";
                         $sql.= ", date_traite = '".$this->db->idate($now)."'";
@@ -1025,7 +1022,7 @@ class BonPrelevement extends CommonObject
 
                     $bonprev->factures = $factures_prev_id;
 
-                    //Build file
+                    // Generation of SEPA file
                     $bonprev->generate();
                 }
                 dol_syslog(__METHOD__."::End withdraw receipt, file ".$filebonprev, LOG_DEBUG);
@@ -1034,7 +1031,6 @@ class BonPrelevement extends CommonObject
             /*
              * Update total
              */
-
             $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
             $sql.= " SET amount = ".price2num($bonprev->total);
             $sql.= " WHERE rowid = ".$prev_id;
@@ -1047,9 +1043,6 @@ class BonPrelevement extends CommonObject
                 dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
             }
 
-            /*
-             * Rollback or Commit
-             */
             if (!$error)
             {
                 $this->db->commit();
@@ -1261,9 +1254,9 @@ class BonPrelevement extends CommonObject
 			/*
 			 * section Debiteur (sepa Debiteurs bloc lines)
 			 */
-			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,";
+			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
 			$sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
-			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
+			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.datec, rib.rowid as drum";
 			$sql.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
@@ -1504,17 +1497,21 @@ class BonPrelevement extends CommonObject
      *	@param	string		$row_idfac			pf.fk_facture AS idfac,
      *	@param	string		$row_iban			rib.iban_prefix AS iban,
      *	@param	string		$row_bic			rib.bic AS bic,
-     *	@param	string		$row_datec			soc.datec,
+     *	@param	string		$row_datec			rib.datec,
-     *	@param	string		$row_drum			soc.rowid AS drum
+     *	@param	string		$row_drum			rib.rowid AS drum
      *	@return	string							Return string with SEPA part DrctDbtTxInf
      */
     function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
     {
 		$CrLf = "\n";
 		$Rowing = sprintf("%06d", $row_idfac);
+
+		// Define value for RUM
+		// Example:  RUMCustomerCode-CustomerBankAccountId-01424448606	(note: Date is date of creation of CustomerBankAccountId)
 		$Date_Rum = strtotime($row_datec);
-		$pre = ($date_Rum > 1359673200) ? 'Rum' : '++R';
+		$pre = ($date_Rum > 1359673200) ? 'RUM' : '++R';
-		$Rum = $pre.$row_code_client.$row_drum.'-0'.date('U', $Date_Rum);
+		$Rum = dol_trunc($pre.$row_code_client.'-'.$row_drum.'-0'.date('U', $Date_Rum), 35, 'right', 'UTF-8', 1);
+
 		$XML_DEBITOR ='';
 		$XML_DEBITOR .='			<DrctDbtTxInf>'.$CrLf;
 		$XML_DEBITOR .='				<PmtId>'.$CrLf;

htdocs/contact/note.php

@@ -36,7 +36,7 @@ $langs->load("companies");
 // Security check
 $id = GETPOST('id','int');
 if ($user->societe_id) $id=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id, '&societe');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
 if ($id > 0) $object->fetch($id);

htdocs/core/class/doleditor.class.php

@@ -183,7 +183,8 @@ class DolEditor
             						customConfig : ckeditorConfig,
             						readOnly : '.($this->readonly?'true':'false').',
                             		htmlEncodeOutput :'.$htmlencode_force.',
-            						toolbar: \''.$this->toolbarname.'\',
+            						allowedContent :'.(empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)?'false':'true').',
+                            		toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
             						height: '.$this->height.',

htdocs/core/class/extrafields.class.php

@@ -1262,8 +1262,8 @@ class ExtraFields
 	 * Fill array_options property of object by extrafields value (using for data sent by forms)
 	 *
 	 * @param   array	$extralabels    $array of extrafields
-	 * @param   object	$object        Object
+	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only following key is filled
+	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
 	 * @return	int						1 if array_options set / 0 if no value
 	 */
 	function setOptionalsFromPost($extralabels,&$object,$onlykey='')

htdocs/core/class/html.formmail.class.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -269,6 +270,7 @@ class FormMail
         	if ($this->withform == 1)
         	{
         		$out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
+				$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
         		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
         	}
         	foreach ($this->param as $key=>$value)

htdocs/core/lib/agenda.lib.php

@@ -140,6 +140,10 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		if (empty($conf->dol_use_jmobile)) print ' - ';
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</td></tr>';
+
+		print '<tr><td>'.$langs->trans("AgendaShowBirthdayEvents").' <input type="checkbox" id="check_birthday" name="check_birthday"></td></tr>';
+		print '</table>';
+		print '</td>';
 	}
 
 	// Hooks

htdocs/core/lib/functions.lib.php

@@ -10,8 +10,8 @@
  * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -153,7 +153,7 @@ function getBrowserInfo()
 	elseif (preg_match('/epiphany/i',$_SERVER["HTTP_USER_AGENT"]))                       { $name='epiphany';  $version=$reg[2]; }
 	elseif ((empty($phone) || preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"])) && preg_match('/safari(\/|\s)([\d\.]*)/i',$_SERVER["HTTP_USER_AGENT"], $reg)) { $name='safari'; $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i',  $_SERVER["HTTP_USER_AGENT"], $reg))  { $name='opera';     $version=$reg[2]; }
-	elseif (preg_match('/msie(\/|\s)([\d\.]*)/i',   $_SERVER["HTTP_USER_AGENT"], $reg))  { $name='ie';        $version=$reg[2]; }    // MS products at end
+	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];\srv:([0-9]+\.[0-9]+))/i',   $_SERVER["HTTP_USER_AGENT"], $reg))  { $name='ie';        $version= end($reg); }    // MS products at end
 	// Other
 	$firefox=0;
 	if (in_array($name,array('firefox','iceweasel'))) $firefox=1;
@@ -451,18 +451,18 @@ function dol_string_unaccent($str)
 /**
  *	Clean a string from all punctuation characters to use it as a ref or login
  *
- *	@param	string	$str            String to clean
+ *	@param	string	$str            	String to clean
- * 	@param	string	$newstr			String to replace forbidden chars with
+ * 	@param	string	$newstr				String to replace forbidden chars with
- *  @param  array	$badchars       List of forbidden characters
+ *  @param  array	$badcharstoreplace  List of forbidden characters
- * 	@return string          		Cleaned string
+ * 	@return string          			Cleaned string
  *
  * 	@see    		dol_sanitizeFilename, dol_string_unaccent
  */
-function dol_string_nospecial($str,$newstr='_',$badchars='')
+function dol_string_nospecial($str,$newstr='_',$badcharstoreplace='')
 {
 	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","=");
 	$forbidden_chars_to_remove=array();
-	if (is_array($badchars)) $forbidden_chars_to_replace=$badchars;
+	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
 	//$forbidden_chars_to_remove=array("(",")");
 
 	return str_replace($forbidden_chars_to_replace,$newstr,str_replace($forbidden_chars_to_remove,"",$str));
@@ -2704,7 +2704,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath
 	$return='';
 
 	if ($picto == 'setup') $picto='title.png';
-	if (!empty($conf->browser->ie) && $picto=='title.png') $picto='title.gif';
+	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;"><tr>';
@@ -2743,7 +2743,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	global $conf,$langs;
 
 	if ($picto == 'setup') $picto='title.png';
-	if (!empty($conf->browser->ie) && $picto=='title.png') $picto='title.gif';
+	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
 
 	if (($num > $conf->liste_limit) || ($num == -1))
 	{
@@ -3058,7 +3058,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 
 /**
  *	Return localtax rate for a particular vat, when selling a product with vat $tva, from a $thirdparty_buyer to a $thirdparty_seller
- *  Note: It applies same rule than get_default_tva
+ *  Note: This function applies same rules than get_default_tva
  *
  * 	@param	float		$tva			        Vat taxe
  * 	@param  int			$local		         	Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2)
@@ -3159,13 +3159,10 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 		}
 	}
 
-
-
 	$sql  = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
 	$sql .= " AND t.taux = ".((float) $tva)." AND t.active = 1";
-
 	dol_syslog("get_localtax", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
@@ -4667,6 +4664,8 @@ function picto_from_langcode($codelang)
 
 	if (empty($codelang)) return '';
 
+	if (empty($codelang)) return '';
+
 	if ($codelang == 'auto')
 	{
 		return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');

htdocs/core/modules/modMargin.class.php

@@ -81,7 +81,7 @@ class modMargin extends DolibarrModules
 		// New pages on tabs
 		$this->tabs = array(
 				'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__',
-				'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous:/margin/tabs/thirdpartyMargins.php?socid=__ID__'
+				'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($societe->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__'
 		);
 
 

htdocs/fourn/class/fournisseur.commande.class.php

@@ -907,7 +907,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ", entity";
         $sql.= ", fk_soc";
         $sql.= ", date_creation";
-		//$sql.= ", date_livraison";
+		$sql.= ", date_livraison";
         $sql.= ", fk_user_author";
         $sql.= ", fk_statut";
         $sql.= ", source";
@@ -919,12 +919,12 @@ class CommandeFournisseur extends CommonOrder
         $sql.= " VALUES (";
         $sql.= "''";
         $sql.= ", '".$this->ref_supplier."'";
-        $sql.= ", '".$this->note_private."'";
+        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->note_public."'";
+        $sql.= ", '".$this->db->escape($this->note_public)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", ".$this->socid;
         $sql.= ", '".$this->db->idate($now)."'";
-		//$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
         $sql.= ", ".$user->id;
         $sql.= ", 0";
         $sql.= ", " . $this->source;

htdocs/fourn/commande/card.php

@@ -69,6 +69,8 @@ $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (!
 $hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
 $hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$datelivraison=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), GETPOST('liv_sec','int'), GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
+
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
@@ -144,8 +146,6 @@ if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer)
 // date de livraison
 if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer)
 {
-	$datelivraison=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), GETPOST('liv_sec','int'), GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
-
 	$result=$object->set_date_livraison($user,$datelivraison);
 	if ($result < 0)
 	{
@@ -783,9 +783,8 @@ if ($action == 'update_extras')
 {
 	// Fill array 'array_options' with data from add form
 	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
-
+	if ($ret < 0) $error++;
-	if($ret < 0) $error++;
 
 	if (!$error)
 	{
@@ -800,7 +799,6 @@ if ($action == 'update_extras')
 		{
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-
 				$result=$object->insertExtraFields();
 
 				if ($result < 0)
@@ -844,6 +842,7 @@ if ($action == 'add' && $user->rights->fournisseur->commande->creer)
         $object->fk_account        = GETPOST('fk_account', 'int');
         $object->note_private	= GETPOST('note_private');
         $object->note_public   	= GETPOST('note_public');
+		$object->date_livraison = $datelivraison;
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -1275,6 +1274,16 @@ if ($action=="create")
 	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
 	print '</td></tr>';
 
+	// Planned delivery date
+	print '<tr><td>';
+	print $langs->trans('DateDeliveryPlanned');
+	print '</td>';
+	print '<td>';
+	$usehourmin=0;
+	if (! empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin=1;
+	$form->select_date($datelivraison?$datelivraison:-1,'liv_',$usehourmin,$usehourmin,'',"set");
+	print '</td></tr>';
+
     // Bank Account
     if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
     {

htdocs/fourn/facture/card.php

@@ -1073,7 +1073,7 @@ elseif ($action == 'update_extras')
 {
 	// Fill array 'array_options' with data from add form
 	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
 
 	if($ret < 0) $error++;
 

htdocs/index.php

@@ -318,7 +318,8 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
     $board=new ActionComm($db);
-	$dashboardlines[] = $board->load_board($user);
+
+    $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of customer orders a deal

htdocs/langs/de_DE/accountancy.lang

@@ -9,13 +9,13 @@ Menuaccount=Buchhaltung Konten
 Menuthirdpartyaccount=Partnerkonten
 MenuTools=Werkzeuge
 
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Konfiguration des Experten Buchhaltungsmodul 
 Journaux=Journale
 JournalFinancial=Finanz-Journale
 Exports=Exports
-Export=Export
+Export=Exportieren
 Modelcsv=Exportmodell
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Für dieses Exportierungsmodell, sind die Einstellungen deaktiviert
 Selectmodelcsv=Wählen Sie ein Exportmodell
 Modelcsv_normal=Klassischer Export
 Modelcsv_CEGID=Export zu CEGID Expert
@@ -27,12 +27,12 @@ Selectchartofaccounts=Kontenplan wählen
 Validate=Freigeben
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
 AccountAccounting=Buchhaltungs Konto
-Ventilation=Breakdown
+Ventilation=Abbauen
 ToDispatch=Zu versenden
 Dispatched=Versandt
 
-CustomersVentilation=Breakdown customers
+CustomersVentilation=Kundenabbau
-SuppliersVentilation=Breakdown suppliers
+SuppliersVentilation=Lieferantenabbau
 TradeMargin=Handelsspanne
 Reports=Berichte
 ByCustomerInvoice=Nach Kundenrechnungen
@@ -41,81 +41,81 @@ NewAccount=Neues Buchhaltungskonto
 Update=Aktualisieren
 List=Liste
 Create=Erstelle
-UpdateAccount=Modification of an accounting account
+UpdateAccount=Änderung eines Bilanz-Kontos
-UpdateMvts=Modification of a movement
+UpdateMvts=Änderung einer Bewegung
-WriteBookKeeping=Record accounts in general ledger
+WriteBookKeeping=Konten ins Hauptbuch übernehmen
 Bookkeeping=Hauptbuch
 AccountBalanceByMonth=Kontostand pro Monat
 
-AccountingVentilation=Breakdown accounting
+AccountingVentilation=Rechnungswesenabbau
-AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationSupplier=Abbau von Buchhaltungs-Lieferanten
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilationCustomer=Abbau von Buchhaltungs-Kunden
 Line=Zeile
 
 CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
+InvoiceLines=Rechnungszeile bereinigen
-InvoiceLinesDone=Ventilated lines of invoice
+InvoiceLinesDone=Bereinigte Rechnungszeilen
-IntoAccount=In the accounting account
+IntoAccount=Im Buchhaltungs-Konto
 
 Ventilate=erörtern
-VentilationAuto=Automatic breakdown
+VentilationAuto=Automatischer Abbau
 
 Processing=Bearbeitung
 EndProcessing=Das Ende der Verarbeitung
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Beliebige Zeile zu bereinigen
 SelectedLines=Gewählte Zeilen
 Lineofinvoice=Rechnungszeile
-VentilatedinAccount=Ventilated successfully in the accounting account
+VentilatedinAccount=Erfolgreich im Rechnungskonto bereinigt
-NotVentilatedinAccount=Not ventilated in the accounting account
+NotVentilatedinAccount=Nicht im Rechnungskonto bereinigt
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Spaltentrennzeichen in Exportdatei
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die Aufgliederung nach Seite angezeigt werden (empfohlenes Maximum: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Abbau Seiten "Muss sortiert werden" durch die aktuellen Elemente
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie die Sortierung der Abbau Seiten "Abbau" durch die aktuellen Elemente
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLength=Länge der in Dolibarr gezeigten Rechnungskonten
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTING_LENGTH_GACCOUNT=Länge der Finanzbuchführung
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
 ACCOUNTING_BANK_JOURNAL=Bankauszug
 ACCOUNTING_CASH_JOURNAL=Kassenbeleg
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Verschiedenes Journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SOCIAL_JOURNAL=Sozial-Journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto der Transaktion
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_SUSPENSE=Konto der Warte
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Produkte (wenn nicht im Produktblatt definiert)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Produkte (wenn nicht im Produktblatt definiert)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Dienstleistungen (wenn nicht im Produktblatt definiert)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Dienstleistungen (wenn nicht im Produktblatt definiert)
 
 Doctype=Dokumententyp
 Docdate=Datum
 Docref=Referenz
 Numerocompte=Konto
-Code_tiers=Thirdparty
+Code_tiers=Partner
-Labelcompte=Label account
+Labelcompte=Label-Account
 Debit=Soll
 Credit=Haben
 Amount=Betrag
 Sens=Sens
 Codejournal=Journal
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs
 
 SellsJournal=Verkaufsjournal
 PurchasesJournal=Einkaufsjournal
 DescSellsJournal=Verkaufsjournal
 DescPurchasesJournal=Einkaufsjournal
 BankJournal=Bankauszug
-DescBankJournal=Bank journal including all the types of payments other than cash
+DescBankJournal=Bankjournal enthält alle Arten von anderen Zahlungsmitteln als Barzahlungen
 CashJournal=Kassenbeleg
-DescCashJournal=Cash journal including the type of payment cash
+DescCashJournal=Barjournal enthält die Zahlungsart: bar
 
 CashPayment=Barzahlung
 
@@ -125,36 +125,36 @@ CustomerInvoicePayment=Rechnungszahlung (Kunde)
 ThirdPartyAccount=Partner Konto
 
 NewAccountingMvt=Neue Änderung
-NumMvts=Number of movement
+NumMvts=Anzahl der Änderungen
-ListeMvts=List of the movement
+ListeMvts=Liste der Bewegungen
 ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Liste der Partner Konten
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+DescThirdPartyReport=Konsultieren Sie hier die Liste der Drittkunden und die Anbieter und ihre Buchhaltungskonten
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Liste der Abrechnungskonten
 
 Pcgversion=Version des Plans
 Pcgtype=Kontenklasse
 Pcgsubtype=Unterkontenklasse
-Accountparent=Root of the account
+Accountparent=Wurzeln des Kontos
 Active=Auszug
 
 NewFiscalYear=Neues fiskalisches Jahr
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Konsultieren Sie hier die jährliche Aufteilung der Buchhaltung Ihrer Rechnungs-Kunden
-TotalVente=Total turnover HT
+TotalVente=Totaler Umsatz
 TotalMarge=Gesamt-Spanne
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilDoneCustomer=Konsultieren Sie hier die Liste der Zeilen der Rechnungs-Kunden und deren Abbrechnungskonto
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+DescVentilTodoCustomer=Bereinigen Sie die Zeilen der Kundenrechnung mit einem Rechnungskonto
-ChangeAccount=Change the accounting account for lines selected by the account:
+ChangeAccount=Ändern sie das Abrechnungskonto für markierte Zeilen durch das Konto:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Konsultieren Sie hier die jährliche Aufteilung der Buchhaltung, Ihrer Rechnungen der Lieferanten
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilTodoSupplier=Bereinigen Sie die Zeilen der Rechnung für Lieferanten, mit einem Abrechnungskonto
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilDoneSupplier=Konsultieren Sie hier die Liste der Zeilen der Rechnungs-Kunden und deren Abbrechnungskonto
 
 ValidateHistory=Automatisch geltend machen
 
 ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird.
 
-FicheVentilation=Breakdown card
+FicheVentilation=Abbau-Karte

htdocs/langs/de_DE/agenda.lang

@@ -60,7 +60,7 @@ SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet
 SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail versendet
 ShippingSentByEMail=Lieferung %s per Email versendet
 ShippingValidated= Sendung %s freigegeben
-InterventionSentByEMail=Intervention %s sent by EMail
+InterventionSentByEMail=Intervention %s gesendet via E-Mail
 NewCompanyToDolibarr= Partner erstellt
 DateActionPlannedStart= Geplantes Startdatum
 DateActionPlannedEnd= Geplantes Enddatum
@@ -69,7 +69,7 @@ DateActionDoneEnd= Effektives Ende
 DateActionStart= Startdatum
 DateActionEnd= Enddatum
 AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
+AgendaUrlOptions2=<b>Login =%s</b> für die Ausgabe an Aktionen erstellt, die von oder an den Benutzer <b>%s</b> zugeordnet beschränken.
 AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erstellte Maßnahmen.
 AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> betroffene Maßnahmen.
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> begrenzt die die Ausgabe auf Maßnahmen im Zusammenhang mit Projekt <b>PROJECT_ID</b>.

htdocs/langs/de_DE/bills.lang

@@ -348,7 +348,7 @@ ChequeNumber=Schecknummer
 ChequeOrTransferNumber=Scheck-/Überweisungsnummer
 ChequeMaker=Scheckaussteller
 ChequeBank=Scheckbank
-CheckBank=Check
+CheckBank=Prüfen
 NetToBePaid=Netto Zahlbetrag
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
@@ -389,7 +389,7 @@ DisabledBecausePayments=Nicht möglich, da es Zahlungen gibt
 CantRemovePaymentWithOneInvoicePaid=Die Zahlung kann nicht entfernt werden, da es mindestens eine Rechnung gibt, die als bezahlt markiert ist
 ExpectedToPay=Erwartete Zahlung
 PayedByThisPayment=mit dieser Zahlung beglichen
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Markiert alle Standard- oder Ersatzrechnungen als "bezahlt", wenn diese vollständig beglichen sind.
 ClosePaidCreditNotesAutomatically=Markiert alle Gutschriften als "bezahlt", wenn diese vollständig beglichen sind.
 AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne ausstehende Zahlungen werden automatisch geschlossen und als "bezahlt" markiert.
 ToMakePayment=Bezahlen
@@ -400,7 +400,7 @@ RevenueStamp=Steuermarke
 YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
 PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
 TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
-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
+MarsNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen, %syymm-nnnn für den Austausch von Rechnungen, %syymm-nnnn für Gutschriften und %syymm-nnnn für Gutschrifen wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Kundenrechnung
@@ -420,11 +420,11 @@ InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 Progress=Progress
-ModifyAllLines=Modify all lines
+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
-InvoiceSituationLast=Final and general invoice
+InvoiceSituationLast=Allgemeine Endrechnung

htdocs/langs/de_DE/projects.lang

@@ -3,7 +3,7 @@ RefProject=Projekt-Nr.
 ProjectId=Projekt-ID
 Project=Projekt
 Projects=Projekte
-ProjectStatus=Project status
+ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Kontakte zum Projekt
 MyProjectsDesc=Hier können Sie nur die Projekte einsehen, bei welchen Sie als Kontakt hinzugefügt sind.
@@ -103,7 +103,7 @@ CloneContacts=Dupliziere Kontakte
 CloneNotes=Dupliziere Hinweise
 CloneProjectFiles=Dupliziere verbundene Projektdateien
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Projekt / Aufgaben Daten vom aktuellen Zeitpunkt updaten?
 ConfirmCloneProject=Möchten Sie dieses Projekt wirklich duplizieren?
 ProjectReportDate=Passe Aufgaben-Datum dem Projekt-Startdatum an
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen

htdocs/langs/de_DE/sendings.lang

@@ -4,8 +4,8 @@ Sending=Sendung
 Sendings=Sendungen
 Shipment=Sendung
 Shipments=Lieferungen
-ShowSending=Show Sending
+ShowSending=Zeige Sendung
-Receivings=Receipts
+Receivings=Beleg
 SendingsArea=Versandübersicht
 ListOfSendings=Versandliste
 SendingMethod=Versandart
@@ -15,7 +15,7 @@ SearchASending=Suche Sendung
 StatisticsOfSendings=Versandstatistik
 NbOfSendings=Anzahl der Sendungen
 NumberOfShipmentsByMonth=Anzahl der Sendungen nach Monaten
-SendingCard=Shipment card
+SendingCard=Sendungs-Karte
 NewSending=Neue Sendung
 CreateASending=Erzeuge eine Sendung
 CreateSending=Sendung erzeugen
@@ -38,7 +38,7 @@ StatusSendingCanceledShort=Storno
 StatusSendingDraftShort=Entwurf
 StatusSendingValidatedShort=Freigegeben
 StatusSendingProcessedShort=Fertig
-SendingSheet=Shipment sheet
+SendingSheet=Sendungs Blatt
 Carriers=Spediteure
 Carrier=Spediteur
 CarriersArea=Spediteursübersicht
@@ -55,19 +55,19 @@ StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist
 DateDeliveryPlanned=Geplantes Zustellungsdatum
 DateReceived=Datum der Zustellung
 SendShippingByEMail=Verand per E-Mail
-SendShippingRef=Submission of shipment %s
+SendShippingRef=Abgabe der Sendung %s
 ActionsOnShipping=Anmerkungen zur Sendung
 LinkToTrackYourPackage=Link zur Sendungsnachverfolgung
 ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung über die Bestellkarte erfolgt.
-RelatedShippings=Related shipments
+RelatedShippings=Ähnliche Sendungen
 ShipmentLine=Sendungszeilen
 CarrierList=Liste der Transporter
-SendingRunning=Product from ordered customer orders
+SendingRunning=Die Produktion von dem bestellten Kundenaufträge
-SuppliersReceiptRunning=Product from ordered supplier orders
+SuppliersReceiptRunning=Produkt aus Lieferantenbestellung
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
+ProductQtyInCustomersOrdersRunning=Produktmenge in geöffneter Kunden Bestellungen
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ProductQtyInSuppliersOrdersRunning=Produktmenge in geöffneter Lieferantenbestellungen
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Produktmenge aus geöffneter Kundenbestellung bereits versandt
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus Lieferantenbestellung bereits erhalten
 
 # Sending methods
 SendingMethodCATCH=Abholung durch Kunden

htdocs/langs/en_US/projects.lang

@@ -8,8 +8,10 @@ SharedProject=Everybody
 PrivateProject=Contacts of project
 MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 ProjectsArea=Projects area

htdocs/langs/fr_FR/admin.lang

@@ -631,7 +631,7 @@ Permission181=Consulter les commandes fournisseurs
 Permission182=Créer/modifier les commandes fournisseurs
 Permission183=Valider les commandes fournisseurs
 Permission184=Approuver les commandes fournisseurs
-Permission185=Passer les commandes fournisseurs et les annuler
+Permission185=Passer les commandes fournisseurs
 Permission186=Accuser réception des commandes fournisseurs
 Permission187=Clôturer les commandes fournisseurs
 Permission188=Annuler les commandes fournisseurs
@@ -1501,7 +1501,7 @@ CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ven
 CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
 CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
 CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Ne pas réduire le stock quand une vente est faite depuis le Point de Vente. Sinon, la réduction est faite par défaut.
+CashDeskDoNotDecreaseStock=Désactiver la réduction de stock quand une vente est faite depuis le Point de Vente. Si "non", la réduction du stock est faite d'office par le module Point de Vente, quelque soit le mode choisi dans la configuration du module stock.
 CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
 StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.

htdocs/langs/fr_FR/exports.lang

@@ -125,7 +125,7 @@ BankAccountNumber=Numéro de compte
 BankAccountNumberKey=Clé RIB
 SpecialCode=Code spécial
 ExportStringFilter=%% permet de remplacer 1 ou plusieurs caractères dans le texte
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtre pour une année/mois/jour<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtre pour une plage année/mois/jour<br> > YYYY, > YYYYMM, > YYYYMMDD': filtre pour une date supérieure à une année/mois/jour donné<br> < YYYY, < YYYYMM, < YYYYMMDD: filtre pour une date inférieure à une année/mois/jour donné
+ExportDateFilter=AAAA, AAAAMM, AAAAMMJJ: filtre pour une année/mois/jour<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMJJ+AAAAMMJJ: filtre pour une plage année/mois/jour<br> > AAAA, > AAAAMM, > AAAAMMJJ': filtre pour une date supérieure à une année/mois/jour donné<br> < AAAA, < AAAAMM, < AAAAMMJJ: filtre pour une date inférieure à une année/mois/jour donné
 ExportNumericFilter='NNNNN' filtres sur une valeur<br>'NNNNN+NNNNN' filtres sur une place de valeurs<br>'&gt;NNNNN' filtres sur les valeurs plus petites<br>'&gt;NNNNN' filtres sur les valeurs plus grandes
 ## filters
 SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs.

htdocs/langs/sl_SI/accountancy.lang

@@ -13,9 +13,9 @@ ConfigAccountingExpert=Konfiguracija modula računovodskega strokovnjaka
 Journaux=Revije
 JournalFinancial=Finančne revije
 Exports=Izvoz
-Export=Export
+Export=Izvoz
 Modelcsv=Model izvoza
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Za ta izvozni model so opcije deaktivirane
 Selectmodelcsv=Izberite model izvoza
 Modelcsv_normal=Classic izvoz
 Modelcsv_CEGID=Izvoz v CEGID Expert
@@ -68,11 +68,11 @@ Lineofinvoice=Line računa
 VentilatedinAccount=Uspešno prezračen v obračunskem računu
 NotVentilatedinAccount=Ni prezračen v obračunskem računu
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Ločilo za stolpce v izvozni datoteki
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Število elementov za pregled po straneh (največ priporočeno: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začni sortiranje strani za pregled "potrebno pregledati" z najnovejšimi elementi
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začni sortiranje strani za pregled "Pregledano" z najnovejšimi elementi
 
 AccountLength=Dolžina računovodstva računov prikazan v Dolibarrju
 AccountLengthDesc=Funkcija omogoča, da Predstavljati dolžino obračunskega računa z zamenjavo prostorov z ničelno sliki. Ta funkcija se dotakne le zaslon, ne spreminja računovodskih račune registrirane v Dolibarrju. Za izvoz, to funkcijo je potrebno, da so združljivi z določeno programsko opremo.
@@ -130,7 +130,7 @@ ListeMvts=Seznam gibanja
 ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
 
 ReportThirdParty=Seznam thirdparty račun
-DescThirdPartyReport=Posvetujejo tukaj seznam thirdparty kupcev in dobaviteljev in njihovih računovodskih računov
+DescThirdPartyReport=Tukaj poglejte seznam kupcev in dobaviteljev in njihovih računovodskih računov
 
 ListAccounts=Seznam računovodskih računov
 
@@ -142,19 +142,19 @@ Active=Izjava
 
 NewFiscalYear=Novo poslovno leto
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Tukaj poglejte letni pregled vaših računov kupcem
 TotalVente=Skupni prihodek HT
 TotalMarge=Skupaj prodajna marža
-DescVentilDoneCustomer=Posvetujejo tukaj seznam vrstic računov strank in njihovo računovodsko račun
+DescVentilDoneCustomer=Tukaj poglejte seznam vrstic na računih za kupce in njihovih računovodskih računov
 DescVentilTodoCustomer=Prezračite svoje linije računa stranke z računovodsko račun
 ChangeAccount=Spremenite računovodsko račun linij, ki jih na račun izbranih:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Tukaj poglejte letni pregled računov vaših dobaviteljev
 DescVentilTodoSupplier=Prezračite svoje linije dobavitelja na računu z računovodsko račun
-DescVentilDoneSupplier=Posvetujejo tukaj seznam vrstic računov dobaviteljem in njihovo računovodsko račun
+DescVentilDoneSupplier=Tukaj poglejte seznam vrstic na računih dobaviteljev in njihovih računovodskih računov
 
 ValidateHistory=Potrditi Samodejno
 
 ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
 
-FicheVentilation=Breakdown card
+FicheVentilation=Kartica pregleda

htdocs/langs/sl_SI/admin.lang

@@ -56,8 +56,8 @@ UseSearchToSelectCompany=Za izbiranje partnerjev uporabite polja z avtomatsko iz
 ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti
 UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 UseSearchToSelectContact=Zaizbiro kontakta uporabite polja z avtomatsko izpolnitvijo (namesto uporabe seznama).
-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)
+DelaiedFullListToSelectCompany=Čakanje na pritisk tipke pred nalaganjem vsebine kombiniranega seznama partnerjev (to lahko izboljša zmogljivosti, če imate veliko število partnerjev)
-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)
+DelaiedFullListToSelectContact=Čakanje na pritisk tipke pred nalaganjem vsebine kombiniranega seznama kontaktov (to lahko izboljša zmogljivosti, če imate veliko število kontaktov)
 SearchFilter=Opcije iskalnega filtra
 NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu
 ViewFullDateActions=Prikaz polnih datumov aktivnosti v tretjem zavihku
@@ -70,7 +70,7 @@ PreviewNotAvailable=Predogled ni na voljo
 ThemeCurrentlyActive=Trenutno aktivna tema
 CurrentTimeZone=Časovni pas PHP strežnika
 MySQLTimeZone=Časovni pas MySql (baze podatkov)
-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=Podatkovni strežnik shranjuje in prikazuje podatke, kot da bi bili shranjeni v predloženih nizih. Časovna cona učinkuje samo, če uporabljate funkcijo UNIX_TIMESTAMP (te Dolibarr ne sme uporabljati, zato TZ baza ne bi smela imeti nmobenega učinka, tudi če se spremeni po vnosu podatkov).
 Space=Presledek
 Table=Tabela
 Fields=Polja
@@ -210,7 +210,7 @@ ModulesJobDesc=Poslovni moduli zagotavljajo enostavne prednastavitve aplikacije
 ModulesMarketPlaceDesc=Več modulov si lahko naložite preko zunanjih web strani na internetu...
 ModulesMarketPlaces=Več modulov...
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
-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=Seznam podjetij, ki lahko zagotovijo/razvijejo module po želji (opomba: vsako odprtokodno podjetje z znanjem PHP jezika vam lahko zagotovi specifičen razvoj)
 WebSiteDesc=Ponudniki spletnih strani, na katerih lahko poiščete več modulov...
 URL=Link
 BoxesAvailable=Polja, ki so na voljo
@@ -222,7 +222,7 @@ AutomaticIfJavascriptDisabled=Avtomatsko, če je Javascript onemogočen
 AvailableOnlyIfJavascriptNotDisabled=Na voljo samo, če JavaScript ni onemogočen
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Na voljo samo, če JavaScript in Ajax nista onemogočena
 Required=Zahtevano
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Uporablja se samo pri nekaterih ocijah agende
 Security=Varnost
 Passwords=Gesla
 DoNotStoreClearPassword=Ne shranjujte v bazi podatkov celih gesel, temveč samo šifrirane vrednosti (priporočena aktivacija)
@@ -294,7 +294,7 @@ DoNotUseInProduction=Ne uporabljajte v proizvodnji
 ThisIsProcessToFollow=To je nastavitev za proces:
 StepNb=Korak %s
 FindPackageFromWebSite=Poiščite paket, ki omogoča funkcijo, ki jo želite (na primer na spletni strani %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Prenesi paket %s.
 UnpackPackageInDolibarrRoot=Razpakiraj paketno datoteko v Dolibarr korensko mapo <b>%s</b>
 SetupIsReadyForUse=Instalacija je zaključena in Dolibarr je pripravljen na uporabo s to novo komponento.
 NotExistsDirect=Ni definirana alternativna korenska mapa.<br>
@@ -304,7 +304,7 @@ YouCanSubmitFile=Izberi modul:
 CurrentVersion=Trenutna različica Dolibarr
 CallUpdatePage=Pojdite na stran za nadgradnjo strukture in podatkov v podatkovni bazi: %s.
 LastStableVersion=Zadnja stabilna različica
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Posodobitev strežnika brez povezave
 GenericMaskCodes=Vnesete lahko kakršnokoli številčno masko. V tej maski lahko uporabite naslednje oznake:<br><b>{000000}</b> ustreza številki, ki se poveča pri vsakem %s. Vnesite toliko ničel, kot je želena dolžina števca. Števec se bo zapolnil z ničlami na levi strani, da bi velikost ustrezala maski. <br><b>{000000+000}</b> enako kot prej, vendar je desno od znaka + odmik, ki je uporabljen na prvi %s. <br><b>{000000@x}</b> enako kot prej, vendar se števec resetira na 0, ko se doseže mesec x (x je med 1 in 12). Če je uporabljena ta opcija, ,in je x enak ali večji od 2, je zahtevana tudi sekvenca {yy}{mm} ali {yyyy}{mm}. <br><b>{dd}</b> dan (01 do 31).<br><b>{mm}</b> mesec (01 do 12).<br><b>{yy}</b>, <b>{yyyy}</b> ali <b>{y}</b> leto, izraženo z 2, 4 ali 1 številko. <br>
 GenericMaskCodes2=<b>{cccc}</b> koda klienta z n znaki<br><b>{cccc000}</b> koda klienta z n znaki se nadaljuje s števcem stranke. Ta namenski števec stranke se resetira obenem z globalnim števcem.<br><b>{tttt}</b> Koda partnerja z n znaki (glejte slovar-tipi partnerjev).<br>
 GenericMaskCodes3=Vsi ostali znaki v maski bodo ostali nedotaknjeni.<br>Presledki niso dovoljeni.<br>
@@ -383,12 +383,12 @@ ExtrafieldSelectList = Izberi iz tabele
 ExtrafieldSeparator=Ločilo
 ExtrafieldCheckBox=Potrditveno polje
 ExtrafieldRadio=Radijski gumb
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
 ExtrafieldParamHelpselect=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...<br><br>Če želite imeti seznam odvisen od drugega :<br>1,vrednost1|parent_list_code:parent_key<br>2,vrednost2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
 ExtrafieldParamHelpsellist=Seznam parametrov iz tabele<br>Syntax : table_name:label_field:id_field::filter<br>Primer : c_typent:libelle:id::filter<br><br>filter je lahko enostaven test (npr active=1) za prikaz samo aktivnih vrednsost <br> če želite filtrirati fpo dodatnih poljih, uporabite sintakso extra.fieldcode=... (kjer je field code koda dodatnega polja)<br><br>če želite, da je seznam odvisen od drugega :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Seznam parametrov iz tabele<br>Syntax : table_name:label_field:id_field::filter<br>Primer : c_typent:libelle:id::filter<br><br>filter je lahko enostaven test (npr active=1) za prikaz samo aktivne vrednosti <br> če želite filtrirati po dodatnih poljih, uporabite sintakso extra.fieldcode=... (kjer je field code koda dodatnega polja)<br><br>če želite, da je seznam odvisen od drugega :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Uporabljena knjižnica za ustvarjanje PDF
 WarningUsingFPDF=Pozor: vaš <b>conf.php</b> vsebuje direktivo <b>dolibarr_pdf_force_fpdf=1</b>. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.<br>Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite <a href="http://www.tcpdf.org/" target="_blank">TCPDF knjižnico</a>, nato označite kot komentar ali odstranite vrstico <b>$dolibarr_pdf_force_fpdf=1</b>, in namesto nje dodajte <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=V nekaterih državah so na vsako vrstico računa vezani 2 ali 3 davki. V takem primeru izberite tip in stopnjo drugega in tretjega davka. Možni tipi so:<br>1 : lokalni davek na proizvode in storitve brez DDV (DDV se ne obračuna na lokalni davek)<br>2 : lokalni davek na proizvode in storitve pred DDV (DDV se obračuna na znesek + lokalni davek)<br>3 : lokalni davek na proizvode brez DDV (DDV se ne obračuna na lokalni davek)<br>4 : lokalni davek na proizvode pred DDV (DDV se obračuna na znesek + lokalni davek)<br>5 : lokalni davek na storitve brez DDV (DDV se ne obračuna na lokalni davek)<br>6 : lokalni davek na storitve pred DDV (DDV se obračuna na znesek + lokalni davek)
@@ -407,7 +407,7 @@ InitEmptyBarCode=Začetna vrednost za naslednjih %s praznih zapisov
 EraseAllCurrentBarCode=Zbrišite vse trenutne vrednosti črtnih kod
 ConfirmEraseAllCurrentBarCode=Ali zares želite izbrisati vse trenutne vrednosti črtnih kod ?
 AllBarcodeReset=Vse vrednosti črtnih kod so bile odstranjene
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+NoBarcodeNumberingTemplateDefined=Nobena številčna predloga črtne kode ni omogočena v mudulu za nastavitev črtnih kod.
 NoRecordWithoutBarcodeDefined=Noben zapis ni definiran brez črtne kode.
 
 # Modules
@@ -450,7 +450,7 @@ Module55Desc=Upravljanje črtnih kod
 Module56Name=Telefonija
 Module56Desc=Integracija telefonije
 Module57Name=Trajniki
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Upravljanje trajnikov in nakazil. Vključuje tudi generiranje SEPA za evropske države.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
 Module59Name=Vaš zaznamek
@@ -482,7 +482,7 @@ Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani
 Module330Name=Zaznamki
 Module330Desc=Upravljanje zaznamkov
 Module400Name=Projekti/priložnosti/možnosti
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Desc=Upravljanje projektov, priložnosti ali potencialov. Nato lahko dodate vse druge elemente (račun, naročilo, ponudbo, intervencijo, ...) k tem projektom, da dobite transverzalni pogled iz projektnega pogleda.
 Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
 Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
@@ -512,7 +512,7 @@ Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo
 Module2600Name=Spletne storitve
 Module2600Desc=Omogočanje Dolibarr strežnika za spletne storitve
 Module2650Name=Spletne storitve (klient)
-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=Vključitev Dolibarr klienta za mrežni servis (lahko se uporablja za potisk podatkov/zahtev na zunanji strežnik. Zaenkrat so podprta samo naročila pri dobaviteljih)
 Module2700Name=Gravatar
 Module2700Desc=Uporaba online Gravatar storitev (www.gravatar.com) za prikaz fotografij uporabnikov/članov (na osnovi njihovih emailov). Potreben je internetni dostop
 Module2800Desc=FTP Client
@@ -526,8 +526,8 @@ Module6000Name=Potek dela
 Module6000Desc=Upravljanje poteka dela
 Module20000Name=Upravljanje zahtevkov za dopust
 Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih
-Module39000Name=Product batch
+Module39000Name=Paket proizvodov
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Desc=Paket serijskih številk, upravljanje proizvodov po datumu prevzema in datumu prodaje
 Module50000Name=PayBox
 Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox
 Module50100Name=Prodajalne
@@ -544,8 +544,8 @@ Module59000Name=Marže
 Module59000Desc=Modul za upravljanje z maržami
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje s provizijami
-Module150010Name=Batch number, eat-by date and sell-by date
+Module150010Name=Paketna številka, datum prevzema in datum prodaje
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module150010Desc=paketna številka, upravljanje proizvodov po datumu prevzema in datumu prodaje
 Permission11=Branje računov
 Permission12=Kreiranje/Spreminjanje računov
 Permission13=Preklic potrditve računov
@@ -575,7 +575,7 @@ Permission67=Izvoz intervencij
 Permission71=Branje članov
 Permission72=Kreiranje/spreminjanje članov
 Permission74=Brisanje članov
-Permission75=Setup types of membership
+Permission75=Nastavitev tipov članov
 Permission76=Izvoz podatkov
 Permission78=Branje naročnin
 Permission79=Kreiranje/spreminjanje naročnin
@@ -598,8 +598,8 @@ Permission106=Izvoz pošiljk
 Permission109=Brisanje pošiljk
 Permission111=Branje finančnih postavk
 Permission112=Kreiranje/spreminjanje/brisanje in primerjava transakcij
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Nastavitve finančnih kontov (kreiranje, upravljanje kategorij)
-Permission114=Reconciliate transactions
+Permission114=Pobotanje transkacij
 Permission115=Izvoz transakcij in računovodskih izkazov
 Permission116=Transfer med računi
 Permission117=Upravljanje pošiljanja čekov
@@ -764,7 +764,7 @@ Permission55001=Branje anket
 Permission55002=Kreiranje/spreminjanje anket
 Permission59001=Branje komercialnih marž
 Permission59002=Določitev komercialnih marž
-Permission59003=Read every user margin
+Permission59003=Branje vsake uporabniške marže
 DictionaryCompanyType=Tip partnerjev
 DictionaryCompanyJuridicalType=Pravna oblika partnerjev
 DictionaryProspectLevel=Nivo potenciala možne stranke
@@ -828,11 +828,11 @@ LocalTax2IsUsedExampleES= V Španiji, samostojnimi in neodvisni strokovnjaki, ki
 LocalTax2IsNotUsedExampleES= V Španiji so poslovne niso predmet davčnega sistema modulov.
 CalcLocaltax=Poročila
 CalcLocaltax1ES=Prodaja - Nabava
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax1Desc=Poročila o lokalnih davkih so izračunana kot razlika med nabavnimi in prodajnimi davki
 CalcLocaltax2ES=Nabava
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=Poročila o lokalnih davkih so seštevek nabavnih davkov
 CalcLocaltax3ES=Prodaja
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=Poročila o lokalnih davkih so seštevek prodajnih davkov
 LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 NbOfDays=Število dni
@@ -1042,7 +1042,7 @@ SendingMailSetup=Nastavitev pošiljanja z elektronsko pošto
 SendmailOptionNotComplete=Pozor, na nekaterih Linux sistemih mora za pošiljanje pošte z vašega naslova nastavitev vsebovati opcijo -ba (parameter mail.force_extra_parameters v vaši datoteki php.ini). Če nekateri prejemniki nikoli ne dobijo pošte, poskusite popraviti PHP parameter z mail.force_extra_parameters = -ba).
 PathToDocuments=Pot do dokumentov
 PathDirectory=Mapa
-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=Funkcija za pošiljanje pošte z uporabo metode "PHP mail DIRECT" bo ustvarila poštno sporočilo, ki ga morda nekateri poštni strežniki ne bodo pravilno razčlenili. Posledica tega je, da nekatere pošte ne bodo mogli brati uporabniki, ki gostujejo na takih platformah. To veljalo za nekaj internetnih ponudnikov (npr.: Orange v Franciji). Problem ni v Dolibarr niti v PHP, ampak v sprejemanju poštnega strežnika. Lahko pa v nastavitvah dodate opcijo MAIN_FIX_FOR_BUGGED_MTA kot 1. v setup, da bi se temu izognili brez modifikacije Dolibarr. Vendar pa lahko pride do težav z drugimi strežniki, ki strogo spoštujejo SMTP standard. Druga rešitev (priporočena) je uporaba metode "SMTP socket knjižnice", ki nima teh slabosti.
 TranslationSetup=Konfiguracija prevoda
 TranslationDesc=Izbira na zaslonu vidnega jezika se lahko spremeni:<br>* Globalno preko menija <strong>Domov - Nastavitve - Prikaz</strong><br>* Samo za uporabnike preko zavihka <strong>Nastavitev zaslona uporabnika</strong> (klik na login na vrhu ekrana).
 TotalNumberOfActivatedModules=Skupno število aktiviranih modulov za lastnosti: <b>%s</b>
@@ -1061,7 +1061,7 @@ BrowserIsOK=Uporabljate spletni brskalnik %s. Ta brskalnik je ustrezen tako gled
 BrowserIsKO=Uporabljate spletni brskalnik %s. Ta brskalnik je slaba izbira glede varnosti, zmogljivosti in zanesljivosti. Priporočamo uporabo Firefox, Chrome, Opera ali Safari.
 XDebugInstalled=Naložen je XDebug
 XCacheInstalled=Naložen je XCache.
-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=Prikaz referenčnega seznama kupcev/dobaviteljev (izberite seznam ali combobox) in večine hiper povezav. Partnerji bodo prikazani z imenom "CC12345 - SC45678 - The big company coorp", namesto kot "The big company coorp".
 FieldEdition=%s premenjenih polj
 FixTZ=Fiksiranje časovne cone
 FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono)
@@ -1087,7 +1087,7 @@ ModuleCompanyCodeAquarium=Predlaga računovodsko kodo, sestavljeno iz "401" in k
 ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo.
 ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja.
 UseNotifications=Uporaba sporočil
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih. Ciljo obvestil so lahko definirani kot:<br>* kontakti pri partnerjih (kupcih ali dobaviteljih), en partner naenkrat.<br>* ali z nastavitvijo globalnega ciljnega email naslova na strani za nastavitev modula.
 ModelModules=Predloge dokumentov
 DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...)
 WatermarkOnDraft=Vodni žig na osnutku dokumenta
@@ -1151,7 +1151,7 @@ AddDeliveryAddressAbility=Dodaj možen datum dobave
 UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra kot opcija
 FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
 WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe
 ##### Orders #####
 OrdersSetup=Nastavitve upravljanja z naročili
 OrdersNumberingModules=Moduli za številčenje naročil
@@ -1161,7 +1161,7 @@ ValidOrderAfterPropalClosed=Za potrditev naročila po zaključku ponudbe, naj ne
 FreeLegalTextOnOrders=Poljubno besedilo na naročilih
 WatermarkOnDraftOrders=Vodni tisk na osnutkih naročil (brez, če je prazno)
 ShippableOrderIconInList=Dodaj ikono na seznamnaročil, ki označuje, če je naročilo pripravljeno za odpremo
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Vprašaj za končni bančni račun naročila
 ##### Clicktodial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
 ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url.  Na url lahko uporabite ikono<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
@@ -1326,8 +1326,8 @@ YouMayFindPerfAdviceHere=Na tej strani najdete nekaj kontrol ali nasvetov, povez
 NotInstalled=Ni nameščeno, zato to ni vzrok počasnosti strežnika
 ApplicativeCache=Aplikativni predpomnilnik
 MemcachedNotAvailable=Ni najden aplikativni predpomnilnik. Zmogljivost lahko izboljšate z namestitvijo predpomnilniškega strežnika Memcached in modula, ki zna uporabljati ta predpomnilniški strežnik.<br>Več informacij najdete tukaj <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Vedite, da veliko gostiteljev spletnih strani ne zagotavlja takega predpomnilniškega strežnika..
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedModuleAvailableButNotSetup=Najden je predpomnilniški modul za aplikativni predpomnilnik, vendar nastavitev modula ni zaključena.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedAvailableAndSetup=Vklopljen je predpomnilniški modul za predpomnilniški strežnik.
 OPCodeCache=OPCode predpomnilnik
 NoOPCodeCacheFound=Ni najden OPCode predpomnilnik. Morda uporabljate drugačen OPCode predpomnilnik, kot sta XCache ali eAccelerator (v redu), morda pa nimate OPCode predpomnilnika (zelo slabo).
 HTTPCacheStaticResources=HTTP predpomnilnik za statične vire (css, img, javascript)
@@ -1397,19 +1397,19 @@ RSSUrlExample=Zanimiv vir RSS
 MailingSetup=Nastavitev E-mail modula
 MailingEMailFrom=Naslov pošiljatelja (Od) za emaile, ki jih pošlje e-mailing modul
 MailingEMailError=Naslov za vračilo (Napake-za) emailov z napakami
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Čakanje v sekundah po pošiljanju naslednjega sporočila
 ##### Notification #####
 NotificationSetup=Nastavitev modula za obvestila po elektronski pošti
 NotificationEMailFrom=Naslov pošiljatelja (od) za emaile, ki se pošljejo kot obvestila
-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)
+ListOfAvailableNotifications=Nastavitev dogodkov, za katere lahko pošljete obvestilo, za vsakega partnerja (nastavite na kartici partnerja) ali z nastavitvijo fiksnega emaila (seznam je odvisen od aktiviranega modula)
 FixedEmailTarget=Popravi ciljni email
 ##### Sendings #####
 SendingsSetup=Nastavitev modula za pošiljanje
 SendingsReceiptModel=Obrazci odpremnic
 SendingsNumberingModules=Moduli za številčenje pošiljk
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Podpora za odpremnice za dobavo kupcem
 NoNeedForDeliveryReceipts=V večini primerov se dobavnice uporabljajo tako kot dokument za dostavo kupcem (seznam proizvodov, ki jih je potrebno poslati), kakor tudi kot dokument, ki ga dobi in podpiše kupec. Zato je odpremnica podvojena funkcija, ki je redko aktivirana.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Prosti tekst na pošiljkah
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul za številčenje dobavnic
 DeliveryOrderModel=Obrazci dobavnic
@@ -1420,7 +1420,7 @@ AdvancedEditor=Napredni urejevalnik
 ActivateFCKeditor=Aktiviranje FCKeditor za:
 FCKeditorForCompany=WYSIWIG kreiranje/urejanje opisa podjetij in opomb
 FCKeditorForProduct=WYSIWIG kreiranje/urejanje opisa proizvodov/storitev in opomb
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">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.</font>
+FCKeditorForProductDetails=WYSIWIG kreiranje/urejanje vrstic za podrobnosti za vse entitete (ponudbe, naročila, računi, itd...). <font class="warning">Opozorilo: Uporaba te opcije resnično ni priporočljiva, ker lahko povzroči težave s posebnimi znaki in formatiranjem strani PDF datotek.</font>
 FCKeditorForMailing= WYSIWIG kreiranje/urejanje pošte
 FCKeditorForUserSignature=WYSIWIG kreiranje/urejanje podpisa uporabnika
 FCKeditorForMail=WYSIWIG kreiranje/urejanje za vse pošte (razen Outils->eMailing)
@@ -1432,7 +1432,7 @@ OSCommerceTestKo2=Povezava s strežnikom '%s' uporabnika '%s' ni uspela.
 ##### Stock #####
 StockSetup=Nastavitve modula za skladišče
 UserWarehouse=Uporabi uporabnikova prilagojena skladišča
-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=Če uporabljate prodajni modul (privzeti POS modul ali drug zunanji modul), bo vaš Point Of Sale modul morda ignoriral to nastavitev. Večina prodajnih modulov privzeto takoj ustvari račun in zmanjša zalogo ne glede na opcijo, ki je tukaj izbrana. Če torej želite ali ne želite zmanjšati zalogo ob prodaji preko prodajnega modula, preverite tudi nastavitve vašega prodajnega modula.
 ##### Menu #####
 MenuDeleted=Izbrisan meni
 TreeMenu=Drevesni meniji
@@ -1558,7 +1558,7 @@ ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto?
 Opened=Odprt
 Closed=Zaključeno
 AlwaysEditable=Lahko je vedno urejeno
-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=Prisilni prikaz imena aplikacije (opozorilo: če tukaj nastavite vaše lastno ime, lahko prekinete funkcijo avtomatskega vnosa uporabniškega imena pri uporabi mobilne aplikacije DoliDroid)
 NbMajMin=Minimalno število velikih črk
 NbNumMin=Minimalno število cifer
 NbSpeMin=Minimalno število posebnih znakov
@@ -1568,4 +1568,4 @@ SalariesSetup=Nastavitev modula za plače
 SortOrder=Sortiraj naročilo
 Format=Format
 TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju
-IncludePath=Include path (defined into variable %s)
+IncludePath=Vključi pot (definirana v spremenljivki %s)

htdocs/langs/sl_SI/agenda.lang

@@ -58,7 +58,7 @@ OrderSentByEMail=Naročilo kupca %s poslano po elektronski pošti
 InvoiceSentByEMail=Račun kupcu %s poslan po elektronski pošti
 SupplierOrderSentByEMail=Naročilo dobavitelju %s poslano po elektronski pošti
 SupplierInvoiceSentByEMail=Račun odbavitelja %s poslan po elektronski pošti
-ShippingSentByEMail=Shipment %s sent by EMail
+ShippingSentByEMail=Odpremnica %s poslana po EMailu
 ShippingValidated= Pošiljka %s potrjena
 InterventionSentByEMail=Intervencija %s poslana po E-pošti
 NewCompanyToDolibarr= Kreiran partner
@@ -69,7 +69,7 @@ DateActionDoneEnd= Realen končni datum
 DateActionStart= Začetni datum
 DateActionEnd= Končni datum
 AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
+AgendaUrlOptions2=<b>login=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti v lasti uporabnika <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika <b>%s</b>.
 AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> za omejitev izhoda na aktivnosti povezane s projektom<b>PROJECT_ID</b>.

htdocs/langs/sl_SI/bills.lang

@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
 Bills=Računi
-BillsCustomers=Customers invoices
+BillsCustomers=Računi za kupce
-BillsCustomer=Customers invoice
+BillsCustomer=Račun za kupce
-BillsSuppliers=Suppliers invoices
+BillsSuppliers=Računi dobaviteljev
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomersUnpaid=Neplačani računi kupcev
 BillsCustomersUnpaidForCompany=Neplačani računi kupcev za %s
 BillsSuppliersUnpaid=Neplačani računi dobaviteljev
 BillsSuppliersUnpaidForCompany=Neplačani računi dobaviteljev za %s
 BillsLate=Zamujena plačila
-BillsStatistics=Customers invoices statistics
+BillsStatistics=Statistika računov za kupce
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatisticsSuppliers=Statistika računov dobaviteljev
 DisabledBecauseNotErasable=Onemogočen, ker ni možno brisanje
 InvoiceStandard=Standardni račun
 InvoiceStandardAsk=Standardni račun
@@ -348,7 +348,7 @@ ChequeNumber=Ček N°
 ChequeOrTransferNumber=Ček/Prenos N°
 ChequeMaker=Oddaja čeka
 ChequeBank=Banka izdajalka čeka
-CheckBank=Check
+CheckBank=Ček
 NetToBePaid=Neto za plačilo
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
@@ -389,7 +389,7 @@ DisabledBecausePayments=Ni možno zaradi nekaterih odprtih plačil
 CantRemovePaymentWithOneInvoicePaid=Brisanje plačila ni možno, ker je vsaj en račun označen kot plačan
 ExpectedToPay=Pričakovano plačilo
 PayedByThisPayment=Plačano s tem plačilom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Označi s "Plačano" vse standardne, situacijske ali nadomestne račune, ki so bili v celoti plačani.
 ClosePaidCreditNotesAutomatically=Označi s "Plačano" vse dobropise, ki so bili v celoti vrnjeni.
 AllCompletelyPayedInvoiceWillBeClosed=Vsi računi, ki nimajo neplačanih preostankov, bodo avtomatsko zaključeni v status "Plačano".
 ToMakePayment=Plačati
@@ -412,19 +412,19 @@ TypeContact_invoice_supplier_external_BILLING=Kontakt za račun dobavitelja
 TypeContact_invoice_supplier_external_SHIPPING=Kontakt za pošiljanje pri dobavitelju
 TypeContact_invoice_supplier_external_SERVICE=Kontakt za servis pri dobavitelju
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationAsk=Račun za prvo situacijo
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceFirstSituationDesc=<b>Situacijski računi</b> so vezani na situacijo glede na napredek, na primer na napredek gradnje. Vska situacija je povezana z računom.
-InvoiceSituation=Situation invoice
+InvoiceSituation=Situacijski račun
-InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationAsk=Račun, ki sledi situaciji
-InvoiceSituationDesc=Create a new situation following an already existing one
+InvoiceSituationDesc=Ustvari novo situacijo, ki sledi obstoječi
-SituationAmount=Situation invoice amount(net)
+SituationAmount=Vrednost računa za situacijo (neto)
-SituationDeduction=Situation subtraction
+SituationDeduction=Odštevanje situacije
-Progress=Progress
+Progress=Napredek
-ModifyAllLines=Modify all lines
+ModifyAllLines=Uredi vse vrstice
-CreateNextSituationInvoice=Create next situation
+CreateNextSituationInvoice=Ustvari naslednjo situacijo
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
+NotLastInCycle=Ta račun ni zadnji v ciklu in ga ne morete spremeniti.
-DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseNotLastInCycle=Naslednja situacija že obstaja.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseFinal=Ta situacija je končna.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+CantBeLessThanMinPercent=Napredek ne more biti manjši, kot je vrednost prejšnje situacije
-NoSituations=No opened situations
+NoSituations=Ni odprtih situacij
-InvoiceSituationLast=Final and general invoice
+InvoiceSituationLast=Končni in skupni račun

htdocs/langs/sl_SI/donations.lang

@@ -33,6 +33,6 @@ IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku
 MinimumAmount=Najmanjši znesek je %s
 FreeTextOnDonations=Poljubno besedilo v nogi
 FrenchOptions=Opcije za Francijo
-DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART200=Prikaži člen 200 iz CGI, če se vas tiče
-DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART238=Prikaži člen 238 iz CGI, če se vas tiče
-DONATION_ART885=Show article 885 from CGI if you are concerned
+DONATION_ART885=Prikaži člen 885 iz CGI, če se vas tiče

htdocs/langs/sl_SI/ecm.lang

@@ -43,8 +43,8 @@ ECMDocsByContracts=Dokumenti, povezani s pogodbami
 ECMDocsByInvoices=Dokumenti, povezani z računi za kupce
 ECMDocsByProducts=Dokumenti, povezani s proizvodi
 ECMDocsByProjects=Dokumenti, povezani s projekti
-ECMDocsByUsers=Documents linked to users
+ECMDocsByUsers=Dokumenti, povezani z uporabniki
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByInterventions=Dokumenti, povezani z intervencijami
 ECMNoDirectoryYet=Ni kreiranih map
 ShowECMSection=Prikaži mapo
 DeleteSection=Odstrani mapo

htdocs/langs/sl_SI/install.lang

@@ -155,7 +155,7 @@ MigrationFinished=Prenos končan
 LastStepDesc=<strong>Zadnji korak</strong>: Tukaj določite uporabniško ime in geslo, ki ju nameravate uporabiti za priklop v software. Ne izgubite ju, ker je to račun za administriranje vseh ostalih računov.
 ActivateModule=Vključite modul %s
 ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Pozor:\nAli ste najprej naredili varnostno kopijo baze podatkov ?\nTo je zelo priporočeno: na primer zaradi nekaterih hroščev v sistemu baze podatkov (na primer mysql verzija 5.5.40), lahko med tem postopkom izgubite nekatere podatke ali tabele, zato je priporočeno imeti celotno kopijo vaše baze podatkov pred začetkom migracije.\n\nKliknite OK za začetek procesa migracije...
 
 #########
 # upgrade
@@ -207,7 +207,7 @@ MigrationProjectTaskTime=Posodobitev porabljenega časa v sekundah
 MigrationActioncommElement=Posodobitev podatkov o aktivnostih
 MigrationPaymentMode=Podatki, migracije za način plačila
 MigrationCategorieAssociation=Migracija kategorij
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migracija dogodkov za dodajanje lastnika dogodka v dodelitveno tabelo
 
 ShowNotAvailableOptions=Prikaži opcije, ki niso na voljo
 HideNotAvailableOptions=Skrij opcije, ki niso na voljo

htdocs/langs/sl_SI/interventions.lang

@@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Ime in podpis serviserja :
 NameAndSignatureOfExternalContact=Ime in podpis kupca :
 DocumentModelStandard=Standardni vzorec dokumenta za intervencijo
 InterventionCardsAndInterventionLines=Intervencije in vrstice na intervenciji
-InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Označi kot "Zaračunano"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyUnBilled=Označi kot "Nezaračunano"
 StatusInterInvoiced=Zaračunano
 RelatedInterventions=Odvisne intervencije
 ShowIntervention=Prikaži intervencijo
@@ -34,8 +34,8 @@ SendInterventionByMail=Pošlji intervencijo po E-pošti
 InterventionCreatedInDolibarr=Intervencija %s je ustvarjena
 InterventionValidatedInDolibarr=Intervencija %s je potrjena
 InterventionModifiedInDolibarr=Intervencija %s je spremenjena
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedBilledInDolibarr=Intervencijo %s označi kot "zaračunana"
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionClassifiedUnbilledInDolibarr=Intervencijo %s označi kot "nezaračunana"
 InterventionSentByEMail=Intervencija %s je poslana po E-pošti
 InterventionDeletedInDolibarr=Intervencija %s je izbrisana
 SearchAnIntervention=Poišči intervencijo

htdocs/langs/sl_SI/main.lang

@@ -261,7 +261,7 @@ days=dni
 Hours=Ur
 Minutes=Minut
 Seconds=Sekund
-Weeks=Weeks
+Weeks=Tednov
 Today=Danes
 Yesterday=Včeraj
 Tomorrow=Jutri

htdocs/langs/sl_SI/orders.lang

@@ -16,20 +16,20 @@ SupplierOrder=Naročilo pri dobavitelju
 SuppliersOrders=Naročila pri dobaviteljih
 SuppliersOrdersRunning=Trenutna naročila pri dobaviteljih
 CustomerOrder=Naročilo kupca
-CustomersOrders=Customers orders
+CustomersOrders=Naročila kupcev
 CustomersOrdersRunning=Trenutna naročila kupcev
 CustomersOrdersAndOrdersLines=Naročila kupcev in vrstice naročil
-OrdersToValid=Customers orders to validate
+OrdersToValid=Naročila kupcev za potrditev
-OrdersToBill=Customers orders delivered
+OrdersToBill=Naročila kupcev za fakturiranje
-OrdersInProcess=Customers orders in process
+OrdersInProcess=Naročila kupcev v obdelavi
-OrdersToProcess=Customers orders to process
+OrdersToProcess=Naročila kupcev za obdelavo
 SuppliersOrdersToProcess=Naročila pri dobaviteljih za obdelavo
 StatusOrderCanceledShort=Preklicano
 StatusOrderDraftShort=Osnutek
 StatusOrderValidatedShort=Potrjeno
 StatusOrderSentShort=V postopku
 StatusOrderSent=Pošiljanje v teku
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Naročeno
 StatusOrderProcessedShort=Obdelano
 StatusOrderToBillShort=Za fakturiranje
 StatusOrderToBill2Short=Za fakturiranje
@@ -41,7 +41,7 @@ StatusOrderReceivedAllShort=Prejeto v celoti
 StatusOrderCanceled=Preklicano
 StatusOrderDraft=Osnutek (potrebno potrditi)
 StatusOrderValidated=Potrjeno
-StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcess=Naročeno - čaka na prevzem
 StatusOrderProcessed=Obdelano
 StatusOrderToBill=Za fakturiranje
 StatusOrderToBill2=Za fakturiranje
@@ -50,8 +50,8 @@ StatusOrderRefused=Zavrnjeno
 StatusOrderReceivedPartially=Delno prejeto
 StatusOrderReceivedAll=Prejeto v celoti
 ShippingExist=Pošiljka ne obstaja
-ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraft=Količina proizvoda v osnutkih naročil
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraftOrWaitingApproved=Količina proizvoda v osnutku ali odobrenem naročilu, ki še ni naročen
 DraftOrWaitingApproved=Osnutek ali odobritev, še ne naročen
 DraftOrWaitingShipped=Osnutek ali potrditev, še ne odposlan
 MenuOrdersToBill=Naročila za fakturiranje

htdocs/langs/sl_SI/other.lang

@@ -47,7 +47,7 @@ Notify_PROJECT_CREATE=Ustvarjanje projekta
 Notify_TASK_CREATE=Ustvarjena naloga
 Notify_TASK_MODIFY=Spremenjena naloga
 Notify_TASK_DELETE=Izbrisana naloga
-SeeModuleSetup=See module setup
+SeeModuleSetup=Glejte nastavitev modula
 NbOfAttachedFiles=Število pripetih datotek/dokumentov
 TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov
 MaxSize=Največja velikost
@@ -203,26 +203,26 @@ ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email
 
 ##### Calendar common #####
 AddCalendarEntry=Dodaj vnos v koledar %s
-NewCompanyToDolibarr=Company %s added
+NewCompanyToDolibarr=Podjetje %s dodano
-ContractValidatedInDolibarr=Contract %s validated
+ContractValidatedInDolibarr=Pogodba %s potrjena
-ContractCanceledInDolibarr=Contract %s canceled
+ContractCanceledInDolibarr=Pogodba %s preklicana
-ContractClosedInDolibarr=Contract %s closed
+ContractClosedInDolibarr=Pogodba %s zaključena
-PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedSignedInDolibarr=Ponudba %s podpisana
-PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalClosedRefusedInDolibarr=Ponudba %s zavrnjena
-PropalValidatedInDolibarr=Proposal %s validated
+PropalValidatedInDolibarr=Ponudba %s potrjena
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+PropalClassifiedBilledInDolibarr=Ponudba %s je označena kot "zaračunana"
-InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarr=Račun %s potrjen
-InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoicePaidInDolibarr=Račun %s spremenjen v 'plačano'
-InvoiceCanceledInDolibarr=Invoice %s canceled
+InvoiceCanceledInDolibarr=Račun %s preklican
-PaymentDoneInDolibarr=Payment %s done
+PaymentDoneInDolibarr=Plačilo %s izvršeno
-CustomerPaymentDoneInDolibarr=Customer payment %s done
+CustomerPaymentDoneInDolibarr=Plačilo kupca %s izvršeno
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
+SupplierPaymentDoneInDolibarr=Plačilo dobavitelju %s izvršeno
-MemberValidatedInDolibarr=Member %s validated
+MemberValidatedInDolibarr=Član %s potrjen
-MemberResiliatedInDolibarr=Member %s resiliated
+MemberResiliatedInDolibarr=Član %s obnovljen
-MemberDeletedInDolibarr=Member %s deleted
+MemberDeletedInDolibarr=Član %s izbrisan
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+MemberSubscriptionAddedInDolibarr=Naročnina za člana %s dodana
-ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentValidatedInDolibarr=Pošiljka %s potrjena
-ShipmentDeletedInDolibarr=Shipment %s deleted
+ShipmentDeletedInDolibarr=Pošiljka %s izbrisana
 ##### Export #####
 Export=Izvoz
 ExportsArea=Področje izvoza

htdocs/langs/sl_SI/paybox.lang

@@ -35,6 +35,6 @@ MessageKO=Sporočilo na strani za preklic plačila
 NewPayboxPaymentReceived=Novo Paybox plačilo prejeto
 NewPayboxPaymentFailed=Zavrnjen poskus novega Paybox plačila
 PAYBOX_PAYONLINE_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali zavrnjeno)
-PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_SITE=Vrednost za PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_RANG=Vrednost za PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_IDENTIFIANT=Vrednost za PBX ID

htdocs/langs/sl_SI/products.lang

@@ -22,16 +22,16 @@ ProductAccountancySellCode=Računovodski konto (prodaja)
 ProductOrService=Proizvod ali storitev
 ProductsAndServices=Proizvodi in storitve
 ProductsOrServices=Proizvodi ali storitve
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
+ProductsAndServicesOnSell=Proizvodi in storitve za prodajo ali nabavo
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Proizvodi in storitve, ki se ne prodajajo več
 ProductsAndServicesStatistics=Statistika proizvodov in storitev
 ProductsStatistics=Statistika proizvodov
-ProductsOnSell=Product for sale or for pruchase
+ProductsOnSell=Proizvodi za prodajo ali nabavo
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsNotOnSell=Proizvodi, ki se ne prodajajo ali nabavljajo več
-ProductsOnSellAndOnBuy=Products for sale and for purchase
+ProductsOnSellAndOnBuy=Proizvodi za prodajo ali nabavo
-ServicesOnSell=Services for sale or for purchase
+ServicesOnSell=Storitve za prodajo ali za nakup
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Storitve, ki se ne prodajajo več
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ServicesOnSellAndOnBuy=Storitve za prodajo ali za nabavo
 InternalRef=Interna referenca
 LastRecorded=Zadnji vneseni proizvodi/storitve za prodajo
 LastRecordedProductsAndServices=Zadnjih %s vnesenih proizvodov/storitev
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=Ta opcija omogoča ustvarjanje ali kloniranje storitve,
 CurrentProductPrice=Trenutna cena
 AlwaysUseNewPrice=Vedno uporabi trenutno ceno proizvoda/storitve
 AlwaysUseFixedPrice=Uporabi fiksno ceno
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Različne cene glede na količino
 PriceByQuantityRange=Območje količin
 ProductsDashboard=Povzetek proizvodov/storitev
 UpdateOriginalProductLabel=Spremeni originalni naziv
@@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ali vrednosti črtne
 BarCodeDataForProduct=Informacija o črtni kodi proizvoda %s :
 BarCodeDataForThirdparty=Informacija o črtni kodi partnerja %s :
 ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem boste tudi resetirali že določene vrednosti črtnih kod na novo vrednost)
-PriceByCustomer=Different price for each customer
+PriceByCustomer=Različne cene za vsakega kupca
 PriceCatalogue=Enolična cena po proizvodu/storitvi
-PricingRule=Rules for customer prices
+PricingRule=Pravila za cene za kupce
 AddCustomerPrice=Dodaj ceno po strankah
 ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
 PriceByCustomerLog=Cena po imenu stranke
@@ -244,9 +244,9 @@ MinimumPriceLimit=Minimalna cena ne more biti nižja od %s
 MinimumRecommendedPrice=Minimalna priporočena cena je : %s
 PriceExpressionEditor=Urejevalnik prikaza cene
 PriceExpressionSelected=Izbran prikaz cene
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp1="cena = 2 + 2" ali "2 + 2" za nastavitev cene. Uporabite ; za ločitev izrazov
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=Lahko dostopate do EkstraPolj s spremenljivkami kot <b>#options_myextrafieldkey#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so na voljo naslednje spremenljivke:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: <b>#supplier_min_price#</b><br>Samo za nabavne cene: <b>#supplier_quantity# in #supplier_tva_tx#</b>
 PriceMode=Način cene
 PriceNumeric=Številka

htdocs/langs/sl_SI/stocks.lang

@@ -47,9 +47,9 @@ PMPValue=Uravnotežena povprečna cena
 PMPValueShort=UPC
 EnhancedValueOfWarehouses=Vrednost skladišč
 UserWarehouseAutoCreate=Avtomatsko ustvari zalogo, ko kreirate uporabnika
-QtyDispatched=Prejeta količina
+QtyDispatched=Odposlana količina
-QtyDispatchedShort=Qty dispatched
+QtyDispatchedShort=Odposlana količina
-QtyToDispatchShort=Qty to dispatch
+QtyToDispatchShort=Količina za odpošiljanje
 OrderDispatch=Dobavljena naročila
 RuleForStockManagementDecrease=Pravilo za upravljanje zmanjšanja zalog
 RuleForStockManagementIncrease=Pravilo za upravljanje povečanja zalog
@@ -61,7 +61,7 @@ ReStockOnValidateOrder=Povečanje dejanske zaloge po potrditvi naročila (pozor,
 ReStockOnDispatchOrder=Povečanje dejanske zaloge po ročnem vnosu v skladišče, po prejemu naročila od dobavitelja
 ReStockOnDeleteInvoice=Povečaj dejansko zalogo ob brisanju računa
 OrderStatusNotReadyToDispatch=Naročilo še nima ali nima več statusa, ki omogoča odpremo proizvoda iz skladišča.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Razlaga razlike med knjižno in dejansko zalogo
 NoPredefinedProductToDispatch=Za ta objekt ni preddefiniranih proizvodov. Zato ni potrebna odprema iz skladišča.
 DispatchVerb=Odprema
 StockLimitShort=Omejitev za opozorilo
@@ -118,15 +118,15 @@ MassMovement=Masovni premik
 MassStockMovement=Masovni premik zaloge
 SelectProductInAndOutWareHouse=Izberi proizvod, količino, izvorno skladišče in ciljno skladišče, nato klikni "%s". Ko je to narejeno za vse zahtevane premike, klikni na "%s".
 RecordMovement=Zapis prenešen
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Prevzem tega naročila
 StockMovementRecorded=Zapisan premik zaloge
 RuleForStockAvailability=Pravila za zahtevane zaloge
 StockMustBeEnoughForInvoice=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na račun
 StockMustBeEnoughForOrder=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na naročilo
 StockMustBeEnoughForShipment= Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na odpremnico
-MovementLabel=Label of movement
+MovementLabel=Nalepka gibanja
-InventoryCode=Movement or inventory code
+InventoryCode=Koda gibanja ali zaloge
-IsInPackage=Contained into package
+IsInPackage=Vsebina paketa
-ShowWarehouse=Show warehouse
+ShowWarehouse=Prikaži skladišče
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Popravek količine zaloge za proizvod %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče

htdocs/langs/sl_SI/suppliers.lang

@@ -42,5 +42,5 @@ NoneOrBatchFileNeverRan=Nobena datoteka ali paket <b>%s</b> nedavno ni bila zagn
 SentToSuppliers=Pošlji dobaviteljem
 ListOfSupplierOrders=Seznam naročil dobaviitelja
 MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
-NbDaysToDelivery=Delivery delay in days
+NbDaysToDelivery=Zakasnitev dobave v dnevih
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=Največja zakasnitev je prikazana med seznami naročenih proizvodov

htdocs/langs/sl_SI/withdrawals.lang

@@ -79,7 +79,7 @@ CreditDate=Datum kredita
 WithdrawalFileNotCapable=Ni možno generirati datoteke za prejem nakazil za vašo državo %s (vaša država ni podprta)
 ShowWithdraw=Prikaži nakazilo
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo.
-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=Preko tega zavihka lahko zahtevate trajnik. Po zaključku lahko preko menija Banka->Nakazila upravljate trajnike. Ko je trajnik zaprt, se avtomatsko zapišejo plačila računa in račun se zapre, če ni preostanka za plačilo.
 WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano"

htdocs/langs/tr_TR/admin.lang

@@ -84,7 +84,7 @@ NextValueForReplacements=Sonraki değer (yenileme)
 MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %s ile sınırlandırır
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın)
-UseCaptchaCode=Kullanıcı girişi sayfasında grafiksel kod (CAPTCHA) kullan
+UseCaptchaCode=Oturum açma sayfasında grafiksel kod (CAPTCHA) kullan
 UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için anti-virüs kullan
 AntiVirusCommand= Antivirüs komutu tam yolu
 AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv için örnek: /usr/bin/clamscan
@@ -324,7 +324,7 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Tüm oyuncular ve kuruluşlarının tam listesi için wiki sayfalarına bir göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-DisableLinkToHelpCenter=Kullanıcı girişi sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelpCenter=oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Sol menüde "<b>%s Çevrimiçi yardım</b>" bağlantısını gizle
 AddCRIfTooLong=Otomatik kaydırma yoktur, yani belge üzerinde çok uzun olmasından dolayı satır sayfa sınırı dışına çıkmışsa metin alanında kendiniz satırbaşı yapmalısınız.
 ModuleDisabled=Modül devre dışı
@@ -895,7 +895,7 @@ DefaultSkin=Varsayılan dış görünüm teması
 MaxSizeList=Listenin ençok uzunluğu
 DefaultMaxSizeList=Liste için varsayılan ençok uzunluk
 MessageOfDay=Günün mesajı
-MessageLogin=Kullanıcı girişi sayfası mesajı
+MessageLogin=Oturum açma sayfası mesajı
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
@@ -998,7 +998,7 @@ BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
 BackupPHPWarning=Bu yöntemle yedekleme garanti edilmez. Öncekini yeğleyin
 RestoreDesc=Bir Dolibarr yedeklemesini geri yüklemek için şunları yapmalısınız:
 RestoreDesc2=Yeni Dolibarr kurulum dizini belgeleri dosyaların ağaç ayıklamak için veya bu belgeleri geçerli dizinle içine <b>(% s)</b> listesi arşiv dosyası belgeleri (örneğin zip dosyası) Restore. * Belge dizini arşiv dosyalarını yeni Dolibarr kurulumundaki ya da bu geçerli belge dizinindeki dizine ayıklamak için geri yükleyin(<b>%s</b>).
-RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir Kullanıcı girişi / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
+RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir kullanıcı adı/parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
 RestoreMySQL=MySQL içeaktar
 ForcedToByAModule= Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
 PreviousDumpFiles=Mevcut veritabanı yedekleme dosyaları dökümü
@@ -1014,13 +1014,13 @@ TranslationUncomplete=Kısmi çeviri
 SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilmiş ya da hatalar içeriyor olabilir. Bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Dikey menüyü gizlenebilir yap (javascript seçeneği devre dışı olmamalıdır)
 MAIN_DISABLE_METEO=Meteo görünümünü engelle
-TestLoginToAPI=API  kullanıcı girişi denemesi
+TestLoginToAPI=API  oturum açma denemesi
 ProxyDesc=Dolibarr’ın bazı özelliklerinin çalışması için internet erişimi olması gerekir. Bunun için burada parametreleri tanımlayın. Dolibarr sunucusu bir proxy sunucu arkasında ise, bu parametreler üzerinden Internet erişiminin nasıl olacağını Dolibarr’a söyler.
 ExternalAccess=Dış erişim
 MAIN_PROXY_USE=Bir proxy sunucusu kullan (aksi takdirde internete doğrudan erişin)
 MAIN_PROXY_HOST=Proxy sunucusu Adı/Adresi
 MAIN_PROXY_PORT=Proxy sunucusu portu
-MAIN_PROXY_USER=Proxy sunucusu kullanacak giriş
+MAIN_PROXY_USER=Proxy sunucusunu kulanmak için oturum açma
 MAIN_PROXY_PASS=Proxy sunucusunu kullanacak parola
 DefineHereComplementaryAttributes=Burada bütün öznitelikleri tanımlayın, yalnızca mevcut varsayılanları değil desteklenmenizi istediğiniz %s leri de.
 ExtraFields=Tamamlayıcı öznitelikler
@@ -1044,7 +1044,7 @@ PathToDocuments=Belgelerin yolu
 PathDirectory=Dizin
 SendmailOptionMayHurtBuggedMTA="PHP doğrudan posta" yöntemini kullanarak postalar gönderme özelliği bazı posta alıcısı sunucuları tarafından doğru olarak çözümlenemeyen bir posta iletisi oluşturur. Sonuç ise bazı postaların hatalı platformlar tarafından barındırılan kişiler tarafından okunamaz olmasıdır. Bu durum bazı İnternet sağlayıcılarına özgüdür (Örn: Fransa’daki Orange gibi). Bu Dolibarr ya da PHP için bir sorun değildir ama alıcı posta sunucusu için sorundur. Ancak Dolibarr’ı bundan korumak için Kurulum->Diğer de MAIN_FIX_FOR_BUGGED_MTA yı 1 yapma seçeneğini ekleyebilirsiniz. Ancak SMTP standartlarına sıkıca uyan diğer servislerde sorunla karşılaşabilirsiniz. Diğer bir çözüm (önerilen) ise hiçbir sakıncası olmayan "SMTP soket kütüphanesi" ni kullanmaktır.
 TranslationSetup=Çeviri yapılandırması
-TranslationDesc=Ekran görüntüsündeki dil değiştirilebilir:<br>* Genel olarak bu menüden <strong>Giriş - Kurulum - Görünüm</strong><br>* Yalnızca <strong>User display</strong> sekmesindeki kullanıcı formundan (ekranın tepesindeki girişe tıklayın).
+TranslationDesc=Ekran görüntüsündeki dil değiştirilebilir:<br>* Genel olarak bu menüden <strong>Giriş - Kurulum - Görünüm</strong><br>* Yalnızca <strong>User display</strong> sekmesindeki kullanıcı formundan (ekranın tepesindeki oturum aça tıklayın).
 TotalNumberOfActivatedModules=Toplam etkin özel modül sayısı: <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
@@ -1076,7 +1076,7 @@ GeneratePassword=Oluşturulmuş bir şifre önerin
 RuleForGeneratedPasswords=Önerilen parola oluşturmak ya da parola doğrulamak için kural
 DoNotSuggest=Herhangi bir parola önermeyin
 EncryptedPasswordInDatabase=Veritabanındaki parolanın şifrelendirilmesine izin vermek için
-DisableForgetPasswordLinkOnLogonPage=Kullanıcı girişi sayfasında “Parola unutuldu” bağlantısını gösterme
+DisableForgetPasswordLinkOnLogonPage=Oturum açma sayfasında “Parola unutuldu” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta
 ##### Company setup #####
@@ -1183,7 +1183,7 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo
 MembersSetup=Üye modülü kurulumu
 MemberMainOptions=Ana seçenekler
 AddSubscriptionIntoAccount=Yeni bir ödentili abonelik eklerken, banka modülünde varsayılan olarak bir banka işlemi öner
-AdherentLoginRequired= Her üye için bir Kullanıcı girişi yönetin
+AdherentLoginRequired= Her üye için bir Kullanıcı adı yürütün
 AdherentMailRequired=Yeni üye oluşturmak için E-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 ##### LDAP setup #####
@@ -1263,11 +1263,11 @@ LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış
 LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
 LDAPLdapMapping=LDAP Eşleme
-LDAPFieldLoginUnix=Kullanıcı girişi (Unix)
+LDAPFieldLoginUnix=Oturum açma (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Örnek: &(objectClass = InetOrgPerson)
-LDAPFieldLoginSamba=Kullanıcı girişi (samba, activedirectory)
+LDAPFieldLoginSamba=Oturum açma (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: sAMAccountName
 LDAPFieldFullname=İlk Adı
 LDAPFieldFullnameExample=Örnek: cn

htdocs/langs/tr_TR/agenda.lang

@@ -69,7 +69,7 @@ DateActionDoneEnd= Gerçek bitiş tarihi
 DateActionStart= Başlama tarihi
 DateActionEnd= Bitiş tarihi
 AgendaUrlOptions1=Süzgeç çıktısına ayrıca aşağıdaki parametreleri ekleyebilirsiniz:
-AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>kullanıcı girişi=%s</b> sınırlayacak kullanıcı <b>%s</b>.
+AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>oturum açma=%s</b> sınırlayacak kullanıcı <b>%s</b>.
 AgendaUrlOptions3=<b>kullanıcı girişi=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
 AgendaUrlOptions4=Çıktıyı kullanıcı <b>%s</b> tarafından etkilenen etkinliklerle sınırlamak için<b>logint=%s</b>.
 AgendaUrlOptionsProject=<b>proje=PROJECT_ID</b>, bu <b>PROJECT_ID</b> projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir.

htdocs/langs/tr_TR/companies.lang

@@ -365,7 +365,7 @@ NoParentCompany=Hiçbiri
 ExportImport=İçeaktar-Dışaaktar
 ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
-DolibarrLogin=Dolibarr kullanıcı girişi
+DolibarrLogin=Dolibarr oturumu açma
 NoDolibarrAccess=Dolibarr erişimi yok
 ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri

htdocs/langs/tr_TR/errors.lang

@@ -101,18 +101,18 @@ ErrorFailedToSendPassword=Parola gönderilemedi
 ErrorFailedToLoadRSSFile=RSS beslemesi alınamıyor. Eğer hata mesajları yeterli bilgi sağlamıyorsa MAIN_SIMPLEXMLLOAD_DEBUG değişmezini eklemeyi deneyin.
 ErrorPasswordDiffers=Parolalar farklıdır, bunları tekrar yazın lütfen.
 ErrorForbidden=Erişim engellendi.<br>Kimlik doğrulama sı gerektiren ya da kullanıcınızın izni olmayan bir sayfa, alan veya özelliğe erişmeye çalışın.
-ErrorForbidden2=Bu giriş için izin Dolibarr yöneticiniz tarafından %s->%s menüsünden tanımlanabilir.
+ErrorForbidden2=Bu oturum açma için izin Dolibarr yöneticiniz tarafından %s->%s menüsünden tanımlanabilir.
 ErrorForbidden3=Dolibarr bir kimlik doğrulama oturumu üzerinden kullanılmamış gibi görünüyor. Kimlik doğrulama nasıl yönetileceğini öğrenmek Dolibarr kurulum belgelerine bir göz atın (htaccess, mod_auth veya diğer ...).
 ErrorNoImagickReadimage=Bu PHP Class Imagick yok. Önizleme kullanılır olmayabilir. Yöneticiler Kurulum - Görünüm menüsünde bu sekmeyi devre dışı bırakabilir.
 ErrorRecordAlreadyExists=Kayıt zaten var
 ErrorCantReadFile=Dosya '%s' okunamadı
 ErrorCantReadDir=Dizin '%s' okunamadı
 ErrorFailedToFindEntity=Ortam '%s' okunamadı
-ErrorBadLoginPassword=Kullanıcı veya parola için hatalı değer
+ErrorBadLoginPassword=Kullanıcı adı veya parola için hatalı değer
 ErrorLoginDisabled=Hesabınız engellendi
 ErrorFailedToRunExternalCommand=Dış komut çalıştırılamıyor. PHP sunucunuz tarafından kullanılabilir ve çalıştırılabilir olup olmadığını kontrol edin. PHP <b>Güvenli Mod</b> etkinse, komutun <b>safe_mode_exec_dir</b> parametresiyle tanımlanmış bir dizin içinde olup olmadığını kontrol edin.
 ErrorFailedToChangePassword=Parola değiştirilemedi
-ErrorLoginDoesNotExists=<b>%s</b> girişli kullanıcı bulunamadı.
+ErrorLoginDoesNotExists=<b>%s</b> kullanıcı adlı kullanıcı bulunamadı.
 ErrorLoginHasNoEmail=Bu kullanıcının e-posta adresi yoktur. İşlem iptal edildi.
 ErrorBadValueForCode=Güvenlik kodu için hatalı değer. Yeni değer ile tekrar deneyin...
 ErrorBothFieldCantBeNegative=%s ve %s alanlarının ikisi birden eksi olamaz
@@ -159,7 +159,7 @@ ErrorPriceExpression22=Eksi sonuç '%s'
 ErrorPriceExpressionInternal=İç hata '%s'
 ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri bilgisi gerektiren ürün için parti/seri bilgisi olmadan stok hareketi yapılmaya çalışılıyor.
 
 # Warnings
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış

htdocs/langs/tr_TR/ftp.lang

@@ -6,7 +6,7 @@ FTPAreaDesc=Bu ekranda bir FTP sunucusu görünümünün içeriği gösterilir
 SetupOfFTPClientModuleNotComplete=FTP istemcisi modülünün kurulumu tamamlanmaış gibi görünüyor
 FTPFeatureNotSupportedByYourPHP=PHP niz FTP fonksiyonlarını desteklemiyor
 FailedToConnectToFTPServer=FTP sunucusuna bağlanamadı (sunucu %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Tanımlı kullanıcı/parola ile FTP sunucusuna bağlanılamadı
+FailedToConnectToFTPServerWithCredentials=Tanımlı kullanıcı/parola ile FTP sunucusunda oturum açılamadı
 FTPFailedToRemoveFile=<b>%s</b> Dosyası kaldırılamadı.
 FTPFailedToRemoveDir=<b>%s</b> Dizini kaldırılamadı (İzinleri o dizinin boş olduğunu denetleyin).
 FTPPassiveMode=Pasif mod

htdocs/langs/tr_TR/install.lang

@@ -53,8 +53,8 @@ ServerPortDescription=Veritabanı sunucusu bağlantı noktası. Eğer bilinmiyor
 DatabaseServer=Veritabanı sunucusu
 DatabaseName=Veritabanı adı
 DatabasePrefix=Veritabanı tablo öneki
-Login=Giriş
+Login=Oturum açma
-AdminLogin=Dolibarr veritabanı sahibi girişi.
+AdminLogin=Dolibarr veritabanı oturum açma.
 Password=Parola
 PasswordAgain=Parolayı ikinci kez yeniden yaz
 AdminPassword=Dolibarr veritabanı sahibi parolası.

htdocs/langs/tr_TR/main.lang

@@ -436,7 +436,7 @@ Late=Son
 Photo=Resim
 Photos=Resimler
 AddPhoto=Resim ekle
-Login=Kullanıcı
+Login=Oturum açma
 CurrentLogin=Geçerli kullanıcı
 January=Ocak
 February=Şubat

htdocs/langs/tr_TR/orders.lang

@@ -50,8 +50,8 @@ StatusOrderRefused=Reddedildi
 StatusOrderReceivedPartially=Kısmen alındı
 StatusOrderReceivedAll=Her şey kabul edildi
 ShippingExist=Bir sevkiyat var
-ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraft=Taslak siparişlerdeki ürün miktarı
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraftOrWaitingApproved=Henüz sipariş edilmemiş, taslak veya onaylı siparişlerdeki ürün miktarı
 DraftOrWaitingApproved=Taslak veya onaylanmış henüz sipariş verilmemiş
 DraftOrWaitingShipped=Taslak veya onaylanmış henüz sevkedilmemiş
 MenuOrdersToBill=Teslim edilen siparişler

htdocs/langs/tr_TR/other.lang

@@ -146,7 +146,7 @@ SizeUnitfoot=foot
 SizeUnitpoint=nokta
 BugTracker=Hata izleyici
 SendNewPasswordDesc=Bu form yeni bir parola istemenizi sağlar. Sizin eposta adresinize gönderilecektir.<br>Bu eposta adresindeki onaylama bağlantısına tıkladıktan sonra değişiklik etkili olacaktır.<br>Eposta okuyucu yazılımını kontrol edin.
-BackToLoginPage=Giriş sayfasına geri dön
+BackToLoginPage=Oturum açma sayfasına geri dön
 AuthenticationDoesNotAllowSendNewPassword=Kimlik doğrulama modu <b>%s</b>.<br>bu modda, Dolibarr parolanızı bilemez ve değiştiremez.<br>Parola değiştirmek istiyorsanız sistem yöneticinize danışın.
 EnableGDLibraryDesc=Bu seçeneği kullanmak için PHP nizle GD kütüphanesini kurun ya da etkinleştirin.
 EnablePhpAVModuleDesc=Ant-virüs yazılımınızla uyumlu bir modül kurmalısınız. (Clamav : php4-clamavlib ya da php5-clamavlib)
@@ -195,8 +195,8 @@ CancelUpload=Yüklemeyi iptal et
 FileIsTooBig=Dosyalar çok büyük
 PleaseBePatient=Lütfen sabırlı olun...
 RequestToResetPasswordReceived=Dolibarr parolanızı değiştirmek için bir istek alınmıştır
-NewKeyIs=Bu giriş için yeni anahtarınızdır
+NewKeyIs=Oturum açmak için yeni anahtarınız
-NewKeyWillBe=Yazılıma giriş için yeni anahtarınız bu olacaktır
+NewKeyWillBe=Yazılımda oturum açmak için yeni anahtarınız bu olacaktır
 ClickHereToGoTo=%s e gitmek için buraya tıkla
 YouMustClickToChange=Ancak önce bu şifre değiştirmeyi doğrulamak için aşağıdaki linke tıklamanız gerekir
 ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu epostayı unutun. Kimlik bilgilerinizi güvenli tutulur.

htdocs/langs/tr_TR/printipp.lang

@@ -4,7 +4,7 @@ PrintIPPDesc=Bu modül belgeleri doğrudan yazıcıya gönderecek bir Yazdır d
 PRINTIPP_ENABLED=Belge listelerinde "Doğrudan yazdır" simgesini göster
 PRINTIPP_HOST=Yazıcı sunucusu
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Kullanıcı girişi
+PRINTIPP_USER=Oturum açma
 PRINTIPP_PASSWORD=Parola
 NoPrinterFound=Hiç yazıcı bulunamadı (CUPS ayarlarınızı denetleyin)
 FileWasSentToPrinter=%s Dosyası yazıcıya gönderildi

htdocs/langs/tr_TR/productbatch.lang

@@ -18,4 +18,4 @@ printQty=Mik: %d
 AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
 BatchDefaultNumber=Tanımlanmamış
 WhenProductBatchModuleOnOptionAreForced=Parti/Seri devredeyken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi yapılandırılabilir.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmaz

htdocs/langs/tr_TR/projects.lang

@@ -3,7 +3,7 @@ RefProject=Referans Proje
 ProjectId=Proje Kimliği
 Project=Proje
 Projects=Projeler
-ProjectStatus=Project status
+ProjectStatus=Proje durumu
 SharedProject=Herkes
 PrivateProject=Proje ilgilileri
 MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun).
@@ -103,7 +103,7 @@ CloneContacts=Kişi klonla
 CloneNotes=Not klonla
 CloneProjectFiles=Birleşik proje dosyalarını kopyala
 CloneTaskFiles=Birleşik görev(ler) dosyalarını kopyala (görev(ler) kopyalanmışsa)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Proje/görev tarihleri şu andan itibaren güncellensin mi?
 ConfirmCloneProject=Bu projeyi klonlamak istediğinizden emin misiniz?
 ProjectReportDate=Görevi proje başlama tarihine göre değiştir
 ErrorShiftTaskDate=Görev tarihini yeni proje başlama tarihine göre kaydırmak olası değil

htdocs/langs/tr_TR/sendings.lang

@@ -4,7 +4,7 @@ Sending=Sevkiyat
 Sendings=Sevkiyatlar
 Shipment=Sevkiyat
 Shipments=Sevkiyatlar
-ShowSending=Show Sending
+ShowSending=Gönderimi göster
 Receivings=Kabuller
 SendingsArea=Sevkiyat alanı
 ListOfSendings=Sevkiyat listesi
@@ -64,10 +64,10 @@ ShipmentLine=Sevkiyat kalemi
 CarrierList=Taşımacı listesi
 SendingRunning=Sipariş edilmiş müşteri sparişindeki ürün
 SuppliersReceiptRunning=Sipariş edilmiş tedarikçi sparişindeki ürün
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
+ProductQtyInCustomersOrdersRunning=Açık müşteri siparişlerindeki ürün miktarı
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ProductQtyInSuppliersOrdersRunning=Açık tedarikçi siparişlerindeki ürün miktarı
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Açık müşteri siparişlerindeki halihazırda gönderilmiş ürün miktarı
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=Açık tedarikçi siparişlerindeki halihazırda teslim alınmış ürün miktarı
 
 # Sending methods
 SendingMethodCATCH=Müşteri tarafından

htdocs/langs/tr_TR/stocks.lang

@@ -48,8 +48,8 @@ PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur
 QtyDispatched=Sevkedilen miktar
-QtyDispatchedShort=Qty dispatched
+QtyDispatchedShort=Dağıtılan mik
-QtyToDispatchShort=Qty to dispatch
+QtyToDispatchShort=Dağıtılacak mik
 OrderDispatch=Stok sevkiyatı
 RuleForStockManagementDecrease=Stok azaltma yönetimi kuralı
 RuleForStockManagementIncrease=Stok arttırma yönetimi kuralı
@@ -124,9 +124,9 @@ RuleForStockAvailability=Stok gereksinimi kuralları
 StockMustBeEnoughForInvoice=Faturaya ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
 StockMustBeEnoughForOrder=Siparişe ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
 StockMustBeEnoughForShipment= Sevkiyata ürün/hizmet eklemek için stok düzeyi yeterli olmalıdır
-MovementLabel=Label of movement
+MovementLabel=Hareket etiketi
-InventoryCode=Movement or inventory code
+InventoryCode=Hareket veya stok kodu
-IsInPackage=Contained into package
+IsInPackage=Pakette içerilir
-ShowWarehouse=Show warehouse
+ShowWarehouse=Depo göster
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementTransferStock=%s ürününün başka bir depoya stok aktarılması

htdocs/langs/tr_TR/suppliers.lang

@@ -42,5 +42,5 @@ NoneOrBatchFileNeverRan=Hiçbiri veya toplu <b>%s</b> yürütülmedi
 SentToSuppliers=Tedarikçilere gönderilen
 ListOfSupplierOrders=Tedarikçi siparişleri listesi
 MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
-NbDaysToDelivery=Delivery delay in days
+NbDaysToDelivery=Gün olarak teslim süresi
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=Sipariş ürün listesindeki en uzun teslim süresi

htdocs/langs/tr_TR/users.lang

@@ -38,7 +38,7 @@ NewUser=Yeni kullanıcı
 CreateUser=Kullanıcı oluştur
 SearchAGroup=Bir grup ara
 SearchAUser=Bir kullanıcı ara
-LoginNotDefined=Giriş tanımlı değil.
+LoginNotDefined=Kullanıcı adı tanımlı değil.
 NameNotDefined=Ad tanımlı değil.
 ListOfUsers=Kullanıcı listesi
 Administrator=Yönetici
@@ -69,7 +69,7 @@ ListOfUsersInGroup=Bu gruptaki kullanıcıların listesi
 ListOfGroupsForUser=Bu kullanıcının gruplarının listesi
 UsersToAdd=Bu gruba eklenecek kullanıcılar
 GroupsToAdd=Bu kullanıcıya eklenecek gruplar
-NoLogin=Giriş yok
+NoLogin=Oturum açılmaz
 LinkToCompanyContact=Üçüncü Partiye/kişiye bağlantı
 LinkedToDolibarrMember=Üye bağlantısı
 LinkedToDolibarrUser=Dolibarr kullanıcısı bağlantısı
@@ -107,7 +107,7 @@ GroupDeleted=Grubu %s kaldırıldı
 ConfirmCreateContact=Bu kişi için bir Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
 ConfirmCreateLogin=Bu üye için Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
 ConfirmCreateThirdParty=Bu üye için bir üçüncü parti oluşturmak istediğinizden emin misiniz?
-LoginToCreate=Oluşturulacak giriş
+LoginToCreate=Oluşturulacak kullanıcı adı
 NameToCreate=Oluşturulacak Üçüncü Parti Adı
 YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
@@ -117,6 +117,6 @@ HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni görünümü
 UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Giriş için OpenID kullan
+LoginUsingOpenID=Oturum açmak için OpenID kullan
 WeeklyHours=Haftalık saatler
 ColorUser=Kullanıcı rengi

htdocs/margin/tabs/thirdpartyMargins.php

@@ -103,146 +103,146 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-		// Total Margin
+    // Total Margin
-		print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+    print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-		print '<span id="totalMargin"></span>'; // set by jquery (see below)
+    print '<span id="totalMargin"></span>'; // set by jquery (see below)
-		print '</td></tr>';
+    print '</td></tr>';
 
-		// Margin Rate
+    // Margin Rate
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+    	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
-			print '<span id="marginRate"></span>'; // set by jquery (see below)
+    	print '<span id="marginRate"></span>'; // set by jquery (see below)
-			print '</td></tr>';
+    	print '</td></tr>';
-		}
+    }
 
-		// Mark Rate
+    // Mark Rate
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+    	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
-			print '<span id="markRate"></span>'; // set by jquery (see below)
+    	print '<span id="markRate"></span>'; // set by jquery (see below)
-			print '</td></tr>';
+    	print '</td></tr>';
-		}
+    }
 
-		print "</table>";
+    print "</table>";
-		print '</div>';
+    print '</div>';
 
 
-		$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+    $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
-		$sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
+    $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
-		$sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+    $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-		$sql.= " sum(d.total_ht) as selling_price,";						// may be negative or positive
+    $sql.= " sum(d.total_ht) as selling_price,";						// may be negative or positive
-		$sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";				// always positive
+    $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";				// always positive
-        $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge";	// always positive
+    $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge";	// always positive
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= ", ".MAIN_DB_PREFIX."facture as f";
+    $sql.= ", ".MAIN_DB_PREFIX."facture as f";
-		$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
+    $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-		$sql.= " WHERE f.fk_soc = s.rowid";
+    $sql.= " WHERE f.fk_soc = s.rowid";
-		$sql.= " AND f.fk_statut > 0";
+    $sql.= " AND f.fk_statut > 0";
-		$sql.= " AND s.entity = ".$conf->entity;
+    $sql.= " AND s.entity = ".$conf->entity;
-		$sql.= " AND d.fk_facture = f.rowid";
+    $sql.= " AND d.fk_facture = f.rowid";
-		$sql.= " AND f.fk_soc = $socid";
+    $sql.= " AND f.fk_soc = $socid";
-		$sql.= " AND d.buy_price_ht IS NOT NULL";
+    $sql.= " AND d.buy_price_ht IS NOT NULL";
-		if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-		$sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
+    $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
-		$sql.= $db->order($sortfield,$sortorder);
+    $sql.= $db->order($sortfield,$sortorder);
-		// TODO: calculate total to display then restore pagination
+    // TODO: calculate total to display then restore pagination
-		//$sql.= $db->plimit($conf->liste_limit +1, $offset);
+    //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-		dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
+    dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
-		$result = $db->query($sql);
+    $result = $db->query($sql);
-		if ($result)
+    if ($result)
-		{
+    {
-			$num = $db->num_rows($result);
+    	$num = $db->num_rows($result);
 
-			print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$societe->id,$sortfield,$sortorder,'',0,0,'');
+    	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$societe->id,$sortfield,$sortorder,'',0,0,'');
 
-			$i = 0;
+    	$i = 0;
-			print "<table class=\"noborder\" width=\"100%\">";
+    	print "<table class=\"noborder\" width=\"100%\">";
 
-			print '<tr class="liste_titre">';
+    	print '<tr class="liste_titre">';
-			print_liste_field_titre($langs->trans("Invoice"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("Invoice"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Margin"),$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("Margin"),$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print_liste_field_titre($langs->trans("MarginRate"),$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    		print_liste_field_titre($langs->trans("MarginRate"),$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
+    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print_liste_field_titre($langs->trans("MarkRate"),$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    		print_liste_field_titre($langs->trans("MarkRate"),$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-			print "</tr>\n";
+    	print "</tr>\n";
 
-			$cumul_achat = 0;
+    	$cumul_achat = 0;
-			$cumul_vente = 0;
+    	$cumul_vente = 0;
 
-			$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+    	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
 
-			if ($num > 0)
+    	if ($num > 0)
-			{
+    	{
-				$var=True;
+    		$var=True;
-				while ($i < $num /*&& $i < $conf->liste_limit*/)
+    		while ($i < $num /*&& $i < $conf->liste_limit*/)
-				{
+    		{
-					$objp = $db->fetch_object($result);
+    			$objp = $db->fetch_object($result);
 
-					$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+    			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-					$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
+    			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
-					$var=!$var;
+    			$var=!$var;
 
-					print "<tr ".$bc[$var].">";
+    			print "<tr ".$bc[$var].">";
-					print '<td>';
+    			print '<td>';
-					$invoicestatic->id=$objp->facid;
+    			$invoicestatic->id=$objp->facid;
-					$invoicestatic->ref=$objp->facnumber;
+    			$invoicestatic->ref=$objp->facnumber;
-					print $invoicestatic->getNomUrl(1);
+    			print $invoicestatic->getNomUrl(1);
-					print "</td>\n";
+    			print "</td>\n";
-					print "<td align=\"center\">";
+    			print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+    			print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-					print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
+    			print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+    			print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
+    			print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+    			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-						print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARK_RATES))
+    			if (! empty($conf->global->DISPLAY_MARK_RATES))
-						print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+    			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
-					print "</tr>\n";
+    			print "</tr>\n";
-					$i++;
+    			$i++;
-					$cumul_achat += $objp->buying_price;
+    			$cumul_achat += $objp->buying_price;
-					$cumul_vente += $objp->selling_price;
+    			$cumul_vente += $objp->selling_price;
-				}
+    		}
-			}
+    	}
 
-			// affichage totaux marges
+    	// affichage totaux marges
-			$var=!$var;
+    	$var=!$var;
-			$totalMargin = $cumul_vente - $cumul_achat;
+    	$totalMargin = $cumul_vente - $cumul_achat;
-			if ($totalMargin < 0)
+    	if ($totalMargin < 0)
-			{
+    	{
-				$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+    		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
-				$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
+    		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-			}
+    	}
-			else
+    	else
-			{
+    	{
-				$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+    		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-				$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+    		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-			}
+    	}
-			print '<tr class="liste_total">';
+    	print '<tr class="liste_total">';
-			print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
+    	print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
-			print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
+    	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
+    	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
+    	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
+    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-			print '<td align="right">&nbsp;</td>';
+    	print '<td align="right">&nbsp;</td>';
-			print "</tr>\n";
+    	print "</tr>\n";
-		}
+    }
-		else
+    else
-		{
+    {
-			dol_print_error($db);
+    	dol_print_error($db);
-		}
+    }
-		print "</table>";
+    print "</table>";
-		print '<br>';
+    print '<br>';
-		$db->free($result);
+    $db->free($result);
 }
 else
 {

htdocs/projet/activity/list.php

@@ -125,7 +125,8 @@ if ($id)
     $project->fetch_thirdparty();
 }
 
-$tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0);    // We want to see all task of project i am allowed to see, not only mine. Later only mine will be editable later.
+$onlyopened=1;	// or -1
+$tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0,'',$onlyopened);    // We want to see all task of opened project i am allowed to see, not only mine. Later only mine will be editable later.
 $projectsrole=$taskstatic->getUserRolesForProjectsOrTasks($user,0,($project->id?$project->id:$projectsListId),0);
 $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$project->id:$projectsListId),0);
 //var_dump($tasksarray);
@@ -138,11 +139,11 @@ llxHeader("",$title,"");
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
 // Show description of content
-if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
+if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'<br><br>';
 else
 {
-	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
+	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'<br><br>';
-	else print $langs->trans("ProjectsPublicTakDesc").'<br><br>';
+	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'<br><br>';
 }
 
 

htdocs/projet/class/project.class.php

@@ -58,7 +58,7 @@ class Project extends CommonObject
     var $budget_amount;
 
     var $statuts_short;
-    var $statuts;
+    var $statuts;			// 0=draft, 1=opened, 2=closed
 
     var $oldcopy;
 

htdocs/projet/element.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  *
@@ -60,7 +60,7 @@ $dates=dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('
 $datee=dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
 if (empty($dates) && ! empty($datesrfc)) $dates=dol_stringtotime($datesrfc);
 if (empty($datee) && ! empty($dateerfc)) $datee=dol_stringtotime($dateerfc);
-if (! isset($_POST['datesrfc']) && ! isset($_POST['datesday']))
+if (! isset($_POST['datesrfc']) && ! isset($_POST['datesday']) && ! empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR))
 {
 	$new=dol_now();
 	$tmp=dol_getdate($new);

htdocs/user/card.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
@@ -213,25 +213,25 @@ if ($action == 'add' && $canadduser)
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
         // If multicompany is off, admin users must all be on entity 0.
+        $entity=GETPOST('entity','int');
         if (! empty($conf->multicompany->enabled))
         {
-        	$entity=GETPOST('entity','int');
         	if (! empty($_POST["superadmin"]))
         	{
         		$object->entity = 0;
         	}
         	else if ($conf->multicompany->transverse_mode)
         	{
-        		$object->entity = 1; // all users in master entity
+        		$object->entity = 1; // all users are forced into master entity
         	}
         	else
         	{
-        		$object->entity = (empty($entity) ? 0 : $entity);
+        		$object->entity = ($entity == '' ? 1 : $entity);
         	}
         }
         else
         {
-        	$object->entity = (empty($entity) ? 0 : $entity);
+        	$object->entity = ($entity == '' ? 1 : $entity);
         }
 
         $db->begin();

test/phpunit/AllTests.php

@@ -152,6 +152,9 @@ class AllTests
         $suite->addTestSuite('BankAccountTest');
         require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
         $suite->addTestSuite('CompanyBankAccountTest');
+        require_once dirname(__FILE__).'/BonPrelevementTest.php';
+        $suite->addTestSuite('BonPrelevementTest');
+
         require_once dirname(__FILE__).'/ChargeSocialesTest.php';
         $suite->addTestSuite('ChargeSocialesTest');
         require_once dirname(__FILE__).'/HolidayTest.php';

test/phpunit/BankAccountTest.php

@@ -17,8 +17,8 @@
  */
 
 /**
- *      \file       test/phpunit/ContratTest.php
+ *      \file       test/phpunit/BankAccounrTest.php
- *      \ingroup    test
+ *		\ingroup    test
  *      \brief      PHPUnit test
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */

test/phpunit/BonPrelevementTest.php

@@ -0,0 +1,182 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/BonPrelevementTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/compta/prelevement/class/bonprelevement.class.php';
+
+if (empty($user->id))
+{
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+$langs->load("main");
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class BonPrelevementTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return BankAccountTest
+	 */
+	function __construct()
+	{
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	// Static methods
+  	public static function setUpBeforeClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+    	print __METHOD__."\n";
+    }
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function setUp()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testBonPrevelementCreate
+     *
+     * @return	int
+     */
+    public function testBonPrelevementCreate()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		// TODO
+		// Create invoice
+
+
+		// Create payment with mode withdraw
+
+
+		// Ask withdraw request
+
+
+		// Create withdraw record and generate SEPA file
+		$localobject=new BonPrelevement($this->savdb);
+    	//$localobject->date_solde=dol_now();
+    	$result=$localobject->Create(0,0,'simu');
+
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals($result, 0);
+
+    	// Test SEPA file
+
+
+    	return $result;
+    }
+
+    /**
+     * testBonPrelevementDelete
+     *
+     * @param	int		$id		Id of contract
+     * @return	int
+     *
+     * @depends	testBonPrelevementOther
+     * The depends says test is run only if previous is ok
+     */
+/*    public function testBonPrelevementDelete($id)
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new BonPrelevement($this->savdb);
+    	$result=$localobject->fetch($id);
+		$result=$localobject->delete($id);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
+    	return $result;
+    }
+*/
+
+}

test/phpunit/FunctionsLibTest.php

@@ -130,22 +130,37 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $tmp=getBrowserInfo();
         $this->assertEquals('ie',$tmp['browsername']);
         $this->assertEquals('5.0',$tmp['browserversion']);
+
         $_SERVER['HTTP_USER_AGENT']='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';    // Firefox 0.9.1
         $tmp=getBrowserInfo();
         $this->assertEquals('firefox',$tmp['browsername']);
         $this->assertEquals('0.9.1',$tmp['browserversion']);
+
+        $_SERVER['HTTP_USER_AGENT']='Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)';		// IE 10
+        $tmp=getBrowserInfo();
+        $this->assertEquals('ie',$tmp['browsername']);
+        $this->assertEquals('10.0',$tmp['browserversion']);
+
+        $_SERVER['HTTP_USER_AGENT']='Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';		// IE 11
+        $tmp=getBrowserInfo();
+        $this->assertEquals('ie',$tmp['browsername']);
+        $this->assertEquals('11.0',$tmp['browserversion']);
+
         $_SERVER['HTTP_USER_AGENT']='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
         $tmp=getBrowserInfo();
         $this->assertEquals('opera',$tmp['browsername']);
         $this->assertEquals('6.03',$tmp['browserversion']);
+
         $_SERVER['HTTP_USER_AGENT']='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
         $tmp=getBrowserInfo();
         $this->assertEquals('chrome',$tmp['browsername']);
         $this->assertEquals('19.0.1042.0',$tmp['browserversion']);
+
         $_SERVER['HTTP_USER_AGENT']='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
         $tmp=getBrowserInfo();
         $this->assertEquals('chrome',$tmp['browsername']);
         $this->assertEquals('17.0.963.56',$tmp['browserversion']);
+
         $_SERVER['HTTP_USER_AGENT']='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
         $tmp=getBrowserInfo();
         $this->assertEquals('safari',$tmp['browsername']);