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

2014-12-15 23:24:47 +01:00 · 2014-12-15 23:24:47 +01:00 · 0cd29b3343
commit 0cd29b3343
parent a0112ba724 a8c6417604
587 changed files with 7046 additions and 5471 deletions
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@ -1,20 +1,20 @@
 #!/usr/bin/php
 <?php
 /* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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/>.
+ * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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/>.
 *
 * -----
 *
@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess)

 	print "Output can be found at $output.\n";

-	print "To rename all .delta files, you can do\n";
-	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+	print "To rename all .delta files, you can do\n";
+	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }


--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@ -23,6 +23,7 @@

 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

 $graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
@ -69,7 +70,7 @@ dol_mkdir($dir);

 if ($mode)
 {
-    // Define sql	
+    // Define sql
    if ($mode == 'memberbycountry')
    {
        $label=$langs->trans("Country");
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';

 $langs->load('admin');
 $langs->load('compta');
+$langs->load('accountancy');

 if (!$user->admin)
 accessforbidden();
@ -153,7 +154,7 @@ foreach ($list as $key)
 	print '<tr '.$bc[$var].' class="value">';

 	// Param
-	$libelle = $langs->trans($key); 
+	$libelle = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$libelle.'</label></td>';

 	// Value
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@ -182,30 +182,15 @@ else if ($action == 'setmod')
 	dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity);
 }

-else if ($action == 'set_CONTRACT_FREE_TEXT')
+else if ($action == 'set_other')
 {
 	$freetext= GETPOST('CONTRACT_FREE_TEXT','alpha');
-	$res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);

-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-}
-
-else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
-{
 	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
+	$res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);

-	$res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
+	if (! $res1 > 0 || ! $res2 > 0) $error++;

 	if (! $error)
    {
@ -217,6 +202,7 @@ else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
    }
 }

+
 /*
 * View
 */
@ -506,44 +492,43 @@ print "<br>";
 *
 */

+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_other">';
+
 print_titre($langs->trans("OtherOptions"));
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;

 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_CONTRACT_FREE_TEXT">';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+print '</td></tr>'."\n";
 print '</form>';

 //Use draft Watermark
 $var=!$var;
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_CONTRACT_DRAFT_WATERMARK\">";
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("WatermarkOnDraftContractCards").'<br>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td></tr>'."\n";

 print '</table>';

-print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+dol_fiche_end();

-$db->close();

 llxFooter();
+
+$db->close();
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@ -525,6 +525,13 @@ else
    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
    print '</tr>';

+    $var=!$var;
+    print "<tr ".$bc[$var].">\n";
+    $url='http://partners.dolibarr.org';
+    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
+    print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
+    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '</tr>';

    print "</table>\n";
 }
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
 *
@ -153,7 +153,7 @@ print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEME
 print '</td></tr>';

 // ICS
-print '<tr class="impair"><td>'.$langs->trans("ICS").'</td>';
+print '<tr class="pair"><td>'.$langs->trans("ICS").'</td>';
 print '<td align="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="9" ></td>';
 print '</td></tr>';
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@ -905,7 +905,7 @@ if ($id > 0)
 	    }

 		// Assigned to
-		print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
@ -1077,7 +1077,7 @@ if ($id > 0)
    	}

 		// Assigned to
-    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@ -1142,7 +1142,7 @@ class ActionComm extends CommonObject
     */
    function initAsSpecimen()
    {
-        global $user,$langs,$conf;
+        global $user,$langs,$conf,$user;

        $now=dol_now();

@ -1166,6 +1166,9 @@ class ActionComm extends CommonObject
        $this->transparency=1;	// 1 means opaque
        $this->priority=1;
        $this->note = 'Note';
+
+        $this->userownerid=$user->id;
+        $this->userassigned[$user->id]=array('id'=>$user->id, 'transparency'=> 1);
    }

 }
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@ -435,14 +435,14 @@ if ($result)
 				if($num<$limit){
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}
 				else
 				{
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}

--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@ -249,7 +249,7 @@ if ($resql)
        $objp = $db->fetch_object($resql);

        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        print "<tr ".$bc[$var].">\n";
 //         print '<form method="post" action="rappro.php?account='.$_GET["account"].'">';
 //         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

@ -261,9 +261,9 @@ if ($resql)
        // Date value
 		if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
 		{
-			print '<td align="center" class="nowrap">';
+			print '<td align="center" class="nowrap">'."\n";
 			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
-			print ' &nbsp';
+			print '&nbsp;';
 			print '<span>';
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$acct->id.'&amp;rowid='.$objp->rowid.'">';
 			print img_edit_remove() . "</a> ";
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@ -2837,6 +2837,8 @@ class Facture extends CommonInvoice
 	 */
 	function demande_prelevement($user)
 	{
+		$error=0;
+		
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);

 		if ($this->statut > 0 && $this->paye == 0)
@ -2882,21 +2884,32 @@ class Facture extends CommonInvoice
                    $sql .= ",'".$bac->cle_rib."')";

                    dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-                    if ($this->db->query($sql))
+                    $resql=$this->db->query($sql);
+                    if (! $resql)
                    {
-                        return 1;
-                    }
-                    else
-                  {
                        $this->error=$this->db->lasterror();
                        dol_syslog(get_class($this).'::demandeprelevement Erreur');
-                        return -1;
+                        $error++;
                    }
+
+        			if (! $error)
+        			{
+        				// Force payment mode of invoice to withdraw
+        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement');
+        				if ($payment_mode_id > 0) 
+        				{
+        					$result=$this->setPaymentMethods($payment_mode_id);
+        				}
+        			}            
+                    
+                    if ($error) return -1;
+                    return 1;
                }
                else
                {
                    $this->error="A request already exists";
                    dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
+                    return 0;
                }
            }
            else
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@ -58,6 +58,7 @@ if ($id > 0 || ! empty($ref))
 	}
 }

+
 /*
 * Actions
 */
@ -69,14 +70,14 @@ if ($action == "new")
        $result = $object->demande_prelevement($user);
        if ($result > 0)
        {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
+            setEventMessage($langs->trans("RecordSaved"));
        }
        else
        {
        	setEventMessage($object->error, 'errors');
        }
    }
+    $action='';
 }

 if ($action == "delete")
@ -307,6 +308,31 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';

+	// Conditions de reglement
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentConditionsShort');
+	print '</td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE)
+	{
+		if ($action == 'editconditions')
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+		}
+		else
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+		}
+	}
+	else
+	{
+		print '&nbsp;';
+	}
+	print '</td></tr>';
+
 	// Date payment term
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@ -333,32 +359,7 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';

-	// Conditions de reglement
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('PaymentConditionsShort');
-	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE)
-	{
-		if ($action == 'editconditions')
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
-		}
-		else
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
-		}
-	}
-	else
-	{
-		print '&nbsp;';
-	}
-	print '</td></tr>';
-
-	// Mode de reglement
+	// Payment mode
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
@ -376,6 +377,26 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';

+	// Bank Account
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('BankAccount');
+	print '<td>';
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editbankaccount')
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+	}
+	else
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+	}
+	print "</td>";
+	print '</tr>';
+	
 	// Montants
 	print '<tr><td>'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" colspan="2" nowrap>'.price($object->total_ht).'</td>';
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@ -56,7 +56,9 @@ class BonPrelevement extends CommonObject
    var $statut;    // 0-Wait, 1-Trans, 2-Done
    var $labelstatut=array();

+    var $invoice_in_error=array();

+    
    /**
     *	Constructor
     *
@ -835,7 +837,7 @@ class BonPrelevement extends CommonObject
                            else
 							{
 								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
-                                $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name;
+                                $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name;
                            }
                        }
                        else
@ -1814,21 +1816,21 @@ class BonPrelevement extends CommonObject

        if ($mode == 1)
        {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
        }
        if ($mode == 2)
        {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
        }

        if ($mode == 3)
        {
-            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
            if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
        }
    }
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@ -138,20 +138,20 @@ class LignePrelevement

 		if ($mode == 1)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}

 		if ($mode == 3)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@ -70,6 +70,10 @@ if ($action == 'create')
    if ($result == 0)
    {
        $mesg='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+        foreach($bprev->invoice_in_error as $key => $val)
+        {
+        	$mesg.=$val."<br>\n";
+        }
    }
 }

@ -179,6 +183,7 @@ if ($resql)
    print '<tr class="liste_titre">';
    print '<td>'.$langs->trans("Invoice").'</td>';
    print '<td>'.$langs->trans("ThirdParty").'</td>';
+    print '<td>'.$langs->trans("RIB").'</td>';
    print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
    print '<td align="right">'.$langs->trans("DateRequest").'</td>';
    print '</tr>';
@ -190,16 +195,22 @@ if ($resql)
        {
            $obj = $db->fetch_object($resql);
            $var=!$var;
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr '.$bc[$var].'>';
+            print '<td>';
            $invoicestatic->id=$obj->rowid;
            $invoicestatic->ref=$obj->facnumber;
            print $invoicestatic->getNomUrl(1,'withdraw');
            print '</td>';
+            // Thirdparty
            print '<td>';
-            $thirdpartystatic->id=$obj->socid;
-            $thirdpartystatic->name=$obj->name;
-            print $thirdpartystatic->getNomUrl(1,'customer');
+            $thirdpartystatic->fetch($obj->socid);
+            print $thirdpartystatic->getNomUrl(1,'card');
            print '</td>';
+            // RIB
+            print '<td>';
+            print $thirdpartystatic->display_rib();
+            print '</td>';
+            // Amount
            print '<td align="right">';
            print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency);
            print '</td>';
@ -211,7 +222,7 @@ if ($resql)
            $i++;
        }
    }
-    else print '<tr><td colspan="4">'.$langs->trans("None").'</td></tr>';
+    else print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
    print "</table>";
    print "<br>\n";
 }
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@ -106,7 +106,6 @@ if ($prev_id)

 	/*
 	 * Stats
-	 *
 	 */
 	$ligne=new LignePrelevement($db,$user);

