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

Conflicts:
	htdocs/contrat/card.php

ChangeLog

@@ -196,6 +196,9 @@ 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
+- Fix: Bad SEPA xml file creation
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
@@ -362,6 +365,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

README-FR.md

@@ -21,8 +21,9 @@ vous devez vous réorienter vers DoliWamp (la version tout-en-un
 de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
 Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
 OpenSuse, Mandriva ou Mageia).
-Vous pouvez les télécharger à l'adresse: 
+
-http://www.dolibarr.org/downloads/
+Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
+http://www.dolibarr.org/
 
 Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:

README.md

@@ -15,7 +15,7 @@ Dolibarr is released under the terms of the GNU General Public License as publis
 
 If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensuse, Mandriva or Mageia).
 
-You can download this at: [Official website] (<http://www.dolibarr.org/downloads/>)
+You can download this from the download area of [Official website] (<http://www.dolibarr.org/>)
 
 If you already have installed a Web server and a Mysql database, you can install the standard version like this:
 

htdocs/accountancy/journal/bankjournal.php

@@ -103,9 +103,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-// To isolate the cash of the other accounts
+$sql .= " WHERE ba.rowid=".$id_accountancy_journal;
-$sql .= " WHERE ba.courant <> 2";
-$sql .= " AND ba.rowid=".$id_accountancy_journal;
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND ba.entity = " . $conf->entity;
 }
@@ -218,6 +216,7 @@ if ($result) {
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
 				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
 
+
 				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 				$resultmid = $db->query($sqlmid);
 				if ($resultmid)
@@ -237,6 +236,7 @@ if ($result) {
 			{
 				$paymentsalstatic->id = $links[$key]['url_id'];
 				$paymentsalstatic->ref = $links[$key]['url_id'];
+				$paymentsalstatic->label = $links[$key]['label'];
 				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
 				$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
 			}
@@ -421,6 +421,7 @@ if ($action == 'export_csv')
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
 
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
@@ -438,21 +439,44 @@ if ($action == 'export_csv')
 			}
 
 			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			if (is_array ( $tabtp[$key]))
-				if ($mt) {
+			{
-					print $date . $sep;
+				foreach ( $tabtp[$key] as $k => $mt )
-					print $bank_journal . $sep;
+				{
-					if ($val["lib"] == '(SupplierInvoicePayment)') {
+					if ($mt)
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+					{
-					} else {
+						print $date . $sep;
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+						print $bank_journal . $sep;
+						if ($val["lib"] == '(SupplierInvoicePayment)') {
+							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+						} else {
+							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+						}
+						print length_accounta(html_entity_decode($k)) . $sep;
+						print ($mt < 0 ? 'D' : 'C') . $sep;
+						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+						print $val["type_payment"] . $sep;
+						print $val["ref"] . $sep;
+						print "\n";
+					}
+				}
+			}
+			else
+			{
+				foreach ( $tabbq[$key] as $k => $mt )
+				{
+					if (1)
+					{
+						print $date . $sep;
+						print $bank_journal . $sep;
+						print $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . $sep;
+						print $sep;
+						print ($mt < 0 ? 'D' : 'C') . $sep;
+						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+						print $val["type_payment"] . $sep;
+						print $val["ref"] . $sep;
+						print "\n";
 					}
-					print length_accounta(html_entity_decode($k)) . $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print $val["type_payment"] . $sep;
-					print $val["ref"] . $sep;
-					print "\n";
 				}
 			}
 		}
@@ -476,15 +500,35 @@ if ($action == 'export_csv')
 			}
 
 			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			if (is_array ( $tabtp[$key]))
-				if ($mt) {
+			{
-					print '"' . $date . '"' . $sep;
+				foreach ( $tabtp[$key] as $k => $mt ) 
-					print '"' . $val["type_payment"] . '"' . $sep;
+				{
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					if ($mt) {
-					print '"' . $companystatic->name . '"' . $sep;
+						print '"' . $date . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . $val["type_payment"] . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-					print "\n";
+						print '"' . $companystatic->name . '"' . $sep;
+						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print "\n";
+					}
+				}
+			}
+			else
+			{				
+				foreach ( $tabbq[$key] as $k => $mt )
+				{
+					if (1)
+					{
+						print '"' . $date . '"' . $sep;
+						print '"' . $val["ref"] . '"' . $sep;
+						print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . '"' . $sep;
+						print '"' . $langs->trans("Bank") . '"' . $sep;
+						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print "\n";
+					}
 				}
 			}
 		}
@@ -498,14 +542,54 @@ else
 	llxHeader('', $langs->trans("BankJournal"));
 
 	$namereport = $langs->trans("BankJournal");
-	$namelink = '';
+	$description = $langs->trans("DescBankJournal");
-	$periodlink = '';
-	$exportlink = '';
-	$builddate = time();
-	$description = $langs->trans("DescBankJournal") . '<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($namereport, $namelink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
+	// Report
+	$h=0;
+	$head[$h][0] = $_SERVER["PHP_SELF"].'?id_account='.$id_accountancy_journal;
+	$head[$h][1] = $langs->trans("Report");
+	$head[$h][2] = 'report';
+
+	dol_fiche_head($head, $hselected);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id_account='.$id_accountancy_journal.'">';
+	print '<table width="100%" class="border">';
+
+	// Title
+	print '<tr>';
+	print '<td valign="top" width="110">'.$langs->trans("ReportName").'</td>';
+	print '<td colspan="3">'.$namereport.'</td>';
+	print '</td>';
+	print '</tr>';
+
+	// Period report
+	print '<tr>';
+	print '<td>'.$langs->trans("ReportPeriod").'</td>';
+	if (! $periodlink) print '<td colspan="3">';
+	else print '<td>';
+	if ($period) print $period;
+	if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+	print '</td>';
+	print '</tr>';
+
+	// Description
+	print '<tr>';
+	print '<td valign="top">'.$langs->trans("ReportDescription").'</td>';
+	print '<td colspan="3">'.$description.'</td>';
+	print '</tr>';
+
+	print '<tr>';
+	print '<td colspan="4" align="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></td>';
+	print '</tr>';
+
+	print '</table>';
+
+	print '</form>';
+
+	print '</div>';
+	// End report
+	
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writeBookKeeping();" />';
@@ -565,20 +649,36 @@ else
 		}
 
 		// Third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
+		if (is_array ( $tabtp[$key]))
-			if ($k != 'type') {
+		{
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($k != 'type') {
+					print "<tr " . $bc[$var] . ">";
+					print "<td>" . $date . "</td>";
+					print "<td>" . $val["soclib"] . "</td>";
+					print "<td>" . length_accounta($k) . "</td>";
+					print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+					print "<td>" . $val["type_payment"] . "</td>";
+					print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+					print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+					print "</tr>";
+				}
+			}
+		}
+		else
+		{
+			foreach ( $tabbq[$key] as $k => $mt )
+			{
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
-				print "<td>" . $val["soclib"] . "</td>";
+				print "<td>" . $reflabel . "</td>";
-				print "<td>" . length_accounta($k) . "</td>";
+				print "<td>" . $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . "</td>";
-				print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+				print "<td>" . $langs->trans('ThirdParty') . "</td>";
-				print "<td>" . $val["type_payment"] . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
 			}
 		}
-
 		$var = ! $var;
 	}
 

htdocs/accountancy/journal/cashjournal.php

