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

.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+[*.php]
+indent_style = space
+indent_size = 4
+[*.js]
+indent_style = space
+indent_size = 2
+[*.css]
+indent_style = space
+indent_size = 2
+[*.xml]
+indent_style = space
+indent_size = 4

.travis.yml

@@ -99,6 +99,8 @@ script:
  - php upgrade.php 3.6.0 3.7.0 >> upgrade.log
 # - cat upgrade360370.log
  - php upgrade2.php 3.6.0 3.7.0 >> upgrade2.log
+ - php upgrade.php 3.7.0 3.8.0 >> upgrade.log
+ - php upgrade2.php 3.7.0 3.8.0 >> upgrade2.log
 # - cat upgrade2.log
  - cd ../..
  - date

.tx/config

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

build/debian/README.howto

@@ -101,6 +101,12 @@ http://packages.qa.debian.org/package.html
 http://bugs.debian.org/package
 
 
+##### Modify severity of a bug ticket
+
+- Send this email to control@bugs.debian.org and wait 10 minutes
+
+severity 123 xxx
+
 
 ##### Testing a package into unstable env
 

build/makepack-dolibarr.pl

@@ -365,6 +365,7 @@ if ($nboftargetok) {
 		print "Clean $BUILDROOT\n";
 		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
@@ -373,7 +374,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;

dev/translation/strip_language_file.php

@@ -1,9 +1,22 @@
 #!/usr/bin/php
 <?php
-/*
+/* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * strip_language_file.php
+ * 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/>.
  *
- * (c) 2014 by FromDual GmbH, licensed under GPL v2
+ * -----
  *
  * Compares a secondary language translation file with its primary
  * language file and strips redundant translations.
@@ -12,11 +25,10 @@
  *
  * Usage:
  * cd htdocs/langs
- * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> <languagefile.lang>
+ * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
  *
- * Parameters:
+ * To rename all .delta files, you can do
- * 1 - Primary Language
+ * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
- * 2 - Secondary Language
  *
  * Rules:
  * secondary string == primary string -> strip
@@ -24,9 +36,6 @@
  * secondary string not in primary -> strip and warning
  * secondary string has no value -> strip and warning
  * secondary string != primary string -> secondary.lang.delta
- *
- * To rename all .delta fils, you can do
- * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
  */
 
 /**
@@ -260,6 +269,9 @@ 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";
 }
 
 

htdocs/adherents/admin/adherent.php

@@ -53,7 +53,7 @@ if ($action == 'update' || $action == 'add')
 	$constname=GETPOST('constname','alpha');
 	$constvalue=(GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
 
-	if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue='';
+	if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE' || $constname=='ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue='';
 	if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
 	{
 		if ($constvalue) $constvalue=0;
@@ -209,6 +209,23 @@ if ($conf->facture->enabled)
 	}
 	print "</tr>\n";
 	print '</form>';
+
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	{
+		$var=!$var;
+		print '<form action="adherent.php" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
+		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<td>';
+		print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print '</td>';
+	}
+	print "</tr>\n";
+	print '</form>';
 }
 
 print '</table>';

htdocs/adherents/card_subscriptions.php

@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -315,13 +316,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                         }
                     }
                     else
-                    {
+					{
                         $error++;
                         $errmsg=$acct->error;
                     }
                 }
                 else
-                {
+				{
                     $error++;
                     $errmsg=$acct->error;
                 }
@@ -385,6 +386,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                 {
 	                // Add line to draft invoice
 	                $idprodsubscription=0;
+			        if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+
 	                $vattouse=0;
 	                if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
 	                {
@@ -947,9 +950,10 @@ if ($rowid)
             print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.GETPOST('cotisation').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
             // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
+            print '<tr><td>'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' ';
+            print '<td><input name="label" type="text" size="32" value="';
-            print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>';
+            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom?$datefrom:time()),"%Y");
+            print '"></td></tr>';
 
             // Complementary action
             if (! empty($conf->banque->enabled) || ! empty($conf->facture->enabled))
@@ -990,7 +994,13 @@ if ($rowid)
                     	print $langs->trans("CreateDolibarrThirdParty");
                     	print '</a>)';
                     }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+                    if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+                    {
+                    	$prodtmp=new Product($db);
+                    	$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+                    	print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+                    }
                     print '<br>';
                 }
                 // Add invoice with payments
@@ -1009,7 +1019,13 @@ if ($rowid)
                     	print $langs->trans("CreateDolibarrThirdParty");
                     	print '</a>)';
                     }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+                    if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+                    {
+                    	$prodtmp=new Product($db);
+                    	$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+                    	print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+                    }
                     print '<br>';
                 }
                 print '</td></tr>';

htdocs/adherents/class/adherent.class.php

@@ -1306,7 +1306,7 @@ class Adherent extends CommonObject
                 return $rowid;
             }
             else
-            {
+			{
                 $this->db->rollback();
                 return -2;
             }

htdocs/adherents/fiche_subscription.php

@@ -180,7 +180,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	$head[$h][2] = 'info';
 	$h++;
 
-	dol_fiche_head($head, 'general', $langs->trans("Subscription"));
+	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
 
 	print "\n";
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="post">';

htdocs/admin/boxes.php

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

htdocs/admin/const.php

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

htdocs/admin/supplierinvoice_extrafields.php

@@ -38,6 +38,7 @@ if (!$user->admin)
 $langs->load("admin");
 $langs->load("other");
 $langs->load("bills");
+$langs->load("orders");
 $langs->load("suppliers");
 
 $extrafields = new ExtraFields($db);

htdocs/comm/action/card.php

@@ -1248,34 +1248,6 @@ if ($id > 0)
 
 	if ($action != 'edit')
 	{
-		
-		if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
-				print '<div class="fichecenter"><div class="fichehalfleft">';
-	            print '<a name="builddoc"></a>'; // ancre
-
-	            /*
-	             * Documents generes
-	             */
-	             
-	            $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
-	            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-				
-	            $genallowed=$user->rights->agenda->myactions->create;
-	            $delallowed=$user->rights->agenda->myactions->delete;
-
-	            $var=true;
-
-	            $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
-
-				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-				print '</div></div></div>';
-
-	            print '<div style="clear:both;">&nbsp;</div>';
-	    }
-		
-		
 		// Link to agenda views
 		print '<div id="agendaviewbutton">';
 		print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
@@ -1315,6 +1287,33 @@ if ($id > 0)
 		print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
 		print '</form>'."\n";
 		print '</div>';
+
+		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
+		{
+			print '<div style="clear:both;">&nbsp;</div><div class="fichecenter"><div class="fichehalfleft">';
+            print '<a name="builddoc"></a>'; // ancre
+
+            /*
+             * Documents generes
+             */
+
+            $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
+            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+
+            $genallowed=$user->rights->agenda->myactions->create;
+	        $delallowed=$user->rights->agenda->myactions->delete;
+
+            $var=true;
+
+            $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
+
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+			print '</div></div></div>';
+
+            print '<div style="clear:both;">&nbsp;</div>';
+	    }
 	}
 }
 

htdocs/compta/bank/search.php

@@ -175,7 +175,8 @@ if ($resql)
 		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 
-	print '<form method="post" action="search.php" name="search_form">';
+	print '<form method="post" action="search.php" name="search_form">'."\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 
 	$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': ';
 	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1);
@@ -185,10 +186,10 @@ if ($resql)
 	if ($moreforfilter) {
 		print '<div class="liste_titre">';
 		print $moreforfilter;
-		print '</div>';
+		print '</div>'."\n";
 	}
 
-	print '<table class="liste" width="100%">';
+	print '<table class="liste" width="100%">'."\n";
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder);
@@ -202,7 +203,6 @@ if ($resql)
 	print '<td class="liste_titre" align="left"> &nbsp; '.$langs->trans("Account").'</td>';
 	print "</tr>\n";
 
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
@@ -330,7 +330,7 @@ if ($resql)
 	}
 
 	print "</table>";
-
+    print '</form>';
 	$db->free($resql);
 }
 else

htdocs/core/class/commonobject.class.php

@@ -3603,7 +3603,7 @@ abstract class CommonObject
 						break;
 					}
 
-					$out .= '</td>'."\n";
+					$out .= '</td>';
 
 					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
 					else $out .= '</tr>';
@@ -3611,7 +3611,6 @@ abstract class CommonObject
 				}
 			}
 			$out .= "\n";
-			$out .= '<!-- /showOptionalsInput --> ';
 			$out .= '
 				<script type="text/javascript">
 				    jQuery(document).ready(function() {
@@ -3640,7 +3639,8 @@ abstract class CommonObject
 
 						setListDependencies();
 				    });
-				</script>';
+				</script>'."\n";
+			$out .= '<!-- /showOptionalsInput --> '."\n";
 		}
 		return $out;
 	}

htdocs/core/class/html.form.class.php

@@ -1906,7 +1906,7 @@ class Form
 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
         $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
-        $sql.= " s.nom as name";
+        $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
@@ -1943,6 +1943,7 @@ class Form
         $result=$this->db->query($sql);
         if ($result)
         {
+            require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
 
             $num = $this->db->num_rows($result);
 
@@ -1987,6 +1988,17 @@ class Form
                 {
                     $outqty=$objp->quantity;
 					$outdiscount=$objp->remise_percent;
+                    if (!empty($objp->fk_price_expression)) {
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+                        if ($price_result >= 0) {
+                            $objp->fprice = $price_result;
+                            if ($objp->quantity >= 1)
+                            {
+                                $objp->unitprice = $objp->fprice / $objp->quantity;
+                            }
+                        }
+                    }
                     if ($objp->quantity == 1)
                     {
 	                    $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
@@ -2075,7 +2087,7 @@ class Form
 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
         $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";
-        $sql.= " s.nom as name";
+        $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
@@ -2100,6 +2112,7 @@ class Form
             }
             else
             {
+                require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
                 $form.= '<option value="0">&nbsp;</option>';
 
                 $i = 0;
@@ -2114,6 +2127,17 @@ class Form
                     }
                     $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
 
+                    if (!empty($objp->fk_price_expression)) {
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+                        if ($price_result >= 0) {
+                            $objp->fprice = $price_result;
+                            if ($objp->quantity >= 1)
+                            {
+                                $objp->unitprice = $objp->fprice / $objp->quantity;
+                            }
+                        }
+                    }
                     if ($objp->quantity == 1)
                     {
                         $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
@@ -2978,12 +3002,13 @@ class Form
 			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
             $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
             if (! empty($more)) {
-            	$formconfirm.= '<p>'.$more.'</p>';
+            	$formconfirm.= '<div>'.$more.'</div>';
             }
             $formconfirm.= img_help('','').' '.$question;
-            $formconfirm.= '</div>';
+            $formconfirm.= '</div>'."\n";
 
-            $formconfirm.= '<script type="text/javascript">';
+            $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";
+            $formconfirm.= '<script type="text/javascript">'."\n";
             $formconfirm.='
             $(function() {
             	$( "#'.$dialogconfirm.'" ).dialog({
@@ -3050,13 +3075,14 @@ class Form
                 }
             });
             </script>';
+            $formconfirm.= "<!-- end ajax form_confirm -->\n";
         }
         else
         {
         	$formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n";
 
             $formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
-            $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">';
+            $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
             $formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 
             $formconfirm.= '<table width="100%" class="valid">'."\n";

htdocs/core/class/html.formfile.class.php

@@ -301,12 +301,10 @@ class FormFile
                     $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
                 }
             }
-			
 			else if ($modulepart == 'agenda')
             {
                null;
             }
-			
             else if ($modulepart == 'propal')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
@@ -439,7 +437,7 @@ class FormFile
             }
             else
             {
-            	
+
                 // For normalized standard modules
                 $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
                 if (file_exists($file))

htdocs/core/lib/agenda.lib.php

@@ -446,7 +446,7 @@ function actions_prepare_head($object)
     $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if ($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
     $head[$h][2] = 'documents';
     $h++;
 

htdocs/core/menus/init_menu_auguria.sql

@@ -196,8 +196,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);
--- Fiscal year
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 5, __ENTITY__);
 -- Rapports
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -208,6 +206,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+-- Fiscal year
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'main', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'main', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__);
 -- Check deposit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);

htdocs/core/menus/standard/eldy.lib.php

@@ -702,7 +702,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("contracts");
 				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts');
-				$newmenu->add("/contrat/card.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
+				$newmenu->add("/contrat/card.php?action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
 				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
 				$newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
 				if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
@@ -1360,7 +1360,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				for ($j=0; $j < $tabul; $j++)
 				{
-					$tabstring.='&nbsp; &nbsp; &nbsp;';
+					$tabstring.='&nbsp;&nbsp;&nbsp;';
 				}
 			}
 

htdocs/core/modules/modDynamicPrices.class.php

@@ -0,0 +1,122 @@
+<?php
+/* Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \defgroup   produit     Module dynamic prices
+ *  \brief      Module to manage dynamic prices in products
+ *  \file       htdocs/core/modules/modDynamicPrices.class.php
+ *  \ingroup    produit
+ *  \brief      File to describe module to manage dynamic prices in products
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Class descriptor of DynamicPrices module
+ */
+class modDynamicPrices extends DolibarrModules
+{
+
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 2200;
+
+        $this->family = "products";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Enable the usage of math expressions for prices";
+        $this->version = 'experimental';                        // 'experimental' or 'dolibarr' or version
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 0;
+        // Name of image file used for this module.
+        $this->picto='technic';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        //-------------
+        //$this->config_page_url = array("dynamicprices.php@dynamicprices");
+
+        // Dependancies
+        //-------------
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->langfiles = array("other");
+
+        // Constantes
+        //-----------
+        $this->const = array();
+
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
+
+        // Boxes
+        //------
+        $this->boxes = array();
+
+        // Permissions
+        //------------
+        $this->rights = array();
+        $this->rights_class = 'dynamicprices';
+        $r=0;
+    }
+
+
+    /**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Prevent pb of modules not correctly disabled
+        //$this->remove($options);
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
+
+    /**
+	 *		Function called when module is disabled.
+	 *      Remove from database constants, boxes and permissions from Dolibarr database.
+	 *		Data directories are not deleted
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+     */
+    function remove($options='')
+    {
+		$sql = array();
+
+		return $this->_remove($sql,$options);
+    }
+
+}

htdocs/core/modules/modMargin.class.php

@@ -106,8 +106,8 @@ class modMargin extends DolibarrModules
     			'url'=>'/margin/index.php',
     			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
     			'position'=>100,
-    			'enabled'=>'$user->rights->margins->liretous',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'1',			// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
     			'target'=>'',
     			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		$r++;

htdocs/core/tpl/login.tpl.php