@ -121,6 +120,8 @@ if ($prev_id)
 		$num = $db->num_rows($resql);
 		$i = 0;

+		print_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
+		
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@ -134,7 +134,7 @@ if ($id)
 		print '<table class="border" width="100%">';

 		print '<tr><td width="20%">'.$langs->trans("WithdrawalsReceipts").'</td><td>';
-		print '<a href="card.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
+		print $bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>'.$lipre->LibStatut($lipre->statut,1).'</td></tr>';
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@ -124,8 +124,6 @@ $pagenext = $page + 1;

 /*
 * Liste des lignes de prelevement
- *
- *
 */
 $sql = "SELECT pl.rowid, pl.statut, pl.amount";
 $sql.= ", s.rowid as socid, s.nom as name";
@ -175,7 +173,11 @@ if ($result)
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';

-		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
+		$thirdparty=new Societe($db);
+		$thirdparty->fetch($obj->socid);
+		print '<td>';
+		print $thirdparty->getNomUrl(1);
+		print "</td>\n";

 		print '<td align="center">'.price($obj->amount)."</td>\n";

--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@ -21,7 +21,7 @@
 /**
 *		\file       htdocs/compta/prelevement/stats.php
 *      \ingroup    prelevement
- *      \brief      Page de stats des prelevements
+ *      \brief      Page with statistics on withdrawals
 */

 require('../../main.inc.php');
@ -96,7 +96,7 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';

-	$var=True;
+	$var=false;

 	while ($i < $num)
 	{
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
 * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
@ -273,7 +273,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
 	                {
 	                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);

-						if ($product_type == 1) { //only services	// TODO Exclude also deee
+						if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
 							// service prédéfini
 							if ($lines[$i]->fk_product > 0)
 							{
@ -538,7 +538,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
 				}

 				$ret = $object->fetch($id); // Reload to get new records
-				
+
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}

@ -847,7 +847,7 @@ $formfile = new FormFile($db);
 $objectlignestatic=new ContratLigne($db);

 // Load object modContract
-$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive');
+$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 {
 	$module = substr($module, 0, dol_strlen($module)-4);
@ -1020,13 +1020,18 @@ if ($action == 'create')

    print "</table>\n";

+    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
    if (is_object($objectsrc))
    {
        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-	}

-    print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
+        {
+        	print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
+        }
+	}

    print "</form>\n";

@ -1043,6 +1048,8 @@ else

    if ($object->id > 0)
    {
+    	$object->fetch_thirdparty();
+
        $result=$object->fetch_lines();	// This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
        if ($result < 0) dol_print_error($db,$object->error);

--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@ -837,7 +837,7 @@ class Form
 	        			});
 	        		    </script>';
 					}
-										
+
 					if (count($events))		// Add management of event
 					{
 						$out.='<script type="text/javascript">
@ -1355,7 +1355,7 @@ class Form
                $out.= '<option value="">'.$langs->trans("None").'</option>';
            }
            $out.= '</select>';
-            
+
           	$out.= '<script type="text/javascript">
 						$(document).ready(function() {

@ -1701,6 +1701,8 @@ class Form
 		$outqty=1;
 		$outdiscount=0;

+		$maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
+
        $label=$objp->label;
        if (! empty($objp->label_translated)) $label=$objp->label_translated;
        if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
@ -1720,11 +1722,11 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
        }
        $opt.= '>';
-        $opt.= $objp->ref.' - '.dol_trunc($label,32).' - ';
+        $opt.= $objp->ref.' - '.dol_trunc($label,$maxlengtharticle).' - ';

        $objRef = $objp->ref;
        if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label,32).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label,$maxlengtharticle).' - ';

        $found=0;

@ -1770,7 +1772,7 @@ class Form
        }

 		// Price by quantity
-		if (!empty($objp->quantity) && $objp->quantity >= 1 && $conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)
+		if (!empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$found = 1;
 			$outqty=$objp->quantity;
@ -1896,7 +1898,7 @@ class Form
            // mode=2 means suppliers products
            $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished;
            print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="16" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
+            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
        }
        else
        {
@ -2004,8 +2006,8 @@ class Form
                $outval.=$objRef;
                if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')';
                $outval.=' - ';
-                $opt.=dol_trunc($objp->label,18).' - ';
-                $outval.=dol_trunc($label,18).' - ';
+                $opt.=dol_trunc($label, 72).' - ';
+                $outval.=dol_trunc($label, 72).' - ';

                if (! empty($objp->idprodfournprice))
                {
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@ -856,7 +856,7 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				print '<tr '.$bc[$var].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
+				print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@ -1044,7 +1044,7 @@ class FormFile

        if (count($filearray) == 0)
        {
-            print '<tr '.$bc[$var].'><td colspan="4">';
+            print '<tr '.$bc[false].'><td colspan="4">';
            if (empty($textifempty)) print $langs->trans("NoFileFound");
            else print $textifempty;
            print '</td></tr>';
@ -1211,7 +1211,7 @@ class FormFile
        }
        if ($nboflinks == 0)
        {
-            print '<tr ' . $bc[$var] . '><td colspan="5">';
+            print '<tr ' . $bc[false] . '><td colspan="5">';
            print $langs->trans("NoLinkFound");
            print '</td></tr>';
        }
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@ -560,13 +560,13 @@ class FormOther
     *
     *		@param	string		$set_color		Pre-selected color
     *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
     * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
     * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
     * 		@return	void
     * 		@deprecated
     */
-    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
+    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
    {
    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
    }
@ -576,13 +576,13 @@ class FormOther
     *
     *		@param	string		$set_color		Pre-selected color
     *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
     * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
     * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
     * 		@param	string		$morecss		Add css style into input field
     * 		@return	void
     */
-    function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
    {
        global $langs,$conf;

--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@ -1782,14 +1782,16 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap
 * 	@param	string	$stringencoding		Tell what is source string encoding
 *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.
+ *  @param  int     $display            Trunc is use to display and can be changed for small screen
 *	@return string						Truncated string
 */
-function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0)
+function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0, $display=0)
 {
 	global $conf;

 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-
+	// reduce for small screen
+    if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
 	// We go always here
 	if ($trunc == 'right')
 	{
@ -4843,19 +4845,6 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 }


-/**
- *	Convert an array with RGB value into hex RGB value
- *
- *  @param	array	$arraycolor			Array
- *  @param	string	$colorifnotfound	Color code to return if entry not defined
- *  @return	string						RGB hex value (without # before). For example: FF00FF
- */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
-{
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
-}
-
 /**
 * Set focus onto field with selector
 *
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@ -1836,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) {
 	}
 	return 0;
 }
+
+
+/**
+ *	Convert an array with RGB value into hex RGB value
+ *
+ *  @param	array	$arraycolor			Array
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorStringToArray
+ */
+function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+{
+	if (! is_array($arraycolor)) return $colorifnotfound;
+	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+}
+
+
+/**
+ *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255)
+ *
+ *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorArrayToHex
+ */
+function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+{
+	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	if (! $tmp)
+	{
+		$tmp=explode(',',$stringcolor);
+		if (count($tmp) < 3) return $colorifnotfound;
+		return $tmp;
+	}
+	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+}
+
+
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@ -492,7 +492,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 *  @param  int			$curx            		X
 *  @param  int			$cury            		Y
 *  @param  Account		$account         		Bank account object
- *  @param  int			$onlynumber      		Output only number
+ *  @param  int			$onlynumber      		Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation)
 *  @param	int			$default_font_size		Default font size
 *  @return	float                               The Y PDF position
 */
@ -513,10 +513,14 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default

 	$outputlangs->load("banks");

+	// Use correct name of bank id according to country
+	$bickey="BICNumber";
+	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
 	// Get format of bank account according to its country
 	$usedetailedbban=$account->useDetailedBBAN();

-	//$onlynumber=0; $usedetailedbban=0; // For tests
+	$onlynumber=0; $usedetailedbban=1; // For tests
 	if ($usedetailedbban)
 	{
 		$savcurx=$curx;
@ -529,27 +533,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 			$cury+=3;
 		}

-		// Use correct name of bank id according to country
-		$ibankey="IBANNumber";
-		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-		if (! empty($account->iban))
-		{
-			$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
-			$ibanDisplay = "";
-
-			for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){
-				$ibanDisplay .= $ibanDisplay_temp[$i];
-				if($i%4 == 3 && $i > 0){
-					$ibanDisplay .= " ";
-				}
-			}
-
-			$pdf->SetFont('','B',$default_font_size - 3);
-			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-			$cury+=3;
-		}
-
 		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8);

 		if ($usedetailedbban == 1)
@ -612,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		}

 		$curx=$savcurx;
-		$cury+=10;
+		$cury+=9;
 	}
 	else
 	{
@ -629,10 +612,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		if ($diffsizecontent <= 2) $cury+=1;
 	}