@@ -1,533 +0,0 @@
-<?php
-/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013		Christophe Battarel	<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.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
- * 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/>.
- */
-
-/**
- * \file		htdocs/accountancy/journal/cashjournal.php
- * \ingroup		Accounting Expert
- * \brief		Page with cash journal
- */
-
-require '../../main.inc.php';
-
-// Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-
-// Langs
-$langs->load("companies");
-$langs->load("other");
-$langs->load("compta");
-$langs->load("bank");
-$langs->load("accountancy");
-
-$date_startmonth = GETPOST('date_startmonth');
-$date_startday = GETPOST('date_startday');
-$date_startyear = GETPOST('date_startyear');
-$date_endmonth = GETPOST('date_endmonth');
-$date_endday = GETPOST('date_endday');
-$date_endyear = GETPOST('date_endyear');
-
-// Security check
-if ($user->societe_id > 0)
-	accessforbidden();
-
-$action = GETPOST('action');
-
-/*
- * View
- */
-
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear --;
-}
-
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
-
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
-	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
-}
-
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
-
-$sql = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, soc.code_compta, ba.courant,";
-$sql .= " soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, ba.account_number, bu1.type as typeop";
-$sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-
-// Code opération type caisse
-$sql .= " WHERE ba.courant = 2";
-if (! empty($conf->multicompany->enabled)) {
-	$sql .= " AND ba.entity = " . $conf->entity;
-}
-
-if ($date_start && $date_end)
-	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
-$sql .= " ORDER BY b.datev";
-
-$object = new Account($db);
-$paymentstatic = new Paiement($db);
-$paymentsupplierstatic = new PaiementFourn($db);
-$societestatic = new Societe($db);
-$chargestatic = new ChargeSociales($db);
-$paymentvatstatic = new TVA($db);
-
-dol_syslog("accountancy/journal/cashjournal.php:: sql=" . $sql, LOG_DEBUG);
-$result = $db->query($sql);
-if ($result) {
-
-	$num = $db->num_rows($result);
-	// les variables
-	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
-	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-	$cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
-	$cptsociale = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
-
-	$tabpay = array ();
-	$tabbq = array ();
-	$tabtp = array ();
-	$tabcompany = array ();
-	$tabtype = array ();
-
-	$i = 0;
-	while ( $i < $num ) {
-		$obj = $db->fetch_object($result);
-
-		// controls
-		$compta_bank = $obj->account_number;
-		if ($obj->label == '(SupplierInvoicePayment)')
-			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $cptfour);
-		if ($obj->label == '(CustomerInvoicePayment)')
-			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
-		if ($obj->typeop == '(BankTransfert)')
-			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
-
-			// variable bookkeeping
-
-		$tabpay[$obj->rowid]["date"] = $obj->do;
-		$tabpay[$obj->rowid]["ref"] = $obj->label;
-		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
-		if (preg_match('/^\((.*)\)$/i', $obj->label, $reg)) {
-			$tabpay[$obj->rowid]["lib"] = $langs->trans($reg[1]);
-		} else {
-			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
-		}
-		$links = $object->get_url($obj->rowid);
-
-		foreach ( $links as $key => $val ) {
-
-			$tabtype[$obj->rowid] = $links[$key]['type'];
-
-			if ($links[$key]['type'] == 'payment') {
-				$paymentstatic->id = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-			} else if ($links[$key]['type'] == 'payment_supplier') {
-				$paymentsupplierstatic->id = $links[$key]['url_id'];
-				$paymentsupplierstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
-			} else if ($links[$key]['type'] == 'company') {
-
-				$societestatic->id = $links[$key]['url_id'];
-				$societestatic->name = $links[$key]['label'];
-				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-			} else if ($links[$key]['type'] == 'sc') {
-
-				$chargestatic->id = $links[$key]['url_id'];
-				$chargestatic->ref = $links[$key]['url_id'];
-
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-					if ($reg[1] == 'socialcontribution')
-						$reg[1] = 'SocialContribution';
-					$chargestatic->lib = $langs->trans($reg[1]);
-				} else {
-					$chargestatic->lib = $links[$key]['label'];
-				}
-				$chargestatic->ref = $chargestatic->lib;
-				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
-				$sqlmid = 'SELECT cchgsoc.accountancy_code';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
-				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
-				}
-			} else if ($links[$key]['type'] == 'payment_vat') {
-
-				$paymentvatstatic->id = $links[$key]['url_id'];
-				$paymentvatstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-			} else if ($links[$key]['type'] == 'banktransfert') {
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-			}
-			/*else {
-				$tabtp [$obj->rowid] [$cptsociale] += $obj->amount;
-			}*/
-		}
-		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
-
-		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-
-		$i ++;
-	}
-} else {
-	dol_print_error($db);
-}
-
-/*
- * Actions
-*/
-
-// write bookkeeping
-if ($action == 'writeBookKeeping') {
-	$error = 0;
-	foreach ( $tabpay as $key => $val ) {
-		// cash
-		foreach ( $tabbq[$key] as $k => $mt ) {
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->doc_type = 'cash';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_bank"];
-			$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-			$bookkeeping->numero_compte = $k;
-			$bookkeeping->label_compte = $compte->label;
-			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-			if ($tabtype[$key] == 'payment') {
-
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-			} else if ($tabtype[$key] == 'payment_supplier') {
-
-				$sqlmid = 'SELECT facf.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-			}
-
-			$result = $bookkeeping->create();
-			if ($result < 0) {
-				$error ++;
-				setEventMessage($object->errors, 'errors');
-			}
-		}
-		// third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->doc_type = 'cash';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_bank"];
-			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-			$bookkeeping->credit = ($mt >= 0 ? $mt : 0);
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-			if ($tabtype[$key] == 'sc') {
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->numero_compte = $k;
-			} else if ($tabtype[$key] == 'payment') {
-
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			} else if ($tabtype[$key] == 'payment_supplier') {
-
-				$sqlmid = 'SELECT facf.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-			} else if ($tabtype[$key] == 'company') {
-
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			} else {
-
-				$bookkeeping->doc_ref = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			}
-
-			$result = $bookkeeping->create();
-			if ($result < 0) {
-				$error ++;
-				setEventMessage($object->errors, 'errors');
-			}
-		}
-	}
-
-	if (empty($error)) {
-		setEventMessage($langs->trans('Success'), 'mesgs');
-	}
-}
-// Export
-if ($action == 'export_csv') {
-	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$cash_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-	header('Content-Type: text/csv');
-	header('Content-Disposition:attachment;filename=journal_caisse.csv');
-
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
-	{
-		$sep = ";";
-
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
-			// Cash
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $cash_journal . $sep;
-				print length_accountg(html_entity_decode($k)) . $sep;
-				print $sep;
-				print ($mt < 0 ? 'C' : 'D') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print $val["type_payment"] . $sep;
-				print $val["ref"] . $sep;
-				print "\n";
-			}
-
-			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
-				if ($mt) {
-					print $date . $sep;
-					print $cash_journal . $sep;
-					if ($val["lib"] == '(SupplierInvoicePayment)') {
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
-					} else {
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-					}
-					print length_accounta(html_entity_decode($k)) . $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print $val["type_payment"] . $sep;
-					print $val["ref"] . $sep;
-					print "\n";
-				}
-			}
-		}
-	} else 	// Model Classic Export
-	{
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), 'day');
-
-			// Cash
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Cash") . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-				print "\n";
-			}
-			
-			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
-				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-					print '"' . $langs->trans("ThirdParty") . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
-				}
-			}
-		}
-	}
-} else {
-
-	$form = new Form($db);
-
-	llxHeader('', $langs->trans("CashJournal"), '');
-
-	$name = $langs->trans("CashJournal");
-	$nomlink = '';
-	$periodlink = '';
-	$exportlink = '';
-	$builddate = time();
-	$description = $langs->trans("DescCashJournal") . '<br>';
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
-
-	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-
-	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writeBookKeeping();" />';
-
-	print '
-	<script type="text/javascript">
-		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
-			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
-		}
-		function writeBookKeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writeBookKeeping");
-			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
-		}
-	</script>';
-
-	/*
-	 * Show result array
-	 */
-	print '<br><br>';
-
-	$i = 0;
-	print "<table class=\"noborder\" width=\"100%\">";
-	print "<tr class=\"liste_titre\">";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
-	print "<td>" . $langs->trans("Account") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
-	print "</tr>\n";
-
-	$var = true;
-	$r = '';
-
-	foreach ( $tabpay as $key => $val ) {
-		$date = dol_print_date($db->jdate($val["date"]), 'day');
-
-		// Cash
-		foreach ( $tabbq[$key] as $k => $mt ) {
-			if (1) {
-				print "<tr " . $bc[$var] . " >";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $val["lib"] . "</td>";
-				print "<td>" . length_accountg($k) . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print "</tr>";
-			}
-		}
-
-		// third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
-			if ($k != 'type') {
-				print "<tr " . $bc[$var] . ">";
-
-				print "<td>" . $date . "</td>";
-				print "<td>" . $val["soclib"] . "</td>";
-
-				print "<td>" . length_accounta($k) . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			}
-		}
-
-		$var = ! $var;
-	}
-
-	print "</table>";
-
-	// End of page
-	llxFooter();
-}
-$db->close();

htdocs/adherents/card.php

@@ -302,6 +302,7 @@ if (empty($reshook))
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0) $error++;
 
 			// Check if we need to also synchronize user information
 			$nosyncuser=0;
@@ -471,6 +472,7 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
 
 		// Check parameters
 		if (empty($morphy) || $morphy == "-1") {

htdocs/adherents/type.php

@@ -89,6 +89,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$adht);
+		if ($ret < 0) $error++;
 
 		if ($adht->libelle)
 		{
@@ -126,6 +127,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$adht);
+		if ($ret < 0) $error++;
 
 		$adht->update($user);
 

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/stock.php

@@ -136,6 +136,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->facture->enabled))
 {
 	$var=!$var;
@@ -148,6 +150,7 @@ if (! empty($conf->facture->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->commande->enabled))
@@ -162,6 +165,7 @@ if (! empty($conf->commande->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->expedition->enabled))
@@ -176,7 +180,17 @@ if (! empty($conf->expedition->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockDecrease").'</td>';
+	print "</tr>\n";
+}
+
 print '</table>';
 
 print '<br>';
@@ -189,6 +203,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->fournisseur->enabled))
 {
 	$var=!$var;
@@ -201,6 +217,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->fournisseur->enabled))
@@ -215,6 +232,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 if (! empty($conf->fournisseur->enabled))
 {
@@ -228,65 +246,76 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
+}
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockIncrease").'</td>';
+	print "</tr>\n";
 }
 
 print '</table>';
 
 // Optio to force stock to be enough before adding a line into document
-print '<br>';
+if ($conf->invoice->enabled || $conf->order->enabled || $conf->expedition->enabled)
-print '<table class="noborder" width="100%">';
+{
-print '<tr class="liste_titre">';
+	print '<br>';
-print "  <td>".$langs->trans("RuleForStockAvailability")."</td>\n";
+	print '<table class="noborder" width="100%">';
-print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+	print '<tr class="liste_titre">';
-print '</tr>'."\n";
+	print "  <td>".$langs->trans("RuleForStockAvailability")."</td>\n";
+	print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+	print '</tr>'."\n";
 
-if($conf->invoice->enabled) {
+	if($conf->invoice->enabled) {
-	$var = !$var;
+		$var = !$var;
-	print "<tr ".$bc[$var].">";
+		print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
-	print '<td width="160" align="right">';
+		print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
+		print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_INVOICE\">";
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_INVOICE\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_INVOICE",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE,1);
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_INVOICE",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
+		print '</form>';
-	print "</td>\n";
+		print "</td>\n";
-	print "</tr>\n";
+		print "</tr>\n";
+	}
+
+	if($conf->order->enabled) {
+		$var = !$var;
+		print "<tr ".$bc[$var].">";
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
+		print '<td width="160" align="right">';
+		print "<form method=\"post\" action=\"stock.php\">";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_ORDER\">";
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_ORDER",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER,1);
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+		print "</td>\n";
+		print "</tr>\n";
+	}
+
+	if($conf->expedition->enabled) {
+		$var = !$var;
+		print "<tr ".$bc[$var].">";
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
+		print '<td width="160" align="right">';
+		print "<form method=\"post\" action=\"stock.php\">";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT\">";
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT,1);
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+		print "</td>\n";
+		print "</tr>\n";
+	}
+	print '</table>';
 }
 
-if($conf->order->enabled) {
-	$var = !$var;
-	print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
-	print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_ORDER\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_ORDER",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
-	print "</td>\n";
-	print "</tr>\n";
-}
-
-if($conf->expedition->enabled) {
-	$var = !$var;
-	print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
-	print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
-	print "</td>\n";
-	print "</tr>\n";
-}
-print '</table>';
-
-
 $virtualdiffersfromphysical=0;
 if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)

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/categories/card.php