@@ -49,7 +49,6 @@ $(document).ready(function () {
 <div align="center">
 <div class="login_vertical_align">
 
-
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 <input type="hidden" name="loginfunction" value="loginfunction" />
@@ -110,7 +109,7 @@ if (! empty($hookmanager->resArray['options'])) {
 	if ($captcha) {
 		// TODO: provide accessible captha variants
 ?>
-	<!-- Captcha -->
+<!-- Captcha -->
 	<tr><td valign="middle" class="loginfield nowrap"><label for="securitycode"><b><?php echo $langs->trans('SecurityCode'); ?></b></label></td>
 	<td valign="top" class="nowrap none" align="left">
 
@@ -191,18 +190,14 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 	echo '</div>';
 }
 
-
 ?>
 
 </div>
-
+</div>
 </div>
 
 </form>
 
-
-
-
 <?php if (! empty($_SESSION['dol_loginmesg']))
 {
 ?>
@@ -216,21 +211,17 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 <?php if ($main_home)
 {
 ?>
-	<div class="login_main_home center" style="max-width: 80%">
+<!-- main_home message -->
-	<?php echo $main_home; ?>
+<div class="login_main_home center" style="max-width: 80%"><?php echo $main_home; ?></div>
-	</div><br>
+<br>
 <?php
 }
 ?>
-
 <!-- authentication mode = <?php echo $main_authentication ?> -->
 <!-- cookie name used for this session = <?php echo $session_name ?> -->
 <!-- urlfrom in this session = <?php echo isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:''; ?> -->
-
 <!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
-
 <?php if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?>
-
 <?php
 // Google Analytics (need Google module)
 if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
@@ -276,10 +267,8 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
 	}
 }
 ?>
-
-
 </div>
-
+</div>
 
 </body>
 </html>

htdocs/core/tpl/objectline_view.tpl.php

@@ -45,7 +45,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
 	<?php } ?>
-	<td><?php $coldisplay++; ?><div id="<?php echo $line->rowid; ?>"></div>
+	<td><?php $coldisplay++; ?><div id="row-<?php echo $line->id; ?>"></div>
 	<?php if (($line->info_bits & 2) == 2) { ?>
 		<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
 		<?php

htdocs/externalsite/frames.php

@@ -58,7 +58,7 @@ print "
 
 <noframes>
 <body>
-	<br><div class="center">
+	<br><div class=\"center\">
 	Sorry, your browser is too old or not correctly configured to view this area.<br>
 	Your browser must support frames.<br>
 	</div>

htdocs/filefunc.inc.php

@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

htdocs/fourn/ajax/getSupplierPrices.php

@@ -48,7 +48,7 @@ if (! empty($idprod))
 	$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
 	$sql.= " pfp.ref_fourn,";
 	$sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,";
-	$sql.= " s.nom as name";
+	$sql.= " pfp.fk_price_expression, pfp.tva_tx, s.nom as name";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc";
@@ -66,11 +66,24 @@ if (! empty($idprod))
 
 		if ($num)
 		{
+            require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
 			$i = 0;
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($result);
 
+                if (!empty($objp->fk_price_expression)) {
+                    $priceparser = new PriceParser($db);
+                    $price_result = $priceparser->parseProductSupplier($idprod, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+                    if ($price_result >= 0) {
+                        $objp->fprice = $price_result;
+                        if ($objp->quantity >= 1)
+                        {
+                            $objp->unitprice = $objp->fprice / $objp->quantity;
+                        }
+                    }
+                }
+
 				$price = $objp->fprice * (1 - $objp->remise_percent / 100);
 				$unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100);
 

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

@@ -27,6 +27,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
 
 
 /**
@@ -55,6 +56,8 @@ class ProductFournisseur extends Product
     var $fourn_unitprice;
     var $fourn_tva_npr;
 
+    var $fk_price_expression;
+
 
     /**
 	 *	Constructor
@@ -320,13 +323,14 @@ class ProductFournisseur extends Product
     /**
      *    Loads the price information of a provider
      *
-     *    @param	int		$rowid	        Line id
+     *    @param    int     $rowid              Line id
-     *    @return   int 					< 0 if KO, 0 if OK but not found, > 0 if OK
+     *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
+     *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
      */
-    function fetch_product_fournisseur_price($rowid)
+    function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
     {
         $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
-        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
+        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_price_expression"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
 
@@ -351,6 +355,25 @@ class ProductFournisseur extends Product
             	$this->fk_product				= $obj->fk_product;
             	$this->fk_availability			= $obj->fk_availability;
             	//$this->fourn_tva_npr			= $obj->fourn_tva_npr; // FIXME this field not exist in llx_product_fournisseur_price
+                $this->fk_price_expression      = $obj->fk_price_expression;
+
+                if (empty($ignore_expression) && !empty($this->fk_price_expression)) {
+                    $priceparser = new PriceParser($this->db);
+                    $price_result = $priceparser->parseProductSupplier($this->fk_product, $this->fk_price_expression, $this->fourn_qty, $this->fourn_tva_tx);
+                    if ($price_result >= 0) {
+                    	$this->fourn_price = $price_result;
+                    	//recalculation of unitprice, as probably the price changed...
+	                    if ($this->fourn_qty!=0)
+	                    {
+	                        $this->fourn_unitprice = price2num($this->fourn_price/$this->fourn_qty,'MU');
+	                    }
+	                    else
+	                    {
+	                        $this->fourn_unitprice="";
+	                    }
+                    }
+                }
+
             	return 1;
             }
             else
@@ -379,7 +402,7 @@ class ProductFournisseur extends Product
         global $conf;
 
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id,";
+        $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id, pfp.fk_price_expression,";
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -416,6 +439,16 @@ class ProductFournisseur extends Product
                 $prodfourn->fk_availability			= $record["fk_availability"];
                 $prodfourn->id						= $prodid;
                 $prodfourn->fourn_tva_npr						= $record["info_bits"];
+                $prodfourn->fk_price_expression     = $record["fk_price_expression"];
+
+                if (!empty($prodfourn->fk_price_expression)) {
+                    $priceparser = new PriceParser($this->db);
+                    $price_result = $priceparser->parseProductSupplier($prodid, $prodfourn->fk_price_expression, $prodfourn->fourn_qty, $prodfourn->fourn_tva_tx);
+                    if ($price_result >= 0) {
+                    	$prodfourn->fourn_price = $price_result;
+                    	$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
+                    }
+                }
 
                 if (!isset($prodfourn->fourn_unitprice))
                 {
@@ -468,7 +501,7 @@ class ProductFournisseur extends Product
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
         $sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
-        $sql.= " pfp.remise, pfp.remise_percent";
+        $sql.= " pfp.remise, pfp.remise_percent, pfp.fk_price_expression";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND pfp.fk_product = ".$prodid;
@@ -495,6 +528,7 @@ class ProductFournisseur extends Product
             $this->fourn_tva_tx				= $record["tva_tx"];
             $this->fourn_id					= $record["fourn_id"];
             $this->fourn_name				= $record["supplier_name"];
+            $this->fk_price_expression      = $record["fk_price_expression"];
             $this->id						= $prodid;
             $this->db->free($resql);
             return 1;
@@ -506,6 +540,39 @@ class ProductFournisseur extends Product
         }
     }
 
+    /**
+     *  Sets the price expression
+     *
+     *  @param  string  $expression_id	Expression
+     *  @return int                 	<0 if KO, >0 if OK
+     */
+    function setPriceExpression($expression_id)
+    {
+        global $conf;
+
+        // Clean parameters
+        $this->db->begin();
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+        $sql.= " SET fk_price_expression = ".$expression_id;
+        $sql.= " WHERE rowid = ".$this->product_fourn_price_id;
+
+        dol_syslog(get_class($this)."::setPriceExpression", LOG_DEBUG);
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error()." sql=".$sql;
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
     /**
      *	Display supplier of product
      *

htdocs/includes/evalmath/README.md

@@ -0,0 +1,11 @@
+evalmath.class.php
+==================
+
+Version 1.0
+
+Taken from http://www.phpclasses.org/browse/file/11680.html, cred to Miles Kaufmann
+
+This repository is cloned for two reasons:
+
+1. To allow downloading the code without signing in to phpclasses.org.
+2. To add very small improvements to the code.

htdocs/includes/evalmath/evalmath.class.php

@@ -0,0 +1,393 @@
+<?php
+
+/*
+================================================================================
+
+EvalMath - PHP Class to safely evaluate math expressions
+Copyright (C) 2005 Miles Kaufmann <http://www.twmagic.com/>
+
+================================================================================
+
+NAME
+    EvalMath - safely evaluate math expressions
+    
+SYNOPSIS
+      include('evalmath.class.php');
+      $m = new EvalMath;
+      // basic evaluation:
+      $result = $m->evaluate('2+2');
+      // supports: order of operation; parentheses; negation; built-in functions
+      $result = $m->evaluate('-8(5/2)^2*(1-sqrt(4))-8');
+      // create your own variables
+      $m->evaluate('a = e^(ln(pi))');
+      // or functions
+      $m->evaluate('f(x,y) = x^2 + y^2 - 2x*y + 1');
+      // and then use them
+      $result = $m->evaluate('3*f(42,a)');
+      
+DESCRIPTION
+    Use the EvalMath class when you want to evaluate mathematical expressions 
+    from untrusted sources.  You can define your own variables and functions,
+    which are stored in the object.  Try it, it's fun!
+
+METHODS
+    $m->evalute($expr)
+        Evaluates the expression and returns the result.  If an error occurs,
+        prints a warning and returns false.  If $expr is a function assignment,
+        returns true on success.
+    
+    $m->e($expr)
+        A synonym for $m->evaluate().
+    
+    $m->vars()
+        Returns an associative array of all user-defined variables and values.
+        
+    $m->funcs()
+        Returns an array of all user-defined functions.
+
+PARAMETERS
+    $m->suppress_errors
+        Set to true to turn off warnings when evaluating expressions
+
+    $m->last_error
+        If the last evaluation failed, contains a string describing the error.
+        (Useful when suppress_errors is on).
+
+    $m->last_error_code
+        If the last evaluation failed, 2 element array with numeric code and extra info
+
+AUTHOR INFORMATION
+    Copyright 2005, Miles Kaufmann.
+
+LICENSE
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+    
+    1   Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+    2.  Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+    3.  The name of the author may not be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+    
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class EvalMath {
+
+    var $suppress_errors = false;
+    var $last_error = null;
+    var $last_error_code = null;
+    
+    var $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants)
+    var $f = array(); // user-defined functions
+    var $vb = array('e', 'pi'); // constants
+    var $fb = array(  // built-in functions
+        'sin','sinh','arcsin','asin','arcsinh','asinh',
+        'cos','cosh','arccos','acos','arccosh','acosh',
+        'tan','tanh','arctan','atan','arctanh','atanh',
+        'sqrt','abs','ln','log');
+    
+    function EvalMath() {
+        // make the variables a little more accurate
+        $this->v['pi'] = pi();
+        $this->v['e'] = exp(1);
+    }
+    
+    function e($expr) {
+        return $this->evaluate($expr);
+    }
+    
+    function evaluate($expr) {
+        $this->last_error = null;
+        $this->last_error_code = null;
+        $expr = trim($expr);
+        if (substr($expr, -1, 1) == ';') $expr = substr($expr, 0, strlen($expr)-1); // strip semicolons at the end
+        //===============
+        // is it a variable assignment?
+        if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
+            if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
+                return $this->trigger(1, "cannot assign to constant '$matches[1]'", $matches[1]);
+            }
+            if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) return false; // get the result and make sure it's good
+            $this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
+            return $this->v[$matches[1]]; // and return the resulting value
+        //===============
+        // is it a function assignment?
+        } elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
+            $fnn = $matches[1]; // get the function name
+            if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
+                return $this->trigger(2, "cannot redefine built-in function '$matches[1]()'", $matches[1]);
+            }
+            $args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments
+            if (($stack = $this->nfx($matches[3])) === false) return false; // see if it can be converted to postfix
+            for ($i = 0; $i<count($stack); $i++) { // freeze the state of the non-argument variables
+                $token = $stack[$i];
+                if (preg_match('/^[a-z]\w*$/', $token) and !in_array($token, $args)) {
+                    if (array_key_exists($token, $this->v)) {
+                        $stack[$i] = $this->v[$token];
+                    } else {
+                        return $this->trigger(3, "undefined variable '$token' in function definition", $token);
+                    }
+                }
+            }
+            $this->f[$fnn] = array('args'=>$args, 'func'=>$stack);
+            return true;
+        //===============
+        } else {
+            return $this->pfx($this->nfx($expr)); // straight up evaluation, woo
+        }
+    }
+    
+    function vars() {
+        $output = $this->v;
+        unset($output['pi']);
+        unset($output['e']);
+        return $output;
+    }
+    
+    function funcs() {
+        $output = array();
+        foreach ($this->f as $fnn=>$dat)
+            $output[] = $fnn . '(' . implode(',', $dat['args']) . ')';
+        return $output;
+    }
+
+    //===================== HERE BE INTERNAL METHODS ====================\\
+
+    // Convert infix to postfix notation
+    function nfx($expr) {
+    
+        $index = 0;
+        $stack = new EvalMathStack;
+        $output = array(); // postfix form of expression, to be passed to pfx()
+        $expr = trim(strtolower($expr));
+        
+        $ops   = array('+', '-', '*', '/', '^', '_');
+        $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator?  
+        $ops_p = array('+'=>0,'-'=>0,'*'=>1,'/'=>1,'_'=>1,'^'=>2); // operator precedence
+        
+        $expecting_op = false; // we use this in syntax-checking the expression
+                               // and determining when a - is a negation
+    
+        if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
+            return $this->trigger(4, "illegal character '{$matches[0]}'", $matches[0]);
+        }
+    
+        while(1) { // 1 Infinite Loop ;)
+            $op = substr($expr, $index, 1); // get the first character at the current index
+            // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+            $ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
+            //===============
+            if ($op == '-' and !$expecting_op) { // is it a negation instead of a minus?
+                $stack->push('_'); // put a negation on the stack
+                $index++;
+            } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack 
+                return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
+            //===============
+            } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
+                if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
+                    $op = '*'; $index--; // it's an implicit multiplication
+                }
+                // heart of the algorithm:
+                while($stack->count > 0 and ($o2 = $stack->last()) and in_array($o2, $ops) and ($ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2])) {
+                    $output[] = $stack->pop(); // pop stuff off the stack into the output
+                }
+                // many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
+                $stack->push($op); // finally put OUR operator onto the stack
+                $index++;
+                $expecting_op = false;
+            //===============
+            } elseif ($op == ')' and $expecting_op) { // ready to close a parenthesis?
+                while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last (
+                    if (is_null($o2)) return $this->trigger(5, "unexpected ')'", ")");
+                    else $output[] = $o2;
+                }
+                if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function?
+                    $fnn = $matches[1]; // get the function name
+                    $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
+                    $output[] = $stack->pop(); // pop the function and push onto the output
+                    if (in_array($fnn, $this->fb)) { // check the argument count
+                        if($arg_count > 1)
+                            return $this->trigger(6, "wrong number of arguments ($arg_count given, 1 expected)", array($arg_count, 1));
+                    } elseif (array_key_exists($fnn, $this->f)) {
+                        if ($arg_count != count($this->f[$fnn]['args']))
+                            return $this->trigger(6, "wrong number of arguments ($arg_count given, " . count($this->f[$fnn]['args']) . " expected)", array($arg_count, count($this->f[$fnn]['args'])));
+                    } else { // did we somehow push a non-function on the stack? this should never happen
+                        return $this->trigger(7, "internal error");
+                    }
+                }
+                $index++;
+            //===============
+            } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument?
+                while (($o2 = $stack->pop()) != '(') { 
+                    if (is_null($o2)) return $this->trigger(5, "unexpected ','", ","); // oops, never had a (
+                    else $output[] = $o2; // pop the argument expression stuff and push onto the output
+                }
+                // make sure there was a function
+                if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
+                    return $this->trigger(5, "unexpected ','", ",");
+                $stack->push($stack->pop()+1); // increment the argument count
+                $stack->push('('); // put the ( back on, we'll need to pop back to it again
+                $index++;
+                $expecting_op = false;
+            //===============
+            } elseif ($op == '(' and !$expecting_op) {
+                $stack->push('('); // that was easy
+                $index++;
+                $allow_neg = true;
+            //===============
+            } elseif ($ex and !$expecting_op) { // do we now have a function/variable/number?
+                $expecting_op = true;
+                $val = $match[1];
+                if (preg_match("/^([a-z]\w*)\($/", $val, $matches)) { // may be func, or variable w/ implicit multiplication against parentheses...
+                    if (in_array($matches[1], $this->fb) or array_key_exists($matches[1], $this->f)) { // it's a func
+                        $stack->push($val);
+                        $stack->push(1);
+                        $stack->push('(');
+                        $expecting_op = false;
+                    } else { // it's a var w/ implicit multiplication
+                        $val = $matches[1];
+                        $output[] = $val;
+                    }
+                } else { // it's a plain old var or num
+                    $output[] = $val;
+                }
+                $index += strlen($val);
+            //===============
+            } elseif ($op == ')') { // miscellaneous error checking
+                return $this->trigger(5, "unexpected ')'", ")");
+            } elseif (in_array($op, $ops) and !$expecting_op) {
+                return $this->trigger(8, "unexpected operator '$op'", $op);
+            } else { // I don't even want to know what you did to get here
+                return $this->trigger(9, "an unexpected error occured");
+            }
+            if ($index == strlen($expr)) {
+                if (in_array($op, $ops)) { // did we end with an operator? bad.
+                    return $this->trigger(10, "operator '$op' lacks operand", $op);
+                } else {
+                    break;
+                }
+            }
+            while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace 
+                $index++;                             // into implicit multiplication if no operator is there)
+            }
+        
+        } 
+        while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output
+            if ($op == '(') return $this->trigger(11, "expecting ')'", ")"); // if there are (s on the stack, ()s were unbalanced
+            $output[] = $op;
+        }
+        return $output;
+    }
+
+    // evaluate postfix notation
+    function pfx($tokens, $vars = array()) {
+        
+        if ($tokens == false) return false;
+    
+        $stack = new EvalMathStack;
+        
+        foreach ($tokens as $token) { // nice and easy
+            // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+            if (in_array($token, array('+', '-', '*', '/', '^'))) {
+                if (is_null($op2 = $stack->pop())) return $this->trigger(12, "internal error");
+                if (is_null($op1 = $stack->pop())) return $this->trigger(13, "internal error");
+                switch ($token) {
+                    case '+':
+                        $stack->push($op1+$op2); break;
+                    case '-':
+                        $stack->push($op1-$op2); break;
+                    case '*':
+                        $stack->push($op1*$op2); break;
+                    case '/':
+                        if ($op2 == 0) return $this->trigger(14, "division by zero");
+                        $stack->push($op1/$op2); break;
+                    case '^':
+                        $stack->push(pow($op1, $op2)); break;
+                }
+            // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+            } elseif ($token == "_") {
+                $stack->push(-1*$stack->pop());
+            // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+            } elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function!
+                $fnn = $matches[1];
+                if (in_array($fnn, $this->fb)) { // built-in function:
+                    if (is_null($op1 = $stack->pop())) return $this->trigger(15, "internal error");
+                    $fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms
+                    if ($fnn == 'ln') $fnn = 'log';
+                    eval('$stack->push(' . $fnn . '($op1));'); // perfectly safe eval()
+                } elseif (array_key_exists($fnn, $this->f)) { // user function
+                    // get args
+                    $args = array();
+                    for ($i = count($this->f[$fnn]['args'])-1; $i >= 0; $i--) {
+                        if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) return $this->trigger(16, "internal error");
+                    }
+                    $stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!!
+                }
+            // if the token is a number or variable, push it on the stack
+            } else {
+                if (is_numeric($token)) {
+                    $stack->push($token);
+                } elseif (array_key_exists($token, $this->v)) {
+                    $stack->push($this->v[$token]);
+                } elseif (array_key_exists($token, $vars)) {
+                    $stack->push($vars[$token]);
+                } else {
+                    return $this->trigger(17, "undefined variable '$token'", $token);
+                }
+            }
+        }
+        // when we're out of tokens, the stack should have a single element, the final result
+        if ($stack->count != 1) return $this->trigger(18, "internal error");
+        return $stack->pop();
+    }
+    
+    // trigger an error, but nicely, if need be
+    function trigger($code, $msg, $info = null) {
+        $this->last_error = $msg;
+        $this->last_error_code = array($code, $info);
+        if (!$this->suppress_errors) trigger_error($msg, E_USER_WARNING);
+        return false;
+    }
+}
+
+// for internal use
+class EvalMathStack {
+
+    var $stack = array();
+    var $count = 0;
+    
+    function push($val) {
+        $this->stack[$this->count] = $val;
+        $this->count++;
+    }
+    
+    function pop() {
+        if ($this->count > 0) {
+            $this->count--;
+            return $this->stack[$this->count];
+        }
+        return null;
+    }
+    
+    function last($n=1) {
+        if (isset($this->stack[$this->count-$n])) {
+          return $this->stack[$this->count-$n];
+        }
+        return;
+    }
+}

htdocs/install/check.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013-2014	Juanjo Menent			<jmenent@2byte.es>
@@ -380,22 +380,14 @@ else
 			$allowupgrade=false;
 		}
 		if (defined("MAIN_NOT_INSTALLED")) $allowupgrade=false;
-		$migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'),
+		$migrationscript=array(	array('from'=>'3.0.0', 'to'=>'3.1.0'),
-								//array('from'=>'2.1.0', 'to'=>'2.2.0'),
-								//array('from'=>'2.2.0', 'to'=>'2.4.0'),
-								//array('from'=>'2.4.0', 'to'=>'2.5.0'),
-								//array('from'=>'2.5.0', 'to'=>'2.6.0'),
-								array('from'=>'2.6.0', 'to'=>'2.7.0'),
-								array('from'=>'2.7.0', 'to'=>'2.8.0'),
-								array('from'=>'2.8.0', 'to'=>'2.9.0'),
-								array('from'=>'2.9.0', 'to'=>'3.0.0'),
-								array('from'=>'3.0.0', 'to'=>'3.1.0'),
 								array('from'=>'3.1.0', 'to'=>'3.2.0'),
 								array('from'=>'3.2.0', 'to'=>'3.3.0'),
 								array('from'=>'3.3.0', 'to'=>'3.4.0'),
 								array('from'=>'3.4.0', 'to'=>'3.5.0'),
 								array('from'=>'3.5.0', 'to'=>'3.6.0'),
-								array('from'=>'3.6.0', 'to'=>'3.7.0')
+								array('from'=>'3.6.0', 'to'=>'3.7.0'),
+								array('from'=>'3.7.0', 'to'=>'3.8.0')
 		);
 
 		$count=0;

htdocs/install/default.css

@@ -296,3 +296,7 @@ background-color: #dfd;
 background-repeat: repeat-x;
 background-position: top left;
 }
+
+.center {
+    text-align: center;
+}

htdocs/install/etape5.php

@@ -115,7 +115,6 @@ if (empty($versionfrom) && empty($versionto) && ! is_writable($conffile))
 
 if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 {
-    print '<table cellspacing="0" cellpadding="2" width="100%">';
     $error=0;
 
     // If password is encoded, we decode it
@@ -298,12 +297,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
     $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT',1).",".$db->encrypt($setuplang,1).",'chaine',0,'Default language',1)");
     //if (! $resql) dol_print_error($db,'Error in setup program');
 
-    print '</table>';
-
     $db->close();
 }
 
-print "<br>";
 
 
 // Create lock file

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

@@ -1136,6 +1136,9 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
 
+ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;
 
 -- This request make mysql drop (mysql bug, so we add it at end):
 --ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);

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

@@ -0,0 +1,29 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 3.8.0 or higher.
+--
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To restrict request to Mysql version x.y use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as default NULL:             VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+--create table for price expressions and add column in product supplier
+create table llx_c_price_expression
+(
+  rowid     integer AUTO_INCREMENT PRIMARY KEY,
+  title     varchar(20) NOT NULL,
+  expression    varchar(80) NOT NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAULT NULL;

htdocs/install/mysql/tables/llx_c_price_expression.sql

@@ -0,0 +1,24 @@
+-- ============================================================================
+-- Copyright (C) 2014		Ion agorria			<ion@agorria.com> 
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+create table llx_c_price_expression
+(
+	rowid			integer AUTO_INCREMENT PRIMARY KEY,
+	title			varchar(20) NOT NULL,
+	expression		varchar(80) NOT NULL
+)ENGINE=innodb;

htdocs/install/mysql/tables/llx_facture.sql

@@ -65,6 +65,7 @@ create table llx_facture
 
   fk_account			integer,								-- bank account
   fk_currency			varchar(3),								-- currency code
+  
   fk_cond_reglement		integer  DEFAULT 1 NOT NULL,			-- condition de reglement (30 jours, fin de mois ...)
   fk_mode_reglement		integer,								-- mode de reglement (Virement, Prelevement)
   date_lim_reglement	date,									-- date limite de reglement

htdocs/install/mysql/tables/llx_facture_rec.sql

@@ -1,8 +1,8 @@
 -- ===========================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2012-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
--- Copyright (C) 2010 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -31,17 +31,21 @@ create table llx_facture_rec
   remise             real     DEFAULT 0,
   remise_percent     real     DEFAULT 0,
   remise_absolue     real     DEFAULT 0,
+  
   tva                double(24,8)     DEFAULT 0,
   localtax1			 double(24,8)     DEFAULT 0,           -- amount localtax1
   localtax2          double(24,8)     DEFAULT 0,           -- amount localtax2
+  revenuestamp       double(24,8)     DEFAULT 0,			 -- amount total revenuestamp
   total              double(24,8)     DEFAULT 0,
   total_ttc          double(24,8)     DEFAULT 0,
 
   fk_user_author     integer,             -- createur
+  
   fk_projet          integer,             -- projet auquel est associe la facture
-  fk_cond_reglement  integer DEFAULT 0,   -- condition de reglement
+  
+  fk_cond_reglement  integer DEFAULT 0,  -- condition de reglement
   fk_mode_reglement  integer DEFAULT 0,  -- mode de reglement (Virement, Prelevement)
-  date_lim_reglement date,               -- date limite de reglement
+  date_lim_reglement date,				   -- date limite de reglement
 
   note_private       text,
   note_public        text,
@@ -49,8 +53,9 @@ create table llx_facture_rec
   usenewprice        integer DEFAULT 0,
   frequency          integer,
   unit_frequency     varchar(2) DEFAULT 'd',
+  
   date_when          datetime DEFAULT NULL,		-- date for next gen (when an invoice is generated, this field must be updated with next date)
   date_last_gen      datetime DEFAULT NULL,		-- date for last gen (date with last successfull generation of invoice)
   nb_gen_done        integer DEFAULT NULL,		-- nb of generation done (when an invoice is generated, this field must incremented)
-  nb_gen_max         integer DEFAULT NULL		-- maximum number of generation
+  nb_gen_max         integer DEFAULT NULL		    -- maximum number of generation
 )ENGINE=innodb;

htdocs/install/mysql/tables/llx_facturedet_rec.sql

@@ -1,6 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
--- Copyright (C) 2009		Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2009-2014  Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
 -- Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 --
@@ -28,23 +28,23 @@ create table llx_facturedet_rec
   product_type		integer DEFAULT 0,
   label				varchar(255) DEFAULT NULL,
   description		text,
-  tva_tx			double(6,3) DEFAULT 19.6,		-- taux tva
+  tva_tx			double(6,3),	             	-- taux tva
   localtax1_tx      double(6,3) DEFAULT 0,    		-- localtax1 rate
-  localtax1_type	varchar(10)	NULL, 				-- localtax1 type
+  localtax1_type	varchar(10) NULL, 				-- localtax1 type
   localtax2_tx      double(6,3) DEFAULT 0,    		-- localtax2 rate
-  localtax2_type	varchar(10)	NULL, 				-- localtax2 type
+  localtax2_type	varchar(10)	 NULL, 				-- localtax2 type
   qty				real,							-- quantity
-  remise_percent	real DEFAULT 0,					-- pourcentage de remise
+  remise_percent	real DEFAULT 0,				-- pourcentage de remise
-  remise			real DEFAULT 0,					-- montant de la remise
+  remise			real DEFAULT 0,				-- montant de la remise
   subprice			double(24,8),					-- prix avant remise
   price				double(24,8),					-- prix final
   total_ht			double(24,8),					-- Total HT de la ligne toute quantity et incluant remise ligne et globale
   total_tva			double(24,8),					-- Total TVA de la ligne toute quantity et incluant remise ligne et globale
-  total_localtax1	double(24,8) DEFAULT 0,			-- Total LocalTax1 for total quantity of line
+  total_localtax1	double(24,8) DEFAULT 0,		-- Total LocalTax1 for total quantity of line
-  total_localtax2	double(24,8) DEFAULT 0,			-- total LocalTax2 for total quantity of line
+  total_localtax2	double(24,8) DEFAULT 0,		-- total LocalTax2 for total quantity of line
   total_ttc			double(24,8),					-- Total TTC de la ligne toute quantity et incluant remise ligne et globale
-  info_bits			integer    DEFAULT 0,			-- TVA NPR ou non
+  info_bits			integer DEFAULT 0,				-- TVA NPR ou non
-  special_code		integer UNSIGNED DEFAULT 0,		-- code pour les lignes speciales
+  special_code		integer UNSIGNED DEFAULT 0,	-- code pour les lignes speciales
-  rang				integer    DEFAULT 0			-- ordre d'affichage
+  rang				integer DEFAULT 0,				-- ordre d'affichage
-  
+  fk_contract_line  integer NULL					-- id of contract line when predefined invoice comes from contract lines 
 )ENGINE=innodb;

htdocs/install/mysql/tables/llx_product_fournisseur_price.sql

@@ -39,5 +39,6 @@ create table llx_product_fournisseur_price
   tva_tx				double(6,3) NOT NULL,
   info_bits				integer NOT NULL DEFAULT 0,
   fk_user				integer,
+  fk_price_expression	integer,                     -- Link to the rule for dynamic amount calculation
   import_key			varchar(14)                  -- Import key
 )ENGINE=innodb;

htdocs/langs/ar_SA/accountancy.lang

@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched
 
-CustomersVentilation=Ventilation customers
+CustomersVentilation=Breakdown customers
-SuppliersVentilation=Ventilation suppliers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month
 
-AccountingVentilation=Accounting ventilation
+AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line
 
 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
 
 Processing=Processing
 EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
 
 ACCOUNTING_SEPARATORCSV=Separator CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
 
 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
 
 NewFiscalYear=New fiscal year
 
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card

htdocs/langs/ar_SA/admin.lang

@@ -475,8 +475,8 @@ Module320Name=تغذية RSS
 Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
 Module330Name=العناوين
 Module330Desc=العناوين إدارة
-Module400Name=المشاريع
+Module400Name=Projects/Opportunity
-Module400Desc=إدارة المشاريع داخل وحدات أخرى
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar التكامل
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=الإخطارات
-Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module1200Name=فرس النبي
@@ -514,16 +514,16 @@ Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Holidays
+Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees holidays
+Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
 Module39000Desc=Batch number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
 Module50100Desc=نقطة بيع وحدة
-Module50200Name= باي بال
+Module50200Name=باي بال
-Module50200Desc= وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
+Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=قراءة أوامر دائمة
 Permission152=إعداد أوامر دائمة
 Permission153=قراءة أوامر دائمة إيصالات
 Permission154=الائتمان / ورفض أوامر دائمة ايصالات
-Permission161=قراءة العقود
+Permission161=Read contracts/subscriptions
-Permission162=إنشاء / تغيير العقود
+Permission162=Create/modify contracts/subscriptions
-Permission163=تفعيل خدمة للعقد
+Permission163=Activate a service/subscription of a contract
-Permission164=تعطيل خدمة للعقد
+Permission164=Disable a service/subscription of a contract
-Permission165=حذف العقود
+Permission165=Delete contracts/subscriptions
-Permission171=قراءة رحلات
+Permission171=Read trips and expenses (own and his subordinates)
-Permission172=إنشاء / تغيير الرحلات
+Permission172=Create/modify trips and expenses
-Permission173=حذف رحلات
+Permission173=Delete trips and expenses
-Permission178=رحلات التصدير
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=قراءة الموردين
 Permission181=قراءة مورد أوامر
 Permission182=إنشاء / تغيير المورد أوامر
@@ -671,7 +672,7 @@ Permission300=شريط قراءة المدونات
 Permission301=إنشاء / تغيير شريط الرموز
 Permission302=حذف شريط الرموز
 Permission311=قراءة الخدمات
-Permission312=إسناد عقود الخدمة
+Permission312=Assign service/subscription to contract
 Permission331=قراءة العناوين
 Permission332=إنشاء / تغيير العناوين
 Permission333=حذف العناوين
@@ -701,8 +702,8 @@ Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission1001=قراءة مخزونات
-Permission1002=إنشاء / تغيير المخزونات
+Permission1002=Create/modify warehouses
-Permission1003=حذف الأرصدة
+Permission1003=Delete warehouses
 Permission1004=قراءة تحركات الأسهم
 Permission1005=إنشاء / تعديل تحركات الأسهم
 Permission1101=قراءة تسليم أوامر
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها:
 ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
 ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة.
 UseNotifications=استخدام الإخطارات
-NotificationsDesc=إشعارات البريد الإلكتروني ميزة تسمح لك صمت إرسال البريد الآلي ، وبالنسبة لبعض الأحداث Dolibarr ، لأطراف ثالثة (العملاء أو الموردين) التي هي لتهيئتها. اختيار نشط الاشعار الاتصالات واعتماد أهداف واحدة لطرف ثالث في الوقت المناسب.
+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.
 ModelModules=وثائق قوالب
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
 UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات الصفر المبلغ يعتبر خيارا
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=أوامر إدارة الإعداد
 OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت
 FreeLegalTextOnOrders=بناء على أوامر النص الحر
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
 ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=الترقيم وحدات التدخل
 TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=عقود وحدة الإعداد
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=عقود ترقيم الوحدات
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
@@ -1382,9 +1384,10 @@ MailingSetup=إعداد وحدة الارسال بالبريد الالكترو
 MailingEMailFrom=مرسل البريد الالكتروني (من) لرسائل البريد الإلكتروني التي بعث بها وحدة الإنترنت
 MailingEMailError=بريد إلكتروني العودة (إلى أخطاء) لرسائل البريد الإلكتروني مع الأخطاء
 ##### Notification #####
-NotificationSetup=الإخطار بو الإعداد وحدة البريد الإلكتروني
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=مرسل البريد الالكتروني (من) لإرسال رسائل البريد الإلكتروني لالإخطارات
-ListOfAvailableNotifications=قائمة الإخطارات المتاحة (هذا يعتمد على وحدات قائمة المنشط)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=ارسال وحدة الإعداد
 SendingsReceiptModel=ارسال استلام نموذج
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=علاقة الخادم '٪ ق' على قاعدة البيان
 OSCommerceTestKo1=علاقة الخادم '٪ ق' تنجح ولكن قاعدة البيانات '٪ ق' لا يمكن التوصل إليها.
 OSCommerceTestKo2=علاقة الخادم '٪ ق' مستخدم '٪ ق' فشلت.
 ##### Stock #####
-StockSetup=تكوين وحدة المخزون
+StockSetup=Warehouse module setup
-UserWarehouse=استخدام الأرصدة الشخصية للمستخدم
+UserWarehouse=Use user personal warehouses
+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=حذف من القائمة
 TreeMenu=شجرة القوائم
@@ -1478,11 +1482,14 @@ ClickToDialDesc=هذا النموذج يسمح لإضافة رمز بعد رقم
 ##### Point Of Sales (CashDesk) #####
 CashDesk=نقاط البيع
 CashDeskSetup=مكتب الإعداد وحدة نقدية
-CashDeskThirdPartyForSell=عامة لاستخدام طرف ثالث لتبيعها
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
 CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات
 CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-CashDeskIdWareHouse=Datawarehous لتبيع للمستخدم
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+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 #####
 BookmarkSetup=إعداد وحدة المرجعية
 BookmarkDesc=هذا النموذج يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type

htdocs/langs/ar_SA/agenda.lang

@@ -41,9 +41,10 @@ AutoActions= إكمال تلقائي
 AgendaAutoActionDesc= عرف الأحداث التي تريد من دوليبار إنشائها تلقائيا في جدوال الأعمال. إذا لم تقم بإختيار أي شي (الخيار الإفتراضي), سوف يتم فقط إدخال الأنشطلة إلى جدول الأعمال يدوياً
 AgendaSetupOtherDesc= تسمح لك هذه الصفحة بنقل الأحداث إلى تقويم خارجي مثل جوجل, تندربيرد وغيرها, وذلك بإستخدام الخيارات في هذه الصفحة
 AgendaExtSitesDesc=تسمح لك هذه الصفحة بتعريف مصادر خارجية للتقويم وذلك لرؤية الأحداث الخاصة بالتقويم الخاص بهم في تقويم دوليبار
-ActionsEvents= الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
+ActionsEvents=الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
-PropalValidatedInDolibarr= تم تفعيل %s من الإقتراح
+PropalValidatedInDolibarr=تم تفعيل %s من الإقتراح
-InvoiceValidatedInDolibarr= تم توثيق %s من الفاتورة
+InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة
 InvoiceDeleteDolibarr=تم حذف %s من الفاتورة
 OrderValidatedInDolibarr= تم توثيق %s من الطلب
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
 OrderCanceledInDolibarr=تم إلغاء %s من الطلب
-InterventionValidatedInDolibarr=تم توثيق %s من التدخل
 ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني
 OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
 InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة
 SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني
 ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي
 DateActionPlannedStart= التاريخ المخطط للبدء
 DateActionPlannedEnd= التاريخ المخطط للإنهاء
@@ -70,9 +68,9 @@ DateActionStart= تاريخ البدء
 DateActionEnd= تاريخ النهاية
 AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لترشيح النتائج:
 AgendaUrlOptions2=<b>login=<b>login=%s</b> لتقييد الانتاج المنشأ أو الذي تم الإنتهاء منه بواسطة المستخدم <b>%s</b>
-AgendaUrlOptions3=<b>logina=<b>logina=%s</b> لتقييد الانتاج للإجراءات التي أنشأها المستخدم <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint=%s</b> لتقييد الانتاج للإجراءات المناطة للمستخدم <b>%s</b>
-AgendaUrlOptions5=<b>logind=<b>logind=%s</b> لتقييد الانتاج للإجراءات التي قام بها المستخدم <b>%s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=أظهر تاريخ الميلاد في عناوين الإتصال
 AgendaHideBirthdayEvents=أخفي تاريخ الميلاد في عناوين الإتصال
 Busy=مشغول
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
 ExtSiteNoLabel=لا يوجد وصف
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability

htdocs/langs/ar_SA/bills.lang

@@ -28,8 +28,8 @@ InvoiceAvoir=علما الائتمان
 InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة
 InvoiceAvoirDesc=<b>الفضل</b> في <b>المذكرة</b> سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=يستعاض عن فاتورة ٪ ق
 ReplacementInvoice=استبدال الفاتورة
 ReplacedByInvoice=بعبارة فاتورة ق ٪
@@ -87,7 +87,7 @@ ClassifyCanceled=تصنيف 'المهجورة'
 ClassifyClosed=تصنيف 'مغلقة'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=إنشاء الفاتورة
-AddBill=تضيف المذكرة الائتمان أو فاتورة
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=شطب فاتورة
 SearchACustomerInvoice=البحث عن زبون فاتورة
@@ -99,7 +99,7 @@ DoPaymentBack=هل لدفع الظهر
 ConvertToReduc=تحويل الخصم في المستقبل
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
 EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
-DisabledBecauseRemainderToPayIsZero=لأن بقية المعوقين الدفع صفر
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=مبلغ
 PriceBase=سعر الأساس
 BillStatus=حالة الفاتورة
@@ -137,8 +137,6 @@ BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
 NewBill=فاتورة جديدة
-Prélèvements=من أجل الوقوف
-Prélèvements=من أجل الوقوف
 LastBills=آخر الفواتير ق ٪
 LastCustomersBills=٪ ق الماضي فواتير العملاء
 LastSuppliersBills=٪ ق الماضي فواتير الموردين
@@ -156,9 +154,9 @@ ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الف
 ConfirmCancelBillQuestion=لماذا تريدها لتصنيف هذه الفاتورة 'المهجورة؟
 ConfirmClassifyPaidPartially=هل أنت متأكد من أنك تريد تغيير فاتورة <b>٪ ق</b> لمركز paid؟
 ConfirmClassifyPaidPartiallyQuestion=هذه الفاتورة لم تدفع بالكامل. ما هي أسباب قريبة لك هذه الفاتورة؟
-ConfirmClassifyPaidPartiallyReasonAvoir=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا مع تصحيح وضع ضريبة القيمة المضافة علما ائتمان.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. إنني أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا استرداد ضريبة القيمة المضافة على هذا الائتمان والخصم من دون ملاحظة.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
 ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
@@ -191,9 +189,9 @@ AlreadyPaid=دفعت بالفعل
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=دفعت بالفعل (بدون تلاحظ الائتمان والودائع)
 Abandoned=المهجورة
-RemainderToPay=تبقى على الدفع
+RemainderToPay=Remaining unpaid
-RemainderToTake=ما تبقى لاتخاذ
+RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPayBack=Remaining amount to pay back
 Rest=Pending
 AmountExpected=المبلغ المطالب به
 ExcessReceived=تلقى الزائدة
@@ -219,19 +217,18 @@ NoInvoice=لا الفاتورة
 ClassifyBill=تصنيف الفاتورة
 SupplierBillsToPay=دفع فواتير الموردين
 CustomerBillsUnpaid=فواتير غير مدفوعة للعملاء
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
 NonPercuRecuperable=غير القابلة للاسترداد
 SetConditions=تحدد شروط الدفع
 SetMode=حدد طريقة الدفع
 Billed=فواتير
-RepeatableInvoice=محددة مسبقا فاتورة
+RepeatableInvoice=Template invoice
-RepeatableInvoices=محددة مسبقا والفواتير
+RepeatableInvoices=Template invoices
-Repeatable=محددة مسبقا
+Repeatable=Template
-Repeatables=محددة مسبقا
+Repeatables=Templates
-ChangeIntoRepeatableInvoice=تحويل محددة مسبقا
+ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=إنشاء فاتورة محددة مسبقا
+CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=خلق من فاتورة محددة مسبقا
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط
 CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
 ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط

htdocs/langs/ar_SA/categories.lang

@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
 CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
 DeleteFromCat=Remove from category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category

htdocs/langs/ar_SA/compta.lang

@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=قانون محاسبة العملاء سي
 SuppliersProductsSellSalesTurnover=وقد ولدت عن طريق الدوران مبيعات الموردين المنتجات.
 CheckReceipt=التحقق من إيداع
 CheckReceiptShort=التحقق من إيداع
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=خصم جديد
 NewCheckDeposit=تأكد من ايداع جديدة
 NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق

htdocs/langs/ar_SA/contracts.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=عقود منطقة
 ListOfContracts=قائمة العقود
-LastContracts=آخر تعديل العقود ق ٪
+LastModifiedContracts=Last %s modified contracts
 AllContracts=جميع العقود
 ContractCard=عقد بطاقة
 ContractStatus=عقد مركز
@@ -27,7 +27,7 @@ MenuRunningServices=ادارة الخدمات
 MenuExpiredServices=انتهت الخدمات
 MenuClosedServices=أغلقت الخدمات
 NewContract=العقد الجديد
-AddContract=إضافة العقد
+AddContract=Create contract
 SearchAContract=بحث عقد
 DeleteAContract=الغاء العقد
 CloseAContract=وثيقة العقد
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=آخر تعديل العقود ق ٪
+LastContracts=Last % contracts
 LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
 LastModifiedServices=آخر تعديل ٪ ق الخدمات
 EditServiceLine=تعديل خط الخدمات

htdocs/langs/ar_SA/cron.lang

@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = حول
 CronAbout = About Cron
 CronAboutPage = Cron about page
-
 # Right
 Permission23101 = Read Scheduled task
 Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
 CronJobs=Scheduled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
-CronListInactive= List of disabled jobs
+CronListInactive=List of disabled jobs
-CronListActive= List of active jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output

htdocs/langs/ar_SA/donations.lang

@@ -4,7 +4,7 @@ Donations=التبرعات
 DonationRef=Donation ref.
 Donor=الجهات المانحة
 Donors=الجهات المانحة
-AddDonation=إضافة تبرع
+AddDonation=Create a donation
 NewDonation=منحة جديدة
 ShowDonation=Show donation
 DonationPromise=هدية الوعد
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
 ThankYou=Thank You
 IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
 MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned

htdocs/langs/ar_SA/externalsite.lang

@@ -2,3 +2,4 @@
 ExternalSiteSetup=رابط الإعداد لموقع خارجي
 ExternalSiteURL=الخارجية الموقع URL
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry

htdocs/langs/ar_SA/holiday.lang

@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=تحديث
 CantUpdate=You cannot update this leave request.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
+ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the request holidays
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Date approved
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Reason for refusal
 DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
 UserUpdateCP=For the user
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=اسم
 Employee=Employee
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
 DescOptionCP=Description of the option
 ValueOptionCP=القيمة
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
+DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=صحة
 UpdateEventCP=Update events

htdocs/langs/ar_SA/interventions.lang

@@ -3,7 +3,7 @@ Intervention=التدخل
 Interventions=المداخلات
 InterventionCard=تدخل البطاقة
 NewIntervention=التدخل الجديدة
-AddIntervention=إضافة التدخل
+AddIntervention=Create intervention
 ListOfInterventions=قائمة التدخلات
 EditIntervention=Editer التدخل
 ActionsOnFicheInter=إجراءات على التدخل
@@ -30,6 +30,15 @@ StatusInterInvoiced=فواتير
 RelatedInterventions=التدخلات المتعلقة
 ShowIntervention=عرض التدخل
 SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=ممثل متابعة التدخل
 TypeContact_fichinter_internal_INTERVENING=التدخل

htdocs/langs/ar_SA/mails.lang

@@ -115,7 +115,7 @@ SentBy=أرسلها
 MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة.
 ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=لائحة واضحة
 ToClearAllRecipientsClickHere=من الواضح أن المستفيدين قائمة لهذا البريد الإلكتروني ، انقر على زر
 ToAddRecipientsChooseHere=إضافة إلى المتلقين ، وتختار في هذه القوائم
@@ -133,6 +133,9 @@ Notifications=الإخطارات
 NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
 ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني
 SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني
-AddNewNotification=تفعيل جديد طلب إخطار بالبريد الإلكتروني
+AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=قائمة البريد الإلكتروني لجميع طلبات الإخطار
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.

htdocs/langs/ar_SA/main.lang

@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=فشلت في العثور على المس
 ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يعرف لمعدلات ضريبة القيمة المضافة فى البلاد ٪ ق.
 ErrorNoSocialContributionForSellerCountry=خطأ ، لا يوجد نوع المساهمة الاجتماعية المحددة للبلد '%s'.
 ErrorFailedToSaveFile=خطأ ، وفشلت في انقاذ الملف.
-ErrorOnlyPngJpgSupported=خطأ فقط. بابوا نيو غينيا ، وجيه. شكل صورة ملف الدعم.
-ErrorImageFormatNotSupported=PHP الخاص بك لا يدعم وظائف لتحويل الصور من هذا الشكل.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 BackgroundColorByDefault=لون الخلفية الافتراضي
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=يتم تحديد ملف مرفق لكنه لم يكن بعد تحميلها. انقر على "ملف إرفاق" لهذا الغرض.
 NbOfEntries=ملاحظة : إدخالات
 GoToWikiHelpPage=الانترنت تساعد على قراءة (على ضرورة الوصول إلى الإنترنت)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=قادري
 MonthOfDay=خلال شهر من اليوم
 HourShort=حاء
+MinuteShort=mn
 Rate=سعر
 UseLocalTax=Include tax
 Bytes=بايت
@@ -340,6 +341,7 @@ FullList=القائمة الكاملة
 Statistics=احصاءات
 OtherStatistics=آخر الإحصاءات
 Status=حالة
+Favorite=Favorite
 ShortInfo=Info.
 Ref=المرجع.
 RefSupplier=المرجع. المورد
@@ -365,6 +367,7 @@ ActionsOnCompany=الأعمال حول هذا الطرف الثالث
 ActionsOnMember=أحداث حول هذا العضو
 NActions=ق ٪ الإجراءات
 NActionsLate=ق ٪ في وقت متأخر
+RequestAlreadyDone=Request already recorded
 Filter=فلتر
 RemoveFilter=إزالة فلتر
 ChartGenerated=رسم ولدت
@@ -645,6 +648,7 @@ OptionalFieldsSetup=اضافية سمات الإعداد
 URLPhoto=للتسجيل من الصورة / الشعار
 SetLinkToThirdParty=ربط طرف ثالث آخر
 CreateDraft=خلق مشروع
+SetToDraft=Back to draft
 ClickToEdit=انقر للتحرير
 ObjectDeleted=%s الكائن المحذوف
 ByCountry=حسب البلد
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء

htdocs/langs/ar_SA/margins.lang

@@ -10,24 +10,18 @@ MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
 InputPrice=Input price
-
 margin=Profit margins management
 margesSetup=Profit margins management setup
-
 MarginDetails=Margin details
-
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
-
 ProductService=المنتج أو الخدمة
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-
 StartDate=تاريخ البدء
 EndDate=نهاية التاريخ
 Launch=يبدأ
-
 ForceBuyingPriceIfNull=Force buying price if null
 ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
 MARGIN_TYPE=Margin type
 MargeBrute=Raw margin
 MargeNette=Net margin
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
 CostPrice=Cost price
 BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
-
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos

htdocs/langs/ar_SA/orders.lang

@@ -2,7 +2,7 @@
 OrdersArea=أوامر منطقة العملاء
 SuppliersOrdersArea=الموردين أوامر المنطقة
 OrderCard=من أجل بطاقة
-# OrderId=Order Id
+OrderId=Order Id
 Order=ترتيب
 Orders=أوامر
 OrderLine=من أجل خط
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=ألغى
 StatusOrderDraftShort=مسودة
 StatusOrderValidatedShort=صادق
 StatusOrderSentShort=في عملية
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=على عملية
 StatusOrderProcessedShort=تجهيز
 StatusOrderToBillShort=على مشروع قانون
@@ -53,9 +53,9 @@ ShippingExist=شحنة موجود
 DraftOrWaitingApproved=الموافقة على مشروع أو لم يأمر بعد
 DraftOrWaitingShipped=مشروع مصادق عليه أو لم تشحن
 MenuOrdersToBill=أوامر لمشروع قانون
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
 SearchOrder=من أجل البحث
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
 ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
@@ -65,14 +65,14 @@ ValidateOrder=من أجل التحقق من صحة
 UnvalidateOrder=Unvalidate النظام
 DeleteOrder=من أجل حذف
 CancelOrder=من أجل إلغاء
-AddOrder=من أجل إضافة
+AddOrder=Create order
 AddToMyOrders=أضف إلى أوامر
 AddToOtherOrders=إضافة إلى أوامر أخرى
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
 ShowOrder=وتبين من أجل
 NoOpenedOrders=أي أوامر فتح
 NoOtherOpenedOrders=أي أوامر فتح
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
 OtherOrders=أوامر أخرى
 LastOrders=ق الماضي أوامر ٪
 LastModifiedOrders=آخر تعديل أوامر ق ٪
@@ -82,7 +82,7 @@ NbOfOrders=عدد الأوامر
 OrdersStatistics=أوامر إحصاءات
 OrdersStatisticsSuppliers=المورد أوامر إحصاءات
 NumberOfOrdersByMonth=عدد أوامر الشهر
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=قائمة الأوامر
 CloseOrder=وثيق من أجل
 ConfirmCloseOrder=هل أنت متأكد من أجل اقفال هذا؟ مرة واحدة أمر قد انتهى ، فإنه لا يمكن إلا أن يكون فواتير.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=هل أنت متأكد أنك تريد استعادة <b>
 ConfirmCancelOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
 ConfirmMakeOrder=هل أنت متأكد من أن يؤكد لك هذا النظام على <b>٪ ق؟</b>
 GenerateBill=توليد الفاتورة
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
 ClassifyBilled=تصنيف "فواتير"
 ComptaCard=بطاقة المحاسبة
 DraftOrders=مشروع أوامر
@@ -101,7 +101,6 @@ RelatedOrders=الأوامر ذات الصلة
 OnProcessOrders=على عملية أوامر
 RefOrder=المرجع. ترتيب
 RefCustomerOrder=المرجع. عملاء النظام
-CustomerOrder=عملاء النظام
 RefCustomerOrderShort=المرجع. العملاء. ترتيب
 SendOrderByMail=لكي ترسل عن طريق البريد
 ActionsOnOrder=إجراءات من أجل
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON
 Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
 Error_FailedToLoad_COMMANDE_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
-# Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=No orders to invoice selected
-
-
 # Sources
 OrderSource0=اقتراح التجارية
 OrderSource1=الإنترنت
@@ -144,25 +141,22 @@ OrderSource5=التجارية
 OrderSource6=مخزن
 QtyOrdered=الكمية أمرت
 AddDeliveryCostLine=تضاف تكلفة توصيل خط يبين الوزن من أجل
-
 # Documents models
 PDFEinsteinDescription=من أجل نموذج كامل (logo...)
 PDFEdisonDescription=نموذج النظام بسيطة
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
 # Orders modes
 OrderByMail=بريد
 OrderByFax=الفاكس
 OrderByEMail=بريد إلكتروني
 OrderByWWW=على الانترنت
 OrderByPhone=هاتف
-
+CreateInvoiceForThisCustomer=Bill orders
-# CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
-# NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
-# MenuOrdersToBill2=Orders to bill
+Ordered=Ordered
-# OrderCreation=Order creation
+OrderCreated=Your orders have been created
-# Ordered=Ordered
+OrderFail=An error happened during your orders creation
-# OrderCreated=Your orders have been created
+CreateOrders=Create orders
-# OrderFail=An error happened during your orders creation
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".

htdocs/langs/ar_SA/oscommerce.lang

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

htdocs/langs/ar_SA/other.lang

@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=رمز الحماية
 Calendar=التقويم
-AddTrip=إضافة رحلة
 Tools=أدوات
 ToolsDesc=ويكرس هذا المجال لمجموعة الأدوات المتنوعة التي لم تتوفر في إدخالات القوائم الأخرى. <br><br> ويمكن الوصول إلى هذه الأدوات من القائمة على الجانب.
 Birthday=عيد ميلاد
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
 MaxSize=الحجم الأقصى
@@ -80,6 +80,16 @@ ModifiedBy=المعدلة ق ٪
 ValidatedBy=يصادق عليها ق ٪
 CanceledBy=ألغى به ق ٪
 ClosedBy=أغلقت ٪ ق
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
 FileWasRemoved=تم حذف الملف
 DirWasRemoved=دليل أزيل
 FeatureNotYetAvailableShort=متاحة في الإصدار التالي
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
 
 ##### Calendar common #####
 AddCalendarEntry=إضافة الدخول في التقويم ق ٪
-NewCompanyToDolibarr=وأضافت الشركة ل ٪ الى Dolibarr
+NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=ق ٪ العقد المصادق عليه في Dolibarr
+ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=٪ ق الغاء العقد في Dolibarr
+ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=ق ٪ مغلقا عقد في Dolibarr
+ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=اقتراح ٪ ق الذي وقع في Dolibarr
+PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=ق رفض الاقتراح ٪ في Dolibarr
+PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=اقتراح ٪ في التحقق من صحة المستندات Dolibarr
+PropalValidatedInDolibarr=Proposal %s validated
-InvoiceValidatedInDolibarr=فاتورة ٪ في التحقق من صحة المستندات Dolibarr
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoicePaidInDolibarr=ق ٪ الفاتورة المدفوعة في تغيير Dolibarr
+InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceCanceledInDolibarr=فاتورة ٪ ق الغى في Dolibarr
+InvoicePaidInDolibarr=Invoice %s changed to paid
-PaymentDoneInDolibarr=ق ٪ الدفع به في Dolibarr
+InvoiceCanceledInDolibarr=Invoice %s canceled
-CustomerPaymentDoneInDolibarr=العميل بدفع ٪ ق عمله في Dolibarr
+PaymentDoneInDolibarr=Payment %s done
-SupplierPaymentDoneInDolibarr=المورد ٪ ق دفع به في Dolibarr
+CustomerPaymentDoneInDolibarr=Customer payment %s done
-MemberValidatedInDolibarr=عضو ٪ في التحقق من صحة المستندات Dolibarr
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberResiliatedInDolibarr=عضو في resiliated ٪ ق Dolibarr
+MemberValidatedInDolibarr=Member %s validated
-MemberDeletedInDolibarr=عضو ٪ ق حذفها من Dolibarr
+MemberResiliatedInDolibarr=Member %s resiliated
-MemberSubscriptionAddedInDolibarr=الاكتتاب عضو ق ٪ وأضاف في Dolibarr
+MemberDeletedInDolibarr=Member %s deleted
-ShipmentValidatedInDolibarr=%s شحنة التحقق من صحتها في Dolibarr
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
 ##### Export #####
 Export=تصدير
 ExportsArea=صادرات المنطقة

htdocs/langs/ar_SA/paybox.lang

@@ -32,6 +32,9 @@ VendorName=اسم البائع
 CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
 MessageOK=رسالة على الصفحة التحقق من صحة الدفع عودة
 MessageKO=رسالة في إلغاء دفع الصفحة عودة
-# NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
+NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID

htdocs/langs/ar_SA/resource.lang

@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource

htdocs/langs/ar_SA/sendings.lang

@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جدي
 RelatedShippings=Related shippings
 ShipmentLine=Shipment line
 CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=القبض على العملاء

htdocs/langs/ar_SA/stocks.lang

@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=مستودع العلامة مطلوبة
 CorrectStock=تصحيح الأوراق المالية
 ListOfWarehouses=لائحة المخازن
 ListOfStockMovements=قائمة الحركات الأسهم
-StocksArea=مخزون المنطقة
+StocksArea=Warehouses area
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
 NumberOfDifferentProducts=Number of different products

htdocs/langs/ar_SA/users.lang

@@ -63,7 +63,6 @@ ShowGroup=وتبين لفريق
 ShowUser=وتظهر للمستخدم
 NonAffectedUsers=غير المتأثرة المستخدمين
 UserModified=المعدل المستخدم بنجاح
-GroupModified=تعديل المجموعة بنجاح
 PhotoFile=ملف الصور
 UserWithDolibarrAccess=مع وصول المستخدمين Dolibarr
 ListOfUsersInGroup=قائمة المستخدمين في هذه المجموعة
@@ -103,7 +102,7 @@ UserDisabled=مستخدم ٪ ق المعوقين
 UserEnabled=مستخدم ٪ ق تفعيلها
 UserDeleted=ق إزالة المستخدم ٪
 NewGroupCreated=أنشأت مجموعة ق ٪
-GroupModified=تعديل المجموعة بنجاح
+GroupModified=Group %s modified
 GroupDeleted=فريق ازالة ق ٪
 ConfirmCreateContact=هل أنت متأكد من خلق Dolibarr حساب هذا الاتصال؟
 ConfirmCreateLogin=هل أنت متأكد من خلق Dolibarr حساب هذا؟
@@ -114,8 +113,10 @@ YourRole=الأدوار الخاص
 YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
 NbOfUsers=ملحوظة من المستخدمين
 DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
 UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user

htdocs/langs/ar_SA/withdrawals.lang

@@ -14,8 +14,9 @@ WithdrawalReceiptShort=ورود
 LastWithdrawalReceipts=ق الماضي سحب إيصالات ٪
 WithdrawedBills=Withdrawed الفواتير
 WithdrawalsLines=خطوط السحب
-RequestStandingOrderToTreat=طلب لأوامر دائمة لمعالجة
+RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=طلب تعامل أوامر دائمة
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 CustomersStandingOrders=الزبون أوامر دائمة
 CustomerStandingOrder=يقف النظام العميل
 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=طريقة البث
 Send=إرسال
 Lines=خطوط
 StandingOrderReject=رفض إصدار
-InvoiceRefused=تهمة الرفض لزبون
 WithdrawalRefused=سحب Refuseds
 WithdrawalRefusedConfirm=هل أنت متأكد أنك تريد الدخول في رفض الانسحاب للمجتمع
 RefusedData=تاريخ الرفض
 RefusedReason=أسباب الرفض
 RefusedInvoicing=رفض الفواتير
 NoInvoiceRefused=لا تهمة الرفض
-InvoiceRefused=تهمة الرفض لزبون
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
 Status=حالة
 StatusUnknown=غير معروف
 StatusWaiting=انتظار
@@ -76,7 +76,7 @@ WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
 WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
 BankToReceiveWithdraw=حساب مصرفي لتلقي تنسحب
 CreditDate=الائتمان على
-WithdrawalFileNotCapable=غير قادر على توليد سحب ملف استلام لبلدك
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
 DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.

htdocs/langs/bg_BG/accountancy.lang

@@ -7,7 +7,7 @@ Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Инструменти
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
@@ -25,19 +25,19 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched
 
-CustomersVentilation=Ventilation customers
+CustomersVentilation=Breakdown customers
-SuppliersVentilation=Ventilation suppliers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
-Reports=Reports
+Reports=Отчети
 ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+ByMonth=По месец
 NewAccount=New accounting account
 Update=Update
-List=List
+List=Списък
 Create=Create
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month
 
-AccountingVentilation=Accounting ventilation
+AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line
 
 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
 
 Processing=Processing
 EndProcessing=The end of processing
@@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=Разделител CSV (стандарт за разделяне със "," запетя)
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
 
 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -92,17 +92,17 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Type of document
+Doctype=Тип на документа
-Docdate=Date
+Docdate=Дата
-Docref=Reference
+Docref=Справка
-Numerocompte=Account
+Numerocompte=Сметка
-Code_tiers=Thirdparty
+Code_tiers=Трета страна
-Labelcompte=Label account
+Labelcompte=Етикет на сметка
-Debit=Debit
+Debit=Дебит
-Credit=Credit
+Credit=Кредит
-Amount=Amount
+Amount=Сума
 Sens=Sens
-Codejournal=Journal
+Codejournal=Дневник
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -140,19 +140,19 @@ Active=Statement
 
 NewFiscalYear=New fiscal year
 
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Валидирайте автоматично
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
 
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card

htdocs/langs/bg_BG/admin.lang

@@ -12,10 +12,10 @@ SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
 SessionSavePath=Място за съхранение на сесията
 PurgeSessions=Изчистване на сесиите
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Сигурни ли сте, че желаете да изчистите всички сесии? Това ще прекъсне всички потребители (освен Вас).
 NoSessionListWithThisHandler=Запиши сесиен манипулатор конфигурирани във вашата PHP, не позволява да се изброят всички текущи сесии.
 LockNewSessions=Заключване за нови свързвания
-ConfirmLockNewSessions=Сигурен ли сте, че искате да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
+ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
 UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителска сесия
@@ -42,20 +42,20 @@ RestoreLock=Възстановете файла <b>%s,</b> само с прав
 SecuritySetup=Настройки на сигурността
 ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока
 ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока
-ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от <b>%s</b> не се поддържа.
+ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висока от <b>%s</b> не се поддържа.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис.
-ErrorCodeCantContainZero=Code can't contain value 0
+ErrorCodeCantContainZero=Кода не може да съдържа стойност 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Изключете функциите JavaScript и Ajax (Препоръчва се за незрящи и при текстови браузъри)
 ConfirmAjax=Използвайте Аякс потвърждение изскачащи прозорци
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+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=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
 SearchFilter=Опции на филтрите за търсене
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 ViewFullDateActions=Показване на пълните събития дати в третия лист
@@ -70,16 +70,16 @@ CurrentTimeZone=TimeZone PHP (сървър)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Пространство
-Table=Table
+Table=Таблица
 Fields=Полетата
-Index=Index
+Index=Индекс
 Mask=Маска
 NextValue=Следваща стойност
 NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
 NextValueForDeposit=Next value (deposit)
 NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на %s <b>%s,</b> независимо от стойността на този параметър е
+MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
 MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване)
 UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход
@@ -118,28 +118,28 @@ ParameterInDolibarr=Параметър %s
 LanguageParameter=Езиков параметър %s
 LanguageBrowserParameter=Параметър %s
 LocalisationDolibarrParameters=Локализация параметри
-ClientTZ=Client Time Zone (user)
+ClientTZ=Часова зона на клиента (потребител)
-ClientHour=Client time (user)
+ClientHour=Час на клиента (потребител)
-OSTZ=Server OS Time Zone
+OSTZ=Часова зона на Операционната Система
-PHPTZ=PHP server Time Zone
+PHPTZ=Часова зона на PHP Сървъра
 PHPServerOffsetWithGreenwich=PHP сървъра компенсира широчина Гринуич (секунди)
 ClientOffsetWithGreenwich=Клиент / Browser компенсира широчина Гринуич (секунди)
 DaylingSavingTime=Лятното часово време
-CurrentHour=PHP Time (server)
+CurrentHour=Час на PHP (сървър)
-CompanyTZ=Company Time Zone (main company)
+CompanyTZ=Часова зона на фирмата (основна фирма)
-CompanyHour=Company Time (main company)
+CompanyHour=Час на фирмата (основна фирма)
 CurrentSessionTimeOut=Продължителност на текущата сесия
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 OSEnv=OS околната среда
 Box=Кутия
 Boxes=Кутии
 MaxNbOfLinesForBoxes=Максимален брой на редовете за кутии
-PositionByDefault=Подразбиране за
+PositionByDefault=Default order
-Position=Position
+Position=Длъжност
 MenusDesc=Менюта мениджърите определят съдържанието на две ленти с менюта (хоризонтална лента и вертикална лента).
 MenusEditorDesc=Менюто редактор ви позволяват да определите персонализирани вписвания в менютата. Използвайте го внимателно, за да се избегне dolibarr нестабилна и записи в менюто постоянно недостижим. <br> Някои модули добавяне на записи в менютата (в менюто <b>Всички</b> в повечето случаи). Ако сте премахнали някои от тези записи по погрешка, можете да ги възстановите, като изключите и отново да активирате модула.
 MenuForUsers=Меню за потребители
-LangFile=.lang file
+LangFile=.lang файл
 System=Система
 SystemInfo=Системна информация
 SystemTools=Системни инструменти
@@ -171,7 +171,7 @@ ImportMethod=Внос метод
 ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете <a href="%s">тук</a> .
 ImportMySqlDesc=За да импортирате архивния файл, трябва да използвате MySQL команда от командния ред:
 ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Име на генерирания файл
 Compression=Компресия
@@ -210,8 +210,8 @@ ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
 WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
 URL=Връзка
-BoxesAvailable=Кутии наличните
+BoxesAvailable=Налични Кутии
-BoxesActivated=Кутии активира
+BoxesActivated=Активирани Кутии
 ActivateOn=Активиране на
 ActiveOn=Активирана
 SourceFile=Изходният файл
@@ -238,7 +238,7 @@ OfficialWebSiteFr=Френски официален уеб сайт
 OfficialWiki=Dolibarr документация на Wiki
 OfficialDemo=Dolibarr онлайн демо
 OfficialMarketPlace=Официален магазин за външни модули/добавки
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -283,11 +283,11 @@ ModuleFamilyProjects=Проекти / съвместна работа
 ModuleFamilyOther=Друг
 ModuleFamilyTechnic=Mutli модули инструменти
 ModuleFamilyExperimental=Експериментални модули
-ModuleFamilyFinancial=Финансови Модули (Счетоводство / Каса)
+ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса)
 ModuleFamilyECM=Електронно Управление на Съдържанието (ECM)
 MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
-DoNotUseInProduction=Do not use in production
+DoNotUseInProduction=Не използвайте на продукшън платформа
 ThisIsProcessToFollow=Това е настройка на процеса:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
@@ -302,7 +302,7 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
 LastStableVersion=Последна стабилна версия
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> клиентския код в знака n <br><b>{cccc000}</b>клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.<br><b>{tttt}</b> Кодът на типа трети страни в знака n (погледнете речник-типове трети страни).<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
@@ -437,8 +437,8 @@ Module52Name=Запаси
 Module52Desc=Управление на склад (продукти)
 Module53Name=Услуги
 Module53Desc=Управление на услуги
-Module54Name=Договори
+Module54Name=Contracts/Subscriptions
-Module54Desc=Управлението на договорите и услуги
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Баркодове
 Module55Desc=Управление на баркод
 Module56Name=Телефония
@@ -475,8 +475,8 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Проекти
+Module400Name=Projects/Opportunity
-Module400Desc=Управление на проекти вътре в други модули
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=Известия
-Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
 Module1200Name=Богомолка
@@ -514,16 +514,16 @@ Module5000Name=Няколко фирми
 Module5000Desc=Позволява ви да управлявате няколко фирми
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Отпуски
+Module20000Name=Leave Requests management
-Module20000Desc=Управление на отпуските на служителите
+Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
 Module39000Desc=Batch number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
 Module50100Desc=Точка на продажбите модул
-Module50200Name= Paypal
+Module50200Name=Paypal
-Module50200Desc= Модул предлага онлайн страница на плащане с кредитна карта с Paypal
+Module50200Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Нареждания за периодични преводи
 Permission152=Създаване / промяна на постоянни нареждания, искане
 Permission153=Кутия постоянни нареждания разписки
 Permission154=Кредит / отказват постоянни постъпления поръчки
-Permission161=Прочети договори
+Permission161=Read contracts/subscriptions
-Permission162=Създаване / промяна на договорите
+Permission162=Create/modify contracts/subscriptions
-Permission163=Активиране на услугата на договор
+Permission163=Activate a service/subscription of a contract
-Permission164=Изключване услуга на договор
+Permission164=Disable a service/subscription of a contract
-Permission165=Изтриване на договори
+Permission165=Delete contracts/subscriptions
-Permission171=Прочети пътувания
+Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Създаване / промяна пътувания
+Permission172=Create/modify trips and expenses
-Permission173=Изтриване пътувания
+Permission173=Delete trips and expenses
-Permission178=Износ пътувания
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=Прочети доставчици
 Permission181=Доставчика поръчки
 Permission182=Създаване / промяна на доставчика поръчки
@@ -671,7 +672,7 @@ Permission300=Баркодове
 Permission301=Създаване / промяна на баркодове
 Permission302=Изтриване на баркодове
 Permission311=Прочети услуги
-Permission312=Присвояване услуга за сключване на договор
+Permission312=Assign service/subscription to contract
 Permission331=Прочетете отметките
 Permission332=Създаване / промяна на отметки
 Permission333=Изтриване на отметки
@@ -701,8 +702,8 @@ Permission701=Прочети дарения
 Permission702=Създаване / промяна на дарения
 Permission703=Изтриване на дарения
 Permission1001=Прочети запаси
-Permission1002=Създаване / промяна на запасите
+Permission1002=Create/modify warehouses
-Permission1003=Изтриване на запасите
+Permission1003=Delete warehouses
 Permission1004=Движението на стоковите наличности
 Permission1005=Създаване / промяна на движението на стоковите наличности
 Permission1101=Поръчките за доставка
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Имайте впредвид, че само следните модули са отворени за външни потребители (каквито и да са правата на тези потребители):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
 ModuleCompanyCodePanicum=Връща празна код счетоводство.
 ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата &quot;C&quot; на първа позиция, следван от първите 5 символа на код на трета страна.
 UseNotifications=Използвайте уведомления
-NotificationsDesc=Функцията за уведомления по имейл позволява тихо изпращане на автоматичен мейл, за някои събития в Dolibarr, на трети лица (клиенти и доставчици), които са конфигурирани. Избор на активно уведомяване и цели контакти е направен на една трета страна в момента.
+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.
 ModelModules=Документи шаблони
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Воден знак върху проект на документ
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Добавяне на способността дат
 UseOptionLineIfNoQuantity=Линия на продукт / услуга с нулева сума се разглежда като вариант
 FreeLegalTextOnProposal=Свободен текст на търговски предложения
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=Настройки за управление на поръчки
 OrdersNumberingModules=Поръчки номериране модули
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=Да се ​​потвърди ред след предложението близо, това прави възможно да не се увеличат с временния ред
 FreeLegalTextOnOrders=Свободен текст на поръчки
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Кликнете, за да наберете настройка модул
 ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Модули за намеса номериране
 TemplatePDFInterventions=Намеса карти документи модели
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=Договори модул за настройка
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Договори за номериране модули
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Продукти модул за настройка
 ServiceSetup=Услуги модул за настройка
@@ -1382,9 +1384,10 @@ MailingSetup=Настройка на модул Имейли
 MailingEMailFrom=Изпращач (От) за имейли, изпратени от модула за електронна поща
 MailingEMailError=Върнете имейл (грешки) за имейли с грешки
 ##### Notification #####
-NotificationSetup=Настройки на модул за уведомление по e-mail
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=Изпращач (От) за имейли, изпратени за уведомления
-ListOfAvailableNotifications=Списък на наличните уведомления (Този списък зависи от активирани модули)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Изпращане модул за настройка
 SendingsReceiptModel=Изпращане получаване модел
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Връзка към &quot;%s&quot; сървър на &quot;%s&q
 OSCommerceTestKo1=Свързване към сървър &quot;%s успее, но база данни&quot; %s &quot;не може да бъде постигнато.
 OSCommerceTestKo2=Връзка към сървъра &quot;%s&quot; с потребителя %s &quot;се провали.
 ##### Stock #####
-StockSetup=Наличност модулна конфигурация
+StockSetup=Warehouse module setup
-UserWarehouse=Използване на потребителски поименни акции
+UserWarehouse=Use user personal warehouses
+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=Меню заличават
 TreeMenu=Tree менюта
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Този модул позволява да добавите и
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Точка на продажбите
 CashDeskSetup=Точка на продажбите модул за настройка
-CashDeskThirdPartyForSell=Generic трета страна да използва за продава
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
 CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек
 CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskIdWareHouse=Склад да се използва за продава
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+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 #####
 BookmarkSetup=Bookmark настройка модул
 BookmarkDesc=Този модул ви позволява да управлявате отметките. Можете да добавяте преки пътища към страници на Dolibarr или външни уеб сайтове в лявото меню.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type

htdocs/langs/bg_BG/agenda.lang

@@ -41,9 +41,10 @@ AutoActions= Автоматично попълване
 AgendaAutoActionDesc= Определете тук събития, за които искате Dolibarr да създадете автоматично събитие в дневния ред. Ако нищо не се проверява (по подразбиране), само ръчни действия ще бъдат включени в дневния ред.
 AgendaSetupOtherDesc= Тази страница предоставя възможности да се допусне износ на вашите събития Dolibarr в външен календар (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Тази страница позволява да се обяви външните източници на календари, за да видят своите събития в дневния ред Dolibarr.
-ActionsEvents= Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
+ActionsEvents=Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
-PropalValidatedInDolibarr= Proposal %s validated
+PropalValidatedInDolibarr=Proposal %s validated
-InvoiceValidatedInDolibarr= Фактура %s валидирани
+InvoiceValidatedInDolibarr=Фактура %s валидирани
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова
 InvoiceDeleteDolibarr=Invoice %s deleted
 OrderValidatedInDolibarr= Поръчка %s валидирани
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
 OrderCanceledInDolibarr=Поръчка %s отменен
-InterventionValidatedInDolibarr=Намеса %s валидирани
 ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща
 OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента
 InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s доставчик реда, изпратени по
 SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура
 ShippingSentByEMail=Доставка %s изпращат по електронна поща
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Намеса %s изпращат по електронна поща
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Създадено от трета страна
 DateActionPlannedStart= Планирана начална дата
 DateActionPlannedEnd= Планирана крайна дата
@@ -70,9 +68,9 @@ DateActionStart= Начална дата
 DateActionEnd= Крайна дата
 AgendaUrlOptions1=Можете да добавите и следните параметри, за да филтрирате изход:
 AgendaUrlOptions2=<b>вход = %s</b> да ограничи изход към действия, създадени от засегнати или направено от потребителя <b>%s.</b>
-AgendaUrlOptions3=<b>logina = %s</b> да се ограничи производството на действията, създадени от потребителя <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> да се ограничи производството на действията, засегнати на потребителските <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> да се ограничи производството за действия, извършени от потребителя <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Показване на контактите, които имат рожден ден
 AgendaHideBirthdayEvents=Скриване на контактите, които имат рожден ден
 Busy=Зает
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical
 ExtSiteNoLabel=Няма описание
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability

htdocs/langs/bg_BG/bills.lang

@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
 InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвани за решаване на факта, че фактурата е сумата, която се различава от сумата, наистина са платени (защото платил твърде много от грешка, или няма да се изплаща напълно, тъй като той се върна някои продукти, например).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Сменете фактура %s
 ReplacementInvoice=Подмяна фактура
 ReplacedByInvoice=Заменен с фактура %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Класифициране 'Изоставено'
 ClassifyClosed=Класифициране 'Затворено'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Създаване на фактура
-AddBill=Добави фактура или кредитно известие
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Изтриване на фактура
 SearchACustomerInvoice=Търсене за клиент фактура
@@ -99,7 +99,7 @@ DoPaymentBack=Направете плащане със задна дата
 ConvertToReduc=Конвертиране в бъдеще отстъпка
 EnterPaymentReceivedFromCustomer=Въведете получено плащане от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
-DisabledBecauseRemainderToPayIsZero=Хора с увреждания, тъй като остатъка за плащане е равна на нула
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Размер
 PriceBase=Цена база
 BillStatus=Състояние на фактурата
@@ -137,8 +137,6 @@ BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
 NewBill=Нова фактура
-Prélèvements=Постоянния цел
-Prélèvements=Постоянния цел
 LastBills=Последните %s фактури
 LastCustomersBills=Последните %s фактури на клиенти
 LastSuppliersBills=Последните %s фактури на доставчици
@@ -156,9 +154,9 @@ ConfirmCancelBill=Сигурен ли сте, че искате да отмен
 ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като "изоставена"?
 ConfirmClassifyPaidPartially=Сигурен ли сте, че искате да промените фактура <b>%s</b> до статута на платен?
 ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Какви са причините за да се затвори тази фактура?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Нормализира ДДС кредитно известие.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Приемам да губят ДДС върху тази отстъпка.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Възстановяване на ДДС върху тази отстъпка, без кредитно известие.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad клиента
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично се завръща
 ConfirmClassifyPaidPartiallyReasonOther=Сума, изоставен за друга причина
@@ -191,9 +189,9 @@ AlreadyPaid=Вече е платена
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Вече е платена (без кредитни известия и депозити)
 Abandoned=Изоставен
-RemainderToPay=Остатък за плащане
+RemainderToPay=Remaining unpaid
-RemainderToTake=Остатък да предприеме
+RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPayBack=Remaining amount to pay back
 Rest=Pending
 AmountExpected=Претендираната сума
 ExcessReceived=Превишение получи
@@ -219,19 +217,18 @@ NoInvoice=Липса на фактура
 ClassifyBill=Класифициране на фактурата
 SupplierBillsToPay=Доставчици фактури за плащане
 CustomerBillsUnpaid=Неплатени фактури на клиентите
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
 NonPercuRecuperable=Невъзстановими
 SetConditions=Задайте условията за плащане
 SetMode=Задайте режим на плащане
 Billed=Таксува
-RepeatableInvoice=Предварително дефиниран фактура
+RepeatableInvoice=Template invoice
-RepeatableInvoices=Предварително дефинирани фактури
+RepeatableInvoices=Template invoices
-Repeatable=Предварително дефинирани
+Repeatable=Template
-Repeatables=Предварително дефинирани
+Repeatables=Templates
-ChangeIntoRepeatableInvoice=Конвертиране в предварително определен
+ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Създаване на предварително определен фактура
+CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Създаване на предварително определен фактура
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Клиенти фактури и фактури линии
 CustomersInvoicesAndPayments=Фактури и плащания на клиентите
 ExportDataset_invoice_1=Фактури списък с клиенти и фактура линии

htdocs/langs/bg_BG/categories.lang

@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
 CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
 DeleteFromCat=Премахване от категорията
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category

htdocs/langs/bg_BG/compta.lang

@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad код отчетност за клие
 SuppliersProductsSellSalesTurnover=Генерираният оборот от продажбите на продуктите на доставчика.
 CheckReceipt=Проверете депозит
 CheckReceiptShort=Проверете депозит
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=Нов отстъпка
 NewCheckDeposit=Нова проверка депозит
 NewCheckDepositOn=Създаване на разписка за депозит по сметка: %s
@@ -199,11 +200,11 @@ 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_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
+CloneTax=Клониране на социално-осигурителни вноски
-ConfirmCloneTax=Confirm the clone of a social contribution
+ConfirmCloneTax=Потвърдете клонирането на социално-осигурителните вноски
-CloneTaxForNextMonth=Clone it for next month
+CloneTaxForNextMonth=Клониране за следващ месец

htdocs/langs/bg_BG/contracts.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Договори област
 ListOfContracts=Списък на договорите
-LastContracts=Последните %s променени договори
+LastModifiedContracts=Last %s modified contracts
 AllContracts=Всички договори
 ContractCard=Карта на договор
 ContractStatus=Договор статус
@@ -27,7 +27,7 @@ MenuRunningServices=Текущи услуги
 MenuExpiredServices=Изтекли услуги
 MenuClosedServices=Затворени услуги
 NewContract=Нов договор
-AddContract=Добави договор
+AddContract=Create contract
 SearchAContract=Търсене на договора
 DeleteAContract=Изтриване на договора
 CloseAContract=Затваряне на договора
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Последните %s променени договори
+LastContracts=Last % contracts
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия

htdocs/langs/bg_BG/cron.lang

@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = За
 CronAbout = About Cron
 CronAboutPage = Cron about page
-
 # Right
 Permission23101 = Read Scheduled task
 Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
 CronJobs=Scheduled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
-CronListInactive= List of disabled jobs
+CronListInactive=List of disabled jobs
-CronListActive= List of active jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output
@@ -77,13 +74,13 @@ CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dol
 CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
+CronCommandHelp=Системния команден ред за стартиране.
 # Info
-CronInfoPage=Information
+CronInfoPage=Информация
 # Common
-CronType=Task type
+CronType=Тип на задачата
 CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType_command=Терминална команда
-CronMenu=Cron
+CronMenu=Крон (софтуер за изпънение на автоматични задачи)
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.

htdocs/langs/bg_BG/donations.lang

@@ -4,7 +4,7 @@ Donations=Дарения
 DonationRef=Дарение
 Donor=Дарител
 Donors=Дарители
-AddDonation=Добавяне на дарение
+AddDonation=Create a donation
 NewDonation=Ново дарение
 ShowDonation=Показване на дарение
 DonationPromise=Обещано дарение
@@ -30,4 +30,9 @@ SearchADonation=Търсене на дарение
 DonationRecipient=Получател на дарението
 ThankYou=Благодарим Ви!
 IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
-MinimumAmount=Minimum amount is  %s
+MinimumAmount=Минималното количество е %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned

htdocs/langs/bg_BG/externalsite.lang

@@ -2,3 +2,4 @@
 ExternalSiteSetup=Настройка на линк към външен сайт
 ExternalSiteURL=Външен URL адрес на сайта
 ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно.
+ExampleMyMenuEntry=My menu entry

htdocs/langs/bg_BG/holiday.lang

@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Актуализация
 CantUpdate=You cannot update this leave request.
 NoDateDebut=Трябва да изберете началната дата.
 NoDateFin=Трябва да изберете крайна дата.
-ErrorDureeCP=Вашето искане за почивка не съдържа работен ден.
+ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Утвърждава искането за отпуск
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Дата на утвърждаване
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Отхвърляне на заявлението за отпуск
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=Вие трябва да изберете причина за отказ на искането.
-TitleCancelCP=Анулира заявката празници
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Причина за отказа
 DateRefusCP=Дата на отказ
@@ -78,7 +77,7 @@ ActionByCP=В изпълнение на
 UserUpdateCP=За потребителя
 PrevSoldeCP=Предишен баланс
 NewSoldeCP=Нов баланс
-alreadyCPexist=Вече е направено искане за отпуск за този период.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Име
 Employee=Служители
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Настройки на модула за отпуски
+ConfCP=Configuration of leave request module
 DescOptionCP=Описание на опцията
 ValueOptionCP=Стойност
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Потвърждаване на конфигурацията
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Актуализира се успешно.
 ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново.
-AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">кликнете тук</a> .
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Краен срок за кандидатстване за отпуск
+DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Проверка на
 UpdateEventCP=Актуализиране на събития

htdocs/langs/bg_BG/interventions.lang

@@ -3,7 +3,7 @@ Intervention=Намеса
 Interventions=Интервенциите
 InterventionCard=Интервенция карта
 NewIntervention=Нов намеса
-AddIntervention=Добави намеса
+AddIntervention=Create intervention
 ListOfInterventions=Списък на интервенциите
 EditIntervention=Редактиране намеса
 ActionsOnFicheInter=Действия на интервенцията
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса:
 NameAndSignatureOfExternalContact=Име и подпис на клиента:
 DocumentModelStandard=Стандартен документ модел за интервенции
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Класифицирай като "Таксувани"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyUnBilled=Класифицирай като "Нетаксувани"
 StatusInterInvoiced=Таксува
 RelatedInterventions=Подобни интервенции
 ShowIntervention=Покажи намеса
 SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Представител проследяване намеса
 TypeContact_fichinter_internal_INTERVENING=Намеса

htdocs/langs/bg_BG/mails.lang

@@ -115,7 +115,7 @@ SentBy=Изпратено от
 MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Все пак можете да ги изпратите онлайн чрез добавяне на параметър MAILING_LIMIT_SENDBYWEB със стойност на максимален брой на имейлите, които искате да изпратите от сесията. За това, отидете на дома - Setup - Други.
 ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Изчисти списъка
 ToClearAllRecipientsClickHere=Щракнете тук, за да изчистите списъка на получателите за този електронната поща
 ToAddRecipientsChooseHere=Добавяне на получатели, като изберете от списъците
@@ -133,6 +133,9 @@ Notifications=Известия
 NoNotificationsWillBeSent=Не са планирани за това събитие и компания известия по имейл
 ANotificationsWillBeSent=1 уведомление ще бъде изпратено по имейл
 SomeNotificationsWillBeSent=%s уведомления ще бъдат изпратени по имейл
-AddNewNotification=Активиране на ново искане за уведомяване имейл
+AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=Списък на всички активни заявки за уведомяване имейл
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=Списък на всички имейли, изпратени уведомления
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.

htdocs/langs/bg_BG/main.lang

@@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Файла %s не може да се отвори
 ErrorCanNotCreateDir=Не може да се създаде папка %s
 ErrorCanNotReadDir=Не може да се прочете директорията %s
 ErrorConstantNotDefined=Параметъра %s не е дефиниран
-ErrorUnknown=Unknown error
+ErrorUnknown=Непозната грешка
 ErrorSQL=SQL грешка
 ErrorLogoFileNotFound=Файла '%s' с логото не е открит
 ErrorGoToGlobalSetup=Отидете на настройките 'Фирма/Организация' за да настроите параметъра
@@ -55,15 +55,15 @@ ErrorDuplicateField=Дублирана стойност в поле с уник
 ErrorSomeErrorWereFoundRollbackIsDone=Някои бяха открити грешки. Ние намаление на цените промени.
 ErrorConfigParameterNotDefined=Параметъра <b>%s</b> не е дефиниран в конфигурационния файл на Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител <b>%s</b> в базата данни на Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, без ДДС ставки, определени за &quot;%s&quot; страна.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'.
 ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за &quot;%s&quot; страна.
 ErrorFailedToSaveFile=Грешка, файла не е записан.
-ErrorOnlyPngJpgSupported=Грешка, поддържат се само PNG и JPG формати на изображението.
-ErrorImageFormatNotSupported=Вашият PHP не поддържа функции за конвертиране на изображения от този формат.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=Вижте също %s
 BackgroundColorByDefault=Подразбиращ се цвят на фона
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Файлът е избран за прикачане, но все още не е качен. Кликнете върху &quot;Прикачи файл&quot;.
 NbOfEntries=Брой на записите
 GoToWikiHelpPage=Прочетете онлайн помощта (Нуждаете се от достъп до интернет)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
 HourShort=H
+MinuteShort=Минута
 Rate=Процент
 UseLocalTax=с данък
 Bytes=Байта
@@ -340,6 +341,7 @@ FullList=Пълен списък
 Statistics=Статистика
 OtherStatistics=Други статистически данни
 Status=Състояние
+Favorite=Favorite
 ShortInfo=Инфо.
 Ref=Реф.
 RefSupplier=Реф. снабдител
@@ -365,6 +367,7 @@ ActionsOnCompany=Събития за тази трета страна
 ActionsOnMember=Събития за този член
 NActions=%s събития
 NActionsLate=%s със забавено плащане
+RequestAlreadyDone=Request already recorded
 Filter=Филтър
 RemoveFilter=Премахване на филтъра
 ChartGenerated=Графиката е генерирана
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Допълнителни атрибути за настро
 URLPhoto=URL на снимка/лого
 SetLinkToThirdParty=Връзка към друга трета страна
 CreateDraft=Създаване на проект
+SetToDraft=Back to draft
 ClickToEdit=Кликнете, за да редактирате
 ObjectDeleted=Обекта %s е изтрит
 ByCountry=По държава
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
 # Week day
 Monday=Понеделник
 Tuesday=Вторник

htdocs/langs/bg_BG/margins.lang

@@ -38,4 +38,7 @@ BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos

htdocs/langs/bg_BG/orders.lang

@@ -53,7 +53,7 @@ ShippingExist=Пратка съществува
 DraftOrWaitingApproved=Проект или одобрен, все още не е осъден
 DraftOrWaitingShipped=Проект или потвърдено все още не са изпратени
 MenuOrdersToBill=Доставени поръчки
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
 SearchOrder=Търсене за
 SearchACustomerOrder=Search a customer order
 ShipProduct=Кораб продукт
@@ -65,7 +65,7 @@ ValidateOrder=Валидиране за
 UnvalidateOrder=Unvalidate за
 DeleteOrder=Изтрий заявка
 CancelOrder=Отказ за
-AddOrder=Добави за
+AddOrder=Create order
 AddToMyOrders=Добави към моите заповеди
 AddToOtherOrders=Добави към други поръчки
 AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Телефон
 CreateInvoiceForThisCustomer=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
 OrderCreation=Order creation
 Ordered=Ordered
 OrderCreated=Your orders have been created

htdocs/langs/bg_BG/oscommerce.lang

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

htdocs/langs/bg_BG/other.lang

@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Код за сигурност
 Calendar=Календар
-AddTrip=Добави пътуване
 Tools=Инструменти
 ToolsDesc=Тази област е посветена на група разни инструменти, достъпни в други вписвания в менюто. <br><br> Тези инструменти могат да бъдат достигнати от менюто на страната.
 Birthday=Рожден ден
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
 NbOfAttachedFiles=Брой на прикачените файлове/документи
 TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи
 MaxSize=Максимален размер
@@ -80,6 +80,16 @@ ModifiedBy=Променено от %s
 ValidatedBy=Потвърдено от %s
 CanceledBy=Анулирано от %s
 ClosedBy=Затворен от %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
 FileWasRemoved=Файла %s беше премахнат
 DirWasRemoved=Директорията %s беше премахната
 FeatureNotYetAvailableShort=Предлага се в следващата версия
@@ -193,25 +203,26 @@ ForgetIfNothing=Ако не сте заявили промяната, прост
 
 ##### Calendar common #####
 AddCalendarEntry=Добави запис в календара %s
-NewCompanyToDolibarr=Фирмата %s е добавена в Dolibarr
+NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Поръчки %s заверени в Dolibarr
+ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Поръчки %s анулирани през Dolibarr
+ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Поръчки %s затворен в Dolibarr
+ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Предложение %s подписан в Dolibarr
+PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Предложение %s отказва Dolibarr
+PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Предложение %s заверени в Dolibarr
+PropalValidatedInDolibarr=Proposal %s validated
-InvoiceValidatedInDolibarr=Фактура %s заверени в Dolibarr
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoicePaidInDolibarr=Фактура променени %s на платен в Dolibarr
+InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceCanceledInDolibarr=Фактура %s, анулирани през Dolibarr
+InvoicePaidInDolibarr=Invoice %s changed to paid
-PaymentDoneInDolibarr=Плащане %s направено в Dolibarr
+InvoiceCanceledInDolibarr=Invoice %s canceled
-CustomerPaymentDoneInDolibarr=Клиентско плащане %s направено в Dolibarr
+PaymentDoneInDolibarr=Payment %s done
-SupplierPaymentDoneInDolibarr=Доставчик на платежни %s направи в Dolibarr
+CustomerPaymentDoneInDolibarr=Customer payment %s done
-MemberValidatedInDolibarr=Държавите-%s, заверени в Dolibarr
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberResiliatedInDolibarr=%s изключени членове в Dolibarr
+MemberValidatedInDolibarr=Member %s validated
-MemberDeletedInDolibarr=Държавите-%s изтрит от Dolibarr
+MemberResiliatedInDolibarr=Member %s resiliated
-MemberSubscriptionAddedInDolibarr=Абонамент за държавите %s добави Dolibarr
+MemberDeletedInDolibarr=Member %s deleted
-ShipmentValidatedInDolibarr=Превоз %s валидирани в Dolibarr
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
 ##### Export #####
 Export=Износ
 ExportsArea=Износът площ

htdocs/langs/bg_BG/paybox.lang

@@ -35,3 +35,6 @@ MessageKO=Съобщение за анулиране страница плаща
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
 PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID

htdocs/langs/bg_BG/resource.lang

@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource

htdocs/langs/bg_BG/sendings.lang

@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=За момента се извършва от
 RelatedShippings=Свързани shippings
 ShipmentLine=Shipment line
 CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=Улов от клиента
@@ -74,5 +76,5 @@ SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= Склад детайли
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseFormat= Тегло:%s (Количество : %d)

htdocs/langs/bg_BG/stocks.lang

@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Изисква се етикет на склада
 CorrectStock=Промяна на наличност
 ListOfWarehouses=Списък на складовете
 ListOfStockMovements=Списък на движението на стоковите наличности
-StocksArea=Наличности
+StocksArea=Warehouses area
 Location=Място
 LocationSummary=Кратко наименование на място
 NumberOfDifferentProducts=Брой различни продукти

htdocs/langs/bg_BG/users.lang

@@ -63,7 +63,6 @@ ShowGroup=Показване на групата
 ShowUser=Покажи потребителя
 NonAffectedUsers=За засегнатите потребители
 UserModified=Потребителя е променен успешно
-GroupModified=Групата е променена успешно
 PhotoFile=Снимка
 UserWithDolibarrAccess=Потребител с Dolibarr достъп
 ListOfUsersInGroup=Списък на потребителите в групата
@@ -103,7 +102,7 @@ UserDisabled=Потребителя %s е забранен
 UserEnabled=Потребителя %s е активиран
 UserDeleted=Потребителя %s е премахнат
 NewGroupCreated=Групата %s е създадена
-GroupModified=Групата е променена успешно
+GroupModified=Group %s modified
 GroupDeleted=Групата %s е премахната
 ConfirmCreateContact=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този контакт ?
 ConfirmCreateLogin=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този член ?
@@ -114,8 +113,10 @@ YourRole=Вашите роли
 YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
 NbOfUsers=Брой потребители
 DontDowngradeSuperAdmin=Само истинска черна нинджа може да убие друга черна нинджа
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
 HierarchicView=Йерархичен изглед
 UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user

htdocs/langs/bg_BG/withdrawals.lang

@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Получаване
 LastWithdrawalReceipts=Last %s withdrawal receipts
 WithdrawedBills=Изтеглените фактури
 WithdrawalsLines=Отнемане линии
-RequestStandingOrderToTreat=Искане за постоянни нареждания за лечение
+RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Искане за нареждания за периодични преводи третират
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 CustomersStandingOrders=Клиентски поръчки постоянни
 CustomerStandingOrder=Заявка на клиента състояние
 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Метод Предаване
 Send=Изпращам
 Lines=Линии
 StandingOrderReject=Издаде отхвърли
-InvoiceRefused=Фактура отказа
 WithdrawalRefused=Оттегляне Отказ
 WithdrawalRefusedConfirm=Сигурен ли сте, че искате да въведете изтегляне отказ за обществото
 RefusedData=Дата на отхвърляне
 RefusedReason=Причина за отхвърляне
 RefusedInvoicing=Фактуриране отхвърлянето
 NoInvoiceRefused=Не зареждайте отхвърляне
-InvoiceRefused=Фактура отказа
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
 Status=Статус
 StatusUnknown=Неизвестен
 StatusWaiting=Чакане
@@ -76,7 +76,7 @@ WithBankUsingRIB=За банкови сметки с помощта на RIB
 WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Банкова сметка за получаване оттегли
 CreditDate=Кредит за
-WithdrawalFileNotCapable=Не може да се генерира файл за изтегляне разписка за вашата страна
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Покажи Теглене
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
 DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.

htdocs/langs/bs_BA/accountancy.lang

@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
 Validate=Validate
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
 ToDispatch=To dispatch
 Dispatched=Dispatched
 
-CustomersVentilation=Ventilation customers
+CustomersVentilation=Breakdown customers
-SuppliersVentilation=Ventilation suppliers
+SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
 AccountBalanceByMonth=Account balance by month
 
-AccountingVentilation=Accounting ventilation
+AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilationCustomer=Breakdown accounting customer
 Line=Line
 
 CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
 Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
 
 Processing=Processing
 EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
 
 ACCOUNTING_SEPARATORCSV=Separator CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
 
 AccountLength=Length of the accounting accounts shown in Dolibarr
 AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
 
 NewFiscalYear=New fiscal year
 
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card

htdocs/langs/bs_BA/admin.lang

@@ -437,8 +437,8 @@ Module52Name=Stocks
 Module52Desc=Stock management (products)
 Module53Name=Services
 Module53Desc=Service management
-Module54Name=Contracts
+Module54Name=Contracts/Subscriptions
-Module54Desc=Contract and service management
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects
+Module400Name=Projects/Opportunity
-Module400Desc=Project management inside other modules
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
 Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
 Module700Desc=Donation management
 Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow - Tok rada
 Module6000Desc=Upravljanje workflow-om - tokom rada
-Module20000Name=Holidays
+Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees holidays
+Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
 Module39000Desc=Batch 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
 Module50100Desc=Point of sales module
-Module50200Name= Paypal
+Module50200Name=Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
 Permission152=Create/modify a standing orders request
 Permission153=Transmission standing orders receipts
 Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
+Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts
+Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service of a contract
+Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service of a contract
+Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts
+Permission165=Delete contracts/subscriptions
-Permission171=Read trips
+Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips
+Permission172=Create/modify trips and expenses
-Permission173=Delete trips
+Permission173=Delete trips and expenses
-Permission178=Export trips
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
 Permission180=Read suppliers
 Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
 Permission301=Create/modify bar codes
 Permission302=Delete bar codes
 Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
 Permission331=Read bookmarks
 Permission332=Create/modify bookmarks
 Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission1001=Read stocks
-Permission1002=Create/modify stocks
+Permission1002=Create/modify warehouses
-Permission1003=Delete stocks
+Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
 Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
 YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=Imate samo %s proizvoda/usluga u bazu podataka. To ne zahtijeva posebne optimizacije.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=Notifikacije E-mailovima omogućavaju vam da pošaljete automatski mail, za neke Dolibarr događaje, trećim strankama (kupci ili dobavljači) koji su prethodno konfigurirani. Izbor aktivnih notifikacija i viljanih kontakata se radi posebno za svaku treću stranku.
+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.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
 UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
 FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno) 
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
 TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno) 
 ##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Contracts numbering modules
 TemplatePDFContracts=Modeli za dokumente ugovora
 FreeLegalTextOnContracts=Slobodni tekst na ugovorima
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP server
 CacheByServer=Keširanje na serveru
 CacheByClient=Keširanje u browser-u
 CompressionOfResources=Kompresija HTTP odgovora
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
 MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
 MailingEMailError=Return EMail (Errors-to) for emails with errors
 ##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Configuration module stock
+StockSetup=Warehouse module setup
-UserWarehouse=Use user personal stocks
+UserWarehouse=Use user personal warehouses
+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=Menu deleted
 TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
 CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
 CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+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 #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 Opened=Opened
 Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type

htdocs/langs/bs_BA/agenda.lang

@@ -41,9 +41,10 @@ AutoActions= Automatsko popunjavanje
 AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u agendi. Ukoliko se ništa ne provjerava (po defaultu), samo manualne akcije će biti uključeni u dnevni red.
 AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi.
-ActionsEvents= Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
+ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
-PropalValidatedInDolibarr= Prijedlog %s potvrđen
+PropalValidatedInDolibarr=Prijedlog %s potvrđen
-InvoiceValidatedInDolibarr= Faktura %s potvrđena
+InvoiceValidatedInDolibarr=Faktura %s potvrđena
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
 InvoiceDeleteDolibarr=Faktura %s obrisana
 OrderValidatedInDolibarr= Narudžba %s potvrđena
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
 OrderCanceledInDolibarr=Narudžba %s otkazana
-InterventionValidatedInDolibarr=Intervencija %s potvrđena
 ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
 OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
 InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila
 SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila
 ShippingSentByEMail=Dostava %s poslana putem e-maila
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervencija %s poslana putem e-maila
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Trća stranka kreirana
 DateActionPlannedStart= Planirani datum početka
 DateActionPlannedEnd= Planirani datum završetka
@@ -70,9 +68,9 @@ DateActionStart= Datum početka
 DateActionEnd= Datum završetka
 AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog:
 AgendaUrlOptions2=<b>login =%s</b> ​​da se ograniči prikaz na akcije kreiranje, dodiljene ili završene od strane korisnika <b>%s.</b>
-AgendaUrlOptions3=<b>logina=%s</b> ​​da se ograniči prikaz na akcije kreirane od strane korisnika <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> ​​da se ograniči prikaz na akcije dodijeljene korisniku <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s</b> ​​da se ograniči prikaz na akcije završene os strane korisnika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rođendane kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL za pristup .ical fajla
 ExtSiteNoLabel=Nema opisa
 WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
 MyAvailability=My availability

htdocs/langs/bs_BA/bills.lang

@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
 InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Zamijeni fakturu %s
 ReplacementInvoice=Zamjenska faktura
 ReplacedByInvoice=Zamijenjeno sa fakturom %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao 'Otkazano'
 ClassifyClosed=Označi kao 'Zaključeno'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Kreiraj predračun
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Dodaj na uzorak fakture
 DeleteBill=Obriši fakturu
 SearchACustomerInvoice=Traži fakturu kupca
@@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat uplate
 ConvertToReduc=Pretvori u budući popust
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
 EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Onemogućeno, jer je ostatak za plaćanje nula
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Iznos
 PriceBase=Price base
 BillStatus=Status fakture
@@ -137,8 +137,6 @@ BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
 NewBill=Nova faktura
-Prélèvements=Trajni nalog
-Prélèvements=Trajni nalog
 LastBills=Zadnjih %s faktura
 LastCustomersBills=Zadnjih %s faktura kupca
 LastSuppliersBills=Zadnjih %s faktura dobavljača
@@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da želite otkazati fakturu <b>%s</b> ?
 ConfirmCancelBillQuestion=Zašto želite da se ova faktura označi kao 'otkazano'?
 ConfirmClassifyPaidPartially=Jeste li sigurni da želite promijeniti fakturu <b>%s</b> na status plaćeno?
 ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji su razlozi za zatvaranje fakture?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
@@ -191,9 +189,9 @@ AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
 Abandoned=Otkazano
-RemainderToPay=Ostatak za platiti
+RemainderToPay=Remaining unpaid
-RemainderToTake=Ostatak za uzeti
+RemainderToTake=Remaining amount to take
-RemainderToPayBack=Ostatak za povrat uplate
+RemainderToPayBack=Remaining amount to pay back
 Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
@@ -219,19 +217,18 @@ NoInvoice=Nema fakture
 ClassifyBill=Označi fakturu
 SupplierBillsToPay=Fakture dobavljača za platiti
 CustomerBillsUnpaid=NEplaćene fakture kupaca
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
 NonPercuRecuperable=Nepovratno
 SetConditions=Postaviti uslova plaćanja
 SetMode=Postaviti način plaćanja
 Billed=Fakturisano
-RepeatableInvoice=Predefinisana faktura
+RepeatableInvoice=Template invoice
-RepeatableInvoices=Predefinisane fakture
+RepeatableInvoices=Template invoices
-Repeatable=Predefinisano
+Repeatable=Template
-Repeatables=Predefinisano
+Repeatables=Templates
-ChangeIntoRepeatableInvoice=Pretvori u predefinisano
+ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Kreiraj predefinisanu fakturu
+CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Kreiraj na osnovu predefinisane fakture
+CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura
 CustomersInvoicesAndPayments=Faktura kupaca i uplate
 ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura

htdocs/langs/bs_BA/categories.lang

@@ -101,9 +101,6 @@ CatSupLinks=Veze između dobavljača i kategorija
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Veze između proizvoda/usluga i kategorija
 CatMemberLinks=Veze između članova i kategorija
-CatProdLinks=Veze između proizvoda/usluga i kategorija
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Veze između dobavljača i kategorija
 DeleteFromCat=Ukloni iz kategorije
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category

htdocs/langs/bs_BA/compta.lang

@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
 SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
 CheckReceipt=Check deposit
 CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
 NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s

htdocs/langs/bs_BA/contracts.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Područje za ugovore
 ListOfContracts=Lista ugovora
-LastContracts=Zadnji %s izmijenjeni ugovori
+LastModifiedContracts=Last %s modified contracts
 AllContracts=Svi ugovori
 ContractCard=Kartica ugovora
 ContractStatus=Status ugovora
@@ -27,7 +27,7 @@ MenuRunningServices=Aktivne usluge
 MenuExpiredServices=Istekle usluge
 MenuClosedServices=Završene usluge
 NewContract=Novi ugovor
-AddContract=Dodaj ugovor
+AddContract=Create contract
 SearchAContract=Traži kontakt
 DeleteAContract=Obrisati ugovor
 CloseAContract=Zatvori ugovor
@@ -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=Zadnji %s izmijenjeni ugovori
+LastContracts=Last % contracts
 LastActivatedServices=Zadnjih $s aktiviranih usluga
 LastModifiedServices=Zadnjih %s izmijenjenih usluga
 EditServiceLine=Izmijeni stavku usluge

htdocs/langs/bs_BA/cron.lang

@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = O programu
 CronAbout = O Cron-u
 CronAboutPage = Stranica o Cron-u
-
 # Right
 Permission23101 = Pročitaj redovne zadatke
 Permission23102 = Kreiraj/Ažuriraj redovni zadatak
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
 CronJobs=Scheduled jobs
-CronListActive= Lista aktivnih poslova
+CronListActive=List of active/scheduled jobs
-CronListInactive= Lista onemogućenih poslova
+CronListInactive=Lista onemogućenih poslova
-CronListActive= Lista aktivnih poslova
 # Page list
 CronDateLastRun=Zadnje pokretanje
 CronLastOutput=Izvještaj o zadnjem pokretanju

htdocs/langs/bs_BA/donations.lang

@@ -4,7 +4,7 @@ Donations=Donacije
 DonationRef=Donacija ref.
 Donor=Donator
 Donors=Donatori
-AddDonation=Dodaj donaciju
+AddDonation=Create a donation
 NewDonation=Nova donacija
 ShowDonation=Prikaži donaciju
 DonationPromise=Obećanje za poklon
@@ -31,3 +31,8 @@ DonationRecipient=Primalac donacije
 ThankYou=Hvala Vam
 IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos
 MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned

htdocs/langs/bs_BA/externalsite.lang

@@ -2,3 +2,4 @@
 ExternalSiteSetup=Podesi link za eksterni web sajt
 ExternalSiteURL=Link do eksternog web sajta
 ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
+ExampleMyMenuEntry=My menu entry

htdocs/langs/bs_BA/holiday.lang

@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Ažuriranje
 CantUpdate=You cannot update this leave request.
 NoDateDebut=Morate odabrati datum početka.
 NoDateFin=Morate odabrati datum završetka.
-ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan.
+ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Odobri zahtjev za godišnji odmor
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Datum odobrenja
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Odbiti zahtjev za godišnji odmor
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva.
-TitleCancelCP=Poništi zahtjev za godišnji odmor
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Razlog za odbijanje
 DateRefusCP=Datum odbijanja
@@ -78,7 +77,7 @@ ActionByCP=Izvršeno od strane
 UserUpdateCP=Za korisnika
 PrevSoldeCP=Prethodno stanje
 NewSoldeCP=Novo stanje
-alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Naziv
 Employee=Zaposlenik
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Ručno ažuriranje
 HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Konfiguracija modula za godišnje odmore
+ConfCP=Configuration of leave request module
 DescOptionCP=Opis opcije
 ValueOptionCP=Vrijednost
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Potvrdite konfiguraciju
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Uspješno ažuriranje.
 ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo.
-AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom ovdje</a>.
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Rok za prijavu za godišnji odmor
+DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potvrdi
 UpdateEventCP=Ažuriraj događaje