-	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);

 	if (empty($onlynumber) && ! empty($account->domiciliation))
@ -647,8 +626,29 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 	}
 	else if (! $usedetailedbban) $cury+=1;

+	// Use correct name of bank id according to country
+	$ibankey="IBANNumber";
+	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+	if (! empty($account->iban))
+	{
+		$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
+		$ibanDisplay = "";
+
+		for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
+		{
+			$ibanDisplay .= $ibanDisplay_temp[$i];
+			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+		}
+
+		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetXY($curx, $cury);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+		$cury+=3;
+	}
+
 	if (! empty($account->bic))
 	{
+		$pdf->SetFont('','B',$default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 	}
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@ -49,7 +49,7 @@ class modProductBatch extends DolibarrModules
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";

-		$this->rights_class = 'stock';
+		$this->rights_class = 'productbatch';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'experimental';
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@ -73,7 +73,7 @@ $date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["
 if ($action == 'create') {
 	if (is_array($selected) == false) {
 		$mesgs = array (
-				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>' 
+				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
 		);
 	} else {
 		$origin = GETPOST('origin');
@ -91,11 +91,11 @@ $hookmanager->initHooks(array('orderstoinvoicesupplier'));
 */

 if (($action == 'create' || $action == 'add') && empty($mesgs)) {
-	
+
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
 	if (! empty($conf->projet->enabled))
 		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	
+
 	$langs->load('bills');
 	$langs->load('products');
 	$langs->load('main');
@ -103,7 +103,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_GET['orders_to_invoice'];
 		$n = count($orders_id);
 		$i = 0;
-		
+
 		$originid = $orders_id[0];
 		$_GET['originid'] = $orders_id[0];
 	}
@ -111,30 +111,30 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_POST['orders_to_invoice'];
 		$nn = count($orders_id);
 		$ii = 0;
-		
+
 		$originid = $orders_id[0];
 		$_POST['originid'] = $orders_id[0];
 	}
-	
+
 	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
 	$lineid = GETPOST('lineid', 'int');
 	$userid = GETPOST('userid', 'int');
 	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
-	
+
 	// Security check
 	if ($user->societe_id)
 		$socid = $user->societe_id;
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-	
+
 	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
 	$object = new FactureFournisseur($db);
-	
+
 	// Insert new invoice in database
 	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
 		$object->socid = GETPOST('socid');
 		$db->begin();
 		$error = 0;
-		
+
 		// Standard or deposit or proforma invoice
 		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 		if (empty($datefacture)) {
@ -154,17 +154,17 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 			$projectid = GETPOST('projectid');
 			if ($projectid > 0)
 				$object->fk_project = $projectid;
-				
+
 				// Auto calculation of date due if not filled by user
 			if (empty($object->date_echeance))
 				$object->date_echeance = $object->calculate_date_lim_reglement();
-			
+
 			if ($_POST['origin'] && $_POST['originid']) {
 				$object->origin = $_POST['origin'];
 				$object->origin_id = $orders_id[$ii];
 				$object->linked_objects = $orders_id;
 				$id = $object->create($user);
-				
+
 				if ($id > 0) {
 					foreach ( $orders_id as $origin => $origin_id ) {
 						$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
@ -180,14 +180,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 						$sql .= ", " . $id;
 						$sql .= ", '" . $object->element . "'";
 						$sql .= ")";
-						
+
 						if ($db->query($sql)) {
 							$db->commit();
 						} else {
 							$db->rollback();
 						}
 					}
-					
+
 					while ( $ii < $nn ) {
 						$objectsrc = new CommandeFournisseur($db);
 						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
@ -202,10 +202,10 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 							$num = count($lines);
 							for($i = 0; $i < $num; $i ++) {
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-								
+
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-								
+
 								// Dates
 								// TODO mutualiser
 								$date_start = $lines[$i]->date_debut_prevue;
@ -218,14 +218,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 									$date_end = $lines[$i]->date_fin_reel;
 								if ($lines[$i]->date_end)
 									$date_end = $lines[$i]->date_end;
-									
+
 									// Reset fk_parent_line for no child products and special product
 								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 									$fk_parent_line = 0;
 								}
 								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
-								
+
 								if ($result > 0) {
 									$lineid = $result;
 								} else {
@ -250,11 +250,11 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 				}
 			}
 		}
-		
+
 		// End of object creation, we show it
 		if ($id > 0 && ! $error) {
 			$db->commit();
-			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
+			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
 			exit();
 		} else {
 			$db->rollback();
@ -277,10 +277,10 @@ $companystatic = new Societe($db);

 // Mode creation
 if ($action == 'create' && empty($mesgs)) {
-	
+
 	llxHeader();
 	print_fiche_titre($langs->trans('NewBill'));
-	
+
 	$soc = new Societe($db);
 	if ($socid)
 		$res = $soc->fetch($socid);
@ -289,7 +289,7 @@ if ($action == 'create' && empty($mesgs)) {
 		$mode_reglement_id = $soc->mode_reglement_id;
 	}
 	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
-	
+
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
@ -300,21 +300,21 @@ if ($action == 'create' && empty($mesgs)) {
 	print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
 	print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
 	print '<table class="border" width="100%">';
-	
+
 	// Ref
 	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
-	
+
 	// Ref supplier
 	print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
 	print '</tr>';
-	
+
 	// Third party
 	print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
 	print $soc->getNomUrl(1);
 	print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 	print '</td>';
 	print '</tr>' . "\n";
-	
+
 	// Date invoice
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
 	$html->select_date('', '', '', '', '', "add", 1, 1);
@ -330,13 +330,13 @@ if ($action == 'create' && empty($mesgs)) {
 	// Project
 	if (! empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
-		
+
 		$langs->load('projects');
 		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
-	
+
 	$objectsrc = new CommandeFournisseur($db);
 	$listoforders = array ();
 	foreach ( $selected as $sel ) {
@ -345,30 +345,30 @@ if ($action == 'create' && empty($mesgs)) {
 			$listoforders[] = $objectsrc->ref;
 		}
 	}
-	
+
 	// Other attributes
 	$parameters = array (
 			'objectsrc' => $objectsrc,
 			'idsrc' => $listoforders,
-			'colspan' => ' colspan="3"' 
+			'colspan' => ' colspan="3"'
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	                                                                                           
+
 	// Modele PDF
 	print '<tr><td>' . $langs->trans('Model') . '</td>';
 	print '<td>';
 	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
 	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
 	print "</td></tr>";
-	
+
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
 	print '<td valign="top" colspan="2">';
 	print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-	
+
 	print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
-	
+
 	print '</textarea></td></tr>';
 	// Private note
 	if (empty($user->societe_id)) {
@ -376,22 +376,22 @@ if ($action == 'create' && empty($mesgs)) {
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
 		print '<td valign="top" colspan="2">';
 		print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-		
+
 		print '</textarea></td></tr>';
 	}
-	
+
 	print '</table>';
-	
+
 	while ( $i < $n ) {
 		print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
-		
+
 		$i ++;
 	}
-	
+
 	// Button "Create Draft"
 	print '<br><div class="center"><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></div>';
 	print "</form>\n";
-	
+
 	print '</td></tr>';
 	print "</table>\n";
 }
@ -411,7 +411,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	});
 	</script>
 <?php
-	
+
 	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
 	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
 	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
@ -420,13 +420,13 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 	$sql .= ' WHERE c.entity = ' . $conf->entity;
 	$sql .= ' AND c.fk_soc = s.rowid';
-	
+
 	// Show orders with status validated, shipping started and delivered (well any order we can bill)
 	$sql .= " AND c.fk_statut IN (5)";
-	
+
 	// Find order that are not already invoiced
 	$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
-	
+
 	if ($socid)
 		$sql .= ' AND s.rowid = ' . $socid;
 	if (! $user->rights->societe->client->voir && ! $socid)
@ -437,20 +437,20 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	if ($sall) {
 		$sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
 	}
-	
+
 	// Date filter
 	if ($date_start && $date_end)
 		$sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
 	if ($date_starty && $date_endy)
 		$sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
-	
+
 	if (! empty($sref_client)) {
 		$sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
 	}
 	$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
 	dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
 	$resql = $db->query($sql);
-	
+
 	if ($resql) {
 		if ($socid) {
 			$soc = new Societe($db);
@ -463,14 +463,14 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$i = 0;
 		$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
 		$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
-		
+
 		if (! empty($socid)) {
 			// Company
 			$companystatic->id = $socid;
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-		
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
@ -480,7 +480,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
 		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
 		print '</tr>';
-		
+
 		// Lignes des champs de filtre
 		print '<form method="get" action="orderstoinvoice.php">';
 		print '<input type="hidden" name="socid" value="' . $socid . '">';
@ -492,48 +492,48 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		// print '<td class="liste_titre">';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
-		
+
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
 		print '</td>';
-		
+
 		// DATE DELIVERY
 		print '<td class="liste_titre" align="center">';
 		print $periodely;
 		print '</td>';
-		
+
 		// SEARCH BUTTON
 		print '</td><td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-		
+
 		// ALL/NONE
 		print '<td class="liste_titre" align="center">';
 		if ($conf->use_javascript_ajax)
 			print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
 		print '</td>';
-		
+
 		print '</td></tr>';
 		print '</form>';
-		
+
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
 		$var = True;
 		$generic_commande = new CommandeFournisseur($db);
-		
+
 		while ( $i < $num ) {
 			$objp = $db->fetch_object($resql);
 			$var = ! $var;
 			print '<tr ' . $bc[$var] . '>';
 			print '<td class="nowrap">';
-			
+
 			$generic_commande->id = $objp->rowid;
 			$generic_commande->ref = $objp->ref;
-			
+
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			print '<td class="nobordernopadding nowrap">';
 			print $generic_commande->getNomUrl(1, $objp->fk_statut);
 			print '</td>';
-			
+
 			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 			$filename = dol_sanitizeFileName($objp->ref);
 			$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
@ -541,35 +541,35 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 			print '</td></tr></table>';
 			print '</td>';
-			
+
 			print '<td>' . $objp->ref_supplier . '</td>';
-			
+
 			// Order date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_commande), 'day');
 			print '</td>';
-			
+
 			// Delivery date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_livraison), 'day');
 			print '</td>';
-			
+
 			// Statut
 			print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
-			
+
 			// Checkbox
 			print '<td class="center">';
 			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
 			print '</td>';
-			
+
 			print '</tr>';
-			
+
 			$total = $total + $objp->price;
 			$subtotal = $subtotal + $objp->price;
 			$i ++;
 		}
 		print '</table>';
-		
+
 		/*
 		 * Boutons actions
 		*/
--- a/htdocs/index.php
+++ b/htdocs/index.php
@ -294,15 +294,15 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 $rowspan=0;
 $dashboardlines=array();

-print '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">';
-print '<th class="liste_titre"colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Number").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Late").'</th>';
+print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Late").'</th>';
 print '<th class="liste_titre">&nbsp;</th>';
-print '<th class="liste_titre"width="20">&nbsp;</th>';
+print '<th class="liste_titre" width="20">&nbsp;</th>';
 if ($showweather) print '<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
-print '</tr>';
+print '</tr>'."\n";


 //
@ -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&amp;mainmenu=agenda';
    $board->img=img_object($langs->trans("Actions"),"action");
    $rowspan++;
    $dashboardlines[]=$board;
@ -458,7 +458,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
    {
        $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
        $board->label=$langs->trans("TransactionsToConciliate");
-        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank';
+        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
        $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment");
        $rowspan++;
        $dashboardlines[]=$board;
@ -475,7 +475,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
    $board->load_board($user);
    $board->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
    $board->label=$langs->trans("BankChecksToReceipt");
-    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy';
+    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=accountancy';
    $board->img=img_object($langs->trans("BankChecksToReceipt"),"payment");
    $rowspan++;
    $dashboardlines[]=$board;
@ -491,7 +491,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
    $board->load_board($user);
    $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24;
    $board->label=$langs->trans("MembersWithSubscriptionToReceive");
-    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1';
+    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1';
    $board->img=img_object($langs->trans("Members"),"user");
    $rowspan++;
    $dashboardlines[]=$board;
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@ -33,7 +33,7 @@ create table llx_entrepot
  fk_departement  integer,
  fk_pays         integer DEFAULT 0,
  statut          tinyint DEFAULT 1,			-- 1 open, 0 close
-  valo_pmp        float(12,4),					-- valoristaion du stock en PMP
+  valo_pmp        float(12,4),					-- PMP value for this warehouse (deprecated. No sens for a warehouse)
  fk_user_author  integer,
  import_key	  varchar(14)
 )ENGINE=innodb;
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@ -25,7 +25,7 @@ create table llx_product_stock
  fk_product      integer NOT NULL,
  fk_entrepot     integer NOT NULL,
  reel            real,           					-- physical stock
-  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse
+  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse (deprecated. no sens for warehouse)
  import_key      varchar(14)                  -- Import key
 )ENGINE=innodb;

--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= أضف فلتر كخيار لعرض/إخفاء الجهات الأخرى التي تقوم بنشاط حالياً أو توقفت عنه
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=فلاتر خيارات البحث
 NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
 ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة
@ -208,6 +210,7 @@ ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلف
 ModulesMarketPlaceDesc=يمكنك العثور على مزيد من وحدات للتحميل على مواقع الإنترنت الخارجية على شبكة الانترنت...
 ModulesMarketPlaces=مزيد من وحدات...
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
+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)
 WebSiteDesc=مزودي موقع ويب يمكنك البحث للعثور على المزيد من وحدات...
 URL=رابط
 BoxesAvailable=صناديق متاحة
@ -437,14 +440,14 @@ Module52Name=الاسهم
 Module52Desc=مخزون إدارة المنتجات
 Module53Name=الخدمات
 Module53Desc=الخدمات الإدارية
-Module54Name=عقود
-Module54Desc=العقود والخدمات الإدارية
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
 Module56Name=الخدمات الهاتفية
 Module56Desc=تكامل الخدمات الهاتفية
 Module57Name=أوامر دائمة
-Module57Desc=أوامر دائمة وسحب إدارة
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=تغذية RSS
 Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
 Module330Name=العناوين
 Module330Desc=العناوين إدارة
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar التكامل
 Module500Name=Special expenses (tax, social contributions, dividends)
@ -495,6 +498,8 @@ Module1780Name=الفئات
 Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
 Module2000Name=Fckeditor
 Module2000Desc=سوغ محرر
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=جدول الأعمال
@ -503,6 +508,8 @@ Module2500Name=إدارة المحتوى الإلكتروني
 Module2500Desc=حفظ وتبادل الوثائق
 Module2600Name=WebServices
 Module2600Desc=تمكين خدمات الويب Dolibarr الملقم
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=غرفتر
 Module2700Desc=استخدام خدمة غرفتر على الانترنت (www.gravatar.com) لإظهار الصورة من المستخدمين / أعضاء (وجدت مع رسائل البريد الإلكتروني الخاصة بهم). في حاجة الى الوصول الى شبكة الانترنت
 Module2800Desc=FTP Client
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
@ -527,7 +534,7 @@ Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإن
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=الإعداد المحفوظة
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح
 CompanyInfo=الشركة / المؤسسة المعلومات
 CompanyIds=الشركة / المؤسسة الهويات
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=أحداث عينت لـ
 ActionsDoneBy=أحداث انهيت بواسطة
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= كل أحداثي/ مهامي
 AllActions= جميع الأحداث / المهام
 ViewList=عرض قائمة
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@ -15,20 +15,20 @@ ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة
 SuppliersCategoriesArea=الموردين منطقة الفئات
 CustomersCategoriesArea=العملاء منطقة الفئات
 ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات
-MembersCategoriesArea=أعضاء فئات المناطق
+MembersCategoriesArea=منطقة فئات الأعضاء
 ContactsCategoriesArea=Contacts categories area
 MainCats=الفئات الرئيسية
-SubCats=فرعية
-CatStatistics=احصاءات
+SubCats=الفئات الفرعية
+CatStatistics=إحصائيات
 CatList=قائمة الفئات
 AllCats=جميع الفئات
-ViewCat=وترى هذه الفئة
+ViewCat=عرض الفئة
 NewCat=إضافة فئة
 NewCategory=فئة جديدة
 ModifCat=تعديل الفئة
-CatCreated=فئة خلق
-CreateCat=خلق فئة
-CreateThisCat=تهيئة هذه الفئة
+CatCreated=تم إنشاء الفئة
+CreateCat=إنشاء فئة
+CreateThisCat=إنشاء هذه الفئة
 ValidateFields=صحة المجالات
 NoSubCat=لا فرعية.
 SubCatOf=فرعية
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
 LastModifiedServices=آخر تعديل ٪ ق الخدمات
 EditServiceLine=تعديل خط الخدمات
@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=ممثل مبيعات توقيع العقد
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=رمز المورد المطلوب
 ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد
 ErrorBadParameters=بارامترات سيئة
 ErrorBadValueForParameter=قيمة خاطئة &quot;%s 'ل' %s&quot; المعلمة غير صحيحة
-ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@ -8,7 +8,7 @@ Members=أعضاء
 MemberAccount=دخول الأعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=أعضاء التذاكر
 FundationMembers=أعضاء المؤسسة
 Attributs=الصفات
@ -85,8 +85,7 @@ SubscriptionLateShort=متأخر
 SubscriptionNotReceivedShort=لم يتلق
 ListOfSubscriptions=قائمة الاشتراكات
 SendCardByMail=أرسل بطاقة
-AddMember=إضافة عضو
-MemberType=عضو نوع
+AddMember=Create member
 NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء
 NewMemberType=عضو جديد من نوع
 WelcomeEMail=مرحبا بك في البريد الإلكتروني
@ -126,12 +125,12 @@ Date=تاريخ
 DateAndTime=التاريخ والوقت
 PublicMemberCard=عضو بطاقة العامة
 MemberNotOrNoMoreExpectedToSubscribe=أو ليست عضوا في أي أكثر من المتوقع للاكتتاب
-AddSubscription=إضافة اشتراك
+AddSubscription=Create subscription
 ShowSubscription=وتظهر اكتتاب
 MemberModifiedInDolibarr=عضو في تعديل Dolibarr
 SendAnEMailToMember=البريد الإلكتروني لإرسال معلومات العضو
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=بريد إلكتروني الموضوع لautosubscription الأعضاء
 DescADHERENT_AUTOREGISTER_MAIL=البريد الإلكتروني لعضو autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=البريد الإلكتروني لعضو في موضوع المصادقة
@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=موضوع البريد الإلكتروني ل
 DescADHERENT_MAIL_RESIL=البريد الإلكتروني لعضو resiliation
 DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
 DescADHERENT_CARD_HEADER_TEXT=نص مطبوع على رأس عضو البطاقات
 DescADHERENT_CARD_TEXT=نص مطبوع على بطاقات الأعضاء
@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=لم يرتبط بها من طرف ثالث له
 ThirdPartyDolibarr=Dolibarr طرف ثالث
 MembersAndSubscriptions= وأعضاء Subscriptions
 MoreActions=تكميلية العمل على تسجيل
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=إنشاء سجل المعاملات مباشرة على حساب
 MoreActionBankViaInvoice=إنشاء الفاتورة والدفع على حساب
 MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ
@ -171,6 +170,8 @@ LastSubscriptionAmount=آخر مبلغ الاشتراك
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=عدد الأعضاء
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
@ -196,9 +197,10 @@ Collectivités=المنظمات
 Particuliers=الشخصية
 Entreprises=الشركات
 DOLIBARRFOUNDATION_PAYMENT_FORM=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة مح
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=عدد من السعر
 MultiPriceLevelsName=سعر الفئات
-AssociatedProductsAbility=تنشيط المنتجات
-AssociatedProducts=المنتجات
-AssociatedProductsNumber=عدد المنتجات
-ParentProductsNumber=عدد من الناتج الأم
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=المنتسبون
 Translation=الترجمة
 KeywordFilter=الكلمة الرئيسية فلتر
@ -132,7 +132,7 @@ AddDel=إضافة / حذف
 Quantity=الكمية
 NoMatchFound=العثور على أي مباراة
 ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة)
-ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف المنتجات / الخدمات
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟
@ -179,7 +179,7 @@ CloneProduct=استنساخ المنتجات أو الخدمات
 ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ <b>٪ ق؟</b>
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
 CustomerPrices=أسعار العملاء
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
 MyTasks=مهمتي
--- a/htdocs/langs/ar_SA/resource.lang
+++ b/htdocs/langs/ar_SA/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=الائتمان على
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
-DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Използвайте автоматично довъ
 ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Опции на филтрите за търсене
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 ViewFullDateActions=Показване на пълните събития дати в третия лист
@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули осигуряват прост пре
 ModulesMarketPlaceDesc=Можете да намерите повече модули за изтегляне на външни уеб-сайтове в Интернет ...
 ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
 URL=Връзка
 BoxesAvailable=Налични Кутии
@ -444,7 +447,7 @@ Module55Desc=Управление на баркод
 Module56Name=Телефония
 Module56Desc=Телефония интеграция
 Module57Name=Постоянните поръчки
-Module57Desc=Постоянни нареждания и оттегляне управление
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция на ClickToDial система (Asterisk, ...)
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses (tax, social contributions, dividends)
@ -495,6 +498,8 @@ Module1780Name=Категории
 Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Дневен ред
@ -503,6 +508,8 @@ Module2500Name=Електронно Управление на Съдържани
 Module2500Desc=Запазване и споделяне на документи
 Module2600Name=WebServices
 Module2600Desc=Активирайте сървъра на Dolibarr за уеб услуги
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Използвайте онлайн Gravatar услуга (www.gravatar.com), за да покаже снимка на потребители / членове с техните имейли. Нуждаете се от интернет
 Module2800Desc=FTP Клиент
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
@ -527,7 +534,7 @@ Module50200Desc=Модул предлага онлайн страница на
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Полета
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup спаси
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Вашата система е актуализиран успешно
 CompanyInfo=Информация за фирмата/организацията
 CompanyIds=Идентичност на фирмата/организацията
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Събития възложени на
 ActionsDoneBy=Събития извършени от
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Всички мои събития/задачи
 AllActions= Всички събития/задачи
 ViewList=Списъчен изглед
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
 ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
 ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия
@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Търговски представител подписване на договора
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Доставчик изисква код
 ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва
 ErrorBadParameters=Лошите параметри
 ErrorBadValueForParameter=Грешна стойност &quot;%s&quot; за параметрите неправилни &quot;%s&quot;
-ErrorBadImageFormat=Image файла не е поддържан формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Стойност има грешна дата формат
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Неуспех при запис в директорията %s
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
 ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ...
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s.
+WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@ -85,7 +85,7 @@ SubscriptionLateShort=Със закъснение
 SubscriptionNotReceivedShort=Не е получаван
 ListOfSubscriptions=Списък на членския внос
 SendCardByMail=Изпращане на карта по имейл
-AddMember=Добавяне на член
+AddMember=Create member
 NoTypeDefinedGoToSetup=Не са зададени типове членове. Отидете на менюто "Типове членове"
 NewMemberType=Нов тип член
 WelcomeEMail=E-mail за приветствие
@ -125,7 +125,7 @@ Date=Дата
 DateAndTime=Дата и час
 PublicMemberCard=Публична карта на член
 MemberNotOrNoMoreExpectedToSubscribe=-Членка не може или не повече очаква да се абонирате
-AddSubscription=Добавяне на чл. внос
+AddSubscription=Create subscription
 ShowSubscription=Покажи чл. внос
 MemberModifiedInDolibarr=Члена е променен в Dolibarr
 SendAnEMailToMember=Изпращане на информационен имейл до член
@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=Ако продуктът е услуга с ограни
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Категории цени
-AssociatedProductsAbility=Активиране на виртуалните продукти да се отличават
-AssociatedProducts=Виртуален продукт
-AssociatedProductsNumber=Брой на продуктите, съставящи този виртуален продукт
-ParentProductsNumber=Брой на основния виртуален продукт
-IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Асоцииране
 Translation=Превод
 KeywordFilter=Филтър по ключова дума
@ -132,7 +132,7 @@ AddDel=Добавяне/Изтриване
 Quantity=Количество
 NoMatchFound=Не са намерени съвпадения
 ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати)
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт
 DeleteProduct=Изтриване на продукта/услугата
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга?
@ -179,7 +179,7 @@ CloneProduct=Клониране на продукт или услуга
 ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата <b>%s?</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
 CustomerPrices=Цени за клиенти
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@ -14,7 +14,7 @@ TasksDesc=Този възглед представя всички проекти
 Myprojects=Моите проекти
 ProjectsArea=Проекти област
 NewProject=Нов проект
-AddProject=Добави проект
+AddProject=Create project
 DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Сигурен ли сте, че искате да изтриете този проект?
@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
 MyTasks=Моите задачи
@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Нова задача
-AddTask=Добавяне на задача
+AddTask=Create task
 AddDuration=Добави продължителността
 Activity=Дейност
 Activities=Задачите / дейностите
@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
-UnlinkElement=Unlink element
+UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
 PlannedWorkload = Planned workload
@ -129,4 +131,4 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
--- a/htdocs/langs/bg_BG/resource.lang
+++ b/htdocs/langs/bg_BG/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=Кредит за
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Покажи Теглене
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
-DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=Плащане на постоянно нареждане %s от банката
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8

-Accounting=Accounting
+Accounting=Računovodstvo
 Globalparameters=Global parameters
 Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Dodaj opciju filter za prikazivanje/sakrivanje trećih stranaka koji su trenutno u aktivnosti ili su prestali
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli pružaju jednostavane unparijed postavljenje post
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+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)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@ -517,7 +524,7 @@ Module6000Desc=Upravljanje workflow-om - tokom rada
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print preko Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Postavke snimljene
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Događaji dodijeljeni korisniku
 ActionsDoneBy=Događaji završeni od strane korisnika
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewList=Lista
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista stavki aktivnih ugovora
 ListOfRunningServices=Lista aktivnih usluga
 NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima)
 BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Zadnjih $s aktiviranih usluga
 LastModifiedServices=Zadnjih %s izmijenjenih usluga
 EditServiceLine=Izmijeni stavku usluge
@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga pred isticanje
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@ -14,7 +14,7 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris
 Myprojects=Moji projekti
 ProjectsArea=Područje za projekte
 NewProject=Novi projekat
-AddProject=Dodaj projekat
+AddProject=Create project
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite obrisati ovaj projekt?
@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nova provedeno vrijeme
 MyTimeSpent=Moje provedeno vrijeme
 MyTasks=Moji zadaci
@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Novi zadatak
-AddTask=Dodaj zadatak
+AddTask=Create task
 AddDuration=Dodaj trajanje
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
--- a/htdocs/langs/bs_BA/resource.lang
+++ b/htdocs/langs/bs_BA/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=Ova kartica vam omogućava da zatražite trajni nalog. Kada je potpuna, možete izvršiti plaćanje za zatvaranje računa.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcions filtres de cerca
 NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
 ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer
@ -208,6 +210,7 @@ ModulesJobDesc=Els mòduls específics permeten una preconfiguració simplificad
 ModulesMarketPlaceDesc=Hi ha disponbiles per a baixar en llocs externs d'Internet altres mòduls / extensions...
 ModulesMarketPlaces=Més mòduls...
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Llocs proveïdors a consultar per trobar més mòduls
 URL=Enllaç
 BoxesAvailable=Panells disponibles
@ -444,7 +447,7 @@ Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
 Module56Desc=Gestió de la telefonia
 Module57Name=Domiciliacions
-Module57Desc=Gestió de domiciliacions i reintegraments bancaris
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=Fils RSS
 Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
 Module330Name=Bookmarks
 Module330Desc=Gestió de bookmarks
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Gestió de categories (productes, proveïdors i clients)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestor de tasques programades
 Module2400Name=Agenda
@ -503,6 +508,8 @@ Module2500Name=Gestió Electrònica de Documents
 Module2500Desc=Permet administrar una base de documents
 Module2600Name=WebServices
 Module2600Desc=Activa els serveis de servidor web services de Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet
 Module2800Desc=Client FTP
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
 Module50100Name=TPV
@ -527,7 +534,7 @@ Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de c
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Márgenes
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma)
 EnableMultilangInterface=Activar interface multiidioma
 EnableShowLogo=Mostra el logotip en el menú de l'esquerra
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=El seu sistema està actualitzat
 CompanyInfo=Informació de l'empresa/institució
 CompanyIds=Identificació reglamentaria
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Esdeveniments assignats a
 ActionsDoneBy=Esdeveniments realitzats per
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Tots els meus esdeveniments/tasques
 AllActions= Tots els esdeveniments/tasques
 ViewList=Vista llistat
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per a
 TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei
 ListOfRunningServices=Llistat de serveis actius
 NotActivatedServices=Serveis no activats (amb els contractes validats)
 BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Els %s darrers serveis activats
 LastModifiedServices=Els  %s darrers serveis modificats
 EditServiceLine=Edició línia del servei
@ -91,6 +91,7 @@ ListOfServicesToExpire=Llistat de serveis actius a expirar
 NoteListOfYourExpiredServices=Aquest llistat conté només els serveis de contractes de tercers dels que vostè és comercial
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Codi proveïdor obligatori
 ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
 ErrorBadParameters=Paràmetres incorrectes
 ErrorBadValueForParameter=Valor '%s' incorrecte per al paràmetre '%s'
-ErrorBadImageFormat=La imatge no té un format reconegut
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
 ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@ -8,7 +8,7 @@ Members=Membres
 MemberAccount=Login membre
 ShowMember=Mostrar fitxa membre
 UserNotLinkedToMember=Usuari no vinculat a un membre
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Etiquetes membres
 FundationMembers=Membres de l'associació
 Attributs=Atributs
@ -85,8 +85,7 @@ SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=No rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar fitxa per e-mail
-AddMember=Afegir membre
-MemberType=Tipus de membre
+AddMember=Create member
 NoTypeDefinedGoToSetup=Cap tipus de membre definit. Aneu a Configuració->Tipus de membres
 NewMemberType=Nou tipus de membre
 WelcomeEMail=E-mail
@ -126,7 +125,7 @@ Date=Data
 DateAndTime=Data i hora
 PublicMemberCard=Fitxa pública membre
 MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització
-AddSubscription=Afegir afiliació
+AddSubscription=Create subscription
 ShowSubscription=Mostrar afiliació
 MemberModifiedInDolibarr=Membre modificat en Dolibarr
 SendAnEMailToMember=Enviar e-mail d'informació al membre (E-mail: <b>%s</b>)
@ -171,6 +170,8 @@ LastSubscriptionAmount=Import de l'última cotització
 MembersStatisticsByCountries=Estadístiques de membres per país
 MembersStatisticsByState=Estadístiques de membres per població
 MembersStatisticsByTown=Estadístiques de membres per població
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Nombre de membres
 NoValidatedMemberYet=Cap membre validat trobat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de membres per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
@ -202,3 +203,4 @@ MembersByNature=Membres per naturalesa
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
 NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/ca_ES/printipp.lang
+++ b/htdocs/langs/ca_ES/printipp.lang
@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuració del mòdul Impressió directa IPP
-PrintIPPDesc=Aquest mòdul permet afegir un botó d'impressió directa dels seus documents cap a la seva impressora. Es requereix un sistema Linux equipat amb Cups.
-PRINTIPP_ENABLED=Mostra el logo "Impressió directa" en els llistats de documents
-PRINTIPP_HOST=Servidor d'impressió
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Contrasenya
-NoPrinterFound=No s'ha trobat cap impressora (comprovi la seva configuració Cups)
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servei és de durada limitada:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preus
 MultiPriceLevelsName=Categoria de preus
-AssociatedProductsAbility=Activar productes compostos
-AssociatedProducts=Productes compostos
-AssociatedProductsNumber=Nº de productes que composen aquest producte
-ParentProductsNumber=Nº de productes que aquest producte compon
-IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no està sent utilitzat per cap producte virtual
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Compondre
 Translation=Traducció
 KeywordFilter=Filtre per clau
@ -132,7 +132,7 @@ AddDel=Adjuntar/Retirar
 Quantity=Quantitat
 NoMatchFound=No s'han trobat resultats
 ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició
-ProductParentList=Llistat de productes/serveis amb aquest producte com a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
@ -179,7 +179,7 @@ CloneProduct=Clonar producte/servei
 ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei <b>%s</b> ?
 CloneContentProduct=Clonar només la informació general del producte/servei
 ClonePricesProduct=Clonar la informació general i els preus
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del nou producte/servei
 CustomerPrices=Preus clients
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@ -14,7 +14,7 @@ TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritza
 Myprojects=Els meus projectes
 ProjectsArea=Àrea projectes
 NewProject=Nou projecte
-AddProject=Crear projecte
+AddProject=Create project
 DeleteAProject=Eliminar un projecte
 DeleteATask=Eliminar una tasca
 ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte?
@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nou temps dedicat
 MyTimeSpent=El meu temps dedicat
 MyTasks=Les meves tasques
@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nova tasca
-AddTask=Afegir tasca
+AddTask=Create task
 AddDuration=Indicar durada
 Activity=Activitat
 Activities=Tasques/activitats
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Veure domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
-DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=Abonament de domiciliació %s pel banc
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí třetích stran, které jsou v současné době v činnosti nebo ji ukončili
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Nastavení vyhledávání
 NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
 ViewFullDateActions=Zobrazit rozšířené datumy události v třetím listu
@ -208,6 +210,7 @@ ModulesJobDesc=Obchodní moduly poskytují jednoduché nastavení systému Dolib
 ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ...
 ModulesMarketPlaces=Více modulů ...
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Weboví poskytovatelé Dolibarr modulů ...
 URL=Odkaz
 BoxesAvailable=Boxy jsou k dispozici
@ -444,7 +447,7 @@ Module55Desc=Barcode řízení
 Module56Name=Telefonie
 Module56Desc=Telefonie integrace
 Module57Name=Trvalé příkazy
-Module57Desc=Trvalé příkazy a abstinenční řízení
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr
 Module330Name=Záložky
 Module330Desc=Správa záložek
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
 Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
@ -495,6 +498,8 @@ Module1780Name=Kategorie
 Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plánované správu úloh
 Module2400Name=Pořad jednání
@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakční
 Module2500Desc=Uložit a sdílet dokumenty
 Module2600Name=WebServices
 Module2600Desc=Povolit Dolibarr webových služeb serveru
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Pomocí on-line služby (Gravatar www.gravatar.com) ukázat fotku uživatelů / členů (nalezen s jejich e-maily). Potřebujete přístup k internetu
 Module2800Desc=FTP klient
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
 Module50100Name=Bod prodeje
@ -527,7 +534,7 @@ Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Payp
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Tisk přes poháry tiskárny IPP.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavení uloženo
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Výchozí jazyk používat (kód jazyka)
 EnableMultilangInterface=Povolit vícejazyčné rozhraní
 EnableShowLogo=Zobrazit logo na levém menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systém byl úspěšně aktualizován
 CompanyInfo=Společnosti / Nadace informace
 CompanyIds=Společnost / nadace identity
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Akce přiřazené
 ActionsDoneBy=Akce provedené
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Všechny mé akce / úkoly
 AllActions= Všechny události / úkoly
 ViewList=Zobrazení seznamu
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití <b>hotovosti evidence</b> režim není relevantní. Tato zpráva je k dispozici pouze při použití <b>zásnubní evidence</b> režimu (viz nastavení účetního modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam běžících smluv linek
 ListOfRunningServices=Seznam spuštěných služeb
 NotActivatedServices=Neaktivní služby (u ověřených smluv)
 BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Poslední %s aktivaci služby
 LastModifiedServices=Poslední %s upravené služby
 EditServiceLine=Upravit linka
@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam služeb vyprší
 NoteListOfYourExpiredServices=Tento seznam obsahuje pouze služby smluv pro třetí strany si jsou propojeny jako obchodního zástupce.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodní zástupce podpisu smlouvy
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodavatel povinen kód
 ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Chybná hodnota &quot;%s&quot; pro nastavení parametrů nesprávných &quot;%s&quot;
-ErrorBadImageFormat=Obrazový soubor nemá podporovaný formát
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávný formát data
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uživatel s přihlášením <b>%s</b> nebyl nalezen.
 ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušena.
 ErrorBadValueForCode=Bad hodnota bezpečnostního kódu. Zkuste to znovu s novou hodnotou ...
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být negativní
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b>%s</b> použít ke spuštění webový server nemá oprávnění pro které
 ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@ -8,7 +8,7 @@ Members=Členové
 MemberAccount=Vstup pro členy
 ShowMember=Zobrazit členskou kartu
 UserNotLinkedToMember=Uživatel není spojena s členem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Členové Vstupenky
 FundationMembers=Členy Nadace
 Attributs=Atributy
@ -85,8 +85,7 @@ SubscriptionLateShort=Pozdě
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Seznam předplatné
 SendCardByMail=Poslat kartu e-mailem
-AddMember=Přidat člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žádný člen definovány typy. Jdi na menu &quot;Členové typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vítejte e-mail
@ -126,7 +125,7 @@ Date=Datum
 DateAndTime=Datum a čas
 PublicMemberCard=Členské veřejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, který nebo ne více očekává, že k odběru
-AddSubscription=Přidat předplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobrazit předplatné
 MemberModifiedInDolibarr=Člen upraven v Dolibarr
 SendAnEMailToMember=Poslat e-mail Informace o členovi
@ -171,6 +170,8 @@ LastSubscriptionAmount=Poslední úpisu
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členů
 NoValidatedMemberYet=Žádné ověřené členy nalezeno
 MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
@ -202,3 +203,4 @@ MembersByNature=Členové od přírody
 VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
 NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozornit při Dolibarr obdržíte potvrzení o ověřenou platby za předplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/cs_CZ/printipp.lang
+++ b/htdocs/langs/cs_CZ/printipp.lang
@ -1,18 +1,14 @@
-/*
- * Language code: cs_CZ
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-10-26 11:58:10
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-10-26 11:58:10).
-// Reference language: en_US -> cs_CZ
-PrintIPPSetup=Nastavení modulu Přímý tisk
-PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem přímé des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháry.
-PRINTIPP_ENABLED=Zobrazit Piktogram &quot;Přímý tisk&quot; do seznamu dokumentů
-PRINTIPP_HOST=Tiskový server
-PRINTIPP_PORT=Přístav
-PRINTIPP_USER=Přihlášení
-PRINTIPP_PASSWORD=Heslo
-NoPrinterFound=Žádné tiskárny nalezeny (zkontrolujte poháry Nasta)
-// STOP - Lines generated via autotranslator.php tool (2013-10-26 12:39:36).
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobek je služba s omezeným trváním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cen
 MultiPriceLevelsName=Cenová kategorie
-AssociatedProductsAbility=Aktivace virtuální produkty se vyznačují
-AssociatedProducts=Virtuální produkt
-AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt
-ParentProductsNumber=Počet mateřské virtuální produkt
-IfZeroItIsNotAVirtualProduct=Pokud je 0, tento produkt není virtuální produkt
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobek není používán žádným virtuální produkt
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociovat
 Translation=Překlad
 KeywordFilter=Klíčové slovo filtr
@ -132,7 +132,7 @@ AddDel=Přidat / Smazat
 Quantity=Množství
 NoMatchFound=Ne nalezena shoda
 ProductAssociationList=Seznam souvisejících produktů / služeb: název produktu / služby (množství ovlivněny)
-ProductParentList=Seznam virtuálních produktů / služeb s tímto produktem jako součást
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedním z vybraného produktu je rodič s aktuální produkt
 DeleteProduct=Odstranění produktu / služby
 ConfirmDeleteProduct=Jste si jisti, že chcete smazat tento výrobek / službu?
@ -179,7 +179,7 @@ CloneProduct=Clone produkt nebo službu
 ConfirmCloneProduct=Jste si jisti, že chcete klonovat produktů nebo služeb <b>%s?</b>
 CloneContentProduct=Klon všechny hlavní informace o produktu / služby
 ClonePricesProduct=Klonovat hlavní informace a ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu / služby
 CustomerPrices=Prodejní ceny
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@ -14,7 +14,7 @@ TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské
 Myprojects=Moje projekty
 ProjectsArea=Projekty
 NewProject=Nový projekt
-AddProject=Přidat projekt
+AddProject=Create project
 DeleteAProject=Odstranit projekt
 DeleteATask=Odstranit úkol
 ConfirmDeleteAProject=Jste si jisti, že chcete smazat tento projekt?
@ -36,6 +36,8 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový strávený čas
 MyTimeSpent=Můj strávený čas
 MyTasks=Moje úkoly
@ -45,7 +47,7 @@ TaskDateStart=Datum zahájení úkolu
 TaskDateEnd=Datum ukončení úkolu
 TaskDescription=Popis úkolu
 NewTask=Nový úkol
-AddTask=Přidat úkol
+AddTask=Create task
 AddDuration=Přidat trvání
 Activity=Činnost
 Activities=Úkoly / činnosti
--- a/htdocs/langs/cs_CZ/resource.lang
+++ b/htdocs/langs/cs_CZ/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Zobrazit Natáhněte
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Odstoupení soubor
 SetToStatusSent=Nastavte na stav &quot;odeslaný soubor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=Platba %s trvalého příkazu bankou
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Brug automatisk udfyldning af felter til at vælge tred
 ActivityStateToSelectCompany= Tilføj en filter mulighed for at vise / skjule thirdparties, der i øjeblikket i aktivitet eller er ophørt den
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Brug automatisk udfyldning af felter til at vælge kontakt (i stedet for at bruge en liste).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Søg filtre optioner
 NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
 ViewFullDateActions=Vis fuld datoer aktioner i tredje ark
@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler give simple foruddefineret opsætning af Dolibar
 ModulesMarketPlaceDesc=Du kan finde flere moduler for at downloade på eksterne hjemmesider på internettet ...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
+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)
 WebSiteDesc=Web site udbydere kan du søge at finde flere moduler ...
 URL=Link
 BoxesAvailable=Bokse til rådighed
@ -444,7 +447,7 @@ Module55Desc=Stregkoder 'ledelse
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående ordrer
-Module57Desc=Stående ordrer og tilbagetrækninger 'ledelse
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider
 Module330Name=Bogmærker
 Module330Desc=Bogmærker 'ledelse
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@ -503,6 +508,8 @@ Module2500Name=Elektronisk Content Management
 Module2500Desc=Gemme og dele dokumenter
 Module2600Name=WebServices
 Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Har brug for en internetadgang
 Module2800Desc=FTP Client
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX
 Module50100Name=Cash desk
@ -527,7 +534,7 @@ Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog til brug (sprog code)
 EnableMultilangInterface=Aktiver flersproget grænseflade
 EnableShowLogo=Vis logo på venstre menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Dit system er blevet opdateret med succes
 CompanyInfo=Company / fundament oplysninger
 CompanyIds=Company / fundament identiteter
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Aktioner påvirkes i
 ActionsDoneBy=Aktioner udført af
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle mine handlinger / opgaver
 AllActions= Alle les handlinger / opgaver
 ViewList=Vis liste
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste over kører kontrakt linjer
 ListOfRunningServices=Liste over kører tjenester
 NotActivatedServices=Ikke aktiverede tjenester (blandt valideret kontrakter)
 BoardNotActivatedServices=Tjenester for at aktivere blandt valideret kontrakter
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Seneste %s aktiveret tjenester
 LastModifiedServices=Seneste %s modificerede tjenester
 EditServiceLine=Rediger service line
@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salg repræsentant, der underskriver kontrakt
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandør kode kræves
 ErrorSupplierCodeAlreadyUsed=Leverandør koden allerede anvendes
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Forkert værdi &quot;%s&quot; for parameter forkerte &quot;%s forb.
-ErrorBadImageFormat=Billede fil har ikke et understøttet format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Værdi '%s' har forkert datoformat
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Det lykkedes ikke at skrive i mappen %s
@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
 ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
 ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Brugerkonto <b>%s</b> anvendes til at udføre web-server har ikke tilladelse til at
 ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'

 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@ -8,7 +8,7 @@ Members=Medlemmer
 MemberAccount=Medlem login
 ShowMember=Vis medlem kortet
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Medlemmer Billetter
 FundationMembers=Instituttets medlemmer
 Attributs=Attributter
@ -85,8 +85,7 @@ SubscriptionLateShort=Sen
 SubscriptionNotReceivedShort=Aldrig modtaget
 ListOfSubscriptions=Liste over abonnementer
 SendCardByMail=Send kort
-AddMember=Tilføj medlem
-MemberType=Medlem type
+AddMember=Create member
 NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer
 NewMemberType=Nyt medlem type
 WelcomeEMail=Velkommen e-mail
@ -126,12 +125,12 @@ Date=Dato
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kortet
 MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke længere forventes at abonnere
-AddSubscription=Tilføj abonnement
+AddSubscription=Create subscription
 ShowSubscription=Vis tegning
 MemberModifiedInDolibarr=Medlem ændret i Dolibarr
 SendAnEMailToMember=Send information email til medlem
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail emne til medlem autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=EMail for medlem autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=E-mail emne til medlem validering
@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail emne til medlem resiliation
 DescADHERENT_MAIL_RESIL=E-mail for medlem resiliation
 DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format af kort side
 DescADHERENT_CARD_HEADER_TEXT=Tekst trykt på toppen af medlem-kort
 DescADHERENT_CARD_TEXT=Tekst påtrykt medlem kort
@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr. tredjepart forbundet til dette medlem
 ThirdPartyDolibarr=Dolibarr tredjepart
 MembersAndSubscriptions= Medlemmer og Subscriptions
 MoreActions=Supplerende aktion om kontrolapparatet
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Opret en direkte transaktion record på grund
 MoreActionBankViaInvoice=Opret en faktura og acontobeløb
 MoreActionInvoiceOnly=Opret en faktura uden betaling
@ -171,6 +170,8 @@ LastSubscriptionAmount=Sidste tegningsbeløbet
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Antal medlemmer
 NoValidatedMemberYet=Ingen validerede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
@ -196,9 +197,10 @@ Collectivités=Organisationer
 Particuliers=Personlig
 Entreprises=Virksomheder
 DOLIBARRFOUNDATION_PAYMENT_FORM=For at gøre dit abonnement betaling med en bankoverførsel, se side <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> At betale med kreditkort eller Paypal, klik på knappen nederst på denne side. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis produktet er en tjeneste med begrænset varighed:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktiver tilhørende produkter
-AssociatedProducts=Tilhørende produkter
-AssociatedProductsNumber=Antallet af tilknyttede produkter
-ParentProductsNumber=Antal forælder produkt
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Oversættelse
 KeywordFilter=Keyword filter
@ -132,7 +132,7 @@ AddDel=Tilføj / Slet
 Quantity=Mængde
 NoMatchFound=Ingen match fundet
 ProductAssociationList=Liste over relaterede produkter / tjenesteydelser: navn på produkt / tjeneste (mængde påvirkes)
-ProductParentList=Liste over produkter / services med dette produkt som en komponent
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet et produkt / service
 ConfirmDeleteProduct=Er du sikker på du vil slette dette produkt / service?
@ -179,7 +179,7 @@ CloneProduct=Klon vare eller tjenesteydelse
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller <b>tjenesteydelse %s?</b>
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
 ClonePricesProduct=Klon vigtigste informationer og priser
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dette produkt er brugt
 NewRefForClone=Ref. af nye produkter / ydelser
 CustomerPrices=Kunder priser
@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@ -14,7 +14,7 @@ TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertill
 Myprojects=Mine projekter
 ProjectsArea=Projekter område
 NewProject=Nyt projekt
-AddProject=Tilføj projekt
+AddProject=Create project
 DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
 ConfirmDeleteAProject=Er du sikker på du vil slette dette projekt?
@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mine opgaver
@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ny opgave
-AddTask=Tilføj opgave
+AddTask=Create task
 AddDuration=Tilføj varighed
 Activity=Aktivitet
 Activities=Opgaver / aktiviteter
--- a/htdocs/langs/da_DK/resource.lang
+++ b/htdocs/langs/da_DK/resource.lang
@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources

-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@ -79,10 +79,11 @@ CreditDate=Kredit på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Vis Træk
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
-DoStandingOrdersBeforePayments=Denne faner giver dig mulighed for at anmode om en stående ordre. Når den bliver færdig, kan du skrive betalingen for at lukke fakturaen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, 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.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines

 ### Notifications
 InfoCreditSubject=Betaling af stående ordre %s af banken
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@ -56,6 +56,8 @@ UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwen
 ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContact=Suchfeld statt Listenansicht für Kontaktauswahl verwenden.
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Suchfilter Optionen
 NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
 ViewFullDateActions=Zeige alle Terminaktionen in der Partneransicht
@ -208,6 +210,7 @@ ModulesJobDesc=Die Geschäftstypenmodule erlauben eine einfache Einrichtung des
 ModulesMarketPlaceDesc=Hier finden Sie weitere Module auf externen Web-Sites
 ModulesMarketPlaces=Sie können zusätzliche Module im Web finden...
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
+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)
 WebSiteDesc=Website-Anbieter für Ihre Suche nach weiteren Modulen
 URL=Link
 BoxesAvailable=Verfügbare Boxen
@ -396,7 +399,7 @@ ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer übersc
 ExternalModule=Externes Modul - im Verzeichnis %s installiert
 BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcodes löschen?
@ -437,14 +440,14 @@ Module52Name=Produktbestände
 Module52Desc=Produktbestandsverwaltung
 Module53Name=Leistungen
 Module53Desc=Leistungs-Verwaltung
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Kontrakte/Abonnements
+Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos)
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
 Module57Name=Daueraufträge
-Module57Desc=Daueraufträge und Retourenverwaltung (RMA)
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@ -475,8 +478,8 @@ Module320Name=RSS-Feed
 Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
 Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+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.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
@ -495,6 +498,8 @@ Module1780Name=Kategorien
 Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
+Module2200Name=Dynamische Preise
+Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
 Module2300Desc=Verwaltung geplanter Aufgaben
 Module2400Name=Agenda
@ -503,6 +508,8 @@ Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
 Module2600Name=WebServices
 Module2600Desc=Aktivieren Sie Verwendung von Webservices
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung
 Module2800Desc=FTP-Client
@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
 Module39000Name=Produktstapel
-Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
+Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
 Module50000Name=PayBox
 Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
 Module50100Name=Kasse
@ -527,7 +534,7 @@ Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlu
 Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module54000Name=PrintIPP
-Module54000Desc=Mit Cups IPP Drucker ausdrucken.
+Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
 Module55000Name=Open Poll
 Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
 Module59000Name=Gewinnspannen
@ -606,11 +613,11 @@ Permission151=Daueraufträge einsehen
 Permission152=Dauerauftragsanträge erstellen/bearbeiten
 Permission153=Dauerauftragsbelege übertragen
 Permission154=Dauerauftragsbelege kreditieren/ablehnen
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Kontrakte/Abonnements einsehen
+Permission162=Kontrakte/Abonnements erstellen/bearbeiten
+Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren
+Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren
+Permission165=Kontrakt/Abonnement löschen
 Permission171=Reisen und Spesen einsehen (eigene und Untergebene)
 Permission172=Reisen und Spesen erstellen/ändern
 Permission173=Reisen und Spesen löschen
@ -672,7 +679,7 @@ Permission300=Barcodes einsehen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
 Permission311=Leistungen lesen
-Permission312=Assign service/subscription to contract
+Permission312=Leistung/Abonnement einem Vertrag zuordnen
 Permission331=Lesezeichen einsehen
 Permission332=Lesezeichen erstellen/bearbeiten
 Permission333=Lesezeichen löschen
@ -702,8 +709,8 @@ Permission701=Spenden einsehen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission1001=Warenbestände einsehen
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Warenlager erstellen/ändern
+Permission1003=Warenlager löschen
 Permission1004=Lagerbewegungen einsehen
 Permission1005=Lagerbewegungen erstellen/bearbeiten
 Permission1101=Lieferscheine einsehen
@ -765,7 +772,7 @@ DictionaryCivility=Anredeformen
 DictionaryActions=Maßnahmen
 DictionarySocialContributions=Sozialbeitragstypen
 DictionaryVAT=MwSt.-Sätze
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryRevenueStamp=Anzahl der Steuermarken
 DictionaryPaymentConditions=Zahlungsbedingungen
 DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Bestellungen
 DictionaryAccountancyplan=Kontenplan
 DictionaryAccountancysystem=Kontenplan Modul
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gespeichert
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
@ -888,6 +896,7 @@ PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
 EnableMultilangInterface=Mehrsprachigkeit aktivieren
 EnableShowLogo=Logo über dem linken Menü anzeigen
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Das System wurde erfolgreich aktualisiert
 CompanyInfo=Firmen-/Stiftungsinformationen
 CompanyIds=Firmen-/Stiftungs-IDs
@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-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=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:<br>* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.<br>* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention Nummerierung Module
 TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen
 ContractsNumberingModules=Verträge Nummerierung Module
 TemplatePDFContracts=Vertragsvorlagen
 FreeLegalTextOnContracts=Freier Text auf Verträgen
@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprim
 CacheByServer=Vom Server zwischengespeichert
 CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Dienstleistungen Modul Setup
@ -1415,8 +1424,8 @@ OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s
 OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
 OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Warenlager-Modul Einstellungen
+UserWarehouse=Persönliche Warenläger verwenden
 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.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
@ -1482,12 +1491,12 @@ ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dess
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of Sales
 CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe 
 CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
 CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
 CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
@ -1552,4 +1561,4 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|
 SalariesSetup=Setup of module salaries
 SortOrder=Sortierreihenfolge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@ -29,6 +29,7 @@ ActionsToDoBy=Termine zugewiesen an
 ActionsDoneBy=Termine erledigt von
 ActionsForUser=Maßnahmen für Benutzer
 ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle meine Termine/Aufgaben
 AllActions= Alle Termine / Aufgaben
 ViewList=Listenansicht
@ -44,7 +45,7 @@ AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
 ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 PropalValidatedInDolibarr=Angebot freigegeben
 InvoiceValidatedInDolibarr=Rechnung freigegeben
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
 OrderValidatedInDolibarr= Bestellung %s freigegeben
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Buchhaltungscode-Journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Dienstleistungen zu kaufen
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Dienstleistungen zu verkaufen
 ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen
 ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Vertragsübersicht
 ListOfContracts=Liste der Verträge
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Letzte %s geänderte Kontrakte
 AllContracts=Alle Verträge
 ContractCard=Vertragskarte
 ContractStatus=Vertragsstatus
@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
 ListOfRunningServices=Liste aktiver Services
 NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
 BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen)
-LastContracts=Last % contracts
+LastContracts=Letzte %s Kontrakte
 LastActivatedServices=%s zuletzt aktivierte Services
 LastModifiedServices=%s zuletzt bearbeitete Services
 EditServiceLine=Service-Position bearbeiten
@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste der Services die ablaufen
 NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. 
 StandardContractsTemplate=Standard Vertragsschablone 
 ContactNameAndSignature=Für %s, Name und Unterschrift
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.

 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@ -18,7 +18,7 @@ CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Ko
 CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen
 # Menu
 CronJobs=Geplante Jobs
-CronListActive=List of active/scheduled jobs
+CronListActive=Liste der aktiven/geplanten Jobs
 CronListInactive=Liste der deaktivierten Jobs
 # Page list
 CronDateLastRun=Letzte Ausführung
--- a/Show More
+++ b/Show More