@@ -127,6 +127,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 	if ($parent != "-1") $object->fk_parent = $parent;
 
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	if ($ret < 0) $error++;
 
 	if (! $object->label)
 	{

htdocs/categories/edit.php

@@ -90,7 +90,8 @@ if ($action == 'update' && $user->rights->categorie->creer)
 	if (empty($categorie->error))
 	{
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$categorie);
-		
+		if ($ret < 0) $error++;
+
 		if ($categorie->update($user) > 0)
 		{
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$categorie->id.'&type='.$type);

htdocs/comm/action/card.php

@@ -274,6 +274,7 @@ if ($action == 'add')
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	if ($ret < 0) $error++;
 
 	if (! $error)
 	{
@@ -429,6 +430,7 @@ if ($action == 'update')
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
 
 		if (! $error)
 		{

htdocs/comm/action/class/actioncomm.class.php

@@ -184,12 +184,12 @@ class ActionComm extends CommonObject
         $now=dol_now();
 
         // Check parameters
-        if (empty($this->userownerid)) 
+        if (empty($this->userownerid))
         {
         	$this->errors[]='ErrorPropertyUserowneridNotDefined';
         	return -1;
         }
-        
+
         // Clean parameters
         $this->label=dol_trunc(trim($this->label),128);
         $this->location=dol_trunc(trim($this->location),128);
@@ -214,7 +214,7 @@ class ActionComm extends CommonObject
         $userdoneid=$this->userdoneid;
 
         // Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-        if (empty($this->userassigned) || count($this->userassigned) == 0 || ! is_array($this->userassigned)) 
+        if (empty($this->userassigned) || count($this->userassigned) == 0 || ! is_array($this->userassigned))
         	$this->userassigned = array($userownerid=>array('id'=>$userownerid));
 
         if (! $this->type_id || ! $this->type_code)
@@ -306,9 +306,9 @@ class ActionComm extends CommonObject
 			        {
 			        	$val=array('id'=>$val);
 			        }
-					
+
 					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['mandatory']?$val['mandatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory'])?'0':$val['mandatory']).", ".(empty($val['transparency'])?'0':$val['transparency']).", ".(empty($val['answer_status'])?'0':$val['answer_status']).")";
 
 					$resql = $this->db->query($sql);
 					if (! $resql)
@@ -672,7 +672,7 @@ class ActionComm extends CommonObject
 				foreach($this->userassigned as $key => $val)
 				{
 					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['manadatory']?$val['manadatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['manadatory'])?'0':$val['manadatory']).", ".(empty($val['transparency'])?'0':$val['transparency']).", ".(empty($val['answer_status'])?'0':$val['answer_status']).")";
 
 					$resql = $this->db->query($sql);
 					if (! $resql)

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/comm/mailing/class/mailing.class.php

@@ -57,7 +57,7 @@ class Mailing extends CommonObject
 
 	var $date_creat;
 	var $date_valid;
-	
+
 	var $extraparams=array();
 
 	public $statut_dest=array();
@@ -78,12 +78,12 @@ class Mailing extends CommonObject
 		$this->statuts[1] = 'MailingStatusValidated';
 		$this->statuts[2] = 'MailingStatusSentPartialy';
 		$this->statuts[3] = 'MailingStatusSentCompletely';
-		
+
 		$this->statut_dest[-1] = 'MailingStatusError';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusNotContact';
-				
+
 	}
 
 	/**
@@ -186,7 +186,7 @@ class Mailing extends CommonObject
 	function fetch($rowid)
 	{
 		global $conf;
-		
+
 		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
 		$sql.= ", m.email_from, m.email_replyto, m.email_errorsto";
 		$sql.= ", m.statut, m.nbemail";
@@ -211,14 +211,14 @@ class Mailing extends CommonObject
 				$this->statut			= $obj->statut;
 				$this->nbemail			= $obj->nbemail;
 				$this->titre			= $obj->titre;
-				
+
-				$this->sujet			= $obj->sujet;				
+				$this->sujet			= $obj->sujet;
 				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
 					$this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
 				}else {
 					$this->body				= $obj->body;
 				}
-				
+
 				$this->bgcolor			= $obj->bgcolor;
 				$this->bgimage			= $obj->bgimage;
 
@@ -232,7 +232,7 @@ class Mailing extends CommonObject
 				$this->date_creat		= $this->db->jdate($obj->date_creat);
 				$this->date_valid		= $this->db->jdate($obj->date_valid);
 				$this->date_envoi		= $this->db->jdate($obj->date_envoi);
-				
+
 				$this->extraparams		= (array) json_decode($obj->extraparams, true);
 
 				return 1;
@@ -267,6 +267,8 @@ class Mailing extends CommonObject
 
 		$object=new Mailing($this->db);
 
+		$object->context['createfromclone']='createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -313,13 +315,13 @@ class Mailing extends CommonObject
 		{
 			//Clone target
 			if (!empty($option2)) {
-				
+
 				require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';
-				
+
 				$mailing_target = new MailingTargets($this->db);
-				
+
 				$target_array=array();
-				
+
 				$sql = "SELECT fk_contact, ";
 				$sql.=" lastname,   ";
 				$sql.=" firstname,";
@@ -330,7 +332,7 @@ class Mailing extends CommonObject
 				$sql.=" source_type ";
 				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
 				$sql.= " WHERE fk_mailing = ".$fromid;
-				
+
 				dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
 				$result=$this->db->query($sql);
 				if ($result)
@@ -338,17 +340,17 @@ class Mailing extends CommonObject
 					if ($this->db->num_rows($result))
 					{
 						while ($obj = $this->db->fetch_object($result)) {
-						
+
 							$target_array[]=array('fk_contact'=>$obj->fk_contact,
 							'lastname'=>$obj->lastname,
 							'firstname'=>$obj->firstname,
-							'email'=>$obj->email, 
+							'email'=>$obj->email,
 							'other'=>$obj->other,
 							'source_url'=>$obj->source_url,
 							'source_id'=>$obj->source_id,
 							'source_type'=>$obj->source_type);
 						}
-						
+
 					}
 				}
 				else
@@ -356,12 +358,14 @@ class Mailing extends CommonObject
 					$this->error=$this->db->lasterror();
 					return -1;
 				}
-				
+
 				$mailing_target->add_to_target($object->id, $target_array);
 			}
 
 		}
 
+		unset($object->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{
@@ -514,7 +518,7 @@ class Mailing extends CommonObject
 		}
 	}
 
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -526,7 +530,7 @@ class Mailing extends CommonObject
 	{
 		global $langs;
 		$langs->load('mails');
-	
+
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statut_dest[$statut]);
@@ -563,10 +567,10 @@ class Mailing extends CommonObject
 			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
 			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
 		}
-		
+
-		
+
-		
+
-		
+
 	}
 
 }

htdocs/comm/propal.php

@@ -957,6 +957,11 @@ if (empty($reshook))
 		if (GETPOST('model')) {
 			$object->setDocModel($user, GETPOST('model'));
 		}
+	    if (GETPOST('fk_bank')) { // this field may come from an external module
+            $object->fk_bank = GETPOST('fk_bank');
+        } else {
+            $object->fk_bank = $object->fk_account;
+        }
 
 		// Define output language
 		$outputlangs = $langs;
@@ -1080,10 +1085,10 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
-		if (! $error) {
+		if (! $error)
+		{
 			// Actions on extra fields (by external module or standard code)
 			// FIXME le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('propaldao'));

htdocs/comm/propal/class/propal.class.php

@@ -239,27 +239,30 @@ class Propal extends CommonObject
                 return -5;
             }
 
-            $propalligne=new PropaleLigne($this->db);
+            $line=new PropaleLigne($this->db);
-            $propalligne->fk_propal=$this->id;
+
-            $propalligne->fk_remise_except=$remise->id;
+            $this->line->context = $this->context;
-            $propalligne->desc=$remise->description;   	// Description ligne
+
-            $propalligne->tva_tx=$remise->tva_tx;
+            $line->fk_propal=$this->id;
-            $propalligne->subprice=-$remise->amount_ht;
+            $line->fk_remise_except=$remise->id;
-            $propalligne->fk_product=0;					// Id produit predefini
+            $line->desc=$remise->description;   	// Description ligne
-            $propalligne->qty=1;
+            $line->tva_tx=$remise->tva_tx;
-            $propalligne->remise=0;
+            $line->subprice=-$remise->amount_ht;
-            $propalligne->remise_percent=0;
+            $line->fk_product=0;					// Id produit predefini
-            $propalligne->rang=-1;
+            $line->qty=1;
-            $propalligne->info_bits=2;
+            $line->remise=0;
+            $line->remise_percent=0;
+            $line->rang=-1;
+            $line->info_bits=2;
 
             // TODO deprecated
-            $propalligne->price=-$remise->amount_ht;
+            $line->price=-$remise->amount_ht;
 
-            $propalligne->total_ht  = -$remise->amount_ht;
+            $line->total_ht  = -$remise->amount_ht;
-            $propalligne->total_tva = -$remise->amount_tva;
+            $line->total_tva = -$remise->amount_tva;
-            $propalligne->total_ttc = -$remise->amount_ttc;
+            $line->total_ttc = -$remise->amount_ttc;
 
-            $result=$propalligne->insert();
+            $result=$line->insert();
             if ($result > 0)
             {
                 $result=$this->update_price(1);
@@ -276,7 +279,7 @@ class Propal extends CommonObject
             }
             else
             {
-                $this->error=$propalligne->error;
+                $this->error=$line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -393,6 +396,8 @@ class Propal extends CommonObject
             // Insert line
             $this->line=new PropaleLigne($this->db);
 
+            $this->line->context = $this->context;
+
             $this->line->fk_propal=$this->id;
             $this->line->label=$label;
             $this->line->desc=$desc;
@@ -545,6 +550,8 @@ class Propal extends CommonObject
             // Update line
             $this->line=new PropaleLigne($this->db);
 
+            $this->line->context = $this->context;
+
             // Stock previous line records
             $staticline=new PropaleLigne($this->db);
             $staticline->fetch($rowid);
@@ -953,6 +960,8 @@ class Propal extends CommonObject
     {
         global $user,$langs,$conf,$hookmanager;
 
+        $this->context['createfromclone']='createfromclone';
+
         $error=0;
         $now=dol_now();
 
@@ -1046,6 +1055,8 @@ class Propal extends CommonObject
             // End call triggers
         }
 
+        unset($this->context['createfromclone']);
+
         // End
         if (! $error)
         {
@@ -3088,6 +3099,7 @@ class PropaleLigne  extends CommonObject
         if (empty($this->special_code)) $this->special_code=0;
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+        if (empty($this->subprice)) $this->subprice=0;
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 

htdocs/commande/card.php

@@ -94,6 +94,7 @@ $hookmanager->initHooks(array('ordercard','globalcard'));
 
 $permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
 
+
 /*
  * Actions
  */
@@ -271,8 +272,7 @@ if (empty($reshook))
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-				if ($ret < 0)
+				if ($ret < 0) $error++;
-					$error ++;
 
 				if (! $error)
 				{
@@ -365,10 +365,10 @@ if (empty($reshook))
 			} else {
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-				if ($ret < 0)
+				if ($ret < 0) $error++;
-					$error ++;
 
-				if (! $error) {
+				if (! $error)
+				{
 					$object_id = $object->create($user);
 
 					// If some invoice's lines already known
@@ -1073,18 +1073,19 @@ if (empty($reshook))
 		exit();
 	}
 
+	// Generate order document (define into /core/modules/commande/modules_commande.php)
 	else if ($action == 'builddoc') // In get or post
 	{
-		/*
-		 * Generate order document
-		 * define into /core/modules/commande/modules_commande.php
-		 */
-
 		// Save last template used to generate document
 		if (GETPOST('model'))
 			$object->setDocModel($user, GETPOST('model', 'alpha'));
+		    if (GETPOST('fk_bank')) { // this field may come from an external module
+            $object->fk_bank = GETPOST('fk_bank');
+        } else {
+            $object->fk_bank = $object->fk_account;
+        }
 
-			// Define output language
+		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
@@ -1124,8 +1125,7 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
 		if (! $error) {
 			// Actions on extra fields (by external module or standard code)

htdocs/commande/class/commande.class.php

@@ -878,6 +878,8 @@ class Commande extends CommonOrder
 
         $error=0;
 
+        $this->context['createfromclone'] = 'createfromclone';
+
         $this->db->begin();
 
 		// get extrafields so they will be clone
@@ -942,6 +944,8 @@ class Commande extends CommonOrder
             // End call triggers
         }
 
+        unset($this->context['createfromclone']);
+
         // End
         if (! $error)
         {
@@ -1201,6 +1205,8 @@ class Commande extends CommonOrder
             // Insert line
             $this->line=new OrderLine($this->db);
 
+            $this->line->context = $this->context;
+
             $this->line->fk_commande=$this->id;
             $this->line->label=$label;
             $this->line->desc=$desc;
@@ -1315,6 +1321,8 @@ class Commande extends CommonOrder
 
             $line=new OrderLine($this->db);
 
+            $line->context = $this->context;
+
             $line->fk_product=$idproduct;
             $line->desc=$prod->description;
             $line->qty=$qty;
@@ -2397,6 +2405,8 @@ class Commande extends CommonOrder
             // Update line
             $this->line=new OrderLine($this->db);
 
+            $this->line->context = $this->context;
+
             // Stock previous line records
             $staticline=new OrderLine($this->db);
             $staticline->fetch($rowid);

htdocs/commande/list.php

@@ -361,19 +361,22 @@ if ($resql)
                     // stock order and stock order_supplier
                     $stock_order=0;
                     $stock_order_supplier=0;
-                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-                        if (! empty($conf->commande->enabled)) {
+                    {
+                        if (! empty($conf->commande->enabled))
+                        {
                             if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
-                                $generic_product->load_stats_commande(0,'1,2',true);
+                                $generic_product->load_stats_commande(0,'1,2');
                                 $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
                             } else {
                                 $generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'];
                             }
                             $stock_order=$generic_product->stats_commande['qty'];
                         }
-                        if (! empty($conf->fournisseur->enabled)) {
+                        if (! empty($conf->fournisseur->enabled))
+                        {
                             if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {
-                                $generic_product->load_stats_commande_fournisseur(0,'3',true);
+                                $generic_product->load_stats_commande_fournisseur(0,'3');
                                 $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];
                             } else {
                                 $generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'];

htdocs/compta/bank/class/bankcateg.class.php

@@ -300,7 +300,9 @@ class BankCateg // extends CommonObject
 
         $object=new BankCateg($this->db);
 
-        $this->db->begin();
+		$object->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
 
         // Load source object
         $object->fetch($fromid);
@@ -327,6 +329,8 @@ class BankCateg // extends CommonObject
 
         }
 
+        unset($object->context['createfromclone']);
+
         // End
         if (! $error)
         {

htdocs/compta/facture.php

@@ -585,7 +585,7 @@ if (empty($reshook))
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
-			
+
 			foreach ($amount_ht as $tva_tx => $xxx) {
 				$discount->amount_ht = abs($amount_ht [$tva_tx]);
 				$discount->amount_tva = abs($amount_tva [$tva_tx]);
@@ -636,7 +636,7 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from add form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-		if ($ret < 0) $error ++;
+		if ($ret < 0) $error++;
 
 		// Replacement invoice
 		if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
@@ -1676,8 +1676,7 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from add form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
 		if (! $error) {
 			// Actions on extra fields (by external module or standard code)
@@ -3602,13 +3601,13 @@ if ($action == 'create')
 		$formmail->withdeliveryreceipt = 1;
 		$formmail->withcancel = 1;
 		// Tableau des substitutions
-		$formmail->substit ['__FACREF__'] = $object->ref;
+		$formmail->substit['__FACREF__'] = $object->ref;
-		$formmail->substit ['__SIGNATURE__'] = $user->signature;
+		$formmail->substit['__SIGNATURE__'] = $user->signature;
-		$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
+		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+		$formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit ['__PERSONALIZED__'] = '';
+		$formmail->substit['__PERSONALIZED__'] = '';
-		$formmail->substit ['__CONTACTCIVNAME__'] = '';
+		$formmail->substit['__CONTACTCIVNAME__'] = '';
 
 		// Find the good contact adress
 		$custcontact = '';
@@ -3617,7 +3616,7 @@ if ($action == 'create')
 
 		if (is_array($contactarr) && count($contactarr) > 0) {
 			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
+				if ($contact['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
 
 					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 
@@ -3628,15 +3627,15 @@ if ($action == 'create')
 			}
 
 			if (! empty($custcontact)) {
-				$formmail->substit ['__CONTACTCIVNAME__'] = $custcontact;
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
 			}
 		}
 
 		// Tableau des parametres complementaires du post
-		$formmail->param ['action'] = $action;
+		$formmail->param['action'] = $action;
-		$formmail->param ['models'] = $modelmail;
+		$formmail->param['models'] = $modelmail;
-		$formmail->param ['facid'] = $object->id;
+		$formmail->param['facid'] = $object->id;
-		$formmail->param ['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 
 		// Init list of files
 		if (GETPOST("mode") == 'init') {

htdocs/compta/facture/class/facture.class.php

@@ -607,6 +607,8 @@ class Facture extends CommonInvoice
 
 		$error=0;
 
+		$this->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// get extrafields so they will be clone
@@ -693,6 +695,8 @@ class Facture extends CommonInvoice
             // End call triggers
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{
@@ -2043,6 +2047,9 @@ class Facture extends CommonInvoice
 
 			// Insert line
 			$this->line=new FactureLigne($this->db);
+
+			$this->line->context = $this->context;
+
 			$this->line->fk_facture=$this->id;
 			$this->line->label=$label;	// deprecated
 			$this->line->desc=$desc;
@@ -2181,7 +2188,9 @@ class Facture extends CommonInvoice
 			// Update line into database
 			$this->line=new FactureLigne($this->db);
 
-			// Stock previous line records
+            $this->line->context = $this->context;
+
+            // Stock previous line records
 			$staticline=new FactureLigne($this->db);
 			$staticline->fetch($rowid);
 			$this->line->oldline = $staticline;
@@ -2294,6 +2303,8 @@ class Facture extends CommonInvoice
 
 		$line=new FactureLigne($this->db);
 
+        $line->context = $this->context;
+
 		// For triggers
 		$line->fetch($rowid);
 

htdocs/compta/facture/class/paymentterm.class.php

@@ -33,6 +33,7 @@ class PaymentTerm // extends CommonObject
 	var $errors=array();				//!< To return several error codes (or messages)
 	//public  $element='c_payment_term';			//!< Id that identify managed objects
 	//public  $table_element='c_payment_term';	//!< Name of table without prefix where object is stored
+	var $context =array();
 
     var $id;
 
@@ -409,6 +410,8 @@ class PaymentTerm // extends CommonObject
 
 		$object=new PaymentTerm($this->db);
 
+		$object->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -436,6 +439,8 @@ class PaymentTerm // extends CommonObject
 
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{

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

@@ -894,13 +894,13 @@ class BonPrelevement extends CommonObject
             if (!$error)
             {
 				$ref = substr($year,-2).$month;
-				
+
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";
 				$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
 				$sql.= " WHERE ref LIKE '%".$ref."%'";
 				$sql.= " AND entity = ".$conf->entity;
 				$sql.= " ORDER BY ref DESC LIMIT 1";
-				
+
 				dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
@@ -917,7 +917,7 @@ class BonPrelevement extends CommonObject
 				$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT);
 
 				$filebonprev = $ref;
-                
+
                 // Create withdraw receipt in database
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
                 $sql.= " ref, entity, datec";
@@ -978,10 +978,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)."'";
@@ -1029,7 +1026,7 @@ class BonPrelevement extends CommonObject
 
                     $bonprev->factures = $factures_prev_id;
 
-                    //Build file
+                    // Generation of SEPA file
                     $bonprev->generate();
                 }
                 dol_syslog($filebonprev);
@@ -1039,7 +1036,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;
@@ -1053,9 +1049,6 @@ class BonPrelevement extends CommonObject
                 dol_syslog("Erreur mise a jour du total - $sql");
             }
 
-            /*
-             * Rollback or Commit
-             */
             if (!$error)
             {
                 $this->db->commit();
@@ -1262,13 +1255,28 @@ class BonPrelevement extends CommonObject
 			$fileDebiteurSection = '';
 			$fileEmetteurSection = '';
 			$i = 0;
+			$j = 0;
 			$this->total = 0;
 
 			/*
 			 * 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.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+			$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				while ($j < $num)
+				{
+					$objfac = $this->db->fetch_object($resql);
+					$ListOfFactures = $ListOfFactures . $objfac->fac . ",";
+					$j++;
+				}
+			}
+
+			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,";
+			$sql.= " pl.client_nom as nom, 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.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
@@ -1292,7 +1300,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
+					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures , $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}
@@ -1327,13 +1335,14 @@ class BonPrelevement extends CommonObject
 			fputs($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
 			fputs($this->file, '			<InitgPty>'.$CrLf);
 			fputs($this->file, '				<Nm>'.$this->raison_sociale.'</Nm>'.$CrLf);
-/*			fputs($this->file, '				<Id>'.$CrLf);
+			fputs($this->file, '				<Id>'.$CrLf);
-			fputs($this->file, '					<Othr>'.$CrLf);
+			fputs($this->file, '				    <PrvtId>'.$CrLf);
-			fputs($this->file, '						<Id>0533883248</Id>'.$CrLf);
-			fputs($this->file, '						<Issr>KBO-BCE</Issr>'.$CrLf);
 			fputs($this->file, '					<Othr>'.$CrLf);
+			fputs($this->file, '						<Id>'.$conf->global->PRELEVEMENT_ICS.'</Id>'.$CrLf);
+			fputs($this->file, '					</Othr>'.$CrLf);
+			fputs($this->file, '				    </PrvtId>'.$CrLf);
 			fputs($this->file, '				</Id>'.$CrLf);
-*/			fputs($this->file, '			</InitgPty>'.$CrLf);
+			fputs($this->file, '			</InitgPty>'.$CrLf);
 			fputs($this->file, '		</GrpHdr>'.$CrLf);
 			// SEPA File Emetteur
 			if ($result != -2)
@@ -1510,15 +1519,19 @@ 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);
+		$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
 		$pre = ($date_Rum > 1359673200) ? 'Rum' : '++R';
 		$Rum = $pre.$row_code_client.$row_drum.'-0'.date('U', $Date_Rum);
 		$XML_DEBITOR ='';
@@ -1526,11 +1539,11 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='				<PmtId>'.$CrLf;
 		$XML_DEBITOR .='					<EndToEndId>'.('AS-'.$row_facnumber.'-'.$Rowing).'</EndToEndId>'.$CrLf;
 		$XML_DEBITOR .='				</PmtId>'.$CrLf;
-		$XML_DEBITOR .='				<InstdAmt Ccy.="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
+		$XML_DEBITOR .='				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
 		$XML_DEBITOR .='				<DrctDbtTx>'.$CrLf;
 		$XML_DEBITOR .='					<MndtRltdInf>'.$CrLf;
 		$XML_DEBITOR .='						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
-		$XML_DEBITOR .='						<DtOfSgntr>'.$row_datec.'</DtOfSgntr>'.$CrLf;
+		$XML_DEBITOR .='						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
 		$XML_DEBITOR .='						<AmdmntInd>false</AmdmntInd>'.$CrLf;
 		$XML_DEBITOR .='					</MndtRltdInf>'.$CrLf;
 		$XML_DEBITOR .='				</DrctDbtTx>'.$CrLf;
@@ -1543,17 +1556,18 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent($row_nom)).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.strtr($row_adr, array(CHR(13) => ", ", CHR(10) => "")).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent($row_zip.' '.$row_town).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
 		$XML_DEBITOR .='				<DbtrAcct>'.$CrLf;
 		$XML_DEBITOR .='					<Id>'.$CrLf;
-		$XML_DEBITOR .='						<IBAN>'.$row_iban.'</IBAN>'.$CrLf;
+		$XML_DEBITOR .='						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
 		$XML_DEBITOR .='					</Id>'.$CrLf;
 		$XML_DEBITOR .='				</DbtrAcct>'.$CrLf;
 		$XML_DEBITOR .='				<RmtInf>'.$CrLf;
-		$XML_DEBITOR .='					<Ustrd>'.($row_facnumber.'/'.$Rowing.'/'.$Rum).'</Ustrd>'.$CrLf;
+	//	$XML_DEBITOR .='					<Ustrd>'.($row_facnumber.'/'.$Rowing.'/'.$Rum).'</Ustrd>'.$CrLf;
+		$XML_DEBITOR .='					<Ustrd>'.$row_facnumber.'</Ustrd>'.$CrLf;
 		$XML_DEBITOR .='				</RmtInf>'.$CrLf;
 		$XML_DEBITOR .='			</DrctDbtTxInf>'.$CrLf;
 		return $XML_DEBITOR;

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -384,6 +384,8 @@ class PaymentSocialContribution extends CommonObject
 
 		$object=new PaymentSocialContribution($this->db);
 
+		$object->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -411,6 +413,8 @@ class PaymentSocialContribution extends CommonObject
 
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{

htdocs/contact/card.php

@@ -200,6 +200,7 @@ if (empty($reshook))
 
         // Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
 
         if (! GETPOST("lastname"))
         {
@@ -303,6 +304,7 @@ if (empty($reshook))
 
             // Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0) $error++;
 
             $result = $object->update($contactid, $user);
 

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/commonobject.class.php

@@ -38,6 +38,7 @@ abstract class CommonObject
     public $error;
     public $errors;
     public $canvas;                // Contains canvas name if it is
+	public $context=array();		// Use to pass context information
 
     public $name;
     public $lastname;
@@ -3456,7 +3457,8 @@ abstract class CommonObject
 
     /**
      *	Add/Update all extra fields values for the current object.
-     *  All data to describe values to insert are stored into $this->array_options=array('keyextrafield'=>'valueextrafieldtoadd')
+     *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+     *  This function delte record with all extrafields and insert them again from the array $this->array_options.
      *
      *  @return int -1=error, O=did nothing, 1=OK
      */

htdocs/core/class/conf.class.php

@@ -54,6 +54,10 @@ class Conf
 	public $modules_parts			= array('css'=>array(),'js'=>array(),'tabs'=>array(),'triggers'=>array(),'login'=>array(),'substitutions'=>array(),'menus'=>array(),'theme'=>array(),'sms'=>array(),'tpl'=>array(),'barcode'=>array(),'models'=>array(),'societe'=>array(),'hooks'=>array(),'dir'=>array());
 
 	var $logbuffer					= array();
+
+	/**
+	 * @var LogHandlerInterface[]
+	 */
 	var $loghandlers                = array();
 
 	//! To store properties of multi-company

htdocs/core/class/ctypent.class.php

@@ -148,9 +148,10 @@ class Ctypent // extends CommonObject
      *
      *  @param      int		$id    	Id object
      *  @param		string	$code	Code
+     *  @param		string	$label	Label
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='')
+    function fetch($id,$code='',$label='')
     {
     	global $langs;
         $sql = "SELECT";
@@ -163,8 +164,8 @@ class Ctypent // extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
         if ($id)   $sql.= " WHERE t.id = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {

htdocs/core/class/doleditor.class.php

@@ -187,7 +187,8 @@ class DolEditor
                             		allowedContent :'.($this->allowed_content?'true':'false').',
             						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

@@ -1061,9 +1061,9 @@ 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
+	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
 	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
@@ -44,6 +44,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
  * @param	string 	$class		Class name
  * @param 	string 	$member		Name of property
  * @return 	mixed				Return value of static property
+ * @deprecated Dolibarr now requires 5.3.0+
  */
 function getStaticMember($class, $member)
 {
@@ -156,7 +157,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;
@@ -385,7 +386,7 @@ function dol_size($size,$type='')
  *
  *	@param	string	$str            String to clean
  * 	@param	string	$newstr			String to replace bad chars with
- *  @param	string	$unaccent		1=Remove also accent (default), 0 do not remove them
+ *  @param	int	$unaccent		1=Remove also accent (default), 0 do not remove them
  *	@return string          		String cleaned (a-zA-Z_)
  *
  * 	@see        	dol_string_nospecial, dol_string_unaccent
@@ -454,18 +455,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));
@@ -487,8 +488,8 @@ function dolEscapeXML($string)
  *  Returns text escaped for inclusion into javascript code
  *
  *  @param      string		$stringtoescape		String to escape
- *  @param		string		$mode				0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \
+ *  @param		int		$mode				0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \
- *  @param		string		$noescapebackslashn	0=Escape also \n. 1=Do not escape \n.
+ *  @param		int		$noescapebackslashn	0=Escape also \n. 1=Do not escape \n.
  *  @return     string     		 				Escaped string. Both ' and " are escaped into ' if they are escaped.
  */
 function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
@@ -572,7 +573,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
 	global $conf, $user;
 
 	// If syslog module enabled
-	if (empty($conf->syslog->enabled)) return false;
+	if (empty($conf->syslog->enabled)) return;
 
 	if (! empty($level))
 	{
@@ -582,7 +583,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
 		{
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) return false;
+		if ($level > $conf->global->SYSLOG_LEVEL) return;
 
 		// If adding log inside HTML page is required
 		if (! empty($_REQUEST['logtohtml']) && ! empty($conf->global->MAIN_LOGTOHTML))
@@ -590,6 +591,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
 			$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
 		}
 
+		//TODO: Remove this. MAIN_ENABLE_LOG_HTML should be deprecated and use a HTML handler
 		// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
 		if (! empty($conf->global->MAIN_ENABLE_LOG_HTML) && ! empty($_GET["log"]))
 		{
@@ -768,7 +770,7 @@ function dol_bc($var,$moreclass='')
  *      @param  Object		$object         A company or contact object
  * 	    @param	int			$withcountry	1=Add country into address string
  *      @param	string		$sep			Separator to use to build string
- *      @param	Tranlsate	$outputlangs	Object lang that contains language for text translation.
+ *      @param	Translate	$outputlangs	Object lang that contains language for text translation.
  *      @return string          			Formated string
  */
 function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
@@ -1348,7 +1350,7 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
  * 	@param 	string	$country 	Country code to use for formatting
  * 	@param 	int		$cid 		Id of contact if known
  * 	@param 	int		$socid 		Id of third party if known
- * 	@param 	int		$addlink	''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
+ * 	@param 	string		$addlink	''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
  * 	@param 	string	$separ 		Separation between numbers for a better visibility example : xx.xx.xx.xx.xx
  * 	@return string 				Formated phone number
  */
@@ -1564,6 +1566,7 @@ function isValidEmail($address)
 /**
  *  Return true if phone number syntax is ok
  *
+ * TODO: Decide what to do with this
  *  @param	string		$phone		phone (Ex: "0601010101")
  *  @return boolean     			true if phone syntax is OK, false if KO or empty string
  */
@@ -2649,14 +2652,14 @@ function print_fiche_titre($title, $mesg='', $picto='title.png', $pictoisfullpat
  * 	@param	int		$id					To force an id on html objects
  * 	@return	string
  */
-function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0, $id='')
+function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0, $id=0)
 {
 	global $conf;
 
 	$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>';
@@ -2695,7 +2698,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))
 	{
@@ -3010,7 +3013,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)
@@ -3111,13 +3114,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)
@@ -3198,7 +3198,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller)
 {
 	global $db;
 
-	dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local." thirdparty id=".(is_object($thirdparty)?$thirdparty->id:''));
+	dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);
 
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
@@ -3256,30 +3256,6 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller)
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
 				}
 			}
-
-			if(! isOnlyOneLocalTax(2))
-			{
-				if(! isOnlyOneLocalTax(1))
-				{
-					return array($obj->localtax2_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-				else
-				{
-					return array($obj->localtax2_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-			}
-			else
-			{
-				if(! isOnlyOneLocalTax(1))
-				{
-					return array($obj->localtax2_type, $obj->localtax2, $obj->localtax1_type,get_localtax($vatrate, 1, $buyer, $seller) ,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-				else
-				{
-					return array($obj->localtax2_type, $obj->localtax2, $obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-			}
-
 		}
 	}
 
@@ -4014,7 +3990,7 @@ function dol_textishtml($msg,$option=0)
  *
  *  @param	string	$text1		Text 1
  *  @param	string	$text2		Text 2
- *  @param  string	$forxml     false=Use <br>, true=Use <br />
+ *  @param  bool	$forxml     false=Use <br>, true=Use <br />
  *  @return	string				Text 1 + new line + Text2
  *  @see    dol_textishtml
  */
@@ -4056,7 +4032,7 @@ function make_substitutions($chaine,$substitutionarray)
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            If we want substitution from special constants, we provide a language
- *  @param  Object		$object                 If we want substitution from special constants, we provide data in a source object
+ *  @param  object		$object                 If we want substitution from special constants, we provide data in a source object
  *  @param  Mixed		$parameters       		Add more parameters (useful to pass product lines)
  *  @param  string      $callfunc               What is the name of the custom function that will be called? (default: completesubstitutionarray)
  *  @return	void
@@ -4099,8 +4075,8 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
 /**
  *    Format output for start and end date
  *
- *    @param	timestamp	$date_start    Start date
+ *    @param	int	$date_start    Start date
- *    @param    timestamp	$date_end      End date
+ *    @param    int	$date_end      End date
  *    @param    string		$format        Output format
  *    @param	Translate	$outputlangs   Output language
  *    @return	void
@@ -4113,8 +4089,8 @@ function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
 /**
  *    Format output for start and end date
  *
- *    @param	timestamp	$date_start    Start date
+ *    @param	int	$date_start    Start date
- *    @param    timestamp	$date_end      End date
+ *    @param    int	$date_end      End date
  *    @param    string		$format        Output format
  *    @param	Translate	$outputlangs   Output language
  *    @return	string						String
@@ -4610,6 +4586,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/commande/doc/pdf_einstein.modules.php

@@ -718,19 +718,20 @@ class pdf_einstein extends ModelePDFCommandes
         // If payment mode not forced or forced to VIR, show payment with BAN
         if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
         {
-	        if (! empty($conf->global->FACTURE_RIB_NUMBER))
+        	if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
-	        {
+			{
-                $account = new Account($this->db);
+				$bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
-                $account->fetch($conf->global->FACTURE_RIB_NUMBER);
+				$account = new Account($this->db);
+				$account->fetch($bankid);
 
-                $curx=$this->marge_gauche;
+				$curx=$this->marge_gauche;
-                $cury=$posy;
+				$cury=$posy;
 
-                $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+				$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
 
-                $posy+=2;
+				$posy+=2;
-	        }
+			}
-		}
+        }
 
 		return $posy;
 	}

htdocs/core/modules/import/import_csv.modules.php

@@ -354,6 +354,7 @@ class ImportCsv extends ModeleImports
 		}
 		else
 		{
+			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			// For each table to insert, me make a separate insert
 			foreach($objimport->array_import_tables[0] as $alias => $tablename)
 			{
@@ -414,21 +415,34 @@ class ImportCsv extends ModeleImports
 						    if (! empty($objimport->array_import_convertvalue[0][$val]))
 						    {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid' || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref')
+                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                	)
                                 {
                                     if (! is_numeric($newval) && $newval != '')    // If value into input import file is not a numeric, we apply the function defined into descriptor
                                     {
                                         $file=$objimport->array_import_convertvalue[0][$val]['classfile'];
                                         $class=$objimport->array_import_convertvalue[0][$val]['class'];
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
-                                        if (empty($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]))
+                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
+                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        }
+                                        else
+										{
                                             dol_include_once($file);
                                             $classinstance=new $class($this->db);
+                                            // Try the fetch from code or ref
                                             call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            // If not found, try the fetch from label
+                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            {
+												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                            }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if (! empty($classinstance->id))
+                                            if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval=$classinstance->id;
                                             }
@@ -442,10 +456,6 @@ class ImportCsv extends ModeleImports
                                                 $error++;
                                             }
                                         }
-                                        else
-                                        {
-                                            $newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
                                     }
 
                                 }
@@ -581,7 +591,7 @@ class ImportCsv extends ModeleImports
     				    elseif (preg_match('/^lastrowid-/',$val))
     				    {
     				        $tmp=explode('-',$val);
-                            $lastinsertid=$this->db->last_insert_id($tmp[1]);
+    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
     				        $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key);
                             $listvalues.=$lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
@@ -623,6 +633,7 @@ class ImportCsv extends ModeleImports
 						if ($sql)
 						{
 							$resql=$this->db->query($sql);
+							$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 							if ($resql)
 							{
 								//print '.';

htdocs/core/modules/modMargin.class.php

@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012	Christophe Battarel	<christophe.battarel@altairis.fr>
+ * 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
@@ -80,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/core/modules/modSociete.class.php

@@ -382,7 +382,7 @@ class modSociete extends DolibarrModules
 		$this->import_icon[$r]='company';
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('s'=>MAIN_DB_PREFIX.'societe','extra'=>MAIN_DB_PREFIX.'societe_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('s.nom'=>"Name*",'s.status'=>"Status",'s.client'=>"Customer*",'s.fournisseur'=>"Supplier*",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"CustomerAccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'s.fk_departement'=>"StateId",'s.fk_pays'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'s.fk_typent'=>"ThirdPartyType",'s.fk_effectif'=>"Staff","s.fk_forme_juridique"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus','s.default_lang'=>'DefaultLanguage','s.barcode'=>'BarCode','s.datec'=>"DateCreation");
+		$this->import_fields_array[$r]=array('s.nom'=>"Name*",'s.status'=>"Status",'s.client'=>"Customer*",'s.fournisseur'=>"Supplier*",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"CustomerAccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'s.fk_departement'=>"StateId",'s.fk_pays'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'s.fk_typent'=>"ThirdPartyType",'s.fk_effectif'=>"Staff","s.fk_forme_juridique"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus','s.default_lang'=>'DefaultLanguage','s.barcode'=>'BarCode','s.datec'=>"DateCreation");
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
@@ -398,7 +398,7 @@ class modSociete extends DolibarrModules
 		// End add extra fields
 		$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'societe');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
-			's.fk_typent'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ctypent.class.php','class'=>'Ctypent','method'=>'fetch','dict'=>'DictionaryCompanyType'),
+			's.fk_typent'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctypent.class.php','class'=>'Ctypent','method'=>'fetch','dict'=>'DictionaryCompanyType'),
 			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 			's.fk_stcomm'=>array('rule'=>'zeroifnull'),
 		    's.code_client'=>array('rule'=>'getcustomercodeifauto'),
@@ -407,8 +407,8 @@ class modSociete extends DolibarrModules
 		    's.code_compta_fournisseur'=>array('rule'=>'getsupplieraccountancycodeifauto')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('s.status'=>'^[0|1]','s.client'=>'^[0|1|2|3]','s.fournisseur'=>'^[0|1]','s.fk_typent'=>'id@'.MAIN_DB_PREFIX.'c_typent','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_regex_array[$r]=array('s.status'=>'^[0|1]','s.client'=>'^[0|1|2|3]','s.fournisseur'=>'^[0|1]','s.fk_typent'=>'id@'.MAIN_DB_PREFIX.'c_typent','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r]=array('s.nom'=>"MyBigCompany",'s.status'=>"0 (closed) or 1 (active)",'s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 or 1','s.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'s.code_client'=>"CU01-0001 or empty or 'auto'",'s.code_fournisseur'=>"SU01-0001 or empty or 'auto'",'s.address'=>"61 jump street",'s.zip'=>"123456",'s.town'=>"Big town",'s.fk_pays'=>'US, FR, DE...','s.phone'=>"0101010101",'s.fax'=>"0101010102",'s.url'=>"http://mycompany.com",'s.email'=>"test@mycompany.com",'s.siret'=>"",'s.siren'=>"",'s.ape'=>"",'s.idprof4'=>"",'s.tva_intra'=>"FR0123456789",'s.capital'=>"10000",'s.note_private'=>"This is an example of private note for record",'s.note_public'=>"This is an example of public note for record",'s.fk_typent'=>"2",'s.fk_effectif'=>"3","s.fk_forme_juridique"=>"1",'s.fk_prospectlevel'=>'PL_MEDIUM','s.fk_stcomm'=>'0','s.default_lang'=>'en_US','s.barcode'=>'123456789');
+		$this->import_examplevalues_array[$r]=array('s.nom'=>"MyBigCompany",'s.status'=>"0 (closed) or 1 (active)",'s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 or 1','s.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'s.code_client'=>"CU01-0001 or empty or 'auto'",'s.code_fournisseur'=>"SU01-0001 or empty or 'auto'",'s.address'=>"61 jump street",'s.zip'=>"123456",'s.town'=>"Big town",'s.fk_pays'=>'US, FR, DE...','s.phone'=>"0101010101",'s.fax'=>"0101010102",'s.url'=>"http://mycompany.com",'s.email'=>"test@mycompany.com",'s.siret'=>"",'s.siren'=>"",'s.ape'=>"",'s.idprof4'=>"",'s.idprof5'=>"",'s.idprof6'=>"",'s.tva_intra'=>"FR0123456789",'s.capital'=>"10000",'s.note_private'=>"This is an example of private note for record",'s.note_public'=>"This is an example of public note for record",'s.fk_typent'=>"2",'s.fk_effectif'=>"3","s.fk_forme_juridique"=>"1",'s.fk_prospectlevel'=>'PL_MEDIUM','s.fk_stcomm'=>'0','s.default_lang'=>'en_US','s.barcode'=>'123456789','s.datec'=>"2015-01-01 or 2015-01-01 12:30:00");
 
 		// Import list of contact and attributes
 		$r++;
@@ -437,7 +437,7 @@ class modSociete extends DolibarrModules
 			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('s.birthday'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_regex_array[$r]=array('s.birthday'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
 		$this->import_examplevalues_array[$r]=array('s.fk_soc'=>'MyBigCompany','s.civility'=>"MR",'s.lastname'=>"Smith",'s.firstname'=>'John','s.address'=>'61 jump street','s.zip'=>'75000','s.town'=>'Bigtown','s.fk_pays'=>'US, FR, DE...','s.datec'=>'1972-10-10','s.poste'=>"Director",'s.phone'=>"5551122",'s.phone_perso'=>"5551133",'s.phone_mobile'=>"5551144",'s.fax'=>"5551155",'s.email'=>"johnsmith@email.com",'s.note_private'=>"My private note",'s.note_public'=>"My public note");
 
 		// Import Bank Accounts

htdocs/cron/class/cronjob.class.php

@@ -718,6 +718,8 @@ class Cronjob extends CommonObject
 
 		$object=new Cronjob($this->db);
 
+		$object->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -744,6 +746,8 @@ class Cronjob extends CommonObject
 
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{

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

@@ -887,7 +887,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";
@@ -899,12 +899,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;
@@ -1024,7 +1024,9 @@ class CommandeFournisseur extends CommonOrder
 
         $error=0;
 
-        $this->db->begin();
+		$this->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
 
         // Load source object
         $objFrom = dol_clone($this);
@@ -1060,7 +1062,9 @@ class CommandeFournisseur extends CommonOrder
 			// End call triggers
         }
 
-        // End
+		unset($this->context['createfromclone']);
+
+		// End
         if (! $error)
         {
             $this->db->commit();

htdocs/fourn/class/fournisseur.facture.class.php

@@ -1699,7 +1699,9 @@ class FactureFournisseur extends CommonInvoice
 
         $object=new FactureFournisseur($this->db);
 
-        $this->db->begin();
+		$object->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
 
         // Load source object
         $object->fetch($fromid);
@@ -1745,6 +1747,8 @@ class FactureFournisseur extends CommonInvoice
 
         }
 
+        unset($object->context['createfromclone']);
+
         // End
         if (! $error)
         {

htdocs/fourn/class/fournisseur.product.class.php

@@ -447,12 +447,18 @@ class ProductFournisseur extends Product
      *
      *  @param	int		$prodid	    Product id
      *  @param	int		$qty		Minimum quantity
-     *  @return int					<0 if KO, >0 if OK
+     *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
      */
     function find_min_price_product_fournisseur($prodid, $qty=0)
     {
         global $conf;
 
+        if (empty($prodid))
+        {
+        	dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
+        	return 0;
+        }
+
         $this->product_fourn_price_id = '';
         $this->product_fourn_id       = '';
         $this->fourn_ref              = '';
@@ -500,7 +506,7 @@ class ProductFournisseur extends Product
             return 1;
         }
         else
-        {
+		{
             $this->error=$this->db->error();
             return -1;
         }

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)
 	{
@@ -334,7 +334,7 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
     	else
     	{
     		$ttc = price2num($_POST['price_ttc']);
-    		$ht = $ttc / (1 + ($tauxtva / 100));
+    		$ht = $ttc / (1 + ($tva_tx / 100));
     		$price_base_type = 'HT';
     		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end);
     	}
@@ -780,11 +780,10 @@ 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)
-
-	if (!$error)
 	{
 		// Actions on extra fields (by external module or standard code)
 		// FIXME le hook fait double emploi avec le trigger !!
@@ -797,7 +796,6 @@ if ($action == 'update_extras')
 		{
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-
 				$result=$object->insertExtraFields();
 
 				if ($result < 0)
@@ -841,21 +839,29 @@ 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);
+       	if (! $error)
+       	{
+			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0) $error++;
+       	}
 
-        $id = $object->create($user);
+       	if (! $error)
-		if ($id < 0)
+       	{
-		{
+			$id = $object->create($user);
-			$error++;
+        	if ($id < 0)
-		}
+        	{
+        		$error++;
+	        	setEventMessage($langs->trans($object->error), 'errors');
+        	}
+        }
 
         if ($error)
         {
             $langs->load("errors");
             $db->rollback();
-	        setEventMessage($langs->trans($object->error), 'errors');
             $action='create';
             $_GET['socid']=$_POST['socid'];
         }
@@ -1272,6 +1278,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/commande/dispatch.php

@@ -347,38 +347,51 @@ if ($id > 0 || ! empty($ref))
 							print '<td align="right">'.$objp->qty.'</td>';
 							print '<td align="right">'.$products_dispatched[$objp->rowid].'</td>';
 
-							if ( !(empty($conf->productbatch->enabled)) && $objp->tobatch==1) {
+							if (! empty($conf->productbatch->enabled) && $objp->tobatch==1)
-								print '<td colspan="2" align="center">'.img_picto_common($langs->trans('AddDispatchBatchLine'),'treemenu/plustop2.gif','onClick="AddLineBatch('.$i.')"').'</td>';
+							{
+								print '<td align="right">'.img_picto($langs->trans('AddDispatchBatchLine'),'split.png','onClick="addLineBatch('.$i.')"').'</td>';	// Dispatch column
+								print '<td></td>';																													// Warehouse column
 								print '</tr>';
-								print '<tr '.$bc[$var].' name="dluo'.$suffix.'"><td width="5%">';
+
-								print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
+								print '<tr '.$bc[$var].' name="dluo'.$suffix.'">';
-								print '<input name="pu'.$suffix.'" type="hidden" value="'.$up_ht_disc.'"><!-- This is a up including discount -->';
+								print '<td>';
-								print '</td><td>';
-								$form->select_date('','dlc'.$suffix,'','',1,"");
-								print '</td><td>';
-								$form->select_date('','dluo'.$suffix,'','',1,"");
-								print '</td><td>';
-								print '<input type="text" name="lot_number'.$suffix.'" size="40" value="">';
-								print '</td>';
-								print '<td colspan="2">&nbsp</td>';
-							} else {
-								print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 								print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
+								print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 								print '<input name="pu'.$suffix.'" type="hidden" value="'.$up_ht_disc.'"><!-- This is a up including discount -->';
+								print '</td>';
+
+								print '<td>';
+								$form->select_date('','dlc'.$suffix,'','',1,"");
+								print '</td>';
+								print '<td>';
+								$form->select_date('','dluo'.$suffix,'','',1,"");
+								print '</td>';
+								print '<td>';
+								print '<input type="text" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" size="40" value="">';
+								print '</td>';
+								print '<td colspan="2">&nbsp</td>';		// Qty ordered + qty already dispatached
 							}
 
 							// Dispatch
-							print '<td align="right"><input name="qty'.$suffix.'" type="text" size="8" value="'.($remaintodispatch).'"></td>';
+							print '<td align="right">';
+							if (empty($conf->productbatch->enabled) || $objp->tobatch!=1)
+							{
+								print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
+								print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
+								print '<input name="pu'.$suffix.'" type="hidden" value="'.$up_ht_disc.'"><!-- This is a up including discount -->';
+							}
+							print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" size="8" value="'.($remaintodispatch).'">';
+							print '</td>';
 
 							// Warehouse
 							print '<td align="right">';
 							if (count($listwarehouses)>1)
 							{
-								print $form->selectarray("entrepot".$suffix, $listwarehouses, '', 1, 0, 0, '', 0, 0, $disabled);
+								print $form->selectarray("entrepot".$suffix, $listwarehouses, GETPOST("entrepot".$suffix), 1, 0, 0, '', 0, 0, $disabled);
 							}
 							elseif  (count($listwarehouses)==1)
 							{
-								print $form->selectarray("entrepot".$suffix, $listwarehouses, '', 0, 0, 0, '', 0, 0, $disabled);
+								print $form->selectarray("entrepot".$suffix, $listwarehouses, GETPOST("entrepot".$suffix), 0, 0, 0, '', 0, 0, $disabled);
 							}
 							else
 							{

htdocs/fourn/commande/list.php

@@ -43,7 +43,7 @@ $search_company=GETPOST('search_company');
 $search_user=GETPOST('search_user');
 $search_ttc=GETPOST('search_ttc');
 $sall=GETPOST('search_all');
-$search_status=GETPOST('search_status','int');
+$search_status=(GETPOST('search_status','int')!=''?GETPOST('search_status','int'):GETPOST('statut','int'));
 
 $page  = GETPOST('page','int');
 $socid = GETPOST('socid','int');

htdocs/fourn/facture/card.php

@@ -308,7 +308,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
 
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-		if ($ret < 0) $error ++;
+		if ($ret < 0) $error++;
 
         $tmpproject = GETPOST('projectid', 'int');
 
@@ -1070,9 +1070,8 @@ 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++;
-	if($ret < 0) $error++;
 
 	if (!$error)
 	{

htdocs/imports/import.php

@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/import.lib.php';
 
 $langs->load("exports");
+$langs->load("compta");
 $langs->load("errors");
 
 // Security check

htdocs/index.php

@@ -317,7 +317,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
     $board->load_board($user);
     $board->warning_delay=$conf->actions->warning_delay/60/60/24;
     $board->label=$langs->trans("ActionsToDo");
-    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda';
+    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&usertodo=-1&mainmenu=agenda';
     $board->img=img_object($langs->trans("Actions"),"action");
     $rowspan++;
     $dashboardlines[]=$board;

htdocs/install/mysql/migration/3.6.0-3.7.0.sql

@@ -1095,6 +1095,9 @@ ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
 
+ALTER TABLE llx_projet_task CHANGE COLUMN duration_effective real DEFAULT 0 NULL;
+ALTER TABLE llx_projet_task CHANGE COLUMN planned_workload real DEFAULT 0 NULL;
+  
 
 -- add extrafield on ficheinter lines
 CREATE TABLE llx_fichinterdet_extrafields
@@ -1161,4 +1164,4 @@ ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_b
 UPDATE llx_bank_url set url = REPLACE( url, 'fiche.php', 'card.php');
 
 -- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT(11) NOT NULL DEFAULT '0' AFTER fk_product;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INTEGER NOT NULL DEFAULT 0 AFTER fk_product;

htdocs/install/mysql/migration/repair.sql

@@ -212,5 +212,6 @@ update llx_facturedet set product_type = 1 where product_type = 2;
 --update llx_commandedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
 --update llx_facturedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
 
+delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or fk_commandefourndet IS NULL;
 
 

htdocs/install/mysql/tables/llx_projet_task.sql

@@ -31,10 +31,10 @@ create table llx_projet_task
   datev					datetime,						-- date validation
   label					varchar(255) NOT NULL,
   description			text,
-  duration_effective	real DEFAULT 0 NOT NULL,
+  duration_effective	real DEFAULT 0,
-  planned_workload		real DEFAULT 0 NOT NULL,
+  planned_workload		real DEFAULT 0,
-  progress				integer	DEFAULT 0,				-- percentage increase
+  progress				integer DEFAULT 0,				-- percentage increase
-  priority				integer	DEFAULT 0,				-- priority
+  priority				integer DEFAULT 0,				-- priority
   fk_user_creat			integer,						-- user who created the task
   fk_user_valid			integer,						-- user who validated the task
   fk_statut				smallint DEFAULT 0 NOT NULL,

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/admin.lang

@@ -1560,3 +1560,5 @@ SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type 
 IncludePath=Include path (defined into variable %s)
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.

htdocs/langs/en_US/errors.lang

@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
 ErrorPasswordsMustMatch=Both typed passwords must match each other
 ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> en provide the error code <b>%s</b> in your message, or even better by adding a screen copy of this page.
 ErrorWrongValueForField=Wrong value for field number <b>%s</b> (value '<b>%s</b>' does not match regex rule <b>%s</b>)
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b>)
+ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b> = <b>%s</b>)
 ErrorFieldRefNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a <b>%s</b> existing ref)
 ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)

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/en_US/stocks.lang

@@ -108,7 +108,7 @@ WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decreas
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
 ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)

htdocs/langs/es_ES/accountancy.lang

@@ -13,9 +13,9 @@ ConfigAccountingExpert=Configuración del módulo contable
 Journaux=Diarios
 JournalFinancial=Diarios financieros
 Exports=Exportaciones
-Export=Export
+Export=Exportar
 Modelcsv=Modelo de exportación
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Las opciones están desactivadas para este modelo de exportación
 Selectmodelcsv=Seleccione un modelo de exportación
 Modelcsv_normal=Exportación clásica
 Modelcsv_CEGID=Exportar a Cegid Expert
@@ -68,7 +68,7 @@ Lineofinvoice=Línea de la factura
 VentilatedinAccount=Contabilizada con éxito en la cuenta contable
 NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Separador de columnas en el archivo de exportación
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes

htdocs/langs/es_ES/admin.lang

@@ -1568,4 +1568,4 @@ SalariesSetup=Configuración del módulo salarios
 SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
-IncludePath=Include path (defined into variable %s)
+IncludePath=Include path (definida en la variable %s)

htdocs/langs/es_ES/agenda.lang

@@ -60,7 +60,7 @@ SupplierOrderSentByEMail=Pedido a proveedor %s enviada por e-mail
 SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
 ShippingSentByEMail=Expedición %s enviada por email
 ShippingValidated= Expedición %s validada
-InterventionSentByEMail=Intervention %s sent by EMail
+InterventionSentByEMail=Intervención %s enviada por e-mail
 NewCompanyToDolibarr= Tercero creado
 DateActionPlannedStart= Fecha de inicio prevista
 DateActionPlannedEnd= Fecha de fin prevista

htdocs/langs/es_ES/compta.lang

@@ -29,7 +29,7 @@ ReportTurnover=Volumen de ventas
 PaymentsNotLinkedToInvoice=Pagos vinculados a ninguna factura, por lo que ninguún tercero
 PaymentsNotLinkedToUser=Pagos no vinculados a un usuario
 Profit=Beneficio
-AccountingResult=Accounting result
+AccountingResult=Resultado contable
 Balance=Saldo
 Debit=Debe
 Credit=Haber

htdocs/langs/es_ES/cron.lang

@@ -14,8 +14,8 @@ URLToLaunchCronJobs=URL para ejecutar tareas Cron
 OrToLaunchASpecificJob=O para ejecutar una tarea en concreto
 KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunUnix=En entornos Unix se debe utilizar la siguiente entrada crontab para ejecutar el comando cada 5 minutos
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=En entornos Microsoft (tm) Windows, puede utilizar las herramienta  tareas programadas para ejecutar el comando cada 5 minutos
 # Menu
 CronJobs=Tareas programadas
 CronListActive=Listado de tareas activas/programadas

htdocs/langs/es_ES/errors.lang

@@ -158,8 +158,8 @@ ErrorPriceExpression21=Resultado '%s' vacío
 ErrorPriceExpression22=Resultado '%s' negativo
 ErrorPriceExpressionInternal=Error interno '%s'
 ErrorPriceExpressionUnknown=Error desconocido '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta hacer un movimiento de stock sin indicar lote/serie, en un producto que requiere de lote/serie
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos

htdocs/langs/es_ES/orders.lang

@@ -29,7 +29,7 @@ StatusOrderDraftShort=Borrador
 StatusOrderValidatedShort=Validado
 StatusOrderSentShort=Expedición en curso
 StatusOrderSent=Envío en curso
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Pedido
 StatusOrderProcessedShort=Procesado
 StatusOrderToBillShort=Emitido
 StatusOrderToBill2Short=A facturar
@@ -41,7 +41,7 @@ StatusOrderReceivedAllShort=Recibido
 StatusOrderCanceled=Anulado
 StatusOrderDraft=Borrador (a validar)
 StatusOrderValidated=Validado
-StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcess=Pedido - En espera de recibir
 StatusOrderProcessed=Procesado
 StatusOrderToBill=Emitido
 StatusOrderToBill2=A facturar
@@ -50,8 +50,8 @@ StatusOrderRefused=Rechazado
 StatusOrderReceivedPartially=Recibido parcialmente
 StatusOrderReceivedAll=Recibido
 ShippingExist=Existe una expedición
-ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraft=Cantidades en pedidos borrador
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraftOrWaitingApproved=Cantidades en pedidos borrador o aprobados, pero no realizados
 DraftOrWaitingApproved=Borrador o aprobado aún no controlado
 DraftOrWaitingShipped=Borrador o validado aún no expedido
 MenuOrdersToBill=Pedidos a facturar

htdocs/langs/es_ES/productbatch.lang

@@ -1,8 +1,8 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
+ManageLotSerial=Usar numeración por lotes/series
-ProductStatusOnBatch=Yes (Batch/serial required)
+ProductStatusOnBatch=Sí (se necesita lote/serie)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ProductStatusNotOnBatch=No (no se usa lote/serie)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Sí
 ProductStatusNotOnBatchShort=No
 Batch=Lote/Serie
 atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote
@@ -18,4 +18,4 @@ printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
 BatchDefaultNumber=Indefinido
 WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=Este producto no usa numeración por lotes/series

htdocs/langs/es_ES/products.lang

@@ -22,14 +22,14 @@ ProductAccountancySellCode=Código contable ventas
 ProductOrService=Producto o servicio
 ProductsAndServices=Productos y servicios
 ProductsOrServices=Productos o servicios
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
+ProductsAndServicesOnSell=Productos y Servicios a la venta o en compra
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Productos y Servicios fuera de venta
 ProductsAndServicesStatistics=Estadísticas productos y servicios
 ProductsStatistics=Estadísticas productos
 ProductsOnSell=Producto en venta o en compra
 ProductsNotOnSell=Producto fuera de venta y fuera de compra
 ProductsOnSellAndOnBuy=Productos en venta o en compra
-ServicesOnSell=Services for sale or for purchase
+ServicesOnSell=Servicios a la venta o en compra
 ServicesNotOnSell=Servicios fuera de venta
 ServicesOnSellAndOnBuy=Servicios a la venta o en compra
 InternalRef=Referencia interna

htdocs/langs/es_ES/projects.lang

@@ -3,7 +3,7 @@ RefProject=Ref. proyecto
 ProjectId=Id proyecto
 Project=Proyecto
 Projects=Proyectos
-ProjectStatus=Project status
+ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
@@ -103,7 +103,7 @@ CloneContacts=Clonar los contactos
 CloneNotes=Clonar las notas
 CloneProjectFiles=Clonar los archivos adjuntos del proyecto
 CloneTaskFiles=Clonar los archivos adjuntos de la(s) tarea(s) (si se clonan  la(s) tarea(s))
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=¿Actualizar las fechas de los proyectos/tareas?
 ConfirmCloneProject=¿Está seguro de querer clonar este proyecto?
 ProjectReportDate=Cambiar las fechas de las tareas en función de la fecha de inicio del proyecto
 ErrorShiftTaskDate=Se ha producido un error en el cambio de las fechas de las tareas

htdocs/langs/es_ES/sendings.lang

@@ -4,8 +4,8 @@ Sending=Envío
 Sendings=Envíos
 Shipment=Envío
 Shipments=Envíos
-ShowSending=Show Sending
+ShowSending=Mostrar envío
-Receivings=Receipts
+Receivings=Recepciones
 SendingsArea=Área envíos
 ListOfSendings=Listado de envíos
 SendingMethod=Método de envío
@@ -15,7 +15,7 @@ SearchASending=Buscar envío
 StatisticsOfSendings=Estadísticas de envíos
 NbOfSendings=Número de envíos
 NumberOfShipmentsByMonth=Número de envíos por mes
-SendingCard=Shipment card
+SendingCard=Ficha envío
 NewSending=Nuevo envío
 CreateASending=Crear un envío
 CreateSending=Crear envío
@@ -38,7 +38,7 @@ StatusSendingCanceledShort=Anulado
 StatusSendingDraftShort=Borrador
 StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Procesado
-SendingSheet=Shipment sheet
+SendingSheet=Nota de entrega
 Carriers=Transportistas
 Carrier=Transportista
 CarriersArea=Área transportistas
@@ -59,15 +59,15 @@ SendShippingRef=Envío de la expedición %s
 ActionsOnShipping=Eventos sobre la expedición
 LinkToTrackYourPackage=Enlace para el seguimento de su paquete
 ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedición se realiza desde la ficha de pedido.
-RelatedShippings=Related shipments
+RelatedShippings=Expediciones asociadas
 ShipmentLine=Línea de expedición
 CarrierList=Listado de transportistas
-SendingRunning=Product from ordered customer orders
+SendingRunning=Producto de pedidos de clientes
-SuppliersReceiptRunning=Product from ordered supplier orders
+SuppliersReceiptRunning=Producto de pedidos a proveedores
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
+ProductQtyInCustomersOrdersRunning=Cantidad en pedidos de clientes abiertos
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ProductQtyInSuppliersOrdersRunning=Cantidad en pedidos a proveedores abiertos
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Cantidad en pedidos de clientes ya enviados
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad en pedidos a proveedores ya recibidos
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente

htdocs/langs/es_ES/stocks.lang

@@ -48,8 +48,8 @@ PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
 QtyDispatched=Cantidad recibida
-QtyDispatchedShort=Qty dispatched
+QtyDispatchedShort=Cant. recibida
-QtyToDispatchShort=Qty to dispatch
+QtyToDispatchShort=Cant. a enviar
 OrderDispatch=Recepción de stocks
 RuleForStockManagementDecrease=Regla de gestión de decrementos de stock
 RuleForStockManagementIncrease=Regla de gestión de incrementos de stock
@@ -61,7 +61,7 @@ ReStockOnValidateOrder=Incrementar los stocks físicos sobre los pedidos a prove
 ReStockOnDispatchOrder=Incrementa los stocks físicos en el desglose manual de la recepción de los pedidos a proveedores en los almacenes
 ReStockOnDeleteInvoice=Incrementa los stocks físicos en la eliminación de facturas
 OrderStatusNotReadyToDispatch=El pedido aún no está o no tiene un estado que permita un desglose de stock.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Motivo de la diferencia entre valores físicos y teóricos
 NoPredefinedProductToDispatch=No hay productos predefinidos en este objeto. Por lo tanto no se puede realizar un desglose de stock.
 DispatchVerb=Validar recepción
 StockLimitShort=Límite para alerta
@@ -118,15 +118,15 @@ MassMovement=Movimientos en masa
 MassStockMovement=Movimientos de stock en masa
 SelectProductInAndOutWareHouse=Selecccione un producto, una cantidad, un almacén origen y un almacén destino, seguidamente haga clic "%s". Una vez seleccionados todos los movimientos, haga clic en "%s".
 RecordMovement=Registrar transferencias
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Recepciones de este pedido
 StockMovementRecorded=Movimiento de stock registrado
 RuleForStockAvailability=Reglas de requerimiento de stock
 StockMustBeEnoughForInvoice=El nivel de existencias debe ser suficiente para añadir productos/servicios en facturas
 StockMustBeEnoughForOrder=El nivel de existencias debe ser suficiente para añadir productos/servicios en pedidos
 StockMustBeEnoughForShipment= El nivel de existencias debe ser suficiente para añadir productos/servicios en envíos
-MovementLabel=Label of movement
+MovementLabel=Etiqueta del movimiento
-InventoryCode=Movement or inventory code
+InventoryCode=Movimiento o código de inventario
-IsInPackage=Contained into package
+IsInPackage=Contenido en el paquete
-ShowWarehouse=Show warehouse
+ShowWarehouse=Mostrar almacén
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Corrección de stock del producto %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementTransferStock=Transferencia de stock del producto %s a otro almacén

htdocs/langs/es_ES/suppliers.lang

@@ -42,5 +42,5 @@ NoneOrBatchFileNeverRan=Ninguno o lote <b>%s</b> no se ha ejecutado recientement
 SentToSuppliers=Enviado a proveedores
 ListOfSupplierOrders=Listado de pedidos a proveedor
 MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
-NbDaysToDelivery=Delivery delay in days
+NbDaysToDelivery=Tiempo de entrega en días
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=El plazo mayor se visualiza el el listado de pedidos de productos

htdocs/langs/es_ES/withdrawals.lang

@@ -79,7 +79,7 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
-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=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizadas las peticiones, vaya al menú Bancos->Domiciliaciones para gestionar la domiciliación. Al cerrar una domiciliación, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas

htdocs/langs/es_ES/workflow.lang

@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Configuración del módulo Flujo de trabajo
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
+WorkflowDesc=Este módulo le permite cambiar el comportamiento de las acciones automáticas en la aplicación. De forma predeterminada, el workflow está abierto (configure según sus necesidades). Active las acciones automáticas que le interesen.
 ThereIsNoWorkflowToModify=No hay workflow modificable para los módulos que tiene activados.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear un pedido de cliente automáticamente a la firma de un presupuesto
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la firma de un presupuesto

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