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

.tx/config

@@ -7,7 +7,6 @@ file_filter = htdocs/langs/<lang>/admin.lang
 source_file = htdocs/langs/en_US/admin.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
-lang_map = uz_UZ: uz
 
 [dolibarr.agenda]
 file_filter = htdocs/langs/<lang>/agenda.lang

ChangeLog

@@ -130,8 +130,13 @@ parameter. All methods addline in this case were modified to remove this paramet
 
  
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
+Fix: field's problem into company's page (RIB)
+Fix: Document cerfa doesn't contained firstname & lastname from donator
 Fix: Bad rounding on margin calculations and display.
 Fix: Option drop table into backup was broken.
+Fix: [ bug #1105 ] Searching Boxes other search option
+Fix: wrong buy price update
+Fix :[ bug #1142 ] Set paiement on invoice (PGSql)
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined

build/debian/changelog

@@ -14,6 +14,20 @@ dolibarr (3.4.1-3) unstable; urgency=low
 
 dolibarr (3.4.0-3) unstable; urgency=low
 
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+
+dolibarr (3.4.1) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+
+dolibarr (3.4.0) unstable; urgency=low
+
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     

dev/translation/autotranslator.class.php

@@ -154,14 +154,14 @@ class autoTranslator
 		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0)
 		{
 			$fp = fopen($destPath, 'a');
-			fwrite($fp, "\r\n");
+			fwrite($fp, "\n");
-			fwrite($fp, "\r\n");
+			fwrite($fp, "\n");
-			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\r\n");
+			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
-			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\r\n");
+			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
 			foreach( $this->_translatedFiles[$file] as $line) {
-				fwrite($fp, $line . "\r\n");
+				fwrite($fp, $line . "\n");
 			}
-			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\r\n");
+			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
 			fclose($fp);
 		}
 		return;
@@ -177,11 +177,11 @@ class autoTranslator
 	private function createTranslationFile($path,$my_destlang)
 	{
 		$fp = fopen($path, 'w+');
-		fwrite($fp, "/*\r\n");
+		fwrite($fp, "/*\n");
-		fwrite($fp, " * Language code: {$my_destlang}\r\n");
+		fwrite($fp, " * Language code: {$my_destlang}\n");
-		fwrite($fp, " * Automatic generated via autotranslator.php tool\r\n");
+		fwrite($fp, " * Automatic generated via autotranslator.php tool\n");
-		fwrite($fp, " * Generation date " . $this->_time. "\r\n");
+		fwrite($fp, " * Generation date " . $this->_time. "\n");
-		fwrite($fp, " */\r\n");
+		fwrite($fp, " */\n");
 		fclose($fp);
 		return;
 	}

htdocs/adherents/admin/adherent.php

@@ -263,7 +263,7 @@ print '<br>';
 
 
 /*
- * Edition des variables globales non rattachées à un theme specifique
+ * Editing global variables not related to a specific theme
  */
 $constantes=array(
 		'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT',

htdocs/comm/fiche.php

@@ -202,7 +202,7 @@ if ($id > 0)
 	print '<table class="border" width="100%">';
 
 	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
-	$object->next_prev_filter="te.client in (1,3)";
+	$object->next_prev_filter="te.client in (1,2,3)";
 	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
 	print '</td></tr>';
 

htdocs/comm/propal.php

@@ -634,13 +634,33 @@ else if ($action == "setabsolutediscount" && $user->rights->propal->creer)
 }
 
 // Add line
-else if ($action == "addline" && $user->rights->propal->creer)
+else if (($action == 'addline' || $action == 'addline_predef') && $user->rights->propal->creer)
 {
-	$idprod=GETPOST('idprod', 'int');
+	// Set if we used free entry or predefined product
-	$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
+	if (GETPOST('addline_libre'))
-	$price_ht = GETPOST('price_ht');
+	{
-	$tva_tx = (GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+		$predef='';
-	$predef=((! empty($idprod) && $conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=0;
+		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$price_ht = GETPOST('price_ht');
+		$tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+	}
+	if (GETPOST('addline_predefined'))
+	{
+		$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=GETPOST('idprod', 'int');
+		$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):''));
+		$price_ht = '';
+		$tva_tx = '';
+	}
+    if (GETPOST('usenewaddlineform')) {
+        $idprod=GETPOST('idprod', 'int');
+        $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
+        $price_ht = GETPOST('price_ht');
+        $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+    }
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
 
 	//Extrafields
 	$extrafieldsline = new ExtraFields($db);
@@ -673,7 +693,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
 		$error++;
 	}
 
-	if (! $error && (GETPOST('qty') >= 0) && (! empty($product_desc) || ! empty($idprod)))
+	if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
 	{
 		$pu_ht=0;
 		$pu_ttc=0;
@@ -791,8 +811,8 @@ else if ($action == "addline" && $user->rights->propal->creer)
 		}
 
 		// Margin
-		$fournprice=(GETPOST('fournprice')?GETPOST('fournprice'):'');
+		$fournprice=(GETPOST('fournprice'.$predef)?GETPOST('fournprice'.$predef):'');
-		$buyingprice=(GETPOST('buying_price')?GETPOST('buying_price'):'');
+		$buyingprice=(GETPOST('buying_price'.$predef)?GETPOST('buying_price'.$predef):'');
 
 		$date_start=dol_mktime(0, 0, 0, GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(0, 0, 0, GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
@@ -804,7 +824,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
 		$info_bits=0;
 		if ($tva_npr) $info_bits |= 0x01;
 
-		if (! empty($price_min) && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
+		if (! empty($price_min) && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
 		{
 			$mesg = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
 			setEventMessage($mesg, 'errors');
@@ -815,12 +835,12 @@ else if ($action == "addline" && $user->rights->propal->creer)
 			$result=$object->addline(
 				$desc,
 				$pu_ht,
-				GETPOST('qty'),
+				$qty,
 				$tva_tx,
 				$localtax1_tx,
 				$localtax2_tx,
 				$idprod,
-				GETPOST('remise_percent'),
+				$remise_percent,
 				$price_base_type,
 				$pu_ttc,
 				$info_bits,
@@ -854,7 +874,6 @@ else if ($action == "addline" && $user->rights->propal->creer)
 
 				unset($_POST['qty']);
 				unset($_POST['type']);
-				unset($_POST['idprod']);
 				unset($_POST['remise_percent']);
 				unset($_POST['price_ht']);
 				unset($_POST['price_ttc']);
@@ -866,10 +885,16 @@ else if ($action == "addline" && $user->rights->propal->creer)
 				unset($_POST['buying_price']);
 				unset($_POST['np_marginRate']);
 				unset($_POST['np_markRate']);
-
-				// old method
-				unset($_POST['np_desc']);
 				unset($_POST['dp_desc']);
+
+				unset($_POST['idprod']);
+				unset($_POST['qty_predef']);
+				unset($_POST['remise_percent_predef']);
+				unset($_POST['fournprice_predef']);
+				unset($_POST['buying_price_predef']);
+				unset($_POST['np_marginRate_predef']);
+				unset($_POST['np_markRate_predef']);
+				unset($_POST['np_desc']);
 			}
 			else
 			{
@@ -2003,15 +2028,25 @@ else
 	 * Lines
 	 */
 
+	// Show object lines
+	$result = $object->getLinesArray();
+
+
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+	<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+	<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateligne').'">
+	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="id" value="'.$object->id.'">
+	';
+
+
 	if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
 	{
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	}
 
-	print '<table id="tablelines" class="noborder" width="100%">';
+	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-	// Show object lines
-	$result = $object->getLinesArray();
 	if (! empty($object->lines))
 		$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1);
 
@@ -2047,8 +2082,9 @@ else
 
 	print '</table>';
 
-	print '</div>';
+	print "</form>\n";
-	print "\n";
+
+	dol_fiche_end();
 
 	if ($action == 'statut')
 	{

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

@@ -1710,7 +1710,7 @@ class Propal extends CommonObject
         {
             if ($statut == 2)
             {
-                // Classe la société rattachée comme client
+                // The connected company is classified as a client
                 $soc=new Societe($this->db);
                 $soc->id = $this->socid;
                 $result=$soc->set_as_client();

htdocs/comm/propal/document.php

@@ -22,7 +22,7 @@
 /**
  *       \file       htdocs/comm/propal/document.php
  *       \ingroup    propale
- *       \brief      Page de gestion des documents attaches a une proposition commerciale
+ *       \brief      Management page of documents attached to a business proposal
  */
 
 require '../../main.inc.php';

htdocs/commande/class/commande.class.php

@@ -269,7 +269,7 @@ class Commande extends CommonOrder
             if (preg_match('/^[\(]?PROV/i', $this->ref))
             {
                 // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
-                // afin de ne pas perdre les fichiers attaches
+                // in order not to lose the attachments
                 $comref = dol_sanitizeFileName($this->ref);
                 $snum = dol_sanitizeFileName($num);
                 $dirsource = $conf->commande->dir_output.'/'.$comref;

htdocs/commande/document.php

@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/commande/document.php
  *	\ingroup    order
- *	\brief      Documents setup page attached to an order
+ *	\brief      Management page of documents attached to an order
  */
 
 require '../main.inc.php';

htdocs/commande/fiche.php

@@ -564,18 +564,37 @@ else if ($action == 'setnote_private' && $user->rights->commande->creer)
 	if ($result < 0) dol_print_error($db,$object->error);
 }
 
-/*
+// Add a new line
- *  Ajout d'une ligne produit dans la commande
-*/
 else if ($action == 'addline' && $user->rights->commande->creer)
 {
 	$langs->load('errors');
 	$error = false;
 
-	$idprod=GETPOST('idprod', 'int');
+	// Set if we used free entry or predefined product
-	$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
+	if (GETPOST('addline_libre'))
-	$price_ht = GETPOST('price_ht');
+	{
-	$tva_tx = (GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+		$predef='';
+		$idprod=0;
+		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$price_ht = GETPOST('price_ht');
+		$tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+	}
+	if (GETPOST('addline_predefined'))
+	{
+		$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=GETPOST('idprod', 'int');
+		$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):''));
+		$price_ht = '';
+		$tva_tx = '';
+	}
+    if (GETPOST('usenewaddlineform')) {
+        $idprod=GETPOST('idprod', 'int');
+        $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
+        $price_ht = GETPOST('price_ht');
+        $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+    }
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
 
 	//Extrafields
 	$extrafieldsline = new ExtraFields($db);
@@ -591,7 +610,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 		}
 	}
 
-	if ((empty($idprod) || GETPOST('usenewaddlineform')) && ($price_ht < 0) && (GETPOST('qty') < 0))
+	if ((empty($idprod) || GETPOST('usenewaddlineform')) && ($price_ht < 0) && ($qty < 0))
 	{
 		setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), 'errors');
 		$error = true;
@@ -606,7 +625,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")), 'errors');
 		$error++;
 	}
-	if (! GETPOST('qty') && GETPOST('qty') == '')
+	if ($qty == '')
 	{
 		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
 		$error = true;
@@ -617,10 +636,9 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 		$error = true;
 	}
 
-	if (! $error && (GETPOST('qty') >= 0) && (! empty($product_desc) || ! empty($idprod)))
+	if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
 	{
 		// Clean parameters
-		$predef=((! empty($idprod) && $conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
 		$date_start=dol_mktime(0, 0, 0, GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(0, 0, 0, GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
@@ -737,8 +755,8 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 		}
 
 		// Margin
-		$fournprice=(GETPOST('fournprice')?GETPOST('fournprice'):'');
+		$fournprice=(GETPOST('fournprice'.$predef)?GETPOST('fournprice'.$predef):'');
-		$buyingprice=(GETPOST('buying_price')?GETPOST('buying_price'):'');
+		$buyingprice=(GETPOST('buying_price'.$predef)?GETPOST('buying_price'.$predef):'');
 
 		// Local Taxes
 		$localtax1_tx= get_localtax($tva_tx, 1, $object->client);
@@ -749,7 +767,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 		$info_bits=0;
 		if ($tva_npr) $info_bits |= 0x01;
 
-		if (! empty($price_min) && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
+		if (! empty($price_min) && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
 		{
 			$mesg = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
 			setEventMessage($mesg, 'errors');
@@ -760,12 +778,12 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 			$result = $object->addline(
 				$desc,
 				$pu_ht,
-				GETPOST('qty'),
+				$qty,
 				$tva_tx,
 				$localtax1_tx,
 				$localtax2_tx,
 				$idprod,
-				GETPOST('remise_percent'),
+				$remise_percent,
 				$info_bits,
 				0,
 				$price_base_type,
@@ -803,7 +821,6 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 
 				unset($_POST['qty']);
 				unset($_POST['type']);
-				unset($_POST['idprod']);
 				unset($_POST['remise_percent']);
 				unset($_POST['price_ht']);
 				unset($_POST['price_ttc']);
@@ -815,10 +832,16 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 				unset($_POST['buying_price']);
 				unset($_POST['np_marginRate']);
 				unset($_POST['np_markRate']);
-
-				// old method
-				unset($_POST['np_desc']);
 				unset($_POST['dp_desc']);
+
+				unset($_POST['idprod']);
+				unset($_POST['qty_predef']);
+				unset($_POST['remise_percent_predef']);
+				unset($_POST['fournprice_predef']);
+				unset($_POST['buying_price_predef']);
+				unset($_POST['np_marginRate_predef']);
+				unset($_POST['np_markRate_predef']);
+				unset($_POST['np_desc']);
 			}
 			else
 			{
@@ -1449,7 +1472,7 @@ if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->righ
 
 /*
  *	View
-*/
+ */
 
 llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
 
@@ -1460,9 +1483,9 @@ $formorder = new FormOrder($db);
 
 /*********************************************************************
  *
-* Mode creation
+ * Mode creation
-*
+ *
-*********************************************************************/
+ *********************************************************************/
 if ($action == 'create' && $user->rights->commande->creer)
 {
 	print_fiche_titre($langs->trans('CreateOrder'));
@@ -2311,25 +2334,34 @@ else
 
 		/*
 		 * Lines
-		*/
+		 */
 		$result = $object->getLinesArray();
 
-		$numlines = count($object->lines);
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+		<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+		<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateligne').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="'.$object->id.'">
+		';
+
 
 		if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
 		{
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
-		print '<table id="tablelines" class="noborder" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 		// Show object lines
 		if (! empty($object->lines))
 			$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1);
 
+		$numlines = count($object->lines);
+
 		/*
 		 * Form to add new line
-		*/
+		 */
 		if ($object->statut == 0 && $user->rights->commande->creer)
 		{
 			if ($action != 'editline')
@@ -2359,7 +2391,10 @@ else
 			}
 		}
 		print '</table>';
-		print '</div>';
+
+		print "</form>\n";
+
+		dol_fiche_end();
 
 
 		/*

htdocs/compta/charges/index.php

@@ -65,28 +65,26 @@ llxHeader('',$langs->trans("TaxAndDividendsArea"));
 $title=$langs->trans("TaxAndDividendsArea");
 if ($_GET["mode"] == 'sconly') $title=$langs->trans("SocialContributionsPayments");
 
-print_fiche_titre($title,($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
+$param='';
+if (GETPOST("mode") == 'sconly') $param='&mode=sconly';
+if ($sortfield) $param.='&sortfield='.$sortfield;
+if ($sortorder) $param.='&sortorder='.$sortorder;
 
-if ($_GET["mode"] != 'sconly')
+print_fiche_titre($title, ($year?"<a href='index.php?year=".($year-1).$param."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1).$param."'>".img_next()."</a>":""));
+
+if ($year) $param.='&year='.$year;
+
+// Social contributions only
+if (GETPOST("mode") != 'sconly')
 {
 	print $langs->trans("DescTaxAndDividendsArea").'<br>';
 	print "<br>";
-}
 
-
+	print_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
-// Social contributions
-if ($_GET["mode"] != 'sconly')
-{
-	print_titre($langs->trans("SocialContributionsPayments"));
-}
-
-if ($_GET["mode"] == 'sconly')
-{
-	$param='&mode=sconly';
 }
 
 print '<table class="noborder" width="100%">';
-print "<tr class=\"liste_titre\">";
+print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'width="120"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.libelle","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"cs.fk_type","",$param,'',$sortfield,$sortorder);
@@ -110,10 +108,10 @@ if ($year > 0)
 	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 	$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-	$sql .= "OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+	$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 	$sql .= ")";
 }
-$sql.= $db->order($sortfield,$sortorder);
+if (! preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 //$sql.= $db->plimit($limit+1,$offset);
 //print $sql;
 
@@ -184,18 +182,18 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 
 	$tva = new Tva($db);
 
-	print_titre($langs->trans("VATPayments"));
+	print_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
 
-	$sql = "SELECT f.rowid, f.amount, f.label, f.datev as dm";
+	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm";
-	$sql.= " FROM ".MAIN_DB_PREFIX."tva as f ";
+	$sql.= " FROM ".MAIN_DB_PREFIX."tva as pv";
-	$sql.= " WHERE f.entity = ".$conf->entity;
+	$sql.= " WHERE pv.entity = ".$conf->entity;
 	if ($year > 0)
 	{
 		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-		$sql.= " AND f.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+		$sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 	}
-	$sql.= " ORDER BY dm DESC";
+	if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 
 	$result = $db->query($sql);
 	if ($result)
@@ -205,12 +203,12 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 	    $total = 0 ;
 	    print '<table class="noborder" width="100%">';
 	    print '<tr class="liste_titre">';
-	    print '<td width="120" class="nowrap">'.$langs->trans("PeriodEndDate").'</td>';
+		print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="120"',$sortfield,$sortorder);
-	    print "<td>".$langs->trans("Label")."</td>";
+		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder);
-	    print '<td align="right" width="10%">'.$langs->trans("ExpectedToPay")."</td>";
+		print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
-	    print '<td align="right" width="10%">'.$langs->trans("RefPayment")."</td>";
+		print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder);
-	    print '<td align="center" width="15%">'.$langs->trans("DatePayment")."</td>";
+		print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'align="center"',$sortfield,$sortorder);
-	    print '<td align="right" width="10%">'.$langs->trans("PayedByThisPayment")."</td>";
+		print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
 	    print "</tr>\n";
 	    $var=1;
 	    while ($i < $num)
@@ -227,12 +225,13 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 
 	        print '<td align="right">'.price($obj->amount)."</td>";
 
+	        // Ref payment
 			$tva_static->id=$obj->rowid;
 			$tva_static->ref=$obj->rowid;
-	        print '<td align="right">'.$tva_static->getNomUrl(1)."</td>\n";
+	        print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n";
 
 	        print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
-	        print "<td align=\"right\">".price($obj->amount)."</td>";
+	        print '<td align="right">'.price($obj->amount)."</td>";
 	        print "</tr>\n";
 
 	        $i++;

htdocs/compta/prelevement/bons.php

@@ -79,7 +79,7 @@ if ($result)
   print '<table class="liste" width="100%">';
 
   print '<tr class="liste_titre">';
-  print_liste_field_titre($langs->trans("WithdrawalReceipt"),"bons.php","p.ref",'','','class="liste_titre"');
+  print_liste_field_titre($langs->trans("WithdrawalReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"');
   print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
   print '</tr>';

htdocs/compta/prelevement/factures.php

@@ -47,7 +47,7 @@ $page = GETPOST('page','int');
 $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
 $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha');
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -56,7 +56,7 @@ if ($prev_id)
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment');
+      	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche-rejet.php

@@ -46,7 +46,7 @@ $page = GETPOST('page','int');
 /*
  * View
  */
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -55,7 +55,7 @@ if ($prev_id)
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipt"), '', 'payment');
+      	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche-stat.php

@@ -44,7 +44,7 @@ $page = GETPOST('page','int');
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -53,7 +53,7 @@ if ($prev_id)
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipt"), '', 'payment');
+		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche.php

@@ -133,7 +133,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 $bon = new BonPrelevement($db,"");
 $form = new Form($db);
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 
 if ($id > 0)
@@ -141,7 +141,7 @@ if ($id > 0)
 	$bon->fetch($id);
 
 	$head = prelevement_prepare_head($bon);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment');
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 	if (GETPOST('error','alpha')!='')
 	{

htdocs/compta/prelevement/ligne.php

@@ -130,7 +130,7 @@ if ($id)
 
 		print '<table class="border" width="100%">';
 
-		print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipt").'</td><td>';
+		print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipts").'</td><td>';
 		print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';

htdocs/compta/prelevement/lignes.php

@@ -54,7 +54,7 @@ $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortf
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -63,7 +63,7 @@ if ($prev_id)
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipt"), '', 'payment');
+		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/liste.php

@@ -111,7 +111,7 @@ if ($result)
 
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
-    print_liste_field_titre($langs->trans("WithdrawalReceipt"),$_SERVER["PHP_SELF"],"p.ref");
+    print_liste_field_titre($langs->trans("WithdrawalReceipts"),$_SERVER["PHP_SELF"],"p.ref");
     print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
     print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');

htdocs/contrat/class/contrat.class.php

@@ -999,6 +999,9 @@ class Contrat extends CommonObject
 				$pu=$pu_ttc;
 			}
 
+			// Check parameters
+			if (empty($remise_percent)) $remise_percent=0;
+
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker

htdocs/contrat/fiche.php

@@ -158,9 +158,9 @@ if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
     $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 }
 
+// Add contract
 if ($action == 'add' && $user->rights->contrat->creer)
 {
-
 	// Check
 	if (empty($datecontrat))
 	{
@@ -339,9 +339,36 @@ else if ($action == 'classin' && $user->rights->contrat->creer)
     $object->setProject(GETPOST('projectid'));
 }
 
+// Add a new line
 else if ($action == 'addline' && $user->rights->contrat->creer)
 {
-    if (! GETPOST('qty'))
+	// Set if we used free entry or predefined product
+	if (GETPOST('addline_libre'))
+	{
+		$predef='';
+		$idprod=0;
+		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$price_ht = GETPOST('price_ht');
+		$tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+	}
+	if (GETPOST('addline_predefined'))
+	{
+		$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=GETPOST('idprod', 'int');
+		$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):''));
+		$price_ht = '';
+		$tva_tx = '';
+	}
+    if (GETPOST('usenewaddlineform')) {
+        $idprod=GETPOST('idprod', 'int');
+        $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
+        $price_ht = GETPOST('price_ht');
+        $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+    }
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+    if ($qty == '')
     {
     	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")),'errors');
     	$error++;
@@ -362,41 +389,19 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
         }
         $ret=$object->fetch_thirdparty();
 
-        $date_start='';
+		// Clean parameters
-        $date_end='';
+		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-        // Si ajout champ produit libre
+		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-        if (GETPOST('mode') == 'libre')
+		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-        {
-            if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
-            {
-                $date_start=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
-            }
-            if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
-            {
-                $date_end=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
-            }
-        }
-        // Si ajout champ produit predefini
-        if (GETPOST('mode') == 'predefined')
-        {
-            if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
-            {
-                $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-            }
-            if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
-            {
-                $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-            }
-        }
 
         // Ecrase $pu par celui du produit
         // Ecrase $desc par celui du produit
         // Ecrase $txtva par celui du produit
         // Ecrase $base_price_type par celui du produit
-        if (GETPOST('idprod'))
+        if ($idprod > 0)
         {
             $prod = new Product($db);
-            $prod->fetch(GETPOST('idprod'));
+            $prod->fetch($idprod);
 
             $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
             $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
@@ -426,22 +431,21 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
                     $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
                 }
                 else
-                {
+              {
                     $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
                 }
             }
 
-           	$desc = $prod->description;
+           	$desc=$prod->description;
-           	$desc.= $prod->description && GETPOST('np_desc') ? "\n" : "";
+           	$desc=dol_concatdesc($desc,$product_desc);
-           	$desc.= GETPOST('np_desc');
         }
         else
-        {
+		{
             $pu_ht=GETPOST('price_ht');
             $price_base_type = 'HT';
             $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
             $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
-            $desc=GETPOST('dp_desc');
+            $desc=$product_desc;
         }
 
         $localtax1_tx=get_localtax($tva_tx,1,$object->societe);
@@ -457,23 +461,23 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
         $info_bits=0;
         if ($tva_npr) $info_bits |= 0x01;
 
-        if($price_min && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
+        if($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
         {
             $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
             $result = -1 ;
         }
         else
-        {
+		{
             // Insert line
             $result = $object->addline(
                 $desc,
                 $pu_ht,
-                GETPOST('qty'),
+                $qty,
                 $tva_tx,
                 $localtax1_tx,
                 $localtax2_tx,
-                GETPOST('idprod'),
+                $idprod,
-                GETPOST('remise_percent'),
+                $remise_percent,
                 $date_start,
                 $date_end,
                 $price_base_type,
@@ -506,7 +510,6 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
 
 			unset($_POST['qty']);
 			unset($_POST['type']);
-			unset($_POST['idprod']);
 			unset($_POST['remise_percent']);
 			unset($_POST['price_ht']);
 			unset($_POST['price_ttc']);
@@ -516,6 +519,16 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
 			unset($_POST['product_desc']);
 			unset($_POST['fournprice']);
 			unset($_POST['buying_price']);
+			unset($_POST['dp_desc']);
+
+			unset($_POST['idprod']);
+			unset($_POST['qty_predef']);
+			unset($_POST['remise_percent_predef']);
+			unset($_POST['fournprice_predef']);
+			unset($_POST['buying_price_predef']);
+			unset($_POST['np_marginRate_predef']);
+			unset($_POST['np_markRate_predef']);
+			unset($_POST['np_desc']);
         }
         else
         {
@@ -1306,6 +1319,7 @@ else
             }
 
             print "</table>";
+
             print "</form>\n";
 
 
@@ -1472,6 +1486,7 @@ else
                  * Desactiver la ligne de contrat
                  */
                 print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action=closeline" method="post">';
+
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
                 print '<table class="noborder" width="100%">';
@@ -1525,13 +1540,22 @@ else
         }
         //print '</table>';
 
+
 		// Form to add new line
         if ($user->rights->contrat->creer && ($object->statut >= 0))
         {
         	$dateSelector=1;
 
-            print '<br>';
+			print "\n";
-            print '<table id="tablelines" class="noborder" width="100%">';	// Array with (n*2)+1 lines
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateligne').'">
+			<input type="hidden" name="mode" value="">
+			<input type="hidden" name="id" value="'.$object->id.'">
+			';
+
+			print '<br>';
+            print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
 
             // Trick to not show product entries
             $savproductenabled=$conf->product->enabled;
@@ -1567,13 +1591,12 @@ else
         	// Restore correct setup
         	$conf->product->enabled = $savproductenabled;
 
-            print '</form>';
-
             print '</table>';
+
+            print '</form>';
         }
 
-
+		dol_fiche_end();
-        print '</div>';
 
 
         /*
@@ -1642,11 +1665,13 @@ llxFooter();
 
 $db->close();
 ?>
+
 <?php
-if ($conf->margin->enabled) {
+if ($conf->margin->enabled && $action == 'editline')
+{
 ?>
+
 <script type="text/javascript">
-<?php if ($action == 'editline') { ?>
 $(document).ready(function() {
   var idprod = $("input[name='idprod']").val();
   var fournprice = $("input[name='fournprice']").val();
@@ -1695,6 +1720,8 @@ $(document).ready(function() {
       $('#buying_price').show();
     }
 });
-<?php } ?>
 </script>
-<?php } ?>
+
+<?php
+}
+?>

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

@@ -1051,7 +1051,7 @@ class FormFile
         global $bc;
         global $sortfield, $sortorder;
 
-        require_once DOL_DOCUMENT_ROOT . '/link/class/link.class.php';
+        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
         $link = new Link($this->db);
         $links = array();
         if ($sortfield == "name") {

htdocs/core/class/link.class.php

@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/link/class/link.class.php
+ *	\file       htdocs/core/class/link.class.php
  *	\ingroup    link
  *	\brief      File for link class
  */
@@ -39,6 +39,7 @@ class Link extends CommonObject
     public $objecttype;
     public $objectid;
 
+
     /**
      *    Constructor
      *
@@ -184,8 +185,7 @@ class Link extends CommonObject
         $sql .= ", objectid = " . $this->objectid;
         $sql .= " WHERE rowid = '" . $this->id ."'";
 
-
+        dol_syslog(get_class($this)."::update sql = " .$sql);
-        dol_syslog(get_class($this)."::Update sql = " .$sql);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -245,22 +245,27 @@ class Link extends CommonObject
     public function fetchAll(&$links, $objecttype, $objectid, $sortfield=null, $sortorder=null)
     {
         global $conf;
+
         $sql = "SELECT rowid, entity, datea, url, label , objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
         $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid;
-        if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
         if ($sortfield) {
             if (empty($sortorder)) {
                 $sortorder = "ASC";
             }
             $sql .= " ORDER BY " . $sortfield . " " . $sortorder;
         }
+
+        dol_syslog(get_class($this)."::fetchAll sql=".$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
-        dol_syslog(get_class($this)."::fetchAll " . $sql, LOG_DEBUG);
+        if ($resql)
-        if ($resql) {
+        {
             $num = $this->db->num_rows($resql);
             dol_syslog(get_class($this)."::fetchAll " . $num . "records", LOG_DEBUG);
-            if ($num > 0) {
+            if ($num > 0)
-                while ($obj = $this->db->fetch_object($resql)) {
+            {
+                while ($obj = $this->db->fetch_object($resql))
+                {
                     $link = new Link($db);
                     $link->id = $obj->rowid;
                     $link->entity = $obj->entity;
@@ -281,25 +286,31 @@ class Link extends CommonObject
         }
     }
 
-    /*
+    /**
      *  Loads a link from database
-     *  @param rowid id of link to load
-     *  @return int 1 if ok, 0 if no record found, -1 if error
      *
-     * */
+     *  @param 	int		$rowid 		Id of link to load
+     *  @return int 				1 if ok, 0 if no record found, -1 if error
+     *
+     **/
     public function fetch($rowid=null)
     {
         global $conf;
+
         if (empty($rowid)) {
             $rowid = $this->id;
         }
+
         $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
         $sql .= " WHERE rowid = " . $rowid;
         if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+
+        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
-        dol_syslog(get_class($this)."::fetch " . $sql, LOG_DEBUG);
+        if ($resql)
-        if ($resql) {
+        {
-            if($this->db->num_rows($resql) > 0) {
+            if($this->db->num_rows($resql) > 0)
+            {
                 $obj = $this->db->fetch_object($resql);
                 $this->entity = $obj->entity;
                 $this->datea = $this->db->jdate($obj->datea);
@@ -308,14 +319,14 @@ class Link extends CommonObject
                 $this->objecttype = $obj->objecttype;
                 $this->objectid = $obj->objectid;
                 return 1;
-            } else {
+            }
-                $this->error = 'Fetch no link found for id = ' . $rowid;
+            else
-                dol_syslog($this->error, LOG_ERR);
+			{
                 return 0;
             }
         } else {
-            dol_syslog($this->db->error(), LOG_ERR);
+            $this->error=$this->db->lasterror();
-            $this->error=$this->db->error();
+            dol_syslog($this->error, LOG_ERR);
             return -1;
         }
     }
@@ -335,11 +346,12 @@ class Link extends CommonObject
         $this->db->begin();
 
         // Remove link
-
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "links";
         $sql.= " WHERE rowid = " . $this->id;
+
         dol_syslog(get_class($this)."::delete sql=" . $sql, LOG_DEBUG);
-        if (! $this->db->query($sql)) {
+        if (! $this->db->query($sql))
+        {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::delete error -4 " . $this->error, LOG_ERR);

htdocs/core/js/lib_head.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+// Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 // Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -290,8 +290,10 @@ function loadXMLDoc(url,readyStateFunction,async)
 	return req;
 }
 
-// To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
+/* To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
-// not put popup completely on the front)
+ * not put popup completely on the front)
+ * Used only bu popup calendar
+ */
 function hideSelectBoxes() {
 	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
 	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1) 
@@ -304,6 +306,10 @@ function hideSelectBoxes() {
 		}
 	}
 }
+/* To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
+ * not put popup completely on the front)
+ * Used only bu popup calendar
+ */
 function displaySelectBoxes() {
 	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
 	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1) 
@@ -354,9 +360,7 @@ function formatDate(date,format)
 		c=format.charAt(i);	// Recupere char du format
 		substr="";
 		j=i;
-		while ((format.charAt(j)==c) && (j < format.length))	// Recupere char
+		while ((format.charAt(j)==c) && (j < format.length))	// Recupere char successif identiques
-																// successif
-																// identiques
 		{
 			substr += format.charAt(j++);
 		}
@@ -623,8 +627,9 @@ function hideMessage(fieldId,message) {
 	if (textbox.value == message) textbox.value = '';
 }
 
+
 /*
- * 
+ * TODO Used by admin page only ? 
  */
 function setConstant(url, code, input, entity) {
 	$.get( url, {
@@ -679,7 +684,7 @@ function setConstant(url, code, input, entity) {
 }
 
 /*
- * 
+ * TODO Used by admin page only ? 
  */
 function delConstant(url, code, input, entity) {
 	$.get( url, {
@@ -733,7 +738,7 @@ function delConstant(url, code, input, entity) {
 }
 
 /*
- * 
+ * TODO Used by admin page only ? 
  */
 function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton) {
 	var boxConfirm = box;
@@ -784,7 +789,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 /* 
  * ================================================================= 
  * This is to allow to transform all select box into ajax autocomplete box
- * with just one line: $(function() { $( "#idofmylist" ).combobox(); });
+ * with just one line: 
+ * $(function() { $( "#idofmylist" ).combobox(); });
+ * Do not use it on large combo boxes 
  * ================================================================= 
  */
 (function( $ ) {
@@ -894,6 +901,8 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 
 /* 
  * Timer for delayed keyup function
+ * 
+ * TODO Who use this ?
  */
 (function($){
 	$.widget("ui.onDelayedKeyup", {

htdocs/core/lib/ajax.lib.php

@@ -33,7 +33,7 @@
  *  @param	string	$urloption			More parameters on URL request
  *  @param	int		$minLength			Minimum number of chars to trigger that Ajax search
  *  @param	int		$autoselect			Automatic selection if just one value
- *  @param	array	$ajaxoptions		Multiple options array
+ *  @param	array	$ajaxoptions		Multiple options array (Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *	@return string              		Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())

htdocs/core/lib/files.lib.php

@@ -1058,7 +1058,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 		}
 	} elseif ($link) {
 		if (dol_mkdir($upload_dir) >= 0) {
-			require_once DOL_DOCUMENT_ROOT . '/link/class/link.class.php';
+			require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
 			$linkObject = new Link($db);
 			$linkObject->entity = $conf->entity;
 			$linkObject->url = $link;

htdocs/core/lib/functions.lib.php

@@ -2449,7 +2449,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 }
 
 /**
- *	Show a title (deprecated. use print_fiche_titre instrad)
+ *	Show a title (deprecated. use print_fiche_titre instead)
  *
  *	@param	string	$title			Title to show
  *	@return	string					Title to show
@@ -2462,16 +2462,16 @@ function print_titre($title)
 /**
  *	Show a title with picto
  *
- *	@param	string	$titre				Title to show
+ *	@param	string	$title				Title to show
  *	@param	string	$mesg				Added message to show on right
  *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  * 	@param	int		$id					To force an id on html objects
  * 	@return	void
  */
-function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0, $id='')
+function print_fiche_titre($title, $mesg='', $picto='title.png', $pictoisfullpath=0, $id='')
 {
-	print load_fiche_titre($titre, $mesg, $picto, $pictoisfullpath, $id);
+	print load_fiche_titre($title, $mesg, $picto, $pictoisfullpath, $id);
 }
 
 /**

htdocs/core/modules/DolibarrModules.class.php

@@ -562,7 +562,7 @@ abstract class DolibarrModules
                             if (! $resql) $err++;
 
                         }
-                        if (! $err && ! preg_match('/newboxdefonly/',$options))
+                        if (! $err && ! preg_match('/newboxdefonly/',$option))
                         {
                             $lastid=$this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def","rowid");
 

htdocs/core/tpl/ajaxrow.tpl.php

@@ -21,7 +21,7 @@
  */
 ?>
 
-<!-- BEGIN PHP TEMPLATE FOR JQUERY -->
+<!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP -->
 <?php
 $id=$object->id;
 $fk_element=$object->fk_element;
@@ -84,4 +84,4 @@ $(document).ready(function(){
 });
 </script>
 <?php } ?>
-<!-- END PHP TEMPLATE -->
+<!-- END PHP TEMPLATE AJAXROW.TPL.PHP -->

htdocs/core/tpl/document_actions_pre_headers.tpl.php

@@ -56,7 +56,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         }
         elseif ($linkid)
         {
-            require_once DOL_DOCUMENT_ROOT . '/link/class/link.class.php';
+            require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
             $link = new Link($db);
             $link->id = $linkid;
             $link->fetch();
@@ -74,7 +74,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 }
 elseif ($action == 'confirm_updateline' && GETPOST('save') && GETPOST('link', 'alpha'))
 {
-    require_once DOL_DOCUMENT_ROOT . '/link/class/link.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
     $langs->load('link');
     $link = new Link($db);
     $link->id = GETPOST('linkid', 'int');

htdocs/core/tpl/freeproductline_create.tpl.php

@@ -32,12 +32,6 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
 
 <!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
 
-<form name="addproduct" id="addproduct"	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="libre">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
 <tr class="liste_titre nodrag nodrop">
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 	<div id="add"></div>
@@ -116,7 +110,7 @@ else {
 	</td>
 
 	<td align="right"><?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
+	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0';
 	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
 	?>
 	</td>
@@ -137,7 +131,7 @@ else {
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				echo '<td align="right"><input type="text" size="2" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'">%</td>';
 			}
-			elseif (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
 				echo '<td align="right"><input type="text" size="2" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'">%</td>';
 			}
 		}
@@ -155,7 +149,7 @@ else {
 	}
 	?>
 	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
-		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline_libre">
+		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline_libre" id="addline_libre">
 	</td>
 	<?php
 	//Line extrafield
@@ -196,9 +190,9 @@ if (! empty($conf->service->enabled) && $dateSelector)
 	if (! empty($object->element) && $object->element == 'contrat')
 	{
 		print $langs->trans("DateStartPlanned").' ';
-		$form->select_date('',"date_start_sl",$usehm,$usehm,1,"addline_sl");
+		$form->select_date('',"date_start",$usehm,$usehm,1,"addline_sl");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
-		$form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl");
+		$form->select_date('',"date_end",$usehm,$usehm,1,"addline_sl");
 	}
 	else
 	{
@@ -214,7 +208,6 @@ if (! empty($conf->service->enabled) && $dateSelector)
 }
 ?>
 
-</form>
 
 <?php
 if (! empty($usemargins) && $user->rights->margins->creer)
@@ -223,34 +216,29 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 	<script type="text/javascript">
 
 	jQuery(document).ready(function() {
-		var npRate = null;
 		<?php
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
-			npRate = "np_marginRate";
+			$('#addline_libre').click(function (e) {
-		<?php }
+				return checkFreeLine(e, "np_marginRate");
-		elseif (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
-			npRate = "np_markRate";
-		<?php }
-		?>
-
-		$("form#addproduct").submit(function(e) {
-			if (npRate) return checkFreeLine(e, npRate);
-			else return true;
-		});
-		if (npRate == 'np_marginRate') {
-			$("input[name='np_marginRate']:first").blur(function(e) {
-				return checkFreeLine(e, npRate);
 			});
+			$("input[name='np_marginRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_marginRate");
+			});
+		<?php
 		}
-		else {
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
-			if (npRate == 'np_markRate') {
+			$('#addline_libre').click(function (e) {
-				$("input[name='np_markRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_markRate");
-					return checkFreeLine(e, npRate);
+			});
-				});
+			$("input[name='np_markRate']:first").blur(function(e) {
-			}
+				return checkFreeLine(e, "np_markRate");
+			});
+		<?php
 		}
+		?>
 	});
 
+	// TODO This works for french numbers only
 	function checkFreeLine(e, npRate)
 	{
 		var buying_price = $("input[name='buying_price']:first");
@@ -261,14 +249,14 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 			return true;
 		if (! $.isNumeric(rate.val().replace(',','.')))
 		{
-			alert('<?php echo $langs->trans("rateMustBeNumeric"); ?>');
+			alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
 			e.stopPropagation();
 			setTimeout(function () { rate.focus() }, 50);
 			return false;
 		}
 		if (npRate == "np_markRate" && rate.val() >= 100)
 		{
-			alert('<?php echo $langs->trans("markRateShouldBeLesserThan100"); ?>');
+			alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
 			e.stopPropagation();
 			setTimeout(function () { rate.focus() }, 50);
 			return false;
@@ -284,12 +272,14 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 					np_price = ((buying_price.val().replace(',','.') / (1 - rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
 			}
 		}
-		$("input[name='price_ht']:first").val(formatFloat(np_price));
+		$("input[name='price_ht']:first").val(roundFloat(np_price));
 
 		return true;
 	}
 
-	function roundFloat(num) {
+	// TODO This works for french numbers only
+	function roundFloat(num)
+	{
 		var main_max_dec_shown = <?php echo $conf->global->MAIN_MAX_DECIMALS_SHOWN; ?>;
 		var main_rounding = <?php echo min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT); ?>;
 
@@ -312,10 +302,6 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 		return parseFloat(amount).toFixed(rounding);
 	}
 
-	function formatFloat(num) {
-		return roundFloat(num).replace('.', ',');
-	}
-
 	</script>
 <?php
 }

htdocs/core/tpl/objectline_edit.tpl.php

@@ -28,14 +28,7 @@
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
-<form id="editproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'#'.$line->id; ?>" method="POST">
+
-<input type="hidden" name="token" value="<?php  echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="updateligne">
-<input type="hidden" name="usenewupdatelineform" value="1" />
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
-<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
-<input type="hidden" id="product_id" name="productid" value="<?php echo (! empty($line->fk_product)?$line->fk_product:0); ?>" />
 <?php
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 	$coldisplay=2;
@@ -45,7 +38,11 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
  ?>
 <tr <?php echo $bc[$var]; ?>>
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
-	<div id="<?php echo $line->id; ?>"></div>
+	<div id="line_<?php echo $line->id; ?>"></div>
+
+	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
+	<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
+	<input type="hidden" id="product_id" name="productid" value="<?php echo (! empty($line->fk_product)?$line->fk_product:0); ?>" />
 
 	<?php
 	if ($conf->global->MAIN_FEATURES_LEVEL > 1)
@@ -187,12 +184,15 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 </tr>
 <?php } ?>
 
-</form>
 
 <script type="text/javascript">
-$(document).ready(function() {
 
-<?php if ($conf->global->MAIN_FEATURES_LEVEL > 1) { ?>
+<?php
+if ($conf->global->MAIN_FEATURES_LEVEL > 1)		// TODO A virer
+{
+?>
+	jQuery(document).ready(function() {
+
 
 	if ($('#product_type').val() == 0) {
 		$('#service_duration_area').hide();
@@ -290,7 +290,9 @@ $(document).ready(function() {
 		}
 	});
 
-	function update_price(input, output) {
+	// update_price
+	function update_price(input, output)
+	{
 		$.post('<?php echo DOL_URL_ROOT; ?>/core/ajax/price.php', {
 			'amount': $('#' + input).val(),
 			'output': output,
@@ -368,10 +370,19 @@ $(document).ready(function() {
 	});
 	<?php } ?>
 
-<?php } ?>
+	});
 
-	<?php if (! empty($conf->margin->enabled)) { ?>
+<?php } // End MAIN_LEVEL_FEATURES > 1 ?>
-	$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
+
+
+
+<?php
+if (! empty($conf->margin->enabled))
+{
+?>
+	jQuery(document).ready(function()
+	{
+		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
 		if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;
@@ -405,99 +416,101 @@ $(document).ready(function() {
 			$("#fournprice").hide();
 			$('#buying_price').show();
 		}
-	}, 'json');
+		}, 'json');
-	<?php } ?>
-});
-	var npRate = null;
-<?php
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
-				npRate = "marginRate";
-			<?php }
-			elseif (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
-				npRate = "markRate";
-			<?php }
-?>
 
-$("form#editproduct").submit(function(e) {
+		<?php
-	if (npRate) return checkEditLine(e, npRate);
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-	else return true;
+		{
-});
+		?>
-if (npRate == 'marginRate') {
+			$('#savelinebutton').click(function (e) {
-	$("input[name='marginRate']:first").blur(function(e) {
+				return checkEditLine(e, "marginRate");
-		return checkEditLine(e, npRate);
+			});
-	});
+			$("input[name='np_marginRate']:first").blur(function(e) {
-}
+				return checkEditLine(e, "marginRate");
-else {
+			});
-	if (npRate == 'markRate') {
+		<?php
-		$("input[name='markRate']:first").blur(function(e) {
-			return checkEditLine(e, npRate);
-		});
-	}
-}
-
-function checkEditLine(e, npRate)
-{
-	var buying_price = $("input[name='buying_price']:first");
-	var remise = $("input[name='remise_percent']:first");
-
-	var rate = $("input[name='"+npRate+"']:first");
-	if (rate.val() == '')
-		return true;
-	if (! $.isNumeric(rate.val().replace(',','.')))
-	{
-		alert('<?php echo $langs->trans("rateMustBeNumeric"); ?>');
-		e.stopPropagation();
-		setTimeout(function () { rate.focus() }, 50);
-		return false;
-	}
-	if (npRate == "markRate" && rate.val() >= 100)
-	{
-		alert('<?php echo $langs->trans("markRateShouldBeLesserThan100"); ?>');
-		e.stopPropagation();
-		setTimeout(function () { rate.focus() }, 50);
-		return false;
-	}
-
-	var price = 0;
-	if (remise.val().replace(',','.') != 100)
-	{
-		if (npRate == "marginRate")
-			price = ((buying_price.val().replace(',','.') * (1 + rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
-		else {
-			if (npRate == "markRate")
-				price = ((buying_price.val().replace(',','.') / (1 - rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
 		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES))
+		{
+		?>
+			$('#savelinebutton').click(function (e) {
+				return checkEditLine(e, "markRate");
+			});
+			$("input[name='np_markRate']:first").blur(function(e) {
+				return checkEditLine(e, "markRate");
+			});
+		<?php
+		}
+	?>
+	});
+
+
+	// TODO This works for french numbers only
+	function checkEditLine(e, npRate)
+	{
+		var buying_price = $("input[name='buying_price']:first");
+		var remise = $("input[name='remise_percent']:first");
+
+		var rate = $("input[name='"+npRate+"']:first");
+		if (rate.val() == '')
+			return true;
+		if (! $.isNumeric(rate.val().replace(',','.')))
+		{
+			alert('<?php echo $langs->trans("rateMustBeNumeric"); ?>');
+			e.stopPropagation();
+			setTimeout(function () { rate.focus() }, 50);
+			return false;
+		}
+		if (npRate == "markRate" && rate.val() >= 100)
+		{
+			alert('<?php echo $langs->trans("markRateShouldBeLesserThan100"); ?>');
+			e.stopPropagation();
+			setTimeout(function () { rate.focus() }, 50);
+			return false;
+		}
+
+		var price = 0;
+		if (remise.val().replace(',','.') != 100)
+		{
+			if (npRate == "marginRate")
+				price = ((buying_price.val().replace(',','.') * (1 + rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
+			else {
+				if (npRate == "markRate")
+					price = ((buying_price.val().replace(',','.') / (1 - rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
+			}
+		}
+		$("input[name='price_ht']:first").val(roundFloat(price));
+
+		return true;
 	}
-	$("input[name='price_ht']:first").val(formatFloat(price));
 
-	return true;
+	// TODO This works for french numbers only
-}
+	function roundFloat(num) {
-function roundFloat(num) {
+		var main_max_dec_shown = <?php echo $conf->global->MAIN_MAX_DECIMALS_SHOWN; ?>;
-	var main_max_dec_shown = <?php echo $conf->global->MAIN_MAX_DECIMALS_SHOWN; ?>;
+		var main_rounding = <?php echo min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT); ?>;
-	var main_rounding = <?php echo min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT); ?>;
 
-    var amount = num.toString().replace(',','.');	// should be useless
+	    var amount = num.toString().replace(',','.');	// should be useless
-	var nbdec = 0;
+		var nbdec = 0;
-	var rounding = main_rounding;
+		var rounding = main_rounding;
-	var pos = amount.indexOf('.');
+		var pos = amount.indexOf('.');
-	var decpart = '';
+		var decpart = '';
-	if (pos >= 0)
+		if (pos >= 0)
-	    decpart = amount.substr(pos+1).replace('/0+$/i','');	// Supprime les 0 de fin de partie decimale
+		    decpart = amount.substr(pos+1).replace('/0+$/i','');	// Supprime les 0 de fin de partie decimale
-	nbdec = decpart.length;
+		nbdec = decpart.length;
-	if (nbdec > rounding)
+		if (nbdec > rounding)
-	    rounding = nbdec;
+		    rounding = nbdec;
-    // Si on depasse max
+	    // Si on depasse max
-    if (rounding > main_max_dec_shown)
+	    if (rounding > main_max_dec_shown)
-    {
+	    {
-        rounding = main_max_dec_shown;
+	        rounding = main_max_dec_shown;
-    }
+	    }
-  	//amount = parseFloat(amount) + (1 / Math.pow(100, rounding));  // to avoid floating-point errors
+	  	//amount = parseFloat(amount) + (1 / Math.pow(100, rounding));  // to avoid floating-point errors
-	return parseFloat(amount).toFixed(rounding);
+		return parseFloat(amount).toFixed(rounding);
-}
+	}
 
-function formatFloat(num) {
+<?php
-	return roundFloat(num).replace('.', ',');
 }
+?>
 
 </script>
 <!-- END PHP TEMPLATE objectline_edit.tpl.php -->

htdocs/core/tpl/predefinedproductline_create.tpl.php

@@ -32,12 +32,6 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
 
 <!-- BEGIN PHP TEMPLATE predefinedproductline_create.tpl.php -->
 
-<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="predefined">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
 <tr class="liste_titre nodrag nodrop">
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
 	<?php
@@ -128,25 +122,25 @@ else {
 	?>
 	</td>
 
-	<td align="right"><input type="hidden" name="price_ht"><input type="text" size="2" name="qty" class="flat" value="1"></td>
+	<td align="right"><input type="hidden" name="price_ht_predef"><input type="text" size="2" name="qty_predef" class="flat" value="1"></td>
-	<td align="right" class="nowrap"><input type="text" size="1" class="flat" name="remise_percent" value="<?php echo $buyer->remise_percent; ?>"><span class="hideonsmartphone">%</span></td>
+	<td align="right" class="nowrap"><input type="text" size="1" class="flat" name="remise_percent_predef" value="<?php echo $buyer->remise_percent; ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
 	$colspan = 4;
 	if (! empty($usemargins))
 	{
 		?>
 		<td align="right">
-			<select id="fournprice" name="fournprice" class="flat" style="display: none;"></select>
+			<select id="fournprice_predef" name="fournprice_predef" class="flat" style="display: none;"></select>
-			<input type="text" size="5" id="buying_price" name="buying_price" class="flat" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+			<input type="text" size="5" id="buying_price_predef" name="buying_price_predef" class="flat" value="<?php echo (isset($_POST["buying_price_predef"])?$_POST["buying_price_predef"]:''); ?>">
 		</td>
 		<?php
 		if ($user->rights->margins->creer)
 		{
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				echo '<td align="right"><input type="text" size="2" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'">%</td>';
+				echo '<td align="right"><input type="text" size="2" name="np_marginRate_predef" value="'.(isset($_POST["np_marginRate_predef"])?$_POST["np_marginRate_predef"]:'').'">%</td>';
 			}
-			elseif (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-				echo '<td align="right"><input type="text" size="2" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'">%</td>';
+				echo '<td align="right"><input type="text" size="2" name="np_markRate_predef" value="'.(isset($_POST["np_markRate_predef"])?$_POST["np_markRate_predef"]:'').'">%</td>';
 			}
 		}
 		else
@@ -163,7 +157,7 @@ else {
 	}
 	?>
 	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
-		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline_predefined">
+		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline_predefined" id="addline_predefined">
 	</td>
 	<?php
 	//Line extrafield
@@ -203,9 +197,9 @@ if (! empty($conf->service->enabled) && $dateSelector)
 	if (! empty($object->element) && $object->element == 'contrat')
 	{
 		print $langs->trans("DateStartPlanned").' ';
-		$form->select_date('',"date_start",$usehm,$usehm,1,"addline");
+		$form->select_date('',"date_start_predef",$usehm,$usehm,1,"addline");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
-		$form->select_date('',"date_end",$usehm,$usehm,1,"addline");
+		$form->select_date('',"date_end_predef",$usehm,$usehm,1,"addline");
 	}
 	else
 	{
@@ -221,7 +215,6 @@ if (! empty($conf->service->enabled) && $dateSelector)
 }
 ?>
 
-</form>
 
 <?php
 if (! empty($usemargins) && $user->rights->margins->creer)
@@ -230,52 +223,48 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 	<script type="text/javascript">
 
 	jQuery(document).ready(function() {
-		var npRate = null;
 		<?php
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
-			npRate = "np_marginRate";
+			$('#addline_predefined').click(function (e) {
-		<?php }
+				return checkLine(e, "np_marginRate_predef");
-		elseif (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
-			npRate = "np_markRate";
-		<?php }
-		?>
-
-		$("form#addpredefinedproduct").submit(function(e) {
-			if (npRate) return checkLine(e, npRate);
-			else return true;
-		});
-		if (npRate == 'np_marginRate') {
-			$("input[name='np_marginRate']:last").blur(function(e) {
-				return checkLine(e, npRate);
 			});
+			$("input[name='np_marginRate_predef']:last").blur(function(e) {
+				return checkLine(e, "np_marginRate_predef");
+			});
+		<?php
 		}
-		else {
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			if (npRate == 'np_markRate') {
+		?>
-				$("input[name='np_markRate']:last").blur(function(e) {
+			$('#addline_predefined').click(function (e) {
-					return checkLine(e, npRate);
+				return checkLine(e, "np_markRate_predef");
-				});
+			});
-			}
+			$("input[name='np_marginRate_predef']:last").blur(function(e) {
+				return checkLine(e, "np_markRate_predef");
+			});
+		<?php
 		}
+		?>
 	});
 
+	// TODO This works for french numbers only
 	function checkLine(e, npRate)
 	{
-		var buying_price = $("input[name='buying_price']:last");
+		var buying_price = $("input[name='buying_price_predef']:last");
-		var remise = $("input[name='remise_percent']:last");
+		var remise = $("input[name='remise_percent_predef']:last");
 
 		var rate = $("input[name='"+npRate+"']:last");
 		if (rate.val() == '')
 			return true;
 		if (! $.isNumeric(rate.val().replace(',','.')))
 		{
-			alert('<?php echo $langs->trans("rateMustBeNumeric"); ?>');
+			alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
 			e.stopPropagation();
 			setTimeout(function () { rate.focus() }, 50);
 			return false;
 		}
-		if (npRate == "np_markRate" && rate.val() >= 100)
+		if (npRate == "np_markRate_predef" && rate.val() >= 100)
 		{
-			alert('<?php echo $langs->trans("markRateShouldBeLesserThan100"); ?>');
+			alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
 			e.stopPropagation();
 			setTimeout(function () { rate.focus() }, 50);
 			return false;
@@ -284,18 +273,19 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 		var np_price = 0;
 		if (remise.val().replace(',','.') != 100)
 		{
-			if (npRate == "np_marginRate")
+			if (npRate == "np_marginRate_predef")
 				np_price = ((buying_price.val().replace(',','.') * (1 + rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
 			else {
-				if (npRate == "np_markRate")
+				if (npRate == "np_markRate_predef")
 					np_price = ((buying_price.val().replace(',','.') / (1 - rate.val().replace(',','.') / 100)) / (1 - remise.val().replace(',','.') / 100));
 			}
 		}
-		$("input[name='price_ht']:last").val(formatFloat(np_price));
+		$("input[name='price_ht_predef']:last").val(roundFloat(np_price));
 
 		return true;
 	}
 
+	// TODO This works for french numbers only
 	function roundFloat(num) {
 		var main_max_dec_shown = <?php echo $conf->global->MAIN_MAX_DECIMALS_SHOWN; ?>;
 		var main_rounding = <?php echo min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT); ?>;
@@ -319,16 +309,12 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 		return parseFloat(amount).toFixed(rounding);
 	}
 
-	function formatFloat(num) {
-		return roundFloat(num).replace('.', ',');
-	}
-
 	jQuery(document).ready(function() {
 		$("#idprod").change(function()
 		{
-	  		$("#fournprice options").remove();
+	  		$("#fournprice_predef options").remove();
-			$("#fournprice").hide();
+			$("#fournprice_predef").hide();
-			$("#buying_price").val("").show();
+			$("#buying_price_predef").val("").show();
 	  		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', { 'idprod': $(this).val() }, function(data) {
 		    	if (data && data.length > 0)
 		    	{
@@ -339,19 +325,19 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 		        		options += '<option value="'+this.id+'" price="'+this.price+'"';
 		        		if (i == 1) {
 		          			options += ' selected';
-		          			$("#buying_price").val(this.price);
+		          			$("#buying_price_predef").val(this.price);
 		        		}
 		        		options += '>'+this.label+'</option>';
 		      		});
 		      		options += '<option value=""><?php echo $langs->trans("InputPrice"); ?></option>';
-		      		$("#buying_price").hide();
+		      		$("#buying_price_predef").hide();
-		      		$("#fournprice").html(options).show();
+		      		$("#fournprice_predef").html(options).show();
-		      		$("#fournprice").change(function() {
+		      		$("#fournprice_predef").change(function() {
 		        		var selval = $(this).find('option:selected').attr("price");
 		        		if (selval)
-		          			$("#buying_price").val(selval).hide();
+		          			$("#buying_price_predef").val(selval).hide();
 		        		else
-		          			$('#buying_price').show();
+		          			$('#buying_price_predef').show();
 		      		});
 		    	}
 		  	},

htdocs/cron/card.php

@@ -120,7 +120,7 @@ if ($action=='add')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
 
-	//Add cron task
+	// Add cron task
 	$result = $object->create($user);
 
 	// test du Resultat de la requete
@@ -154,7 +154,7 @@ if ($action=='update')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
 
-	//Add cron task
+	// Add cron task
 	$result = $object->update($user);
 
 	// test du Resultat de la requete
@@ -172,7 +172,7 @@ if ($action=='activate')
 {
 	$object->status=1;
 
-	//Add cron task
+	// Add cron task
 	$result = $object->update($user);
 
 	// test du Resultat de la requete
@@ -189,7 +189,8 @@ if ($action=='activate')
 if ($action=='inactive')
 {
 	$object->status=0;
-	//Add cron task
+
+	// Add cron task
 	$result = $object->update($user);
 
 	// test du Resultat de la requete

htdocs/fichinter/fiche.php

@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcontract.class.php';
 
 if (! empty($conf->projet->enabled))
 {

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

@@ -222,7 +222,7 @@ class ProductFournisseur extends Product
 		  		{
 		            // Add price for this quantity to supplier
 		            $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
-		            $sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, entity, info_bits)";
+		            $sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, info_bits, entity)";
 		            $sql.= " values('".$this->db->idate($now)."',";
 		            $sql.= " ".$this->id.",";
 		            $sql.= " ".$fourn->id.",";

htdocs/fourn/commande/document.php

@@ -23,7 +23,7 @@
 /**
  *	\file       htdocs/fourn/commande/document.php
  *	\ingroup    supplier
- *	\brief      Page de gestion des documents attaches a une commande fournisseur
+ *	\brief      Management page of attached documents to a supplier order
  */
 
 require '../../main.inc.php';

htdocs/fourn/commande/fiche.php

@@ -181,160 +181,195 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
     $langs->load('errors');
     $error = 0;
 
-    if (GETPOST('pu') < 0 && GETPOST('qty') < 0)
+	// Set if we used free entry or predefined product
+	if (GETPOST('addline_libre'))
+	{
+		$predef='';
+		$idprod=0;
+		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$price_ht = GETPOST('price_ht');
+		$tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+	}
+	if (GETPOST('addline_predefined'))
+	{
+		$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=GETPOST('idprod', 'int');
+		$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):''));
+		$price_ht = '';
+		$tva_tx = '';
+	}
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+    if (GETPOST('addline_libre') && GETPOST('pu') < 0 && $qty < 0)
     {
         setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
         $error++;
     }
-    if (! GETPOST('idprodfournprice') && GETPOST('type') < 0)
+    if (GETPOST('addline_libre') && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
         $error++;
     }
-    if (! GETPOST('idprodfournprice') && (! GETPOST('pu') || GETPOST('pu')=='')) // Unit price can be 0 but not ''
+    if (! GETPOST('addline_predefined') && (! GETPOST('pu') || GETPOST('pu')=='')) // Unit price can be 0 but not ''
     {
         setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
         $error++;
     }
-    if (! GETPOST('idprodfournprice') && ! GETPOST('np_desc') && ! GETPOST('dp_desc'))
+    if (! GETPOST('addline_predefined')  && ! GETPOST('np_desc') && ! GETPOST('dp_desc'))
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
         $error++;
     }
-    if (! GETPOST('idprodfournprice') && (! GETPOST('qty') || GETPOST('qty') == '')
+    if ((! GETPOST('addline_predefined')  && (! GETPOST('qty') || GETPOST('qty') == ''))
-    || GETPOST('idprodfournprice') && (! GETPOST('pqty') || GETPOST('pqty') == ''))
+    || (GETPOST('addline_predefined') && (! GETPOST('qty_predef') || GETPOST('qty_predef') == '')))
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
         $error++;
     }
 
-    if (! $error && ((GETPOST('qty') || GETPOST('pqty')) && ((GETPOST('pu') && (GETPOST('np_desc') || GETPOST('dp_desc'))) || GETPOST('idprodfournprice'))))
+    // Ecrase $pu par celui	du produit
+    // Ecrase $desc	par	celui du produit
+    // Ecrase $txtva  par celui du produit
+    if (GETPOST('addline_predefined') || GETPOST('idprodfournprice'))	// With combolist idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
     {
-        // Ecrase $pu par celui	du produit
+    	$idprod=0;
-        // Ecrase $desc	par	celui du produit
+    	$productsupplier = new ProductFournisseur($db);
-        // Ecrase $txtva  par celui du produit
-        if (GETPOST('idprodfournprice'))	// >0 or -1
-        {
-            $qty = GETPOST('qty') ? GETPOST('qty') : GETPOST('pqty');
 
-            $productsupplier = new ProductFournisseur($db);
+    	if (GETPOST('idprodfournprice') == '')
-            $idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);    // Just to see if a price exists for the quantity. Not used to found vat
+    	{
+    		$idprod=-1;
+    	}
+    	if (GETPOST('idprodfournprice') > 0)
+    	{
+    		$idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat
+    	}
 
-            if ($idprod > 0)
+    	if ($idprod > 0)
-            {
+    	{
-                $res=$productsupplier->fetch($idprod);
+    		$res=$productsupplier->fetch($idprod);
 
-                // cas special pour lequel on a les meme reference que le fournisseur
+    		$label = $productsupplier->libelle;
-                // $label = '['.$nv_prod->ref.'] - '. $nv_prod->libelle;
-                $label = $productsupplier->libelle;
 
-                $desc = $productsupplier->description;
+    		$desc = $productsupplier->description;
-                $desc.= $productsupplier->description && $_POST['np_desc'] ? "\n" : "";
+    		if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-                $desc.= $_POST['np_desc'];
 
-                $remise_percent = GETPOST('remise_percent') ? GETPOST('remise_percent') : GETPOST('p_remise_percent');
+    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+    		$type = $productsupplier->type;
 
-                $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+    		// Local Taxes
-                $type = $productsupplier->type;
+    		$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    		$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
 
-                // Local Taxes
+    		$result=$object->addline(
-                $localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    			$desc,
-                $localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+    			$productsupplier->fourn_pu,
+    			$qty,
+    			$tva_tx,
+    			$localtax1_tx,
+    			$localtax2_tx,
+    			$productsupplier->id,
+    			GETPOST('idprodfournprice'),
+    			$productsupplier->fourn_ref,
+    			$remise_percent,
+    			'HT',
+    			$type
+    		);
+    	}
+    	if ($idprod == 0)
+    	{
+    		// Product not selected
+    		$error++;
+    		$langs->load("errors");
+    		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")), 'errors');
+    	}
+    	if ($idprod == -1)
+    	{
+    		// Quantity too low
+    		$error++;
+    		$langs->load("errors");
+    		setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
+    	}
+    }
+    else
+	{
+    	$type=$_POST["type"];
+    	$desc=$_POST['dp_desc'];
+    	$tva_tx = price2num($_POST['tva_tx']);
 
-                $result=$object->addline(
+    	// Local Taxes
-                    $desc,
+    	$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-                    $pu, // FIXME $pu is not defined
+    	$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
-                    $qty,
-                    $tva_tx,
-                    $localtax1_tx,
-                    $localtax2_tx,
-                    $productsupplier->id,
-                    GETPOST('idprodfournprice'),
-                    $productsupplier->fourn_ref,
-                    $remise_percent,
-                    'HT',
-                    $type
-                );
-            }
-            if ($idprod == -1)
-            {
-                // Quantity too low
-                setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
-            }
-        }
-        else
-        {
-            $type=$_POST["type"];
-            $desc=$_POST['dp_desc'];
-            $tva_tx = price2num($_POST['tva_tx']);
 
-            // Local Taxes
+    	if (! $product_desc)
-            $localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    	{
-            $localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+    		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
+    	}
+    	else
+    	{
+    		if (!empty($_POST['pu']))
+    		{
+    			$price_base_type = 'HT';
+    			$ht = price2num($_POST['pu']);
+    			$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type);
+    		}
+    		else
+    		{
+    			$ttc = price2num($_POST['amountttc']);
+    			$ht = $ttc / (1 + ($tauxtva / 100));
+    			$price_base_type = 'HT';
+    			$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type);
+    		}
+    	}
+    }
 
-            if (! $_POST['dp_desc'])
+    //print "xx".$tva_tx; exit;
-            {
+    if (! $error && $result > 0)
-            	setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
+    {
-            }
+    	$ret=$object->fetch($object->id);    // Reload to get new records
-            else
-            {
-                if (!empty($_POST['pu']))
-                {
-                    $price_base_type = 'HT';
-                    $ht = price2num($_POST['pu']);
-                    $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, 0, $type);
-                }
-                else
-                {
-                    $ttc = price2num($_POST['amountttc']);
-                    $ht = $ttc / (1 + ($tauxtva / 100));
-                    $price_base_type = 'HT';
-                    $result=$object->addline($desc, $ht, $_POST['qty'], $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $_POST['remise_percent'], $price_base_type, $ttc, $type);
-                }
-            }
-        }
 
-        //print "xx".$tva_tx; exit;
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-        if ($result > 0)
+    	{
-        {
+    		// Define output language
-            $ret=$object->fetch($object->id);    // Reload to get new records
+    		$outputlangs = $langs;
+    		$newlang=GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+    		if (! empty($newlang))
+    		{
+    			$outputlangs = new Translate("",$conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
 
-        	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            {
+    	}
-            	// Define output language
-            	$outputlangs = $langs;
-                $newlang=GETPOST('lang_id','alpha');
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-            	if (! empty($newlang))
-            	{
-            		$outputlangs = new Translate("",$conf);
-            		$outputlangs->setDefaultLang($newlang);
-            	}
 
-                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    	unset($_POST['qty']);
-            }
+    	unset($_POST['type']);
-            unset($_POST['qty']);
+    	unset($_POST['remise_percent']);
-            unset($_POST['type']);
+    	unset($_POST['dp_desc']);
-            unset($_POST['idprodfournprice']);
+    	unset($_POST['pu']);
-            unset($_POST['remmise_percent']);
+    	unset($_POST['tva_tx']);
-            unset($_POST['dp_desc']);
+    	unset($_POST['label']);
-            unset($_POST['np_desc']);
+    	unset($localtax1_tx);
-            unset($_POST['pu']);
+    	unset($localtax2_tx);
-            unset($_POST['tva_tx']);
+
-            unset($localtax1_tx);
+    	unset($_POST['idprodfournprice']);
-            unset($localtax2_tx);
+    	unset($_POST['qty_predef']);
-        }
+    	unset($_POST['remise_percent_predef']);
-        else
+    	unset($_POST['fournprice_predef']);
-        {
+    	unset($_POST['buying_price_predef']);
-            setEventMessage($object->error, 'errors');
+    	unset($_POST['np_desc']);
-        }
+    }
+    else
+	{
+    	setEventMessage($object->error, 'errors');
     }
 }
 
 /*
  *	Mise a jour	d'une ligne	dans la	commande
  */
-else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer &&	$_POST['save'] == $langs->trans('Save'))
+else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer &&	$_POST['save'] == $langs->trans('Save'))
 {
     if ($_POST["elrowid"])
     {
@@ -1381,8 +1416,20 @@ elseif (! empty($object->id))
 
 	/*
 	 * Lines
-	*/
+	 */
-	print '<table class="noborder" width="100%">';
+
+
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+	<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+	<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
+	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="id" value="'.$object->id.'">
+    <input type="hidden" name="facid" value="'.$object->id.'">
+    <input type="hidden" name="socid" value="'.$societe->id.'">
+	';
+
+
+	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 	$num = count($object->lines);
 	$i = 0;	$total = 0;
@@ -1422,8 +1469,8 @@ elseif (! empty($object->id))
 			$type=1;
 		}
 
-		// Ligne en mode visu
+		// Edit line
-		if ($action != 'editline' || $_GET['rowid'] != $line->id)
+		if ($action != 'edit_line' || $_GET['rowid'] != $line->id)
 		{
 			print '<tr '.$bc[$var].'>';
 
@@ -1478,7 +1525,7 @@ elseif (! empty($object->id))
 			print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>';
 			if ($object->statut == 0	&& $user->rights->fournisseur->commande->creer)
 			{
-				print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$line->id.'#'.$line->id.'">';
+				print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;rowid='.$line->id.'#'.$line->id.'">';
 				print img_edit();
 				print '</a></td>';
 
@@ -1495,16 +1542,14 @@ elseif (! empty($object->id))
 		}
 
 		// Ligne en mode update
-		if ($action	== 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
+		if ($action	== 'edit_line' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
 		{
 			print "\n";
-			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;etat=1&amp;ligne_id='.$line->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="updateligne">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
 			print '<tr '.$bc[$var].'>';
 			print '<td>';
+
+			print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
+
 			print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 			if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $line->fk_product > 0)
 			{
@@ -1546,7 +1591,6 @@ elseif (! empty($object->id))
 			print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
 			print '</tr>' .	"\n";
-			print "</form>\n";
 		}
 		$i++;
 	}
@@ -1554,7 +1598,7 @@ elseif (! empty($object->id))
 	/*
 	 * Form to add new line
 	 */
-	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
+	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'edit_line')
 	{
 
 		print '<tr class="liste_titre">';
@@ -1571,19 +1615,6 @@ elseif (! empty($object->id))
 		// TODO Use the predefinedproductline_create.tpl.php file
 
 		// Add free products/services form
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#add" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden"	name="action" value="addline">';
-		print '<input type="hidden"	name="id" value="'.$object->id.'">';
-
-		print '<script type="text/javascript">
-            	jQuery(document).ready(function() {
-            		jQuery(\'#idprodfournprice\').change(function() {
-            			if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
-            		});
-            	});
-            </script>';
-
 		$var=true;
 		print '<tr '.$bc[$var].'>';
 		print '<td>';
@@ -1611,14 +1642,20 @@ elseif (! empty($object->id))
 		print '<td align="right"><input type="text" name="pu" size="5" value="'.GETPOST('pu').'"></td>';
 		print '<td align="right"><input type="text" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>';
 		print '<td align="right" class="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_percent).'"><span class="hideonsmartphone">%</span></td>';
-		print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td>';
+		print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline_libre"></td>';
 		print '</tr>';
 
-		print '</form>';
-
 		// Ajout de produits/services predefinis
 		if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 		{
+			print '<script type="text/javascript">
+            	jQuery(document).ready(function() {
+            		jQuery(\'#idprodfournprice\').change(function() {
+            			if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+            		});
+            	});
+            </script>';
+
 			print '<tr class="liste_titre">';
 			print '<td colspan="3">';
 			print $langs->trans("AddNewLine").' - ';
@@ -1636,21 +1673,16 @@ elseif (! empty($object->id))
 			print '<td colspan="4">&nbsp;</td>';
 			print '</tr>';
 
-			print '<form id="addpredefinedproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#add" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="addline">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-
 			$var=!$var;
 			print '<tr '.$bc[$var].'>';
 			print '<td colspan="3">';
 
 			$ajaxoptions=array(
-					'update' => array('pqty' => 'qty', 'p_remise_percent' => 'discount'),
+					'update' => array('qty_predef' => 'qty_predef', 'remise_percent_predef' => 'remise_percent_predef'),
 					'option_disabled' => 'addPredefinedProductButton',
 					'error' => $langs->trans("NoPriceDefinedForThisSupplier")
 			);
-			$form->select_produits_fournisseurs($object->fourn_id, '', 'idprodfournprice', '', '', $ajaxoptions);
+			$form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions);
 
 			if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) print '<br>';
 
@@ -1666,16 +1698,17 @@ elseif (! empty($object->id))
 			$doleditor->Create();
 
 			print '</td>';
-			print '<td align="right"><input type="text" size="2" id="pqty" name="pqty" value="'.(GETPOST('pqty')?GETPOST('pqty'):'1').'"></td>';
+			print '<td align="right"><input type="text" size="2" id="qty_predef" name="qty_predef" value="'.(GETPOST('qty_predef')?GETPOST('qty_predef'):'1').'"></td>';
-			print '<td align="right" class="nowrap"><input type="text" size="1" id="p_remise_percent" name="p_remise_percent" value="'.(GETPOST('p_remise_percent')?GETPOST('p_remise_percent'):$object->thirdparty->remise_percent).'"><span class="hideonsmartphone">%</span></td>';
+			print '<td align="right" class="nowrap"><input type="text" size="1" id="remise_percent_predef" name="remise_percent_predef" value="'.(GETPOST('remise_percent_predef')?GETPOST('remise_percent_predef'):$object->thirdparty->remise_percent).'"><span class="hideonsmartphone">%</span></td>';
-			print '<td align="center" colspan="4"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans('Add').'"></td>';
+			print '<td align="center" colspan="4"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans('Add').'" name="addline_predefined"></td>';
 			print '</tr>';
-
-			print '</form>';
 		}
 	}
 	print '</table>';
-	print '</div>';
+
+	print '</form>';
+
+	dol_fiche_end();
 
 
 	if ($action != 'presend')
@@ -1683,7 +1716,7 @@ elseif (! empty($object->id))
 		/**
 		 * Boutons actions
 		 */
-		if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
+		if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete')
 		{
 			print '<div	 class="tabsAction">';
 

htdocs/fourn/facture/fiche.php

@@ -477,7 +477,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
 }
 
 // Modification d'une ligne
-elseif ($action == 'update_line')
+elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer)
 {
     if (GETPOST('etat') == '1' && ! GETPOST('cancel')) // si on valide la modification
     {
@@ -524,8 +524,32 @@ elseif ($action == 'update_line')
     }
 }
 
-elseif ($action == 'addline')
+elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
 {
+    $langs->load('errors');
+	$error=0;
+
+	// Set if we used free entry or predefined product
+	if (GETPOST('addline_libre'))
+	{
+		$predef='';
+		$idprod=0;
+		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$price_ht = GETPOST('price_ht');
+		$tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+	}
+	if (GETPOST('addline_predefined'))
+	{
+		$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
+		$idprod=GETPOST('idprod', 'int');
+		$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):''));
+		$price_ht = '';
+		$tva_tx = '';
+	}
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+
     $ret=$object->fetch($id);
     if ($ret < 0)
     {
@@ -534,10 +558,10 @@ elseif ($action == 'addline')
     }
     $ret=$object->fetch_thirdparty();
 
-    if (GETPOST('search_idprodfournprice') || GETPOST('idprodfournprice'))	// With combolist idprodfournprice is > 0 or -1, with autocomplete, idprodfournprice is > 0 or ''
+    if (GETPOST('addline_predefined') || GETPOST('search_idprodfournprice') || GETPOST('idprodfournprice'))	// With combolist idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
     {
     	$idprod=0;
-    	$product=new Product($db);
+    	$productsupplier=new ProductFournisseur($db);
 
     	if (GETPOST('idprodfournprice') == '')
 		{
@@ -545,33 +569,39 @@ elseif ($action == 'addline')
 		}
     	if (GETPOST('idprodfournprice') > 0)
         {
-    	    $idprod=$product->get_buyprice(GETPOST('idprodfournprice'), $_POST['qty']);    // Just to see if a price exists for the quantity. Not used to found vat
+    	    $idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat
         }
 
         if ($idprod > 0)
         {
-            $result=$product->fetch($idprod);
+            $result=$productsupplier->fetch($idprod);
 
-            // cas special pour lequel on a les meme reference que le fournisseur
+            $label = $productsupplier->libelle;
-            // $label = '['.$product->ref.'] - '. $product->libelle;
-            $label = $product->description;
-            $label.= $product->description && $_POST['np_desc'] ? "\n" : "";
-            $label.= $_POST['np_desc'];
 
-            $tvatx=get_default_tva($object->thirdparty, $mysoc, $product->id, $_POST['idprodfournprice']);
+            $desc = $productsupplier->description;
-            $npr = get_default_npr($object->thirdparty, $mysoc, $product->id, $_POST['idprodfournprice']);
+            if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
+
+            $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+            $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
 
             $localtax1tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty);
             $localtax2tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty);
-            $remise_percent=GETPOST('remise_percent');
-            $type = $product->type;
 
-            $result=$object->addline($label, $product->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $_POST['qty'], $idprod, $remise_percent, '', '', 0, $npr);
+            $type = $productsupplier->type;
 
+            $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $qty, $idprod, $remise_percent, '', '', 0, $npr);
+        }
+        if ($idprod == 0)
+        {
+            // Product not selected
+            $error++;
+            $langs->load("errors");
+            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")).'</div>';
         }
         if ($idprod == -1)
         {
             // Quantity too low
+            $error++;
             $langs->load("errors");
             $mesg='<div class="error">'.$langs->trans("ErrorQtyTooLowForThisSupplier").'</div>';
         }
@@ -583,35 +613,37 @@ elseif ($action == 'addline')
         $tauxtva = price2num($tauxtva);
         $localtax1tx= get_localtax($tauxtva, 1, $mysoc,$object->thirdparty);
         $localtax2tx= get_localtax($tauxtva, 2, $mysoc,$object->thirdparty);
-        $remise_percent=GETPOST('remise_percent');
 
-        if (! $_POST['dp_desc'])
+        if (! $product_desc)
         {
+        	$error++;
             $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")).'</div>';
         }
         else
-        {
+       {
             $type = $_POST["type"];
-            if (! empty($_POST['amount']))
+
+	        if (! empty($_POST['amount']))
             {
                 $ht = price2num($_POST['amount']);
                 $price_base_type = 'HT';
 
-                //$desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0)
+                //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
-                $result=$object->addline($_POST['dp_desc'], $ht, $tauxtva, $localtax1tx, $localtax2tx, $_POST['qty'], 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+                $result=$object->addline($product_desc, $ht, $tauxtva, $localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
             }
             else
             {
                 $ttc = price2num($_POST['amountttc']);
                 $ht = $ttc / (1 + ($tauxtva / 100));
                 $price_base_type = 'HT';
-                $result=$object->addline($_POST['dp_desc'], $ht, $tauxtva,$localtax1tx, $localtax2tx, $_POST['qty'], 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+                //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
+                $result=$object->addline($product_desc, $ht, $tauxtva,$localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
             }
         }
     }
 
     //print "xx".$tva_tx; exit;
-    if ($result > 0)
+    if (! $error && $result > 0)
     {
     	// Define output language
     	$outputlangs = $langs;
@@ -622,7 +654,8 @@ elseif ($action == 'addline')
     		$outputlangs = new Translate("",$conf);
     		$outputlangs->setDefaultLang($newlang);
     	}
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+        {
         	$result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         	if ($result	<= 0)
         	{
@@ -633,15 +666,20 @@ elseif ($action == 'addline')
 
         unset($_POST['qty']);
         unset($_POST['type']);
-        unset($_POST['idprodfournprice']);
         unset($_POST['remise_percent']);
         unset($_POST['dp_desc']);
-        unset($_POST['np_desc']);
         unset($_POST['pu']);
         unset($_POST['tva_tx']);
         unset($_POST['label']);
         unset($localtax1_tx);
         unset($localtax2_tx);
+
+        unset($_POST['idprodfournprice']);
+		unset($_POST['qty_predef']);
+		unset($_POST['remise_percent_predef']);
+		unset($_POST['fournprice_predef']);
+		unset($_POST['buying_price_predef']);
+		unset($_POST['np_desc']);
     }
     else if (empty($mesg))
     {
@@ -1103,6 +1141,7 @@ if ($action == 'create')
     print '<input type="hidden" name="action" value="add">';
     print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
     print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
+
     print '<table class="border" width="100%">';
 
     // Ref
@@ -1374,6 +1413,7 @@ else
          */
         $head = facturefourn_prepare_head($object);
         $titre=$langs->trans('SupplierInvoice');
+
         dol_fiche_head($head, 'card', $titre, 0, 'bill');
 
         dol_htmloutput_mesg($mesg);
@@ -1542,7 +1582,7 @@ else
        {
         	if ($societe->localtax1_assuj=="1") $nbrows++;
         	if ($societe->localtax2_assuj=="1") $nbrows++;
-       }
+        }
         print '<td rowspan="'.$nbrows.'" valign="top">';
 
         $sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
@@ -1790,8 +1830,21 @@ else
         /*
          * Lines
          */
+
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+		<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+		<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="'.$object->id.'">
+        <input type="hidden" name="facid" value="'.$object->id.'">
+        <input type="hidden" name="socid" value="'.$societe->id.'">
+
+		';
+
+
         print '<br>';
-        print '<table class="noborder" width="100%">';
+        print '<table id="tablelines" class="noborder noshadow" width="100%">';
         $var=1;
         $num=count($object->lines);
         for ($i = 0; $i < $num; $i++)
@@ -1833,13 +1886,13 @@ else
             // Edit line
             if ($object->statut == 0 && $action == 'edit_line' && $_GET['etat'] == '0' && $_GET['lineid'] == $object->lines[$i]->rowid)
             {
-                print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;etat=1&amp;lineid='.$object->lines[$i]->rowid.'" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="update_line">';
                 print '<tr '.$bc[$var].'>';
 
                 // Show product and description
                 print '<td>';
+
+                print '<input type="hidden" name="lineid" value="'.$object->lines[$i]->rowid.'">';
+
                 if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $object->lines[$i]->fk_product)
                 {
                     print '<input type="hidden" name="idprod" value="'.$object->lines[$i]->fk_product.'">';
@@ -1888,11 +1941,10 @@ else
 
                 print '<td align="right" class="nowrap">&nbsp;</td>';
 
-                print '<td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Save').'">';
+                print '<td align="center" colspan="2"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
                 print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
 
                 print '</tr>';
-                print '</form>';
             }
             else // Affichage simple de la ligne
             {
@@ -1972,7 +2024,7 @@ else
 
         /*
          * Form to add new line
-        */
+         */
 
         if ($object->statut == 0 && $action != 'edit_line')
         {
@@ -1992,11 +2044,6 @@ else
             print '</tr>';
 
             // Add free products/services form
-            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addline" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="facid" value="'.$object->id.'">';
-            print '<input type="hidden" name="socid" value="'.$societe->id.'">';
-
             $var=true;
             print '<tr '.$bc[$var].'>';
             print '<td>';
@@ -2022,23 +2069,30 @@ else
             print $form->load_tva('tauxtva',(GETPOST('tauxtva')?GETPOST('tauxtva'):-1),$societe,$mysoc);
             print '</td>';
             print '<td align="right">';
-            print '<input size="4" name="amount" type="text">';
+            print '<input size="4" name="amount" type="text" value="'.GETPOST("amount").'">';
             print '</td>';
             print '<td align="right">';
-            print '<input size="4" name="amountttc" type="text">';
+            print '<input size="4" name="amountttc" type="text" value="'.GETPOST("amountttc").'">';
             print '</td>';
             print '<td align="right">';
-            print '<input size="1" name="qty" type="text" value="1">';
+            print '<input size="1" name="qty" type="text" value="1" value="'.GETPOST("qty").'">';
             print '</td>';
             print '<td align="right" class="nowrap"><input size="1" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>';
             print '<td>&nbsp;</td>';
             print '<td>&nbsp;</td>';
-            print '<td align="center" valign="middle" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td></tr>';
+            print '<td align="center" valign="middle" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline_libre"></td></tr>';
-            print '</form>';
 
             // Ajout de produits/services predefinis
             if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
             {
+                print '<script type="text/javascript">
+                		jQuery(document).ready(function() {
+                			jQuery(\'#idprodfournprice\').change(function() {
+                				if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+                			});
+                		});
+                </script>';
+
                 print '<tr class="liste_titre">';
                 print '<td colspan="4">';
                 print $langs->trans("AddNewLine").' - ';
@@ -2057,30 +2111,16 @@ else
                 print '<td colspan="4">&nbsp;</td>';
                 print '</tr>';
 
-                // TODO Use the predefinedproductline_create.tpl.php file
-                print '<form name="addline_predef" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addline" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="socid" value="'. $object->socid .'">';
-                print '<input type="hidden" name="facid" value="'.$object->id.'">';
-
-                print '<script type="text/javascript">
-                		jQuery(document).ready(function() {
-                			jQuery(\'#idprodfournprice\').change(function() {
-                				if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
-                			});
-                		});
-                </script>';
-
                 $var=! $var;
                 print '<tr '.$bc[$var].'>';
                 print '<td colspan="4">';
 
                 $ajaxoptions=array(
-                		'update' => array('pqty' => 'qty', 'p_remise_percent' => 'discount'),
+                		'update' => array('qty_predef' => 'qty_predef', 'remise_percent_predef' => 'remise_percent_predef'),
                 		'disabled' => 'addPredefinedProductButton',
                 		'error' => $langs->trans("NoPriceDefinedForThisSupplier")
                 );
-                $form->select_produits_fournisseurs($object->socid, '', 'idprodfournprice', '', '', $ajaxoptions);
+                $form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions);
 
                 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) print '<br>';
 
@@ -2096,19 +2136,21 @@ else
 				$doleditor->Create();
 
                 print '</td>';
-                print '<td align="right"><input type="text" id="pqty" name="qty" value="1" size="1"></td>';
+                print '<td align="right"><input type="text" id="qty_predef" name="qty_predef" value="1" size="1"></td>';
-            	print '<td align="right" class="nowrap"><input size="1" id="p_remise_percent" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>';
+            	print '<td align="right" class="nowrap"><input size="1" id="remise_percent_predef" name="remise_percent_predef" type="text" value="'.(GETPOST('remise_percent_predef')?GETPOST('remise_percent_predef'):'0').'"><span class="hideonsmartphone">%</span></td>';
                 print '<td>&nbsp;</td>';
                 print '<td>&nbsp;</td>';
-                print '<td align="center" valign="middle" colspan="2"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans("Add").'"></td>';
+                print '<td align="center" valign="middle" colspan="2"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans("Add").'" name="addline_predefined"></td>';
                 print '</tr>';
-                print '</form>';
             }
         }
 
         print '</table>';
 
-        print '</div>';
+        print '</form>';
+
+        dol_fiche_end();
+
 
         if ($action != 'presend')
         {

htdocs/fourn/facture/paiement.php

@@ -265,7 +265,7 @@ if ($action == 'create' || $action == 'add_paiement')
 	            $sql.= ' AND f.fk_soc = '.$object->socid;
 	            $sql.= ' AND f.paye = 0';
 	            $sql.= ' AND f.fk_statut = 1';  // Statut=0 => non validee, Statut=2 => annulee
-	            $sql.= ' GROUP BY f.rowid, f.ref_supplier, f.total_ht, f.total_ttc, f.datef';
+	            $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef';
 	            $resql = $db->query($sql);
 	            if ($resql)
 	            {

htdocs/install/mysql/migration/3.3.0-3.4.0.sql

@@ -58,7 +58,7 @@ ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn;
 ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref;
 UPDATE llx_facture_fourn set ref = NULL where ref = '';
 ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (ref, entity);
-ALTER TABLE llx_facture_fourn CHANGE COLUMN facnumber ref_supplier varchar(30);
+ALTER TABLE llx_facture_fourn CHANGE COLUMN facnumber ref_supplier varchar(50);
 ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref_supplier (ref_supplier, fk_soc, entity);
 
 
@@ -161,22 +161,22 @@ CREATE TABLE llx_c_revenuestamp
 
 insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1);
 
-ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_commandedet MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_commandedet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_commandedet MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_commandedet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_contratdet MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_contratdet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_contratdet MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_contratdet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facture_fourn_det MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10) DEFAULT NULL;
-ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10)	NOT NULL DEFAULT '0';
+ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10) DEFAULT NULL;
 -- No more use type 7, use revenuse stamp instead
 UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7';
 UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7';

htdocs/install/mysql/migration/3.4.0-3.5.0.sql

@@ -84,7 +84,9 @@ ALTER TABLE llx_propaldet_extrafields ADD INDEX idx_propaldet_extrafields (fk_ob
 DROP table llx_adherent_options;
 DROP table llx_adherent_options_label;
 
-ALTER TABLE llx_user ADD accountancy_code VARCHAR( 24 ) NULL;
+ALTER TABLE llx_user ADD accountancy_code VARCHAR(24) NULL;
+ALTER TABLE llx_c_chargesociales ADD accountancy_code varchar(24) DEFAULT NULL;
+
 
 DELETE FROM llx_boxes where box_id IN (SELECT rowid FROM llx_boxes_def where file='box_activity.php' AND note IS NULL);
 DELETE FROM llx_boxes_def where file='box_activity.php' AND note IS NULL;

htdocs/install/mysql/tables/llx_c_chargesociales.sql

@@ -24,7 +24,7 @@ create table llx_c_chargesociales
   deductible   smallint DEFAULT 0 NOT NULL,
   active       tinyint DEFAULT 1  NOT NULL,
   code         varchar(12) NOT NULL,
-  accountancy_code varchar(15) DEFAULT NULL,
+  accountancy_code varchar(24) DEFAULT NULL,
   fk_pays      integer DEFAULT 1 NOT NULL,
   module       varchar(32) NULL
 )ENGINE=innodb;

htdocs/langs/el_GR/agenda.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
-# IdAgenda=ID event
+IdAgenda=Αναγνωριστικού συμβάντος
 Actions=Ενέργειες
 ActionsArea=Περιοχή Ενεργειών (γεγονότα και εργασίες)
 Agenda= Ημερολόγιο
@@ -68,7 +68,7 @@ AgendaUrlOptions5=<b>logind=%s</b> για να περιορίσετε τα απ
 AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας
 Busy=Απασχολ.
-# ExportDataset_event1=List of agenda events
+ExportDataset_event1=Κατάλογος των εκδηλώσεων
 
 # External Sites ical
 ExportCal=Εξαγωγή ημερολογίου

htdocs/langs/el_GR/boxes.lang

@@ -74,7 +74,7 @@ NoRecordedProducts=Δεν υπάρχουν καταχωρημένα προϊόν
 NoRecordedProspects=Δεν υπάρχουν προσφορές
 NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβόλαια με προϊόντα/υπηρεσίες
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
-# NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών
 BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών
 NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών
@@ -84,8 +84,8 @@ BoxCustomersOrdersPerMonth=Παραγγελίες πελατών ανά μήνα
 BoxSuppliersOrdersPerMonth=Παραγγελίες προμηθευτών ανά μήνα
 BoxProposalsPerMonth=Προσφορές ανά μήνα
 NoTooLowStockProducts=Κανένα προϊόν κάτω από το χαμηλό όριο του αποθέματος
-# BoxProductDistribution=Products/Services distribution
+BoxProductDistribution=Κατανομή Προϊόντα/Υπηρεσίες
-# BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistributionFor=Κατανομή των %s για %s
 ForCustomersInvoices=Τιμολόγια Πελάτη
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προτάσεις

htdocs/langs/el_GR/companies.lang

@@ -66,8 +66,8 @@ Country=Χώρα
 CountryCode=Country code
 CountryId=Κωδικός Χώρα
 Phone=Τηλέφωνο
-# Skype=Skype
+Skype=Skype
-# Call=Call
+Call=Κλήση
 PhonePro=Επαγγ. τηλέφωνο
 PhonePerso=Προσωπ. τηλέφωνο
 PhoneMobile=Κιν. τηλέφωνο
@@ -398,7 +398,7 @@ InActivity=Ανοιχτό
 ActivityCeased=Κλειστό
 ActivityStateFilter=Το καθεστώς της δραστηριότητας
 ProductsIntoElements=Κατάλογος των προϊόντων σε
-# OutstandingBill=Max. for outstanding bill
+OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
 # Monkey
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 # Leopard

htdocs/langs/el_GR/errors.lang

@@ -124,8 +124,8 @@ ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date can not be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-# ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorPHPNeedModule=Σφάλμα, η PHP σας πρέπει να έχει το module <b>%s</ b> εγκατεστημένο για να χρησιμοποιήσετε αυτήν τη δυνατότητα.
-# ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s
 # ErrorWarehouseMustDiffers=Source and target warehouses must differs
 
 # Warnings

htdocs/langs/el_GR/holiday.lang

@@ -87,7 +87,7 @@ FirstDayOfHoliday=Πρώτη μέρα άδειας
 LastDayOfHoliday=Τελευταία μέρα άδειας
 HolidaysMonthlyUpdate=Μηνιαία ενημέρωση
 ManualUpdate=Χειροκίνητη ενημέρωση
-# HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Ακύρωση αδειών
 
 ## Configuration du Module ##
 ConfCP=Διαμόρφωση τις ενότητας αδειών

htdocs/langs/el_GR/main.lang

@@ -155,7 +155,7 @@ Valid=Έγκυρο
 Approve=Έγκριση
 ReOpen=Εκ νέου άνοιγμα
 Upload=Αποστολή Αρχείου
-# ToLink=Link
+ToLink=Σύνδεσμος
 Select=Επιλογή
 Choose=Επιλογή
 ChooseLangage=Παρακαλούμε επιλέξτε την γλώσσα σας
@@ -659,8 +659,8 @@ from=από
 toward=προς
 Access=Πρόσβαση
 HelpCopyToClipboard=Χρησιμοποιήστε το Ctrl + C για να αντιγράψετε στο πρόχειρο
-# SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+SaveUploadedFileWithMask=Αποθηκεύστε το αρχείο στον server με το όνομα "<strong>%s</strong>" (αλλιώς "%s")
-# OriginFileName=Nom d'origine
+OriginFileName=Αρχική Ονομασία
 
 # Week day
 Monday=Δευτέρα

htdocs/langs/el_GR/members.lang

@@ -8,7 +8,7 @@ Members=Μέλη
 MemberAccount=Είσοδος μέλους
 ShowMember=Εμφάνιση καρτέλα μέλους
 UserNotLinkedToMember=Ο χρήστης δεν συνδέετε με κάποιο μέλος
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Πελ./Προμ. δεν συνδέεται με ένα μέλος
 MembersTickets=Tickets Μελών
 FundationMembers=Μέλη οργανισμού
 Attributs=Ιδιότητες

htdocs/langs/el_GR/orders.lang

@@ -147,7 +147,7 @@ AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
 # Documents models
 PDFEinsteinDescription=Ολοκληρωμένο πρότυπο παραγγελίας (λογότυπο...)
 PDFEdisonDescription=Απλό πρότυπο παραγγελίας
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=Ένα πλήρες προτιμολόγιο (λογότυπο ...)
 # Orders modes
 OrderByMail=Ταχυδρομείο
 OrderByFax=Φαξ

htdocs/langs/el_GR/other.lang

@@ -173,12 +173,12 @@ StartUpload=Έναρξη μεταφόρτωσης
 CancelUpload=Ακύρωση ανεβάσετε
 FileIsTooBig=Τα αρχεία είναι πολύ μεγάλο
 PleaseBePatient=Please be patient...
-# RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=Η αίτηση για την αλλαγή του κωδικού σας στο Dolibarr  έχει παραληφθεί
-# NewKeyIs=This is your new keys to login
+NewKeyIs=Αυτό είναι το νέο σας κλειδί για να συνδεθείτε
-# NewKeyWillBe=Your new key to login to software will be
+NewKeyWillBe=Το νέο σας κλειδί για να συνδεθείτε με το λογισμικό είναι
-# ClickHereToGoTo=Click here to go to %s
+ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο %s
-# YouMustClickToChange=You must however first click on the following link to validate this password change
+YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης
-# ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή.
 
 ##### Calendar common #####
 AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s

htdocs/langs/el_GR/products.lang

@@ -142,11 +142,11 @@ NoStockForThisProduct=Δεν απόθεμα για αυτό το προϊόν
 NoStock=Χωρίς απόθεμα
 Restock=Εφοδιάζω με νέα εμπορεύματα
 ProductSpecial=Ειδικές
-# QtyMin=Minimum Qty
+QtyMin=Ελάχιστη Ποσότητα
 PriceQty=Τιμή για την ποσότητα αυτή
-# PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMin=Τιμή για ελάχιστη ποσότητα (w/o έκπτωση)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-# DiscountQtyMin=Default discount for qty
+DiscountQtyMin=Προεπιλεγμένη έκπτωση για ποσότητα
 NoPriceDefinedForThisSupplier=Δεν υπάρχει τιμή / έκαστος ορίζεται αυτής της επιχείρησης / του προϊόντος
 NoSupplierPriceDefinedForThisProduct=Δεν υπάρχει τιμή προμηθευτή / έκαστος ορίζονται για αυτό το προϊόν
 RecordedProducts=Προϊόντα που καταγράφονται
@@ -198,9 +198,9 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Προϊόν πολλαπλών-τιμών
-# ProductSellByQuarterHT=Products turnover quarterly VWAP
+ProductSellByQuarterHT=Προϊόντα του κύκλου εργασιών τριμηνιαία VWAP
-# ServiceSellByQuarterHT=Services turnover quarterly VWAP
+ServiceSellByQuarterHT=Υπηρεσίες του κύκλου εργασιών τριμηνιαία VWAP
-# Quarter1=1st. Quarter
+Quarter1=1ο. Τέταρτο
-# Quarter2=2nd. Quarter
+Quarter2=2ο. Τέταρτο
-# Quarter3=3rd. Quarter
+Quarter3=3η. Τέταρτο
-# Quarter4=4th. Quarter
+Quarter4=4ο. Τέταρτο

htdocs/langs/el_GR/projects.lang

@@ -45,8 +45,8 @@ MyActivities=Οι εργασίες/δραστηρ. μου
 MyProjects=Τα έργα μου
 DurationEffective=Αποτελεσματική διάρκεια
 Progress=Πρόοδος
-# ProgressDeclared=Declared progress
+ProgressDeclared=Χαρακτηρίστηκε σε εξέλιξη
-# ProgressCalculated=Calculated progress
+ProgressCalculated=Υπολογιζόμενη πρόοδος
 Time=Χρόνος
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=Κατάλογος των ενταλμάτων του πελάτη που σχετίζονται με το έργο
@@ -90,8 +90,8 @@ CloneProject=Clone project
 CloneTasks=Clone tasks
 CloneContacts=Clone contacts
 CloneNotes=Clone notes
-# CloneProjectFiles=Clone project joined files
+CloneProjectFiles=Κλώνος έργου εντάχθηκαν αρχεία
-# CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneTaskFiles=Ο κλώνος εργασία (ες) εντάχθηκαν αρχεία (εάν εργασία (ες) που κλωνοποιήθηκε)
 ConfirmCloneProject=Are you sure to clone this project ?
 ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
@@ -106,8 +106,8 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Εκτελεστική ομάδ
 TypeContact_project_task_external_TASKEXECUTIVE=Εκτελεστική ομάδα
 TypeContact_project_task_internal_CONTRIBUTOR=Συνεισφέρων
 TypeContact_project_task_external_CONTRIBUTOR=Συνεισφέρων
-# SelectElement=Select element
+SelectElement=Επιλέξτε το στοιχείο
-# AddElement=Link to element
+AddElement=Σύνδεση με το στοιχείο
 # Documents models
 DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..)
 PlannedWorkload = Σχέδιο φόρτου εργασίας

htdocs/langs/el_GR/users.lang

@@ -116,5 +116,5 @@ DontDowngradeSuperAdmin=Μόνο μια superadmin μπορεί να προβε
 HierarchicalResponsible=Ιεραρχική ευθύνη
 HierarchicView=Ιεραρχική προβολή
 UseTypeFieldToChange=Χρησιμοποιήστε είδος πεδίου για να αλλάξετε
-# OpenIDURL=OpenID URL
+OpenIDURL=OpenID URL
-# LoginUsingOpenID=Use OpenID to login
+LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδεθείτε

htdocs/langs/el_GR/withdrawals.lang

@@ -92,5 +92,5 @@ InfoTransMessage=Η διαρκής %s ώστε έχει μεταδίδει στ
 InfoTransData=Ποσό: %s <br> Metode: %s <br> Ημερομηνία: %s
 InfoFoot=Αυτό είναι ένα αυτοματοποιημένο μήνυμα που αποστέλλεται από Dolibarr
 InfoRejectSubject=Μόνιμη προκειμένου αρνήθηκε
-# InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectMessage=Γεια σας, <br><br> η πάγια εντολή του τιμολογίου %s που σχετίζεται με την εταιρία %s, με το ποσό των %s έχει απορριφθεί από την τράπεζα. <br><br> -- <br>%s
 ModeWarning=Επιλογή για την πραγματική κατάσταση, δεν είχε καθοριστεί, σταματάμε μετά από αυτή την προσομοίωση

htdocs/langs/en_US/bills.lang

@@ -383,13 +383,13 @@ PaymentInvoiceRef=Payment invoice %s
 ValidateInvoice=Validate invoice
 Cash=Cash
 Reported=Delayed
-DisabledBecausePayments=Not possible since there is some payments
+DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-PayedByThisPayment=Payed by this payment
+PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entirely payed. 
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid. 
-ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entirely paid back. 
+ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. 
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed".
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
@@ -405,11 +405,11 @@ TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
 TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
 TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
 # crabe PDF Model
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (Template recommanded)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 # oursin PDF Model
-PDFOursinDescription=Invoice PDF template Oursin. A complete invoice template (Template alternative)
+PDFOursinDescription=Invoice PDF template Oursin. A complete invoice template (alternative Template)
 # NumRef Modules
-TerreNumRefModelDesc1=Return numero with format %syymm-nnnn for standard and replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposits where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return numero with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.

htdocs/langs/en_US/cron.lang

@@ -18,8 +18,8 @@ Permission23104 = Execute Scheduled task
 # Admin
 #
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to launch cron jobs
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to launch a specific job
+OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes 
@@ -32,6 +32,7 @@ CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Schedul
 CronJobs=Scheduled jobs
 CronListActive= List of active jobs
 CronListInactive= List of disabled jobs
+CronListActive= List of scheduled jobs
 
 
 #
@@ -42,7 +43,7 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList= Job list
+CronList=Jobs list
 CronDelete= Delete cron jobs
 CronConfirmDelete= Are you sure you want to delete this cron job ?
 CronExecute=Launch job

htdocs/langs/en_US/dict.lang

@@ -6,6 +6,7 @@ CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
 CountryGB=Great Britain
+CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
 CountryTN=Tunisia

htdocs/langs/en_US/main.lang

@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for chinese:
+# Note for Chinese:
-# msungstdlight or cid0ct are for traditionnal chinese (traditionnal does not render with ubuntu pdf reader) 
+# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified chinese
+# stsongstdlight or cid0cs are for simplified Chinese
-# To read chinese pdf with linux: sudo apt-get install poppler-data
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
-SeparatorDecimal=,
+SeparatorDecimal=.
-SeparatorThousand=None
+SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
@@ -447,30 +447,30 @@ SeptemberMin=Sep
 OctoberMin=Oct
 NovemberMin=Nov
 DecemberMin=Dec
-Month01=january
+Month01=January
-Month02=february
+Month02=February
-Month03=march
+Month03=March
-Month04=april
+Month04=April
-Month05=may
+Month05=May
-Month06=june
+Month06=June
-Month07=july
+Month07=July
-Month08=august
+Month08=August
-Month09=september
+Month09=September
-Month10=october
+Month10=October
-Month11=november
+Month11=November
-Month12=december
+Month12=December
-MonthShort01=jan
+MonthShort01=Jan
-MonthShort02=feb
+MonthShort02=Feb
-MonthShort03=mar
+MonthShort03=Mar
-MonthShort04=apr
+MonthShort04=Apr
-MonthShort05=may
+MonthShort05=May
-MonthShort06=jun
+MonthShort06=Jun
-MonthShort07=jul
+MonthShort07=Jul
-MonthShort08=aug
+MonthShort08=Aug
-MonthShort09=sep
+MonthShort09=Sep
-MonthShort10=oct
+MonthShort10=Oct
-MonthShort11=nov
+MonthShort11=Nov
-MonthShort12=dec
+MonthShort12=Dec
 AttachedFiles=Attached files and documents
 FileTransferComplete=File was uploaded successfuly
 DateFormatYYYYMM=YYYY-MM
@@ -632,7 +632,7 @@ IM=Instant messaging
 NewAttribute=New attribute
 AttributeCode=Attribute code
 OptionalFieldsSetup=Extra attributes setup
-URLPhoto=Url of photo/logo
+URLPhoto=URL of photo/logo
 SetLinkToThirdParty=Link to another third party
 CreateDraft=Create draft
 ClickToEdit=Click to edit
@@ -642,7 +642,7 @@ ByTown=By town
 ByDate=By date
 ByMonthYear=By month/year
 ByYear=By year
-ByMonth=by month
+ByMonth=By month
 ByDay=By day
 BySalesRepresentative=By sales representative
 LinkedToSpecificUsers=Linked to a particular user contact
@@ -660,7 +660,7 @@ toward=toward
 Access=Access
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Nom d'origine
+OriginFileName=Original filename
 
 # Week day
 Monday=Monday

htdocs/langs/en_US/margins.lang

@@ -47,5 +47,5 @@ BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 
-AgentContactType=Contact type used for commissioning
+AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be associated with commercial agents
+AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents

htdocs/langs/en_US/other.lang

@@ -6,7 +6,7 @@ Tools=Tools
 ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
 Birthday=Birthday
 BirthdayDate=Birthday
-DateToBirth=Date to birth
+DateToBirth=Date of birth
 BirthdayAlertOn= birthday alert active
 BirthdayAlertOff= birthday alert inactive
 Notify_FICHINTER_VALIDATE=Intervention validated

htdocs/langs/en_US/printipp.lang

@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of module Direct Print
+PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=Ce module permet d'ajouter un bouton d'impression direct des documents vers votre imprimante. Il requiert un systeme Linux équipé de Cups.
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show picto "Direct print" into list of documents
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your Cups etup)
+NoPrinterFound=No printers found (check your CUPS setup)

htdocs/langs/en_US/withdrawals.lang

@@ -18,8 +18,8 @@ RequestStandingOrderToTreat=Request for standing orders to treat
 RequestStandingOrderTreated=Request for standing orders treated
 CustomersStandingOrders=Customer standing orders
 CustomerStandingOrder=Customer standing order
-NbOfInvoiceToWithdraw=Nb of invoice with withdraw request
+NbOfInvoiceToWithdraw=No. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdrawWithInfo=No. of invoice with withdraw request for customers having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for withdraw
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Withdraws refused
@@ -34,14 +34,14 @@ ThirdPartyBankCode=Third party bank code
 ThirdPartyDeskCode=Third party desk code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account ?
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Date Transmission
+TransData=Transmission date
-TransMetod=Method Transmission
+TransMetod=Transmission method
 Send=Send
 Lines=Lines
-StandingOrderReject=Issue a reject
+StandingOrderReject=Issue a rejection
 InvoiceRefused=Invoice refused
-WithdrawalRefused=Withdrawal Refused
+WithdrawalRefused=Withdrawal refused
 WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
 RefusedData=Date of rejection
 RefusedReason=Reason for rejection
@@ -51,15 +51,15 @@ InvoiceRefused=Charge the rejection to customer
 Status=Status
 StatusUnknown=Unknown
 StatusWaiting=Waiting
-StatusTrans=Transmitted
+StatusTrans=Sent
 StatusCredited=Credited
 StatusRefused=Refused
 StatusMotif0=Unspecified
-StatusMotif1=Provision insuffisante
+StatusMotif1=Insufficient funds
-StatusMotif2=Tirage conteste
+StatusMotif2=Request contested
 StatusMotif3=No Withdrawal order
 StatusMotif4=Customer Order
-StatusMotif5=RIB inexploitable
+StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
 StatusMotif8=Other reason
@@ -78,18 +78,18 @@ BankToReceiveWithdraw=Bank account to receive withdraws
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
 ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as payed to allow to manage withdrawal before.
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tabs allows you to request for a standing order. Once it will be finished, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also create payments onto invoices and will classify them to paid
+ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank
 InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
 InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been transmited to bank by %s %s.<br><br>
+InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Metode: %s<br>Date: %s
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoFoot=This is an automated message sent by Dolibarr
 InfoRejectSubject=Standing order refused
 InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s

htdocs/langs/fr_FR/admin.lang

@@ -480,15 +480,15 @@ Module2400Name=Agenda
 Module2400Desc=Gestion des actions (événements et tâches) et de l'agenda
 Module2500Name=Gestion électronique de documents
 Module2500Desc=Permet de stocker et administrer une base de documents
-Module2600Name= WebServices
+Module2600Name=WebServices
-Module2600Desc= Active le serveur de Web Services de Dolibarr
+Module2600Desc=Active le serveur de Web Services de Dolibarr
-Module2700Name= Gravatar
+Module2700Name=Gravatar
-Module2700Desc= Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur e-mail). Besoin d'un accès Internet
+Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur e-mail). Besoin d'un accès Internet
 Module2800Desc=Client FTP
-Module2900Name= GeoIPMaxmind
+Module2900Name=GeoIPMaxmind
-Module2900Desc= Capacités de conversion GeoIP Maxmind
+Module2900Desc=Capacités de conversion GeoIP Maxmind
-Module3100Name= Skype
+Module3100Name=Skype
-Module3100Desc= Ajouter un button Skype dans les fiches adhérents / tiers / contacts
+Module3100Desc=Ajouter un button Skype dans les fiches adhérents / tiers / contacts
 Module5000Name=Multi-société
 Module5000Desc=Permet de gérer plusieurs sociétés
 Module6000Name=Workflow
@@ -499,8 +499,8 @@ Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
 Module50100Name=Point de vente
 Module50100Desc=Caisse enregistreuse de point de vente
-Module50200Name= Paypal
+Module50200Name=Paypal
-Module50200Desc= Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
+Module50200Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
 Module54000Name=PrintIPP
 Module54000Desc=Impression via Cups IPP Printer.
 Module55000Name=Open Survey
@@ -698,6 +698,7 @@ Permission1234=Supprimer les factures fournisseur
 Permission1235=Envoyer les factures fournisseur par mail
 Permission1236=Exporter les factures fournisseurs, attributs et règlements
 Permission1237=Exporter les commande fournisseurs, attributs
+<<<<<<< HEAD
 Permission1251=Lancer des importations en masse dans la base (chargement de données)
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1421=Exporter les commandes clients et attributs
@@ -734,6 +735,47 @@ DictionnaryCivility=Titres de civilité
 DictionnaryActions=Liste des types d'événements de l'agenda
 DictionnarySocialContributions=Types de charges sociales
 DictionnaryVAT=Taux de TVA ou de taxes de ventes
+=======
+Permission1251= Lancer des imports de masse dans la base (chargement de données)
+Permission1321= Exporter les factures clients, attributs et règlements
+Permission1401= Lire le plan de compte
+Permission1402= Créer/modifier un plan de compte
+Permission1403= Clôturer un plan de compte
+Permission1411= Lire les mouvements comptables
+Permission1412= Créer/modifier/annuler les mouvements comptables
+Permission1415= Lire CA, bilans, résultats, journaux, grands livres
+Permission1421= Exporter les commandes clients et attributs
+Permission23001 = Voir les tâches planifiée
+Permission23002 = Créer/Modifier les tâches planifiée
+Permission23003 = Supprimer les tâches planifiée
+Permission23004 = Exécuter les tâches planifiée
+Permission2401= Lire les actions (événements ou tâches) liées à son compte
+Permission2402= Créer/modifier les actions (événements ou tâches) liées à son compte
+Permission2403= Supprimer les actions (événements ou tâches) liées à son compte
+Permission2411= Lire les actions (événements ou tâches) des autres
+Permission2412= Créer/modifier les actions (événements ou tâches) pour les autres
+Permission2413= Supprimer les actions (événements ou tâches) pour les autres
+Permission2501= Lire/Récupérer les documents
+Permission2502= Récupérer les documents
+Permission2503= Soumettre ou supprimer des documents
+Permission2515= Administrer les rubriques de documents
+Permission2801=Utiliser un client FTP en mode lecture (parcours et download de fichiers)
+Permission2802=Utiliser un client FTP en mode écriture (suppression et upload de fichiers)
+Permission50101=Utiliser Point de vente
+Permission50201= Consulter les transactions
+Permission50202= Importer les transactions
+DictionnaryCompanyType= Types de sociétés
+DictionnaryCompanyJuridicalType= Formes juridiques
+DictionnaryProspectLevel= Niveau de potentiel des prospects
+DictionnaryCanton= Départements/Provinces/Cantons
+DictionnaryRegion= Régions
+DictionnaryCountry= Pays
+DictionnaryCurrency= Monnaies
+DictionnaryCivility= Titres de civilité
+DictionnaryActions= Liste des types d'événements de l'agenda
+DictionnarySocialContributions= Types de charges sociales
+DictionnaryVAT= Taux de TVA ou de Taxes de Ventes
+>>>>>>> refs/remotes/origin/3.4
 DictionnaryRevenueStamp=Montants des timbres fiscaux
 DictionnaryPaymentConditions=Conditions de règlement
 DictionnaryPaymentModes=Modes de paiements

htdocs/langs/fr_FR/cron.lang

@@ -17,21 +17,21 @@ Permission23104 = Lancer un travail planifié
 #
 # Admin
 #
-CronSetup= Page de configuration du module - Gestion des travaux planifiées
+CronSetup= Page de configuration du module - Gestion des travaux programmés
-URLToLaunchCronJobs=URL pour lancer les travaux planifiés actifs
+URLToLaunchCronJobs=URL pour vérifier et lancer les travaux programmés actifs
-OrToLaunchASpecificJob=Ou pour lancer un travail planifié spécifique
+OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail programmé spécifique
-KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux planifiés
+KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programmés
-FileToLaunchCronJobs=Commande pour lancer les travaux planifiés actifs
+FileToLaunchCronJobs=Commande pour lancer les travaux programmés actifs
 CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser 'crontab' pour exécuter une commande toute les minutes
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâche pour lancer une commande toute les minutes
 
-
 #
 # Menu
 #
-CronJobs=Travaux planifiés
+CronJobs=Travaux programmés
 CronListActive= Liste des travaux actifs
 CronListInactive= Liste des travaux inactifs
+CronListActive= Liste des travaux programmés
 
 
 #
@@ -42,15 +42,15 @@ CronLastOutput=Sortie du dernier lancement
 CronLastResult=Dernier code de retour
 CronListOfCronJobs=Liste des travaux planifiés
 CronCommand=Commande
-CronList= Liste des travaux
+CronList=Liste des travaux
-CronDelete= Supprimer les travaux cron
+CronDelete=Supprimer les travaux cron
-CronConfirmDelete= Êtes-vous sûr de vouloir supprimer ces travaux cron ?
+CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces travaux cron ?
 CronExecute=Lancer cette tâche
-CronConfirmExecute= Êtes-vous sûr de vouloir lancer ce travail maintenant?
+CronConfirmExecute=Êtes-vous sûr de vouloir lancer ce travail maintenant?
-CronInfo= Les travaux planifiés permettent d'exécuter des tâches à intervales réguliers
+CronInfo=Les travaux planifiés permettent d'exécuter des tâches à intervales réguliers
 CronWaitingJobs=Travaux en attente
 CronTask=Tâche
-CronNone= Aucun(e)
+CronNone=Aucun(e)
 CronDtStart=Date de début
 CronDtEnd=Date de fin
 CronDtNextLaunch=Prochaine exécution

htdocs/langs/fr_FR/dict.lang

@@ -5,7 +5,8 @@ CountryIT=Italie
 CountryES=Espagne
 CountryDE=Allemagne
 CountryCH=Suisse
-CountryGB=Royaume-Uni
+CountryGB=Grande-Bretagne
+CountryUK=Royaume-Uni
 CountryIE=Irlande
 CountryCN=Chine
 CountryTN=Tunisie

htdocs/langs/fr_FR/margins.lang

@@ -47,5 +47,5 @@ BuyingCost=Coût de revient
 UnitCharges=Charge unitaire
 Charges=Charges
 
-AgentContactType=Type de contact commissionné
+AgentContactType=Type de contact agent commercial
-AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera associé aux agents commerciaux
+AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera utilisé pour le rapport de marges par agent commercial

htdocs/langs/fr_FR/projects.lang

@@ -56,7 +56,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
 ListFichinterAssociatedProject=Liste des interventions associées au projet
-ListTripAssociatedProject=Liste des notes de frais associés au projet
+ListTripAssociatedProject=Liste des notes de frais associées au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
 ActivityOnProjectThisWeek=Activité sur les projets cette semaine
 ActivityOnProjectThisMonth=Activité sur les projets ce mois
@@ -94,7 +94,7 @@ CloneProjectFiles=Cloner les pièces jointes du projet
 CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
 ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
 ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
-ErrorShiftTaskDate=Une erreur c'est produite dans le report des dates des tâches.
+ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
 ProjectsAndTasksLines=Projets et tâches
 ProjectCreatedInDolibarr=Projet %s créé
 ##### Types de contacts #####
@@ -110,6 +110,12 @@ SelectElement=Séléctionnez l'élément
 AddElement=Link to element
 # Documents models
 DocumentModelBaleine=Modèle de rapport de projet complet (logo...)
+<<<<<<< HEAD
 PlannedWorkload = Charge de travail prévue
 WorkloadOccupation= Pourcentage affectation
 ProjectReferers=Objets associés
+=======
+SelectElement=Eléments associables au projet :
+AddElement=Associer
+ProjectReferers=Objets associés
+>>>>>>> refs/remotes/origin/3.4

htdocs/langs/lv_LV/admin.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Pamats
 Version=Versija
-VersionProgram=Versija programma
+VersionProgram=Programmas versija
 VersionLastInstall=Versija sākotnējo instalēt
 VersionLastUpgrade=Jaunākajai jauninājums
 VersionExperimental=Eksperimentāls
@@ -27,9 +27,9 @@ DBSortingCharset=Datu bāzes rakstzīmju kopas, lai kārtotu datus
 WarningModuleNotActive=Moduļu <b>%s</b> ir jābūt aktivizētam
 WarningOnlyPermissionOfActivatedModules=Tikai atļaujas, kas saistīti ar aktīviem moduļi tiek parādīts šeit. Jūs varat aktivizēt citus moduļus Home-&gt; Setup-&gt; moduļi lapā.
 DolibarrSetup=Dolibarr instalēt vai atjaunināt
-DolibarrUser=Dolibarr lietotāju
+DolibarrUser=Dolibarr lietotājs
-InternalUser=Iekšējo lietotāju
+InternalUser=Iekšējais lietotājs
-ExternalUser=Ārējo lietotāju
+ExternalUser=Ārējais lietotājs
 InternalUsers=Iekšējie lietotāji
 ExternalUsers=Ārējie lietotāji
 GlobalSetup=Global iestatīšana
@@ -43,7 +43,7 @@ SecuritySetup=Drošības iestatīšana
 ErrorModuleRequirePHPVersion=Kļūda, šis modulis ir nepieciešama PHP versija %s vai augstāka
 ErrorModuleRequireDolibarrVersion=Kļūda, šis modulis prasa Dolibarr versija %s vai augstāka
 ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta.
-DictionnarySetup=Vārdnīca iestatīšana
+DictionnarySetup=Vārdnīcas iestatīšana
 Dictionnary=Vārdnīcas
 ErrorReservedTypeSystemSystemAuto=Vērtību &quot;sistēma&quot; un &quot;systemauto&quot; veida tiek aizsargātas. Jūs varat izmantot &quot;lietotājs&quot;, kā vērtība, lai pievienotu savu ierakstu
 ErrorCodeCantContainZero=Kodu nevar saturēt vērtību 0
@@ -68,7 +68,7 @@ Table=Tabula
 Fields=Lauki
 Index=Indekss
 Mask=Maska
-NextValue=Tālāk vērtība
+NextValue=Nākošā vērtība
 NextValueForInvoices=Tālāk vērtība (rēķini)
 NextValueForCreditNotes=Tālāk vērtība (kredīta piezīmes)
 NextValueForDeposit=Tālāk vērtība (depozīts)
@@ -90,7 +90,7 @@ MenuIdParent=Mātes izvēlne ID
 DetailMenuIdParent=ID vecāku izvēlnē (tukšs top izvēlnē)
 DetailPosition=Šķirot skaits definēt izvēlnes novietojumu
 PersonalizedMenusNotSupported=Personalizētā izvēlnes neatbalsta
-AllMenus=Visi
+AllMenus=Viss
 NotConfigured=Modulis nav konfigurēts
 Setup=Setup
 Activation=Aktivizācija
@@ -146,7 +146,7 @@ PurgeNothingToDelete=Nav direktoriju vai failu izdzēst.
 PurgeNDirectoriesDeleted=<b>%s</b> failus vai direktorijas dzēsti.
 PurgeAuditEvents=Iztīrīšana visus drošības pasākumus
 ConfirmPurgeAuditEvents=Vai jūs tiešām vēlaties, lai iztīrītu visus drošības pasākumus? Visi drošības žurnāli tiks dzēsti, nekādi citi dati tiks noņemts.
-NewBackup=Jauns rezerves
+NewBackup=Jauna rezerves kopija
 GenerateBackup=Izveidot rezerves
 Backup=Backup
 Restore=Atjaunot
@@ -285,7 +285,7 @@ InfDirExample=<br> Tad paziņo to failu conf.php <br> $ Dolibarr_main_url_root_a
 YouCanSubmitFile=Izvēlieties moduli:
 CurrentVersion=Dolibarr pašreizējā versija
 CallUpdatePage=Iet uz lapu, kas aktualizē datu bāzes struktūras un datas: %s.
-LastStableVersion=Pēdējā stabila versija
+LastStableVersion=Pēdējā stabilā versija
 GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maska, šādus tagus var izmantot: <br> <b>{000000}</b> atbilst skaitam, kas tiks palielināts par katru %s. Ievadīt tik daudz nullēm, kā vajadzīgajā garumā letes. Skaitītājs tiks pabeigts ar nullēm no kreisās puses, lai būtu tik daudz nullēm kā masku. <br> <b>{000000 000}</b> tāds pats kā iepriekšējais, bet kompensēt atbilst noteiktam skaitam pa labi uz + zīmi tiek piemērots, sākot ar pirmo %s. <br> <b>{000000 @ x}</b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad mēnesī x ir sasniegts (x no 1 līdz 12, 0 vai izmantot agri no finanšu gada mēnešiem, kas noteiktas konfigurācijas, 99 vai atiestatīt uz nulli katru mēnesi ). Ja šis variants tiek izmantots, un x ir 2 vai vairāk, tad secība {gggg} {mm} vai {GGGG} {mm} ir arī nepieciešama. <br> <b>{Dd}</b> diena (no 01 līdz 31). <br> <b>{Mm}</b> mēnesi (no 01 līdz 12). <br> <b>{Yy}, {GGGG}</b> vai <b>{y}</b> gadu vairāk nekā 2, 4 vai 1 numuri. <br>
 GenericMaskCodes2=<b>{CCCC}</b> klienta kodu <br> <b>{Cccc000}</b> klienta kodu par n burtiem seko klienta ref letes bez kompensācijas un zeroized ar pasaules letes. <br> <b>{Tttt}</b> kods uzņēmuma veida par n zīmēm (skat. dictionnary-uzņēmumu veidiem). <br>
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskarts. <br> Atstarpes nav atļauts. <br>
@@ -344,7 +344,7 @@ SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
 EnterRefToBuildUrl=Ievadiet atsauce objektu %s
 GetSecuredUrl=Saņemt aprēķina URL
 ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas
-ProductVatMassChange=Masu PVN maiņa
+ProductVatMassChange=Masveida PVN maiņa
 ProductVatMassChangeDesc=Šī lapa var tikt izmantota, lai mainītu PVN likmi, kas noteikta par produktiem vai pakalpojumiem, no kura vērtība uz otru. Uzmanību, šīs izmaiņas tiek darīts uz visiem datu bāzē.
 OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
@@ -432,7 +432,7 @@ Module75Name=Izdevumu un ceļojumu piezīmes
 Module75Desc=Izdevumi un ceļojumu piezīmes vadība
 Module80Name=Sūtījumiem
 Module80Desc=Sūtījumi un piegādes rīkojumu vadība
-Module85Name=Bankas un naudas
+Module85Name=Bankas un nauda
 Module85Desc=Vadība banku vai naudas kontos
 Module100Name=Ārējā vietne
 Module100Desc=Šis modulis ietver ārējo tīmekļa vietni vai lapu par Dolibarr izvēlnēm un apskatīt to uz Dolibarr rāmī
@@ -484,7 +484,7 @@ Module2600Name= Veikalu
 Module2600Desc= Ļautu Dolibarr tīmekļa pakalpojumu serveri
 Module2700Name= Gravatar
 Module2700Desc= Izmantot tiešsaistes Gravatar pakalpojumu (www.gravatar.com), lai parādītu fotogrāfijas lietotāju / dalībnieku (atrasts ar saviem e-pastiem). Nepieciešams interneta piekļuves
-Module2800Desc=FTP Client
+Module2800Desc=FTP klients
 Module2900Name= GeoIPMaxmind
 Module2900Desc= GeoIP MaxMind pārveidošanu iespējas
 Module3100Name= Skype
@@ -497,8 +497,8 @@ Module20000Name=Brīvdienas
 Module20000Desc=Atzīt un ievērot darbinieku brīvdienas
 Module50000Name=Paybox
 Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox
-Module50100Name=Punktu pārdošanas
+Module50100Name=Tirdzniecības punkts
-Module50100Desc=Punktu pārdošanas moduļa
+Module50100Desc=Tirdzniecības punkta moduļi
 Module50200Name= Paypal
 Module50200Desc= Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti ar Paypal
 Module54000Name=PrintIPP
@@ -646,7 +646,7 @@ Permission293=Modificēt klientiem tarifus
 Permission300=Lasīt svītrkodus
 Permission301=Izveidot / mainīt svītrkodus
 Permission302=Dzēst svītrkodus
-Permission311=Lasīt pakalpojumi
+Permission311=Lasīt pakalpojumus
 Permission312=Piešķirt pakalpojumu līgumu
 Permission331=Lasīt grāmatzīmes
 Permission332=Izveidot / mainīt grāmatzīmes
@@ -784,19 +784,19 @@ LocalTax2IsUsedExampleES= Spānijā, ārštata un neatkarīgi profesionāļi, ka
 LocalTax2IsNotUsedExampleES= Spānijā tie Bussines neattiecas uz nodokļu sistēmas moduļiem.
 LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu
 LabelOnDocuments=Marķējums uz dokumentiem
-NbOfDays=Nb dienu
+NbOfDays=dienu sk
 AtEndOfMonth=Perioda beigās
 Offset=Kompensācija
 AlwaysActive=Vienmēr ir aktīva
 UpdateRequired=Jūsu sistēma ir jāatjaunina. Lai to izdarītu, noklikšķiniet uz <a href="%s">Update tagad</a> .
-Upgrade=Upgrade
+Upgrade=Atjaunināt
-MenuUpgrade=Upgrade / Extend
+MenuUpgrade=Atjaunināt / Paplašināt
 AddExtensionThemeModuleOrOther=Pievienot paplašinājumu (tēma, modulis, ...)
 WebServer=Tīmekļa serveris
 DocumentRootServer=Web servera saknes direktorijā
 DataRootServer=Datu failu direktorija
 IP=IP
-Port=Osta
+Port=Ports
 VirtualServerName=Virtuālā servera nosaukums
 AllParameters=Visi parametri
 OS=OS
@@ -808,14 +808,14 @@ Pear=Bumbieris
 PearPackages=Bumbieru paketes
 Browser=Browser
 Server=Serveris
-Database=Datu bāze
+Database=Datubāze
 DatabaseServer=Datu bāzes serveris
 DatabaseName=Datu bāzes nosaukums
 DatabasePort=Datu bāzes osta
-DatabaseUser=Datu bāzes lietotāju
+DatabaseUser=Datubāzes lietotājs
-DatabasePassword=Datu bāzes paroli
+DatabasePassword=Datubāzes parole
 DatabaseConfiguration=Datu bāzes iestatīšana
-Tables=Galdi
+Tables=Tabulas
 TableName=Tabulas nosaukums
 TableLineFormat=Līnija formāts
 NbOfRecord=Nb ierakstu
@@ -854,13 +854,13 @@ CompanyInfo=Uzņēmuma / nodibinājums informācija
 CompanyIds=Uzņēmuma / nodibinājums identitātes
 CompanyName=Nosaukums
 CompanyAddress=Adrese
-CompanyZip=Rāvējslēdzējs
+CompanyZip=Pasta indekss
 CompanyTown=Pilsēta
 CompanyCountry=Valsts
 CompanyCurrency=Galveno valūtu
 Logo=Logotips
 DoNotShow=Nerādīt
-DoNotSuggestPaymentMode=Neapgalvoju
+DoNotSuggestPaymentMode=Neieteikt
 NoActiveBankAccountDefined=Nav aktīvas bankas definēts kontu
 OwnerOfBankAccount=Īpašnieks bankas kontu %s
 BankModuleNotActive=Bankas konti modulis nav atļautas
@@ -895,8 +895,8 @@ Audit=Revīzija
 InfoDolibarr=Infos Dolibarr
 InfoOS=Infos OS
 InfoWebServer=Infos tīmekļa serveris
-InfoDatabase=Infos datu bāzes
+InfoDatabase=Datubāzes informācija
-InfoPHP=Infos PHP
+InfoPHP=PHP Informācija
 InfoPerf=Infos izrādes
 ListEvents=Audita notikumi
 ListOfSecurityEvents=Saraksts Dolibarr drošības pasākumu
@@ -964,7 +964,7 @@ ProxyDesc=Dažas Dolibarr funkcijas ir nepieciešama piekļuve internetam, lai s
 ExternalAccess=Ārējās piekļuves
 MAIN_PROXY_USE=Izmantot starpniekserveri (citādi tieša piekļuve internetam)
 MAIN_PROXY_HOST=Nosaukums / adrese proxy serveri
-MAIN_PROXY_PORT=Osta proxy serveri
+MAIN_PROXY_PORT=Proxy servera ports
 MAIN_PROXY_USER=Pieslēdzies, lai izmantotu starpniekserveri
 MAIN_PROXY_PASS=Parole, lai izmantotu starpniekserveri
 DefineHereComplementaryAttributes=Definēt šeit visi atribūti, jau nav pieejama pēc noklusējuma, un, ka jūs vēlaties būt atbalstīta %s.
@@ -1017,7 +1017,7 @@ GeneratePassword=Ieteikt ģenerēto paroli
 RuleForGeneratedPasswords=Noteikums, lai radītu piedāvātos paroles vai apstiprināt paroles
 DoNotSuggest=Neliecina jebkuru paroli
 EncryptedPasswordInDatabase=Lai ļautu šifrēšanas paroles datu bāzē
-DisableForgetPasswordLinkOnLogonPage=Neparāda uz saites &quot;Aizmirsi paroli&quot; uz pieteikšanās lapu
+DisableForgetPasswordLinkOnLogonPage=Nerādīt saiti &quot;Aizmirsu paroli&quot; pieteikšanās lapā
 UsersSetup=Lietotāji modulis uzstādīšana
 UserMailRequired=E-Mail nepieciešams, lai izveidotu jaunu lietotāju
 ##### Company setup #####
@@ -1046,7 +1046,7 @@ WebCalNoByDefault=Pēc pieprasījuma (nav pēc noklusējuma)
 WebCalNever=Nekad
 WebCalURL=URL kalendāra piekļuvi
 WebCalServer=Servera hosting kalendārs datu bāzes
-WebCalDatabaseName=Datu bāzes nosaukums
+WebCalDatabaseName=Datubāzes nosaukums
 WebCalUser=Lietotājam, lai piekļūtu datu bāzes
 WebCalSetupSaved=WebCalendar uzstādīšana ir veiksmīgi saglabāta.
 WebCalTestOk=Savienojums ar serveri &quot;%s&quot; par datu bāzē &quot;%s&quot; ar lietotāja %s &quot;sekmīgi pabeigta.
@@ -1063,7 +1063,7 @@ WebCalUrlForVCalExport=Eksporta saite uz <b>%s</b> formātā ir pieejams šādā
 WebCalCheckWebcalSetup=Varbūt webcal modulis uzstādīšana nav pareizs.
 ##### Invoices #####
 BillsSetup=Rēķini modulis uzstādīšana
-BillsDate=Rēķini datumu
+BillsDate=Rēķinu datums
 BillsNumberingModule=Rēķini un kredīta piezīmes numerācijas modeli
 BillsPDFModules=Rēķina dokumenti modeļi
 CreditNoteSetup=Kredītu piezīme modulis uzstādīšana
@@ -1138,8 +1138,8 @@ LDAPSynchronizeContacts=Organizēšana kontaktu LDAP
 LDAPSynchronizeMembers=Organizēšana Fonda locekļu LDAP
 LDAPTypeExample=OpenLDAP, eGroupware vai Active Directory
 LDAPPrimaryServer=Galvenais serveris
-LDAPSecondaryServer=Sekundārā servera
+LDAPSecondaryServer=Sekundārais serveris
-LDAPServerPort=Porta
+LDAPServerPort=Servera ports
 LDAPServerPortExample=Noklusējuma ports: 389
 LDAPServerProtocolVersion=Protokols versija
 LDAPServerUseTLS=Izmantot TLS

htdocs/langs/lv_LV/agenda.lang

@@ -6,7 +6,7 @@ Agenda= Darba kārtība
 Agendas= Darba kārtība
 Calendar= Kalendārs
 Calendars= Kalendāri
-LocalAgenda=Vietējā kalendārs
+LocalAgenda=Lokālais kalendārs
 AffectedTo= Piešķirts
 DoneBy= Izdarīt
 Events= Pasākumi

htdocs/langs/lv_LV/boxes.lang

@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=RSS informācija
-BoxLastProducts=Pēdējās %s produkti / pakalpojumi
+BoxLastProducts=Pēdējie %s produkti / pakalpojumi
 BoxProductsAlertStock=Produkti pārdošanā brīdinājumu
 BoxLastProductsInContract=Pēdējās %s līgumi produktu / pakalpojumu
 BoxLastSupplierBills=Pagājušā piegādātāja rēķinus
@@ -26,7 +26,7 @@ BoxTitleLastBooks=Pēdējās %s ierakstītas grāmatas
 BoxTitleNbOfCustomers=Klientu skaits
 BoxTitleLastRssInfos=Pēdējo reizi %s ziņas no %s
 BoxTitleLastProducts=Pēdējās %s modificēta produktu / pakalpojumu
-BoxTitleProductsAlertStock=Produkti pārdošanā brīdinājumu
+BoxTitleProductsAlertStock=Produktu un krājumu brīdinājumi
 BoxTitleLastCustomerOrders=Pēdējās %s modificēts klientu pasūtījumus
 BoxTitleLastSuppliers=Pēdējās %s reģistrēti piegādātāji
 BoxTitleLastCustomers=Pēdējās %s ierakstītas klientiem

htdocs/langs/lv_LV/cashdesk.lang

@@ -1,15 +1,15 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Tirdzniecības vietā
+CashDeskMenu=Tirdzniecības vieta
-CashDesk=Tirdzniecības vietā
+CashDesk=Tirdzniecības vieta
-CashDesks=Punktu pārdošanas
+CashDesks=Tirdzniecības vietas
 CashDeskBank=Bankas konts
-CashDeskBankCash=Bankas konts (naudas)
+CashDeskBankCash=Bankas konts (skaidra nauda)
 CashDeskBankCB=Bankas konts (karte)
-CashDeskBankCheque=Bankas konts (pārbaude)
+CashDeskBankCheque=Bankas konts (čeks)
 CashDeskWarehouse=Noliktava
 CashdeskShowServices=Pārdošanas pakalpojumi
 CashDeskProducts=Produkti
-CashDeskStock=Krājums
+CashDeskStock=Krājumi
 CashDeskOn=uz
 CashDeskThirdParty=Trešās puses
 CashdeskDashboard=Tirdzniecības vietu piekļuvi

htdocs/langs/lv_LV/companies.lang

@@ -1,38 +1,38 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Uzņēmuma nosaukums %s jau pastāv. Izvēlieties citu.
 ErrorPrefixAlreadyExists=Prefikss %s jau pastāv. Izvēlieties citu.
-ErrorSetACountryFirst=Iestatītu valsti vispirms
+ErrorSetACountryFirst=Izvēlieties vispirms valsti
-SelectThirdParty=Izvēlieties trešo personu
+SelectThirdParty=Izvēlieties trešo pusi
 DeleteThirdParty=Dzēst trešo pusi
-ConfirmDeleteCompany=Vai tiešām vēlaties dzēst šo uzņēmumu un visu mantoto informāciju?
+ConfirmDeleteCompany=Vai tiešām vēlaties dzēst šo uzņēmumu un visu informāciju, kas saistīta ar to?
-DeleteContact=Izdzēstu kontaktu / adrese
+DeleteContact=Izdzēst kontaktu / adresi
-ConfirmDeleteContact=Vai tiešām vēlaties dzēst šo kontaktu un visu mantoto informāciju?
+ConfirmDeleteContact=Vai tiešām vēlaties dzēst šo kontaktu un visu informāciju par šo kontaktu?
-MenuNewThirdParty=Jauns trešā persona
+MenuNewThirdParty=Jauna trešā persona
 MenuNewCompany=Jauns uzņēmums
 MenuNewCustomer=Jauns klients
 MenuNewProspect=Jauns izredzes
 MenuNewSupplier=Jauns piegādātājs
-MenuNewPrivateIndividual=Jauns privātpersona
+MenuNewPrivateIndividual=Jauna privātpersona
 MenuSocGroup=Grupas
-NewCompany=Jaunu uzņēmumu (prospekts, klients, piegādātājs)
+NewCompany=Jauns uzņēmums (prospekts, klients, piegādātājs)
 NewThirdParty=Jauns trešā persona (prospekts, klients, piegādātājs)
-NewSocGroup=Jaunu uzņēmumu grupā
+NewSocGroup=Jauna uzņēmumu grupa
-NewPrivateIndividual=Jauns privātpersona (prospekts, klients, piegādātājs)
+NewPrivateIndividual=Jauna privātpersona (prospekts, klients, piegādātājs)
 ProspectionArea=Ogļūdeņražu meklēšanai platība
 SocGroup=Uzņēmumu grupa
-IdThirdParty=Id trešā persona
+IdThirdParty=Trešās personas Id
 IdCompany=Uzņēmuma Id
 IdContact=Sazinieties ar ID
-Contacts=Kontakti / adreses
+Contacts=Kontaktu / adreses
 ThirdPartyContacts=Trešās puses kontakti
 ThirdPartyContact=Trešās puses kontakts / adrese
 StatusContactValidated=Statuss kontakta / adreses
-Company=Kompānija
+Company=Uzņēmums
 CompanyName=Uzņēmuma nosaukums
 Companies=Uzņēmumi
-CountryIsInEEC=Valsts ir iekšā Eiropas Ekonomikas kopienas
+CountryIsInEEC=Valsts ir Eiropas Ekonomikas kopienas dalībvalsts
 ThirdPartyName=Trešās puses nosaukums
-ThirdParty=Trešās puses
+ThirdParty=Trešā puse
 ThirdParties=Trešās personas
 ThirdPartyAll=Trešās personas (viss)
 ThirdPartyProspects=Perspektīvas
@@ -44,11 +44,11 @@ ThirdPartySuppliers=Piegādātāji
 ThirdPartyType=Trešās puses tips
 Company/Fundation=Kompānija / Foundation
 Individual=Privātpersona
-ToCreateContactWithSameName=Radīs automātiski fizisku kontaktu ar pašu informations
+ToCreateContactWithSameName=Izveidos automātiski kontaktu ar šo pašu informāciju
 ParentCompany=Mātes uzņēmumam
 Subsidiary=Filiāle
-Subsidiaries=Meitas uzņēmumi
+Subsidiaries=Filiāles
-NoSubsidiary=Nav meitas
+NoSubsidiary=Nav filiāles
 ReportByCustomers=Ziņojums, ko klienti
 ReportByQuarter=Ziņojums pēc kursa
 CivilityCode=Pieklājība kods
@@ -58,7 +58,7 @@ Lastname=Uzvārds
 Firstname=Vārds
 PostOrFunction=Post / Funkcija
 UserTitle=Virsraksts
-Surname=Uzvārds / Pseido
+Surname=Uzvārds / Pseidonīms
 Address=Adrese
 State=Valsts / province
 Region=Rajons
@@ -68,19 +68,19 @@ CountryId=Valsts id
 Phone=Telefons
 Skype=Skype
 Call=Zvanīt
-PhonePro=Prof tālrunis
+PhonePro=Darba tālrunis
 PhonePerso=Pers. telefons
-PhoneMobile=Mobils
+PhoneMobile=Mobilais
-No_Email=Nesūtiet masu e-pasta sūtījumi
+No_Email=Nesūtīt masu e-pasta sūtījumus
-Fax=Faksa
+Fax=Fakss
 Zip=Pasta indekss
 Town=Pilsēta
-Web=Web
+Web=Mājaslapa
 Poste= Amats
 DefaultLang=Valoda pēc noklusējuma
 VATIsUsed=PVN tiek izmantots
 VATIsNotUsed=PVN netiek izmantots
-CopyAddressFromSoc=Aizpildiet adresi thirdparty adresi
+CopyAddressFromSoc=Aizpildiet trešās puses adresi
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE tiek izmantota
 LocalTax1IsNotUsedES= RE netiek izmantots
@@ -230,9 +230,9 @@ ProfId6RU=-
 VATIntra=PVN numurs
 VATIntraShort=PVN numurs
 VATIntraVeryShort=PVN
-VATIntraSyntaxIsValid=Sintakse ir derīgs
+VATIntraSyntaxIsValid=Sintakse ir pareiza
-VATIntraValueIsValid=Vērtība ir derīga
+VATIntraValueIsValid=Vērtība ir pareizas
-ProspectCustomer=Prospect / Klientu
+ProspectCustomer=Prospect / Klients
 Prospect=Perspektīva
 CustomerCard=Klienta karte
 Customer=Klients
@@ -256,21 +256,21 @@ CompanyList=Kompānijas sarakstā
 AddContact=Pievienot kontaktu
 AddContactAddress=Pievienot kontaktu / adrese
 EditContact=Labot kontaktu
-EditContactAddress=Labot kontaktu / adrese
+EditContactAddress=Labot kontakta / adresi
 Contact=Sazināties
 ContactsAddresses=Kontakti / adreses
 NoContactDefinedForThirdParty=Nav kontakta definēts šīs trešās personas
 NoContactDefined=Nav kontakta definēts
 DefaultContact=Default kontakta / adrese
 AddCompany=Pievienot uzņēmumu
-AddThirdParty=Pievienot trešo personu
+AddThirdParty=Pievienot trešo pusi
 DeleteACompany=Dzēst uzņēmumu
 PersonalInformations=Personas dati
 AccountancyCode=Grāmatvedība kods
 CustomerCode=Klienta kods
-SupplierCode=Piegādātājs kods
+SupplierCode=Piegādātāja kods
-CustomerAccount=Klienta konta
+CustomerAccount=Klienta konts
-SupplierAccount=Piegādātājs kontu
+SupplierAccount=Piegādātāja konts
 CustomerCodeDesc=Klienta kods, unikāls visiem klientiem
 SupplierCodeDesc=Piegādātājs kods, unikāli visiem piegādātājiem
 RequiredIfCustomer=Nepieciešams, ja trešā puse ir klients vai izredzes
@@ -289,7 +289,7 @@ ListOfCompanies=Uzņēmumu sarakstu
 ListOfThirdParties=Saraksts ar trešajām personām
 ShowCompany=Rādīt uzņēmumu
 ShowContact=Rādīt sazināties
-ContactsAllShort=Visas (Nr. filtrs)
+ContactsAllShort=Visi (Bez filtra)
 ContactType=Sazinieties tipa
 ContactForOrders=Ordeņa kontakts
 ContactForProposals=Priekšlikuma kontakts
@@ -314,7 +314,7 @@ VATIntraCheckDesc=Saite <b>%s</b> ļauj lūgt Eiropas PVN pārbaudītājs pakalp
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Pārbaudiet Intracomunnautary PVN par Eiropas komisijā vietas
 VATIntraManualCheck=Jūs varat arī pārbaudīt manuāli no eiropas mājas lapas <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Pārbaudiet nav iespējams. Pārbaudiet pakalpojums netiek nodrošināts ar dalībvalsts (%s).
+ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
 NorProspectNorCustomer=Tāpat arī izredzes, ne klientu
 JuridicalStatus=Juridiskais statuss
 Staff=Personāls
@@ -334,10 +334,10 @@ TE_UNKNOWN=-
 TE_STARTUP=Starta
 TE_GROUP=Liels uzņēmums
 TE_MEDIUM=Vidēja uzņēmums
-TE_ADMIN=Valdības
+TE_ADMIN=Valsts iestāde
 TE_SMALL=Mazs uzņēmums
 TE_RETAIL=Mazumtirgotājs
-TE_WHOLE=Wholetailer
+TE_WHOLE=Vairumtrirgotājs
 TE_PRIVATE=Privātpersona
 TE_OTHER=Cits
 StatusProspect-1=Nesazināties
@@ -352,8 +352,8 @@ ChangeContactInProcess=Mainīt statusu uz &quot;Kontaktēties procesā&quot;
 ChangeContactDone=Mainīt statusu uz &quot;Kontaktēties jādara&quot;
 ProspectsByStatus=Perspektīvas pēc statusa
 BillingContact=Norēķinu kontakts
-NbOfAttachedFiles=Skaits pievienotos failus
+NbOfAttachedFiles=Pievienoto failu skaits
-AttachANewFile=Pievienojiet jaunu failu
+AttachANewFile=Pievienot jaunu failu
 NoRIB=Nav noteikts BAN
 NoParentCompany=Neviens
 ExportImport=Import-Export
@@ -372,7 +372,7 @@ DeliveryAddress=Piegādes adrese
 DeliveryAddressLabel=Piegādes adrese etiķete
 DeleteDeliveryAddress=Dzēst piegādes adresi
 ConfirmDeleteDeliveryAddress=Vai tiešām vēlaties dzēst šo piegādes adresi?
-NewDeliveryAddress=Jauns piegādes adrese
+NewDeliveryAddress=Jauna piegādes adrese
 AddDeliveryAddress=Pievienot adresi
 AddAddress=Pievienot adresi
 NoOtherDeliveryAddress=Nav alternatīvu piegādes definēts adrese
@@ -380,15 +380,15 @@ SupplierCategory=Piegādātājs kategorija
 JuridicalStatus200=Neatkarīga
 DeleteFile=Izdzēst failu
 ConfirmDeleteFile=Vai jūs tiešām vēlaties izdzēst šo failu?
-AllocateCommercial=Piešķirts pārdošanas pārstāvis
+AllocateCommercial=Piešķirts pārdošanas pārstāvim
-SelectCountry=Izvēlēties valsti
+SelectCountry=Izvēlieties valsti
 SelectCompany=Izvēlieties trešo personu
 Organization=Organizēšana
-AutomaticallyGenerated=Automātiski ģenerē
+AutomaticallyGenerated=Automātiski ģenerēts
-FiscalYearInformation=Informācija par fiskālajā gadā
+FiscalYearInformation=Informācija par fiskālo gadu
-FiscalMonthStart=Sākot mēnesis fiskālajā gadā
+FiscalMonthStart=Fiskālā gada pirmais mēnesis
 YouMustCreateContactFirst=Jums ir izveidot e-pastus kontaktus trešās puses vispirms, lai varētu pievienot e-pastus paziņojumus.
-ListSuppliersShort=Piegādātāju
+ListSuppliersShort=Piegādātāju saraksts
 ListProspectsShort=Saraksts perspektīvas
 ListCustomersShort=Klientu saraksts
 ThirdPartiesArea=Trešām pusēm platība
@@ -397,9 +397,9 @@ UniqueThirdParties=Kopā unikālu trešajām personām
 InActivity=Atvērt
 ActivityCeased=Slēgts
 ActivityStateFilter=Aktivitātes statuss
-ProductsIntoElements=To produktu saraksts, uz
+ProductsIntoElements=Produktu saraksts uz
 OutstandingBill=Maks. par izcilu rēķinu
 # Monkey
 MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0.
 # Leopard
-LeopardNumRefModelDesc=Kods ir bez maksas. Šis kods var grozīt jebkurā laikā.
+LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.

htdocs/langs/lv_LV/externalsite.lang

@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup saite uz ārējo vietni
+ExternalSiteSetup=Ārējo vietņu iestatīšana
 ExternalSiteURL=Ārējā Vietnes URL
-ExternalSiteModuleNotComplete=Modulis ExternalSite nebija pareizi konfigurēts.
+ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.

htdocs/langs/lv_LV/ftp.lang

@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client modulis iestatīšana
+FTPClientSetup=FTP Klienta moduļa iestatīšana
-NewFTPClient=Jauns FTP savienojumu iestatīšana
+NewFTPClient=Jauna FTP savienojuma iestatīšana
-FTPArea=FTP vieta
+FTPArea=FTP sadaļa
-FTPAreaDesc=Šis ekrāns parādīs saturu FTP servera skatu
+FTPAreaDesc=Šis logs attēlo FTP servera saturu
-SetupOfFTPClientModuleNotComplete=Setup FTP klienta modulis, šķiet, nav pabeigta
+SetupOfFTPClientModuleNotComplete=FTP klienta moduļa konfigurēšana, nav pabeigta
-FTPFeatureNotSupportedByYourPHP=Jūsu PHP neatbalsta FTP funkcijas
+FTPFeatureNotSupportedByYourPHP=Jūsu PHP neatbalsta FTP funkciju
-FailedToConnectToFTPServer=Neizdevās izveidot savienojumu ar FTP serveri (servera %s, ostu %s)
+FailedToConnectToFTPServer=Neizdevās izveidot savienojumu ar FTP serveri (serveris %s, posts %s)
-FailedToConnectToFTPServerWithCredentials=Neizdevās, lai pieteiktos uz FTP serveri ar noteiktu login / paroli
+FailedToConnectToFTPServerWithCredentials=Neizdevās pieslēgties FTP serverim ar norādīto lietotāju / paroli
 FTPFailedToRemoveFile=Neizdevās noņemt failu <b>%s.</b>
-FTPFailedToRemoveDir=Neizdevās noņemt direktoriju <b>%s</b> (Pārbaudiet atļaujas un tas katalogs ir tukša).
+FTPFailedToRemoveDir=Neizdevās noņemt direktoriju <b>%s</b> (Pārbaudiet atļaujas un to vai katalogs ir tukšs).
-FTPPassiveMode=Pasīvā režīmā
+FTPPassiveMode=Pasīvais režīms

htdocs/langs/lv_LV/install.lang

@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Vienkārši sekojiet instrukcijām soli pa solim.
-MiscellaneousChecks=Priekšnoteikumi pārbaude
+MiscellaneousChecks=Priekšnoteikumu pārbaude
 DolibarrWelcome=Laipni lūdzam Dolibarr
-ConfFileExists=Konfigurācijas failu <b>%s</b> eksistē.
+ConfFileExists=Konfigurācijas fails <b>%s</b> eksistē.
-ConfFileDoesNotExists=Konfigurācijas failu <b>%s</b> neeksistē!
+ConfFileDoesNotExists=Konfigurācijas fails <b>%s</b> neeksistē!
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurācijas failu <b>%s</b> nav un nevar tikt izveidots!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurācijas fails <b>%s</b> nav un nevar tikt izveidots!
-ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> varētu izveidot.
+ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> nevar izveidot.
-ConfFileIsNotWritable=Konfigurācijas fails <b>%s</b> nav rakstāms. Pārbaudiet atļaujas. Par pirmo instalēt, jūsu tīmekļa serveris ir jāpiešķir, lai varētu rakstīt šajā failā laikā konfigurācijas process (&quot;chmod 666&quot;, piemēram, uz kā OS UNIX).
+ConfFileIsNotWritable=Konfigurācijas failam <b>%s</b> nav rakstīšanas tiesības. Pārbaudiet atļaujas. Par pirmo instalēt, jūsu tīmekļa serveris ir jāpiešķir, lai varētu rakstīt šajā failā laikā konfigurācijas process (&quot;chmod 666&quot;, piemēram, uz kā OS UNIX).
-ConfFileIsWritable=Konfigurācijas fails <b>%s</b> ir rakstāms.
+ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
-ConfFileReload=Pārlādēt visu informāciju no konfigurācijas failu.
+ConfFileReload=Pārlādēt visu informāciju no konfigurācijas faila.
 PHPSupportSessions=Šis PHP atbalsta sesijas.
 PHPSupportPOSTGETOk=Šis PHP atbalsta mainīgie POST un GET.
 PHPSupportPOSTGETKo=Tas ir iespējams, jūsu PHP uzstādīšana neatbalsta mainīgie POST un / vai GET. Pārbaudiet savu parametrs <b>variables_order</b> in php.ini.
@@ -25,40 +25,40 @@ ErrorGoBackAndCorrectParameters=Iet atpakaļ un labot nepareizus parametrus.
 ErrorWrongValueForParameter=Iespējams, esat ievadījis nepareizu vērtību parametra &quot;%s&quot;.
 ErrorFailedToCreateDatabase=Neizdevās izveidot datubāzi '%s &quot;.
 ErrorFailedToConnectToDatabase=Neizdevās izveidot savienojumu ar datu bāzi &quot;%s&quot;.
-ErrorDatabaseVersionTooLow=Datu bāzes versija (%s) pārāk vecs. Versija %s vai augstāka ir nepieciešama.
+ErrorDatabaseVersionTooLow=Datu bāzes versija (%s) pārāk veca. Versija %s vai augstāka ir nepieciešama.
 ErrorPHPVersionTooLow=PHP versija ir pārāk veca. Versija %s ir nepieciešama.
 WarningPHPVersionTooLow=PHP versija ir pārāk veca. Versija %s vai vairāk ir sagaidāms. Šī versija ļaus uzstādīt, bet netiek atbalstīta.
 ErrorConnectedButDatabaseNotFound=Savienojums ar serveri sekmīgi pabeigta, bet datubāze &quot;%s&quot; nav atrasts.
 ErrorDatabaseAlreadyExists=Datubāze &quot;%s&quot; jau eksistē.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Ja datu bāzē neeksistē, dodieties atpakaļ un pārbaudiet opciju &quot;Izveidot datu bāzi&quot;.
-IfDatabaseExistsGoBackAndCheckCreate=Ja datu bāze jau pastāv, dodieties atpakaļ un atzīmēšanu &quot;Izveidot datu bāzi&quot; variantu.
+IfDatabaseExistsGoBackAndCheckCreate=Ja datu bāze jau pastāv, dodieties atpakaļ un izņemiet ķeksi &quot;Izveidot datu bāzi&quot; .
 WarningBrowserTooOld=Pārāk vecs versiju. Uzlabot savu pārlūkprogrammu, lai jaunāko versiju Firefox, Chrome vai Opera ir ļoti recommanded.
 PHPVersion=PHP versija
 YouCanContinue=Jūs varat turpināt ...
 PleaseBePatient=Lūdzu, esiet pacietīgi ...
 License=Izmantojot licenci
-ConfigurationFile=Konfigurācijas failu
+ConfigurationFile=Konfigurācijas fails
-WebPagesDirectory=Katalogs kur web lapas tiek uzglabāti
+WebPagesDirectory=Katalogs kur web lapas tiek uzglabātas
 DocumentsDirectory=Direktorijā uzglabāt augšupielādēto un rada dokumentus
 URLRoot=URL Root
 ForceHttps=Force drošus savienojumus (https)
 CheckToForceHttps=Pārbaudiet šo opciju, lai piespiestu drošus savienojumus (https). <br> Tas nozīmē, ka tīmekļa serveris ir konfigurēts ar SSL sertifikātu.
-DolibarrDatabase=Dolibarr datu bāze
+DolibarrDatabase=Dolibarr datubāze
-DatabaseChoice=Datu bāzes izvēle
+DatabaseChoice=Datubāzes izvēle
-DatabaseType=Datu bāzes tips
+DatabaseType=Datubāzes tips
 DriverType=Driver tips
 Server=Serveris
 ServerAddressDescription=Nosaukums vai IP adrese datu bāzes serveri, parasti &quot;localhost&quot;, kad datu bāzes serveris ir izvietots uz paša servera, kā web serveri
-ServerPortDescription=Datu bāzes servera portu. Saglabājiet tukšu, ja nav zināms.
+ServerPortDescription=Datu bāzes servera ports. Atstājiet tukšu, ja nav zināms.
-DatabaseServer=Datu bāzes serveris
+DatabaseServer=Datubāzes serveris
-DatabaseName=Datu bāzes nosaukums
+DatabaseName=Datubāzes nosaukums
-DatabasePrefix=Datu bāzes prefiksu tabula
+DatabasePrefix=Datubāzes tabulu prefikss
 Login=Login
 AdminLogin=Pieteikšanās uz Dolibarr datu bāzes īpašnieks.
 Password=Parole
 PasswordAgain=Atkārtot paroli otrreiz
 AdminPassword=Parole Dolibarr datu bāzes īpašnieks.
-CreateDatabase=Izveidot datu bāzi
+CreateDatabase=Izveidot datubāzi
 CreateUser=Izveidot īpašnieks
 DatabaseSuperUserAccess=Datu bāzes serveris - superlietotājs piekļuve
 CheckToCreateDatabase=Rūtiņu, ja datu bāze neeksistē, un ir izveidots. <br> Tādā gadījumā, jums ir jāaizpilda pieteikšanās / paroli SuperUser kontā pie šīs lapas apakšā.
@@ -84,8 +84,8 @@ PleaseTypePassword=Lūdzu, ievadiet paroli, tukšas paroles ir aizliegts!
 PleaseTypeALogin=Lūdzu ierakstiet pieteikšanās!
 PasswordsMismatch=Paroles atšķiras, lūdzu, mēģiniet vēlreiz!
 SetupEnd=Beigas iestatīšanas
-SystemIsInstalled=Šī instalācija ir pabeigta.
+SystemIsInstalled=Instalācija ir pabeigta.
-SystemIsUpgraded=Dolibarr ir modernizēta veiksmīgi.
+SystemIsUpgraded=Dolibarr ir atjaunota veiksmīgi.
 YouNeedToPersonalizeSetup=Jums ir nepieciešams, lai konfigurētu Dolibarr, lai atbilstu jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk:
 AdminLoginCreatedSuccessfuly=Dolibarr Administrator Login <b>&quot;%s&quot;</b> izveidots successfuly.
 GoToDolibarr=Iet uz Dolibarr
@@ -109,7 +109,7 @@ ProcessMigrateScript=Skripts apstrāde
 ChooseYourSetupMode=Izvēlies savu iestatīšanas režīmu un noklikšķiniet uz &quot;Start&quot; ...
 FreshInstall=Svaigi instalēt
 FreshInstallDesc=Izmantojiet šo režīmu, ja tas ir jūsu pirmo reizi instalēt. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalēt, bet, ja jūs vēlaties uzlabot savu versiju, izvēlieties &quot;Upgrade&quot; režīmā.
-Upgrade=Upgrade
+Upgrade=Atjaunot
 UpgradeDesc=Izmantojiet šo režīmu, ja esat nomainījis veco Dolibarr failus ar failiem no jaunāku versiju. Tas būs uzlabot savu datu bāzi un datus.
 Start=Sākums
 InstallNotAllowed=Setup nav atļauts ar <b>conf.php</b> atļaujas
@@ -165,7 +165,7 @@ MigrationSupplierOrder=Datu migrācija uz piegādātāja pasūtījumiem
 MigrationProposal=Datu migrācija komerciāliem priekšlikumus
 MigrationInvoice=Datu migrācija uz klienta rēķiniem
 MigrationContract=Datu migrācija līgumiem
-MigrationSuccessfullUpdate=Upgrade veiksmīga
+MigrationSuccessfullUpdate=Atjaunošana veiksmīga
 MigrationUpdateFailed=Neizdevās jaunināšanas process
 MigrationRelationshipTables=Datu migrācija uz attiecībām tabulām (%s)
 MigrationPaymentsUpdate=Maksājumu datu korekcija
@@ -206,4 +206,4 @@ MigrationProjectUserResp=Datu migrācija jomā fk_user_resp no llx_projet lai ll
 MigrationProjectTaskTime=Update pavadītais laiks sekundēs
 MigrationActioncommElement=Atjaunināt informāciju par pasākumiem
 MigrationPaymentMode=Datu migrācija uz maksājumu režīmā
-MigrationCategorieAssociation=Migrācija kategoriju
+MigrationCategorieAssociation=Kategoriju migrācija

htdocs/langs/lv_LV/languages.lang

@@ -2,19 +2,19 @@
 
 Language_ar_AR=Arābu
 Language_ar_SA=Arābu
-Language_bg_BG=Bulgārijas
+Language_bg_BG=Bulgāru
 Language_ca_ES=Katalāņu
 Language_cs_CZ=Čehu
-Language_da_DA=Dānijas
+Language_da_DA=Dāņu
-Language_da_DK=Dānijas
+Language_da_DK=Dāņu
 Language_de_DE=Vācu
 Language_de_AT=Vācu (Austrija)
 Language_el_GR=Grieķu
 Language_en_AU=Angļu (Austrālija)
-Language_en_GB=English (United Kingdom)
+Language_en_GB=Angļu (Apvienotā Karaliste)
 Language_en_IN=Angļu (Indija)
 Language_en_NZ=Angļu (Jaunzēlande)
-Language_en_SA=English (Saūda Arābija)
+Language_en_SA=Angļu (Saūda Arābija)
 Language_en_US=Angļu (ASV)
 Language_en_ZA=English (Dienvidāfrika)
 Language_es_ES=Spāņu
@@ -26,22 +26,23 @@ Language_es_PE=Spāņu (Peru)
 Language_es_PR=Spāņu (Puertoriko)
 Language_et_EE=Igauņu
 Language_fa_IR=Persiešu
-Language_fi_FI=Fins
+Language_fi_FI=Somu
 Language_fr_BE=Franču (Beļģija)
 Language_fr_CA=Franču (Kanāda)
-Language_fr_CH=Franču (Šveice)
+Language_fr_CH=Franču (Šveices)
-Language_fr_FR=Francijas
+Language_fr_FR=Franču
 Language_fr_NC=Franču (Jaunkaledonija)
 Language_he_IL=Ebreju
-Language_hu_HU=Ungārijas
+Language_hu_HU=Ungāru
 Language_is_IS=Islandiešu
-Language_it_IT=Itālijas
+Language_it_IT=Itāļu
 Language_ja_JP=Japāņu
-Language_ko_KR=Korejas
+Language_ko_KR=Korejiešu
+Language_lv_LV=Latviešu
 Language_nb_NO=Norvēģu (bukmols)
-Language_nl_BE=Holandiešu (Beļģija)
+Language_nl_BE=Holandiešu (Beļģijas)
-Language_nl_NL=Holandiešu (Nīderlande)
+Language_nl_NL=Holandiešu (Nīderlandes)
-Language_pl_PL=Pulēšana
+Language_pl_PL=Poļu
 Language_pt_BR=Portugāļu (Brazīlija)
 Language_pt_PT=Portugāļu
 Language_ro_RO=Rumāņu
@@ -51,6 +52,7 @@ Language_tr_TR=Turku
 Language_sl_SI=Slovēņu
 Language_sv_SV=Zviedru
 Language_sv_SE=Zviedru
+Language_sk_SK=Slovāku
 Language_vi_VN=Vjetnamiešu
 Language_zh_CN=Ķīniešu
 Language_zh_TW=Ķīniešu (tradicionālā)

htdocs/langs/lv_LV/main.lang

@@ -7,7 +7,7 @@ DIRECTION=ltr
 FONTFORPDF=Helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
-SeparatorThousand=None
+SeparatorThousand=Neviens
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
@@ -23,58 +23,58 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Savienojums ar datubāzi
-NoTranslation=Nav tulkošana
+NoTranslation=Nav iztulkots
-NoRecordFound=Neviens ieraksts atrasts
+NoRecordFound=Nav atrasti ieraksti
-NoError=Nav kļūda
+NoError=Nav kļūdu
 Error=Kļūda
-ErrorFieldRequired=Lauks "%s" ir nepieciešama
+ErrorFieldRequired=Lauks "%s" ir obligāti aizpildams
-ErrorFieldFormat=Lauks "%s" ir slikta vērtība
+ErrorFieldFormat=Laukā "%s" ir nepareiza vērtība
-ErrorFileDoesNotExists=Failu %s neeksistē
+ErrorFileDoesNotExists=Fails %s neeksistē
 ErrorFailedToOpenFile=Neizdevās atvērt failu %s
-ErrorCanNotCreateDir=Nevar izveidot dir %s
+ErrorCanNotCreateDir=Nevar izveidot direktoriju %s
-ErrorCanNotReadDir=Nevar nolasīt dir %s
+ErrorCanNotReadDir=Nevar nolasīt direktoriju %s
-ErrorConstantNotDefined=Parametrs %s nav noteikts
+ErrorConstantNotDefined=Parametrs %s nav definēts
-ErrorUnknown=Unkown kļūda
+ErrorUnknown=Nezināma kļūda
 ErrorSQL=SQL kļūda
-ErrorLogoFileNotFound=Logotipa faila "%s" netika atrasts
+ErrorLogoFileNotFound=Logotipa fails "%s" nav atrasts
 ErrorGoToGlobalSetup=Iet uz "Sabiedrībai / nodibinājums" uzstādīšana, lai novērstu šo
 ErrorGoToModuleSetup=Iet uz moduļa uzstādīšanas, lai atrisinātu šo
 ErrorFailedToSendMail=Neizdevās nosūtīt pastu (sūtītājs = %s, uztvērējs = %s)
-ErrorAttachedFilesDisabled=Failu pievienojot ir izslēgta šajā serverī
+ErrorAttachedFilesDisabled=Failu pievienšana nav atļauta šajā serverī
-ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet, izmēri nepārsniedz maksimāli pieļaujamo, ka brīvas vietas ir pieejama uz diska, un ka nav jau failu ar tādu pašu nosaukumu, kas šajā direktorijā.
+ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet vai izmērs nepārsniedz maksimāli pieļaujamo un, ka brīvas vietas ir pieejama uz diska, un nav jau failu ar tādu pašu nosaukumu, kas šajā direktorijā.
-ErrorInternalErrorDetected=Atklātā kļūda
+ErrorInternalErrorDetected=Atklāta kļūda
 ErrorNoRequestRan=Nav pieprasījums skrēja
 ErrorWrongHostParameter=Nepareizs uzņēmēja parametrs
-ErrorYourCountryIsNotDefined=Jūsu valsts nav definēts. Iet uz Home-Setup-Edit un post atkal formu.
+ErrorYourCountryIsNotDefined=Jūsu valsts nav definēta. Ejiet uz Home-Setup-Edit un post atkal formu.
 ErrorRecordIsUsedByChild=Neizdevās dzēst šo ierakstu. Šis ieraksts tiek izmantots vismaz viens bērns ierakstus.
 ErrorWrongValue=Nepareizs vērtība
 ErrorWrongValueForParameterX=Nepareiza vērtība parametru %s
 ErrorNoRequestInError=Nav pieprasījums kļūda
 ErrorServiceUnavailableTryLater=Pakalpojums nav pieejams uz šo brīdi. Mēģiniet vēlreiz vēlāk.
 ErrorDuplicateField=Dublikātu vērtību unikālā jomā
-ErrorSomeErrorWereFoundRollbackIsDone=Dažas kļūdas netika atrasts. Mēs atritināt izmaiņas.
+ErrorSomeErrorWereFoundRollbackIsDone=Dažas kļūdas tika atrastas. Mēs atgriezām atpakaļ visu izejas pozīcijā.
-ErrorConfigParameterNotDefined=Parametrs <b>%s</b> nav definētas iekšpusē Dolibarr config failu <b>conf.php.</b>
+ErrorConfigParameterNotDefined=Parametrs <b>%s</b> nav definētas Dolibarr konfigurācijas failā <b>conf.php.</b>
-ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju <b>%s</b> ar Dolibarr datu bāzē.
+ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju <b>%s</b> Dolibarr datu bāzē.
-ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likmēm, kas noteiktas valsts &quot;%s&quot;.
+ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij &quot;%s&quot;.
 ErrorNoSocialContributionForSellerCountry=Kļūda, ne sociālās iemaksas veids definēta valsts &quot;%s&quot;.
 ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
-ErrorOnlyPngJpgSupported=Kļūda, tikai. Png un. Jpg attēla formāta failu, tiek atbalstītas.
+ErrorOnlyPngJpgSupported=Kļūda, tikai. Png un. Jpg attēla formāti ir atļauti.
 ErrorImageFormatNotSupported=Jūsu PHP neatbalsta funkcijas, lai pārvērstu attēlus šajā formātā.
 SeeAlso=Skatīt arī %s
 BackgroundColorByDefault=Noklusējuma fona krāsu
 FileWasNotUploaded=Fails ir izvēlēts arestu, bet vēl nav augšupielādēti. Noklikšķiniet uz &quot;Pievienot failu&quot; par to.
-NbOfEntries=Nb ierakstu
+NbOfEntries=Ierakstu sk
-GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuves)
+GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve)
-GoToHelpPage=Lasīt palīdzēt
+GoToHelpPage=Lasīt palīdzību
 RecordSaved=Ieraksts saglabāts
-RecordDeleted=Ierakstīt svītrots
+RecordDeleted=Ieraksts dzēsts
 LevelOfFeature=Līmeņa funkcijas
-NotDefined=Nav noteikts
+NotDefined=Nav definēts
 DefinedAndHasThisValue=Definēti un vērtību
-IsNotDefined=undefined
+IsNotDefined=nav definēts
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentifikācijas režīms ir setup, lai <b>%s</b> konfigurācijas failu <b>conf.php.</b> <br> Tas nozīmē, ka parole datubāze ir extern uz Dolibarr, tāpēc, mainot šai jomā nav nekādas ietekmes.
 Administrator=Administrators
-Undefined=Undefined
+Undefined=Nav definēts
 PasswordForgotten=Aizmirsāt paroli?
 SeeAbove=Skatīt iepriekš
 HomeArea=Mājas platība
@@ -89,11 +89,11 @@ RequestLastAccess=Pieprasījums pēdējo datu bāzes piekļuvi
 RequestLastAccessInError=Pieprasījums pēdējo datu bāzes piekļuvi kļūda
 ReturnCodeLastAccessInError=Atgriešanās kodu pēdējo datu bāzes piekļuvi kļūda
 InformationLastAccessInError=Informācija pēdējo datu bāzes piekļuvi kļūda
-DolibarrHasDetectedError=Dolibarr ir atklāts tehnisku kļūdu
+DolibarrHasDetectedError=Dolibarr ir atklājis tehnisku kļūdu
-InformationToHelpDiagnose=Šī ir informācija, kas var palīdzēt diagnostikas
+InformationToHelpDiagnose=Šī informācija, kas var palīdzēt diagnostikai
 MoreInformation=Vairāk informācijas
-NotePublic=Piezīme (valsts)
+NotePublic=Piezīme (publiska)
-NotePrivate=Piezīme (privāts)
+NotePrivate=Piezīme (privāta)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr bija setup, lai ierobežotu precizitāti vienības cenām <b>%s</b> zīmēm aiz komata.
 DoTest=Pārbaude
 ToFilter=Filtrs
@@ -103,8 +103,8 @@ Yes=Jā
 no=nē
 No=Nē
 All=Visi
-Home=Mājas
+Home=Mājās
-Help=Palīdzēt
+Help=Palīdzība
 OnlineHelp=Tiešsaistes palīdzība
 PageWiki=Wiki lapa
 Always=Vienmēr
@@ -122,7 +122,7 @@ Disable=Atslēgt
 Disabled=Invalīdiem
 Add=Pievienot
 AddLink=Pievienot saiti
-Update=Modernizēt
+Update=Atjaunot
 AddActionToDo=Pievienot notikumu darīt
 AddActionDone=Pievienot notikumu darīts
 Close=Aizvērt
@@ -137,11 +137,11 @@ Modify=Modificēt
 Edit=Rediģēt
 Validate=Apstiprināt
 ToValidate=Lai apstiprinātu
-Save=Glābt
+Save=Saglabāt
 SaveAs=Saglabāt kā
 TestConnection=Testa savienojums
-ToClone=Klons
+ToClone=Klonēt
-ConfirmClone=Izvēlieties datus, kurus vēlaties klons:
+ConfirmClone=Izvēlieties datus, kurus vēlaties klonēt:
 NoCloneOptionsSpecified=Nav datu klons noteikts.
 Of=no
 Go=Iet
@@ -153,21 +153,21 @@ Search=Meklēšana
 SearchOf=Meklēšana
 Valid=Derīgs
 Approve=Apstiprināt
-ReOpen=Re-Atvērt
+ReOpen=Atvērt par jaunu
 Upload=Sūtīt failu
 ToLink=Saite
 Select=Atlasīt
 Choose=Izvēlēties
-ChooseLangage=Lūdzu, izvēlieties savu valodu
+ChooseLangage=Lūdzu, izvēlieties valodu
-Resize=Resize
+Resize=Samazināt
-Recenter=Ievirzītu
+Recenter=Centrēt
 Author=Autors
 User=Lietotājs
 Users=Lietotāji
 Group=Grupa
 Groups=Grupas
 Password=Parole
-PasswordRetype=Atkārtojiet paroli
+PasswordRetype=PArole atkārtoti
 NoteSomeFeaturesAreDisabled=Ņemiet vērā, ka funkcijas / modules daudz ir invalīdi šajā demonstrācijā.
 Name=Nosaukums
 Person=Persona
@@ -183,7 +183,7 @@ Type=Tips
 Language=Valoda
 MultiLanguage=Multi-valodu
 Note=Piezīme
-CurrentNote=Pašreizējais piezīme
+CurrentNote=Pašreizējā piezīme
 Title=Virsraksts
 Label=Etiķete
 RefOrLabel=Ref. vai etiķete
@@ -200,24 +200,24 @@ NumberByMonth=Numurs pēc mēneša
 AmountByMonth=Summa pēc mēneša
 Numero=Numurs
 Limit=Ierobežot
-Limits=Robežas
+Limits=Ierobežojums
-DevelopmentTeam=Attīstības Team
+DevelopmentTeam=Izstrādātāju komanda
-Logout=Logout
+Logout=Iziet
 Connection=Saistība
-Setup=Setup
+Setup=Iestatījumi
 Alert=Brīdināt
 Previous=Iepriekšējais
 Next=Nākamais
-Cards=Kārtis
+Cards=Kartes
 Card=Karte
 Now=Tagad
 Date=Datums
-DateStart=Šim sākums
+DateStart=Sākuma datums
-DateEnd=Datums beigas
+DateEnd=Beigu datums
-DateCreation=Izveides datums
+DateCreation=Izveidošanas datums
 DateModification=Modificēšanas datums
 DateModificationShort=Modif. datums
-DateLastModification=Pēdējās izmaiņas datums
+DateLastModification=Pēdējo izmaiņu datums
 DateValidation=Apstiprināšanas datums
 DateClosing=Beigu datums
 DateDue=Izpildes datums
@@ -236,7 +236,7 @@ DurationYear=gads
 DurationMonth=mēnesis
 DurationWeek=nedēļa
 DurationDay=diena
-DurationYears=gadiem
+DurationYears=gadi
 DurationMonths=mēneši
 DurationWeeks=nedēļas
 DurationDays=dienas
@@ -246,13 +246,13 @@ Week=Nedēļa
 Day=Diena
 Hour=Stunda
 Minute=Minūte
-Second=Otrais
+Second=Sekunde
-Years=Gadiem
+Years=Gadi
 Months=Mēneši
 Days=Dienas
 days=dienas
-Hours=Laiks
+Hours=Stundas
-Minutes=Protokols
+Minutes=Minūtes
 Seconds=Sekundes
 Today=Šodien
 Yesterday=Vakar
@@ -261,21 +261,21 @@ Quadri=Quadri
 MonthOfDay=Mēnesis dienas
 HourShort=H
 Rate=Likme
-UseLocalTax=Iekļaut nodokli
+UseLocalTax=Ar PVN
 Bytes=Baiti
 KiloBytes=Kilobaiti
 MegaBytes=Megabaiti
-GigaBytes=Gigabaitiem
+GigaBytes=Gigabaiti
-TeraBytes=Terabaitiem
+TeraBytes=Terabaiti
 b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
-Tb=Tuberkuloze
+Tb=Tb
-Cut=Samazināt
+Cut=Izgriezt
 Copy=Kopēt
-Paste=Pasta
+Paste=Ielīmēt
-Default=Default
+Default=Noklusējums
 DefaultValue=Noklusējuma vērtība
 DefaultGlobalValue=Globālā vērtība
 Price=Cena
@@ -307,19 +307,19 @@ Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
 TotalHTShort=Kopējais (neto)
-TotalTTCShort=Pavisam (ieskaitot nodokli)
+TotalTTCShort=Pavisam (ar PVN)
-TotalHT=Kopā (bez nodokļiem)
+TotalHT=Pavisam (bez PVN)
-TotalTTC=Pavisam (ieskaitot nodokli)
+TotalTTC=Pavisam (ar PVN)
 TotalTTCToYourCredit=Pavisam (ieskaitot nodokli), lai jūsu kredīta
 TotalVAT=Kopējā nodokļu
 TotalLT1=Kopējā nodokļu 2
 TotalLT2=Kopējā nodokļu 3
 TotalLT1ES=Kopējais RE
 TotalLT2ES=Kopējais IRPF
-IncludedVAT=Iekļauts nodoklis
+IncludedVAT=Ar PVN
-HT=Pēc nodokļiem
+HT=Bez PVN
-TTC=Inc nodoklis
+TTC=Ar PVN
-VAT=Pārdošanas nodoklis
+VAT=PVN
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Nodokļa likme
@@ -327,7 +327,7 @@ Average=Vidējais
 Sum=Summa
 Delta=Delta
 Module=Modulis
-Option=Izvēle
+Option=Iespējas
 List=Saraksts
 FullList=Pilns saraksts
 Statistics=Statistika
@@ -337,22 +337,22 @@ ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. piegādātājs
 RefPayment=Ref. maksājums
-CommercialProposalsShort=Commercial priekšlikumi
+CommercialProposalsShort=Komerciālie priekšlikumi
 Comment=Komentēt
 Comments=Komentāri
 ActionsToDo=Pasākumi, kas darīt
 ActionsDone=Pasākumi darīts
-ActionsToDoShort=Lai to izdarītu
+ActionsToDoShort=Vēl jādara
-ActionsRunningshort=Sākās
+ActionsRunningshort=Sākts
 ActionsDoneShort=Done
 ActionNotApplicable=Nav piemērojams
-ActionRunningNotStarted=Lai sāktu
+ActionRunningNotStarted=Jāsāk
-ActionRunningShort=Sākās
+ActionRunningShort=Sākts
 ActionDoneShort=Pabeigts
 CompanyFoundation=Kompānija / Foundation
 ContactsForCompany=Kontakti šīs trešās personas
 ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
-AddressesForCompany=Adreses šīs trešās personas
+AddressesForCompany=Šīs trešās puses adreses
 ActionsOnCompany=Pasākumi par šīs trešās personas
 ActionsOnMember=Pasākumi par šo locekli
 NActions=%s notikumi
@@ -361,7 +361,7 @@ Filter=Filtrs
 RemoveFilter=Noņemt filtru
 ChartGenerated=Attēls radīts
 ChartNotGenerated=Attēls nav radīts
-GeneratedOn=Balstīties uz %s
+GeneratedOn=Izveidots %s
 Generate=Radīt
 Duration=Ilgums
 TotalDuration=Kopējais pasākuma ilgums
@@ -372,7 +372,7 @@ DolibarrBoard=Dolibarr padome
 DolibarrStateBoard=Statistika
 DolibarrWorkBoard=Darba uzdevumi padome
 Available=Pieejams
-NotYetAvailable=Nav pieejams
+NotYetAvailable=Nav vēl pieejams
 NotAvailable=Nav pieejams
 Popularity=Popularitāte
 Categories=Kategorijas
@@ -383,18 +383,18 @@ to=līdz
 and=un
 or=vai
 Other=Cits
-Others=Pārējie
+Others=Citi
 OtherInformations=Citas informācija
 Quantity=Daudzums
 Qty=Daudz
-ChangedBy=Mainīt
+ChangedBy=Labojis
 ReCalculate=Pārrēķināt
-ResultOk=Veiksme
+ResultOk=Veiksmīgi
 ResultKo=Neveiksme
 Reporting=Pārskata
 Reportings=Pārskata
-Draft=Projekts
+Draft=Melnraksts
-Drafts=Dambrete
+Drafts=Melnraksti
 Validated=Validēta
 Opened=Atvērts
 New=Jauns
@@ -402,11 +402,11 @@ Discount=Atlaide
 Unknown=Nezināms
 General=Vispārējs
 Size=Lielums
-Received=Saņemti
+Received=Saņemts
-Paid=Apmaksātais
+Paid=Apmaksāts
 Topic=Subjekts
-ByCompanies=Trešās personas
+ByCompanies=Pēc trešajām personām
-ByUsers=Ar lietotājiem
+ByUsers=Pēc lietotājiem
 Links=Saites
 Link=Saite
 Receipts=Ieņēmumi
@@ -436,22 +436,22 @@ October=Oktobris
 November=Novembris
 December=Decembris
 JanuaryMin=Jan
-FebruaryMin=Februāris
+FebruaryMin=Feb
-MarchMin=Sagandēt
+MarchMin=Mar
-AprilMin=Aprīlis
+AprilMin=Apr
-MayMin=Maijs
+MayMin=Mai
-JuneMin=Jūnijs
+JuneMin=Jūn
-JulyMin=Jūlijs
+JulyMin=Jūl
-AugustMin=Augusts
+AugustMin=Aug
-SeptemberMin=Septembris
+SeptemberMin=Sep
-OctoberMin=Oktobris
+OctoberMin=Okt
-NovemberMin=Novembris
+NovemberMin=Nov
-DecemberMin=Decembris
+DecemberMin=Dec
 Month01=janvāris
 Month02=februāris
-Month03=gājiens
+Month03=marts
 Month04=aprīlis
-Month05=var
+Month05=maijs
 Month06=jūnijs
 Month07=jūlijs
 Month08=augusts
@@ -459,30 +459,30 @@ Month09=septembris
 Month10=oktobris
 Month11=novembris
 Month12=decembris
-MonthShort01=janvāris
+MonthShort01=jan
-MonthShort02=februāris
+MonthShort02=feb
-MonthShort03=sagandēt
+MonthShort03=mar
-MonthShort04=aprīlis
+MonthShort04=apr
-MonthShort05=var
+MonthShort05=mai
-MonthShort06=jūnijs
+MonthShort06=jūn
-MonthShort07=jūlijs
+MonthShort07=jūl
-MonthShort08=augusts
+MonthShort08=aug
-MonthShort09=septembris
+MonthShort09=sep
-MonthShort10=oktobris
+MonthShort10=okt
-MonthShort11=novembris
+MonthShort11=nov
-MonthShort12=decembris
+MonthShort12=dec
 AttachedFiles=Pievienotie faili un dokumenti
-FileTransferComplete=Fails tika augšupielādēts successfuly
+FileTransferComplete=Fails tika augšupielādēts veiksmīgi
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
-ReportName=Pārskata nosaukums
+ReportName=Atskaites nosaukums
 ReportPeriod=Atskaites periods
 ReportDescription=Apraksts
 Report=Ziņojums
-Keyword=Mot Clé
+Keyword=Atslēgas vārdi
 Legend=Leģenda
-FillTownFromZip=Aizpildiet pilsētu no rāvējslēdzēju
+FillTownFromZip=Aizpildiet pilsētu no pasta indeksa
 Fill=Aizpildīt
 Reset=Reset
 ShowLog=Rādīt log
@@ -493,9 +493,9 @@ ReadPermissionNotAllowed=Lasīt atļauja nav atļauts
 AmountInCurrency=Summa %s valūtā
 Example=Piemērs
 Examples=Piemēri
-NoExample=Nav piemērs
+NoExample=Nav piemēra
-FindBug=Paziņo par kļūdu
+FindBug=Ziņot par kļūdu
-NbOfThirdParties=Skaits trešajām personām
+NbOfThirdParties=Trešo personu skaits
 NbOfCustomers=Klientu skaits
 NbOfLines=Līniju skaits
 NbOfObjects=Objektu skaits
@@ -545,21 +545,21 @@ TextUsedInTheMessageBody=E-pasts ķermeņa
 SendAcknowledgementByMail=Send Ack. pa e-pastu
 NoEMail=Nav e-pasta
 Owner=Īpašnieks
-DetectedVersion=Atklātie versija
+DetectedVersion=Noteiktā versija
 FollowingConstantsWillBeSubstituted=Šādas konstantes tiks aizstāts ar atbilstošo vērtību.
 Refresh=Atsvaidzināt
 BackToList=Atpakaļ uz sarakstu
 GoBack=Iet atpakaļ
 CanBeModifiedIfOk=Var mainīt, ja ir spēkā
 CanBeModifiedIfKo=Var mainīt, ja nav derīga
-RecordModifiedSuccessfully=Reģistrēt izmaiņas veiksmīgi
+RecordModifiedSuccessfully=ieraksts modificēts veiksmīgi
-RecordsModified=%s ieraksti modificēts
+RecordsModified=%s ieraksti modificēti
 AutomaticCode=Automātiskās kods
 NotManaged=Nepārvalda
-FeatureDisabled=Funkcija izslēgta
+FeatureDisabled=Funkcija bloķēta
 MoveBox=Pārvietot kastes %s
 Offered=Piedāvā
-NotEnoughPermissions=Jums nav atļaujas šai darbībai
+NotEnoughPermissions=Jums nav atļauta šī darbība
 SessionName=Sesijas nosaukums
 Method=Metode
 Receive=Saņemt
@@ -567,57 +567,57 @@ PartialWoman=Daļējs
 PartialMan=Daļējs
 TotalWoman=Kopsumma
 TotalMan=Kopsumma
-NeverReceived=Nekad nav saņēmusi
+NeverReceived=Nekad nav saņemts
 Canceled=Atcelts
-YouCanChangeValuesForThisListFromDictionnarySetup=Jūs varat mainīt vērtības šajā sarakstā no izvēlnes Setup - dictionnary
+YouCanChangeValuesForThisListFromDictionnarySetup=Jūs varat mainīt vērtības šajā sarakstā no izvēlnes Iestatījumi - vārdnīca
 Color=Krāsa
-Documents=Piesaistītu failu
+Documents=Piesaistītie faili
-DocumentsNb=Piesaistītu failu (%s)
+DocumentsNb=Piesaistītie faili (%s)
 Documents2=Dokumenti
-BuildDocuments=Radītais dokumenti
+BuildDocuments=Izveidotie dokumenti
-UploadDisabled=Pievienot invalīdiem
+UploadDisabled=Augšupielāde bloķēta
 MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Dalībnieki
 MenuAgendaGoogle=Google programma
 ThisLimitIsDefinedInSetup=Dolibarr robeža (Menu mājas uzstādīšana-drošība): %s Kb, PHP robeža: %s Kb
-NoFileFound=Neviens dokuments, kas saglabāti šajā direktorijā
+NoFileFound=Neviens dokuments nav saglabāts šajā direktorijā
 CurrentUserLanguage=Pašreizējā valoda
 CurrentTheme=Pašreizējā tēma
 CurrentMenuManager=Pašreizējais izvēlne vadītājs
-DisabledModules=Invalīdiem moduļi
+DisabledModules=Bloķētie moduļi
 For=Uz
 ForCustomer=Klientam
 Signature=Paraksts
 HidePassword=Rādīt komanda ar paroli slēptās
 UnHidePassword=Parādīt savu patieso komandu ar skaidru paroli
 Root=Sakne
-Informations=Informations
+Informations=Informācija
 Page=Lappuse
 Notes=Piezīmes
 AddNewLine=Pievienot jaunu līniju
 AddFile=Pievienot failu
-ListOfFiles=Saraksts pieejamo failu
+ListOfFiles=Saraksts ar pieejamiem failiem
-FreeZone=Brīva teksta
+FreeZone=Brīvs teksts
-CloneMainAttributes=Klons objekts ar tās galvenajiem atribūtiem
+CloneMainAttributes=Klonēt objektu ar tā galvenajiem atribūtiem
-PDFMerge=PDF sapludināšana
+PDFMerge=Apvienot PDF
 Merge=Apvienot
 PrintContentArea=Rādīt lapu drukāt galveno satura jomā
 MenuManager=Izvēlne vadītājs
-NoMenu=Nav sub-menu
+NoMenu=Nav apakš izvēlnes
-WarningYouAreInMaintenanceMode=Uzmanību, jums ir uzturēšanas režīmā, lai tikai pieteikšanās <b>%s</b> ir atļauts lietot pieteikumu brīdī.
+WarningYouAreInMaintenanceMode=Uzmanību, jūs esat uzturēšanas režīmā, t.i. tikai pieteikšanās <b>%s</b> ir atļauts lietot programmu.
 CoreErrorTitle=Sistēmas kļūda
 CoreErrorMessage=Atvainojiet, radās kļūda. Pārbaudiet žurnālus vai sazinieties ar sistēmas administratoru.
 CreditCard=Kredītkarte
-FieldsWithAreMandatory=Lauki ar <b>%s</b> ir obligāti
+FieldsWithAreMandatory=Lauki ar <b>%s</b> ir obligāti aizpildāmi
-FieldsWithIsForPublic=Lauki ar <b>%s</b> tiek parādīta sabiedrības locekļu sarakstu. Ja jūs nevēlaties, lai tas, pārbaudīt pie &quot;sabiedrības&quot; lodziņā.
+FieldsWithIsForPublic=Lauki ar <b>%s</b> parāda sabiedrības locekļu sarakstu. Ja jūs nevēlaties to, tad izņemiet ķeksi pie &quot;sabiedrības&quot; lodziņa.
-AccordingToGeoIPDatabase=(Saskaņā ar GeoIP konversiju)
+AccordingToGeoIPDatabase=(Saskaņā ar GeoIP)
 Line=Līnija
-NotSupported=Netiek atbalstīti
+NotSupported=Netiek atbalstīts
-RequiredField=Obligāts lauks
+RequiredField=Obligāti aizpildāms lauks
 Result=Rezultāts
 ToTest=Pārbaude
-ValidateBefore=Karte ir jāapstiprina, pirms lietojat šo funkciju
+ValidateBefore=Kartiņa ir jāapstiprina, pirms lietojat šo funkciju
 Visibility=Redzamība
 Private=Privāts
 Hidden=Slēpts
@@ -627,24 +627,24 @@ Prefix=Priedēklis
 Before=Pirms
 After=Pēc
 IPAddress=IP adrese
-Frequency=Frekvence
+Frequency=Biežums
 IM=Tūlītējā ziņapmaiņa
 NewAttribute=Jauns atribūts
-AttributeCode=Atribūts kodu
+AttributeCode=Atribūts kods
-OptionalFieldsSetup=Extra atribūti iestatīšana
+OptionalFieldsSetup=Papildus atribūtu iestatīšana
 URLPhoto=URL foto / logo
-SetLinkToThirdParty=Saite citai trešajai pusei
+SetLinkToThirdParty=Saite uz citu trešo pusei
 CreateDraft=Izveidot projektu
 ClickToEdit=Klikšķiniet, lai rediģētu
-ObjectDeleted=Objektu %s svītrots
+ObjectDeleted=Objekts %s dzēsts
 ByCountry=Pēc valsts
-ByTown=Ar pilsētu
+ByTown=Pēc pilsētas
 ByDate=Pēc datuma
-ByMonthYear=Pēc mēneša / gadā
+ByMonthYear=Pēc mēneša / gada
 ByYear=Pēc gada
 ByMonth=pēc mēneša
-ByDay=Līdz dienai
+ByDay=Pēc dienas
-BySalesRepresentative=Ar tirdzniecības pārstāvja
+BySalesRepresentative=Pēc tirdzniecības pārstāvja
 LinkedToSpecificUsers=Saistītas ar noteiktu lietotāja kontaktu
 DeleteAFile=Izdzēst failu
 ConfirmDeleteAFile=Vai jūs tiešām vēlaties izdzēst failu
@@ -652,15 +652,15 @@ NoResults=Nav rezultātu
 ModulesSystemTools=Moduļi instrumenti
 Test=Pārbaude
 Element=Elements
-NoPhotoYet=Nav bildes pieejamas vēl
+NoPhotoYet=Nav bildes
 HomeDashboard=Sākums kopsavilkums
 Deductible=Pašrisks
 from=no
 toward=uz
 Access=Pieeja
-HelpCopyToClipboard=Izmantot taustiņu kombināciju Ctrl + C, lai kopētu uz starpliktuvi
+HelpCopyToClipboard=Izmantot taustiņu kombināciju Ctrl + C, lai kopētu
 SaveUploadedFileWithMask=Saglabāt failu uz servera ar nosaukumu <strong>&quot;%s&quot;</strong> (citādi &quot;%s&quot;)
-OriginFileName=Nom d'origine
+OriginFileName=Sākotnējais nosaukums
 
 # Week day
 Monday=Pirmdiena
@@ -684,10 +684,10 @@ Day4=Ceturtdiena
 Day5=Piektdiena
 Day6=Sestdiena
 Day0=Svētdiena
-ShortMonday=M
+ShortMonday=P
-ShortTuesday=T
+ShortTuesday=O
-ShortWednesday=W
+ShortWednesday=Tr
-ShortThursday=T
+ShortThursday=Ce
-ShortFriday=F
+ShortFriday=P
-ShortSaturday=S
+ShortSaturday=Se
-ShortSunday=S
+ShortSunday=Sv

htdocs/langs/lv_LV/oscommerce.lang

@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - oscommerce
 OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modulis iestatīšana
+OSCommerceSetup=OS Commerce moduļa konfigurēšana
-OSCommerceSetupSaved=OS Commerce uzstādīšana saglabāts
+OSCommerceSetupSaved=OS Commerce uzstādīšanas konfigurācija saglabāta
-OSCommerceServer=OS Commerce servera uzņēmējas / ip
+OSCommerceServer=OS Commerce servera nosaukums / ip adrese
-OSCommerceDatabaseName=OS Commerce datu bāzes nosaukums
+OSCommerceDatabaseName=OS Commerce datubāzes nosaukums
-OSCommercePrefix=OS Commerce tabulas prefiksu
+OSCommercePrefix=OS Commerce tabulas prefikss
-OSCommerceUser=OS Commerce datu bāzes pieteikšanās
+OSCommerceUser=OS Commerce datu bāzes pieteikšanās vārds

htdocs/langs/lv_LV/products.lang

@@ -1,57 +1,57 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produkta ref.
-ProductLabel=Produkta marķējumā
+ProductLabel=Produkta marķējums
-ProductServiceCard=Produkti / Pakalpojumi karte
+ProductServiceCard=Produktu / Pakalpojumu kartiņa
 Products=Produkti
 Services=Pakalpojumi
 Product=Produkts
 Service=Apkalpošana
-ProductId=Produkts / pakalpojums id
+ProductId=Produkta / pakalpojuma id
 Create=Izveidot
-Reference=Atsauces
+Reference=Atsauce
 NewProduct=Jauns produkts
 NewService=Jauns pakalpojums
 ProductCode=Preces kods
-ServiceCode=Pakalpojumu kods
+ServiceCode=Pakalpojuma kods
 ProductAccountancyBuyCode=Grāmatvedība kods (pirkt)
 ProductAccountancySellCode=Grāmatvedība kods (pārdot)
 ProductOrService=Produkts vai pakalpojums
 ProductsAndServices=Produkti un pakalpojumi
-ProductsOrServices=Produkti un pakalpojumi
+ProductsOrServices=Produkti vai pakalpojumi
 ProductsAndServicesOnSell=Pieejamie produkti un pakalpojumi
-ProductsAndServicesNotOnSell=Novecojušas Produkti un pakalpojumi
+ProductsAndServicesNotOnSell=Novecojušie Produkti un Pakalpojumi
-ProductsAndServicesStatistics=Produkti un pakalpojumi statistika
+ProductsAndServicesStatistics=Produktu un pakalpojumu statistika
-ProductsStatistics=Produkti statistika
+ProductsStatistics=Produktu statistika
 ProductsOnSell=Pieejamie produkti
-ProductsNotOnSell=Novecojušas ierīces
+ProductsNotOnSell=Novecojušie produkti
 ServicesOnSell=Pieejamie pakalpojumi
-ServicesNotOnSell=Novecojušas pakalpojumi
+ServicesNotOnSell=Novecojušie pakalpojumi
 InternalRef=Iekšējā atsauce
 LastRecorded=Jaunākie produkti / pakalpojumi par pārdot reģistrē
-LastRecordedProductsAndServices=Pēdējās %s reģistrē produktu / pakalpojumu
+LastRecordedProductsAndServices=Pēdējie %s reģistrētie produkti / pakalpojumi
-LastModifiedProductsAndServices=Pēdējās %s modificēta produktu / pakalpojumu
+LastModifiedProductsAndServices=Pēdējie %s labotie produkti / pakalpojumi
-LastRecordedProducts=Pēdējās %s produkti reģistrē
+LastRecordedProducts=Pēdējie %s reģistrētie produkti
-LastRecordedServices=Pēdējās %s ierakstītas pakalpojumi
+LastRecordedServices=Pēdējie %s reģistrētie pakalpojumi
 LastProducts=Pēdējie produkti
-CardProduct0=Produkta karte
+CardProduct0=Produkta kartiņa
-CardProduct1=Dienesta apliecība
+CardProduct1=Paikalpojuma kartiņa
-CardContract=Līgums karte
+CardContract=Līguma kartiņa
 Warehouse=Noliktava
 Warehouses=Noliktavas
-WarehouseOpened=Noliktava atvērts
+WarehouseOpened=Noliktava atvērta
-WarehouseClosed=Noliktava slēgts
+WarehouseClosed=Noliktava slēgta
 Stock=Krājums
 Stocks=Krājumi
 Movement=Kustība
 Movements=Kustības
 Sell=Pārdošanas
 Buy=Iepirkumi
-OnSell=Pārdod
+OnSell=Pārdošanai
-OnBuy=Iegādei
+OnBuy=Pirkšanai
 NotOnSell=Nav paredzēts pārdošanai
-ProductStatusOnSell=Pārdod
+ProductStatusOnSell=Pārdošanai
 ProductStatusNotOnSell=Nav paredzēts pārdošanai
-ProductStatusOnSellShort=Pārdod
+ProductStatusOnSellShort=Pārdošanai
 ProductStatusNotOnSellShort=Nav paredzēts pārdošanai
 ProductStatusOnBuy=Iegādei
 ProductStatusNotOnBuy=Nav iegādei
@@ -60,14 +60,14 @@ ProductStatusNotOnBuyShort=Nav iegādei
 UpdatePrice=Precizēt cenu
 AppliedPricesFrom=Piemērotās cenas no
 SellingPrice=Pārdošanas cena
-SellingPriceHT=Pārdošanas cena (bez nodokļiem)
+SellingPriceHT=Pārdošanas cena (bez PVN)
-SellingPriceTTC=Pārdošanas cena (ieskaitot PVN)
+SellingPriceTTC=Pārdošanas cena (ar PVN)
 PublicPrice=Sabiedrības cena
 CurrentPrice=Pašreizējā cena
 NewPrice=Jaunā cena
-MinPrice=Minim. pārdošanas cena
+MinPrice=Min. pārdošanas cena
-CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez nodokļiem). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk liela atlaide.
+CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
-ContractStatus=Līgums statuss
+ContractStatus=Līguma statuss
 ContractStatusClosed=Slēgts
 ContractStatusRunning=Ekspluatācijas
 ContractStatusExpired=beidzies
@@ -78,9 +78,9 @@ ErrorProductAlreadyExists=Ar atsauci %s produkts jau pastāv.
 ErrorProductBadRefOrLabel=Nepareiza vērtība atsauces vai etiķeti.
 ErrorProductClone=Radās problēma, mēģinot klons produktu vai pakalpojumu.
 Suppliers=Piegādātāji
-SupplierRef=Piegādātāja produktu ref.
+SupplierRef=Piegādātāja produkta ref.
 ShowProduct=Rādīt preci
-ShowService=Rādīt pakalpojumus
+ShowService=Rādīt pakalpojumu
 ProductsAndServicesArea=Produktu un pakalpojumu jomā
 ProductsArea=Ražojumu jomā
 ServicesArea=Pakalpojumu jomā
@@ -88,7 +88,7 @@ AddToMyProposals=Pievienot pie maniem priekšlikumiem
 AddToOtherProposals=Pievienot pie citiem priekšlikumiem
 AddToMyBills=Pievienot rēķinus
 AddToOtherBills=Pievienot pie citiem rēķiniem
-CorrectStock=Pareiza krājumu
+CorrectStock=Labot krājumus
 AddPhoto=Pievienot foto
 ListOfStockMovements=Saraksts krājumu pārvietošanu
 BuyingPrice=Pirkšanas cena
@@ -98,11 +98,11 @@ AllWays=Ceļš, lai atrastu savu produktu noliktavā
 NoCat=Jūsu produkts nav nevienā kategorijā
 PrimaryWay=Primārā ceļš
 PriceRemoved=Cena noņemts
-BarCode=Svītrkodu
+BarCode=Svītrkods
 BarcodeType=Svītrkoda veids
 SetDefaultBarcodeType=Uzstādīt svītrkoda tipu
-BarcodeValue=Svītrkodu vērtība
+BarcodeValue=Svītrkoda vērtība
-NoteNotVisibleOnBill=Piezīme (nav redzama rēķinos, priekšlikumiem ...)
+NoteNotVisibleOnBill=Piezīme (nav redzama rēķinos, priekšlikumos ...)
 CreateCopy=Izveidot kopiju
 ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks:
 MultiPricesAbility=Aktivizēt multi-cenas
@@ -121,7 +121,7 @@ CategoryFilter=Kategorijas filtrs
 ProductToAddSearch=Meklēt produktu, lai pievienotu
 AddDel=Pievienot / Dzēst
 Quantity=Daudzums
-NoMatchFound=Sakritības atrasts
+NoMatchFound=Nekas netika atrasts
 ProductAssociationList=Saraksts saistītu produktu / pakalpojumu: nosaukums, produkta / pakalpojuma (daudzums ietekmē)
 ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu
 ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu
@@ -129,23 +129,23 @@ DeleteProduct=Dzēst produktu / pakalpojumu
 ConfirmDeleteProduct=Vai tiešām vēlaties dzēst šo produktu / pakalpojumu?
 ProductDeleted=Produkts / Pakalpojums "%s" svītro no datu bāzes.
 DeletePicture=Izdzēstu attēlu
-ConfirmDeletePicture=Vai tiešām vēlaties dzēst šo attēlu?
+ConfirmDeletePicture=Vai tiešām vēlaties izdzēst šo attēlu?
 ExportDataset_produit_1=Produkti
 ExportDataset_service_1=Pakalpojumi
 ImportDataset_produit_1=Produkti
 ImportDataset_service_1=Pakalpojumi
 DeleteProductLine=Dzēst produktu līniju
 ConfirmDeleteProductLine=Vai tiešām vēlaties dzēst šo produktu līniju?
-NoProductMatching=Neviens produkts / pakalpojums atbilst jūsu kritērijiem
+NoProductMatching=Neviens produkts / pakalpojums neatbilst jūsu kritērijiem
 MatchingProducts=Matching produktus / pakalpojumus
 NoStockForThisProduct=Nav akciju šim produktam
 NoStock=Nav noliktavā
 Restock=Atjaunotu
 ProductSpecial=Īpašs
-QtyMin=Minimālā Daudzums
+QtyMin=Minimālais Daudzums
 PriceQty=Cena par šo daudzumu
 PriceQtyMin=Cena par šo min. Daudzums (w / o atlaide)
-VATRateForSupplierProduct=PVN likme (šī piegādātāja / produkta)
+VATRateForSupplierProduct=PVN likme (šim piegādātājam / produktam)
 DiscountQtyMin=Noklusējuma atlaide qty
 NoPriceDefinedForThisSupplier=Nē cena / gab definētas šim piegādātājam / produktu
 NoSupplierPriceDefinedForThisProduct=Piegādātājs cena / gab definētas šo produktu
@@ -167,8 +167,8 @@ ClonePricesProduct=Klons galvenos informations un cenas
 CloneCompositionProduct=Klons produkta / pakalpojuma sastāvu
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
-CustomerPrices=Klienti cenas
+CustomerPrices=Klientu cenas
-SuppliersPrices=Piegādātāji cenas
+SuppliersPrices=Piegādātāju cenas
 CustomCode=Muitas kodekss
 CountryOrigin=Izcelsmes valsts
 HiddenIntoCombo=Slēpta vērā izvēlieties sarakstos

htdocs/langs/lv_LV/shop.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - shop
 Shop=Veikals
 ShopWeb=Interneta veikals
-LastOrders=Pēdējās pasūtījumi
+LastOrders=Pēdējie pasūtījumi
 OnStandBy=Gaidīšanas režīmā
-TreatmentInProgress=Ārstēšana notiek
+TreatmentInProgress=Apstrādāšana procesā
-LastCustomers=Pēdējās klientiem
+LastCustomers=Pēdējais klients
 OSCommerceShop=OsCommerce veikals
 OSCommerce=OsCommerce
 AddProd=Pārdot internetā

htdocs/langs/lv_LV/sms.lang

@@ -3,7 +3,7 @@ Sms=Sms
 SmsSetup=Sms iestatīšana
 SmsDesc=Šī lapa ļauj definēt Globālie iespējas, SMS funkcijas
 SmsCard=SMS Card
-AllSms=Visi SMS campains
+AllSms=Visas SMS kampaņas
 SmsTargets=Mērķi
 SmsRecipients=Mērķi
 SmsRecipient=Mērķis
@@ -16,18 +16,18 @@ SmsMessage=SMS ziņojumu
 ShowSms=Rādīt Sms
 ListOfSms=Saraksts SMS campains
 NewSms=Jauna SMS informācijas kampaņas
-EditSms=Edit Sms
+EditSms=Labot Sms
 ResetSms=Jauns sūtīšana
 DeleteSms=Dzēst Sms informācijas kampaņas
 DeleteASms=Noņemt Sms informācijas kampaņas
 PreviewSms=Previuw Sms
 PrepareSms=Sagatavot sms
-CreateSms=Izveidojiet SMS
+CreateSms=Izveidot SMS
 SmsResult=Rezultāts SMS nosūtīšanas
 TestSms=Testa Sms
 ValidSms=Apstiprināt Sms
 ApproveSms=Apstiprināt Sms
-SmsStatusDraft=Projekts
+SmsStatusDraft=Melnraksts
 SmsStatusValidated=Validēta
 SmsStatusApproved=Apstiprināts
 SmsStatusSent=Nosūtīts
@@ -44,10 +44,10 @@ ConfirmDeleteMailing=Vai varat apstiprināt, likvidējot informācijas kampaņas
 NbOfRecipients=Skaits mērķus
 NbOfUniqueSms=Nb DOF unikālo tālruņa numuriem
 NbOfSms=Nbre no fona numuru
-ThisIsATestMessage=Šis ir testa ziņojums
+ThisIsATestMessage=Šī ir testa ziņa
 SendSms=Sūti SMS
 SmsInfoCharRemain=Nb atlikušo rakstzīmju
 SmsInfoNumero= (Formāts starptautiskā ti: 33899701761)
-DelayBeforeSending=Kavēšanās pirms nosūtīšanas (minūtes)
+DelayBeforeSending=Kavēšanās pirms nosūtīšanas (minūtēs)
 SmsNoPossibleRecipientFound=Nav mērķa pieejams. Pārbaudiet iestatījumus jūsu SMS pakalpojumu sniedzēja.
 

htdocs/langs/lv_LV/workflow.lang

@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-WorkflowSetup=Darbplūsmu modulis uzstādīšana
+WorkflowSetup=Darbplūsmu moduļa iestatīšana
-WorkflowDesc=Šis modulis ir paredzēts, lai mainītu uzvedību automātisko darbību stāšanās spēkā. Pēc noklusējuma, darbplūsma ir atvērts (veicat lieta, lai jūs vēlaties). Jūs varat ļāva automātiskas darbības, kas jums ir interesantas collas
+WorkflowDesc=Šis modulis ir paredzēts, lai mainītu uzvedību automātisko darbību stāšanās spēkā. Pēc noklusējuma, darbplūsma ir atvērta (Jūs varat veikt visu ko vēlaties). Jūs varat automatizēt darbības, kuras Jums ir nepieciešamas
-ThereIsNoWorkflowToModify=Nav darbplūsma jūs varat mainīt, lai modulis ir aktivizēts.
+ThereIsNoWorkflowToModify=Nav darbplūsma kuru Jūs varat mainīt sim modulim.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Izveidot klienta pasūtījumu automātiski pēc komerciāla priekšlikums ir parakstīts
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Izveidot klienta pasūtījumu automātiski pēc komerciālā priekšlikuma parakstīšanas
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc komerciāla priekšlikums ir parakstīts
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Izveidot klienta rēķinu automātiski pēc komerciāla priekšlikuma parakstīšanas
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc tam, kad līgums ir apstiprināts
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc klienta pasūtījuma tiek slēgts
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Izveidot klientu rēķinu automātiski pēc klienta pasūtījuma slēgšanas
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasificēt saistīta avota priekšlikumu Jāmaksā, ja klientu rīkojumu ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasificēt saistīts avots klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasificēt saistīta avota klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir apstiprināts

htdocs/product/composition/fiche.php

@@ -376,7 +376,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td colspan="2">'.$langs->trans("TotalBuyingPriceMin").': ';
 			if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 			print '</td>'; 
-			print '<td>'.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).'</td>';
+			print '<td align="right">'.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).'</td>';
 			if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
 			print '</tr>';
 			print '</table>';

htdocs/product/fiche.php

@@ -698,7 +698,7 @@ else
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto))
 			$tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="32" value="'.$tmpcode.'">';
+        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="32" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($_error)
         {
             print $langs->trans("RefAlreadyExists");
@@ -706,7 +706,7 @@ else
         print '</td></tr>';
 
         // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="libelle" size="40" maxlength="255" value="'.GETPOST('libelle').'"></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag(GETPOST('libelle')).'"></td></tr>';
 
         // On sell
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';

htdocs/public/cron/cron_run_jobs.php

@@ -92,7 +92,7 @@ else
 		exit;
 	}
 }
-$id = GETPOST('id','int');
+$id = GETPOST('id','alpha');	// We accept non numeric id. We will filter later.
 
 
 // create a jobs object

htdocs/societe/class/address.class.php

@@ -0,0 +1,524 @@
+<?php
+/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\file       htdocs/societe/class/address.class.php
+ * 	\ingroup    societe
+ *  \brief      Fichier de la classe des adresses des tiers
+ */
+
+
+/**
+ *  \class 		Address
+ *  \brief 		Class to manage addresses
+ */
+class Address
+{
+	var $db;
+
+	var $id;
+	var $type;
+	var $label;
+	var $socid;
+	var $name;
+	var $address;
+	var $zip;
+	var $town;
+	var $country_id;
+	var $country_code;
+	var $phone;
+	var $fax;
+	var $note;
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDB		$db     Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Create address into database
+	 *
+	 *  @param	int		$socid      Company socid
+	 *  @param  User	$user       Object user making creation
+	 *  @return int         		0 if OK, < 0 if KO
+	 */
+	function create($socid, $user='')
+	{
+		global $langs,$conf;
+
+		// Nettoyage parametres
+		$this->name  = trim($this->name);
+		$this->label = trim($this->label);
+
+		dol_syslog(get_class($this)."::create label=".$this->label);
+
+		$this->db->begin();
+
+		$result = $this->verify();
+
+		if ($result >= 0)
+		{
+			$now=dol_now();
+
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_address (label, fk_soc, name, datec, fk_user_creat) ";
+			$sql .= " VALUES ('".$this->db->escape($this->label)."', '".$socid."', '".$this->db->escape($this->name)."', ".$this->db->idate($now).", '".$user->id."')";
+
+			$result=$this->db->query($sql);
+			if ($result)
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_address");
+
+				$ret = $this->update($this->id, $socid, $user);
+
+				if ($ret >= 0)
+				{
+					dol_syslog(get_class($this)."::create success id=".$this->id);
+					$this->db->commit();
+					return 0;
+				}
+				else
+				{
+					dol_syslog(get_class($this)."::create echec update");
+					$this->db->rollback();
+					return -3;
+				}
+			}
+			else
+
+			{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+
+					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->nom);
+				}
+				else
+				{
+					dol_syslog(get_class($this)."::create echec insert sql=$sql");
+				}
+				$this->db->rollback();
+				return -2;
+			}
+
+		}
+		else
+		{
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::create echec verify sql=$sql");
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Verification lors de la modification de l'adresse
+	 *
+	 *  @return		int	    0 if OK, <0 if KO
+	 */
+	function verify()
+	{
+		$this->label = trim($this->label);
+		$this->name  = trim($this->name);
+		$result = 0;
+		if (!$this->name || !$this->label)
+		{
+			$this->error = "The name of company and the label can not be empty.\n";
+			$result = -2;
+		}
+		return $result;
+	}
+
+
+	/**
+	 *  Mise a jour des parametres de l'adresse
+	 *
+	 *  @param	int		$id             id address
+	 *  @param	int		$socid			id third party
+	 *  @param  User	$user           Utilisateur qui demande la mise a jour
+	 *  @return int             		<0 if KO, >=0 if OK
+	 */
+	function update($id, $socid, $user='')
+	{
+		global $langs;
+
+		// Clean parameters
+		$this->fk_soc		= $socid;
+		$this->label		= trim($this->label);
+		$this->name			= trim($this->name);
+		$this->address		= trim($this->address);
+		$this->zip			= trim($this->zip);
+		$this->town			= trim($this->town);
+		$this->country_id	= trim($this->country_id);
+		$this->phone		= trim($this->phone);
+		$this->phone		= preg_replace("/\s/","",$this->phone);
+		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->fax			= trim($this->fax);
+		$this->fax			= preg_replace("/\s/","",$this->fax);
+		$this->fax			= preg_replace("/\./","",$this->fax);
+		$this->note			= trim($this->note);
+
+		$result = $this->verify();		// Verifie que nom et label obligatoire
+
+		if ($result >= 0)
+		{
+			dol_syslog(get_class($this)."::Update verify ok");
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe_address";
+			$sql.= " SET label = '" . $this->db->escape($this->label) ."'"; // Champ obligatoire
+			$sql.= ", name = '" . $this->db->escape($this->name) ."'"; // Champ obligatoire
+			$sql.= ", address = ".($this->address?"'".$this->db->escape($this->address)."'":"null");
+			$sql.= ", zip = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
+			$sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
+			$sql.= ", fk_pays = '" . ($this->country_id?$this->db->escape($this->country_id):'0') ."'";
+			$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
+			$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
+			$sql.= ", fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");
+			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
+			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $this->db->escape($id) ."'";
+
+			dol_syslog(get_class($this)."::Update sql=".$sql, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				dol_syslog(get_class($this)."::Update success");
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+
+					$this->error=$langs->trans("ErrorDuplicateField",$this->name);
+					$result=-1;
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					dol_syslog(get_class($this)."::Update error sql=".$sql, LOG_ERR);
+					$result=-2;
+				}
+				$this->db->rollback();
+				return $result;
+			}
+		}
+
+	}
+
+	/**
+	 *  Charge depuis la base toutes les adresses d'une societe
+	 *
+	 *  @param	int		$socid       Id de la societe a charger en memoire
+	 *  @param  User	$user        Objet de l'utilisateur
+	 *  @return int 			     >0 si ok, <0 si ko
+	 */
+	function fetch_lines($socid, $user=0)
+	{
+		global $langs, $conf;
+
+		$sql = 'SELECT rowid, nom, client, fournisseur';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe';
+		$sql .= ' WHERE rowid = '.$socid;
+
+		$resqlsoc=$this->db->query($sql);
+		if ($resqlsoc)
+		{
+			if ($this->db->num_rows($resqlsoc))
+			{
+				$obj = $this->db->fetch_object($resqlsoc);
+
+				$this->socname 		= $obj->nom;
+				$this->socid		= $obj->rowid;
+				$this->id			= $obj->rowid;
+				$this->client		= $obj->client;
+				$this->fournisseur	= $obj->fournisseur;
+			}
+
+			$this->db->free($resqlsoc);
+
+            $this->lines = array();
+
+            // Adresses liees a la societe
+			if ($this->socid)
+			{
+				$sql = 'SELECT a.rowid as id, a.label, a.name, a.address, a.datec as dc';
+				$sql .= ', a.tms as date_update, a.fk_soc';
+				$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
+				$sql .= ', p.code as country_code, p.libelle as country';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
+				$sql .= ' WHERE a.fk_soc = '.$this->socid;
+
+				$resql=$this->db->query($sql);
+				if ($resql)
+				{
+					$num = $this->db->num_rows($resql);
+					$i = 0;
+					while ($i < $num)
+					{
+						$objp = $this->db->fetch_object($resql);
+
+						$line = new AddressLine($this->db);
+
+						$line->id				= $objp->id;
+						$line->date_creation	= $this->db->jdate($objp->dc);
+						$line->date_update		= $this->db->jdate($objp->date_update);
+						$line->label			= $objp->label;
+						$line->name				= $objp->name;
+						$line->address			= $objp->address;
+						$line->zip				= $objp->zip;
+						$line->town				= $objp->town;
+						$line->country_id		= $objp->country_id;
+						$line->country_code		= $objp->country_id?$objp->country_code:'';
+						$line->country			= $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?$langs->trans('Country'.$objp->country_code):$objp->country):'';
+						$line->phone			= $objp->phone;
+						$line->fax				= $objp->fax;
+						$line->note				= $objp->note;
+
+						$this->lines[$i]		= $line;
+						$i++;
+					}
+					$this->db->free($resql);
+					return $num;
+				}
+				else
+				{
+					dol_syslog(get_class($this).'::Fetch Erreur: aucune adresse', LOG_ERR);
+					return 0;
+				}
+			}
+			else
+			{
+				dol_syslog(get_class($this).'::Fetch Erreur: societe inconnue', LOG_ERR);
+				return -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this).'::Fetch '.$this->db->error(), LOG_ERR);
+			$this->error=$this->db->error();
+		}
+	}
+
+	/**
+	 *  Charge depuis la base l'objet adresse
+	 *
+	 *  @param	int		$id       	Id de l'adresse a charger en memoire
+	 *  @param  User	$user       Objet de l'utilisateur
+	 *  @return int 				>0 si ok, <0 si ko
+	 */
+	function fetch_address($id, $user=0)
+	{
+		global $langs;
+		global $conf;
+
+		$sql = 'SELECT a.rowid, a.fk_soc, a.label, a.name, a.address, a.datec as date_creation';
+		$sql .= ', a.tms as date_update';
+		$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
+		$sql .= ', p.code as country_code, p.libelle as country';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
+		$sql .= ' WHERE a.rowid = '.$id;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id				= $obj->rowid;
+				$this->socid			= $obj->fk_soc;
+
+				$this->date_update		= $this->db->jdate($obj->date_update);
+				$this->date_creation 	= $this->db->jdate($obj->date_creation);
+
+				$this->label 			= $obj->label;
+				$this->name 			= $obj->name;
+				$this->address 			= $obj->address;
+				$this->zip 				= $obj->zip;
+				$this->town 			= $obj->town;
+
+				$this->country_id 		= $obj->country_id;
+				$this->country_code 	= $obj->country_id?$obj->country_code:'';
+				$this->country			= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):'';
+
+				$this->phone			= $obj->phone;
+				$this->fax				= $obj->fax;
+				$this->note				= $obj->note;
+
+				$result = 1;
+			}
+			else
+			{
+				dol_syslog('Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql);
+				$this->error='Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql;
+				$result = -2;
+			}
+
+			$this->db->free($resql);
+		}
+		else
+		{
+			dol_syslog('Erreur Societe::Fetch echec sql='.$sql);
+			dol_syslog('Erreur Societe::Fetch '.$this->db->error());
+			$this->error=$this->db->error();
+			$result = -3;
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 * 	Suppression d'une adresse
+	 *
+	 *  @param	int		$id      id de la societe a supprimer
+	 *  @param	int		$socid	id third party
+	 *  @return	void
+	 */
+	function delete($id,$socid)
+	{
+		dol_syslog("Address::Delete");
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_address";
+		$sql.= " WHERE rowid = ".$id;
+		$sql.= " AND fk_soc = ".$socid;
+
+		$result = $this->db->query($sql);
+
+		if (!$result)
+		{
+			print $this->db->error() . '<br>' . $sql;
+		}
+	}
+
+	/**
+	 *  Return name of address with link (and eventually picto)
+	 *	Use $this->id, $this->label, $this->socid
+	 *
+	 *	@param		int			$withpicto		Include picto with link
+	 *	@param		string		$option			Where the link point to
+	 *	@return		string						String with URL
+	 */
+	function getNomUrl($withpicto=0,$option='')
+	{
+		global $langs;
+
+		$result='';
+
+		$lien = '<a href="'.DOL_URL_ROOT.'/comm/address.php?id='.$this->id.'&socid='.$this->socid.'">';
+		$lienfin='</a>';
+
+		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
+		$result.=$lien.$this->label.$lienfin;
+		return $result;
+	}
+
+
+	/**
+	 * 	Charge les informations d'ordre info dans l'objet societe
+	 *
+	 *  @param  int		$id     id de la societe a charger
+	 *  @return	void
+	 */
+	function info($id)
+	{
+		$sql = "SELECT s.rowid, s.nom, datec, datea,";
+		$sql.= " fk_user_creat, fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql.= " WHERE s.rowid = ".$id;
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$this->id = $obj->rowid;
+
+				if ($obj->fk_user_creat) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation     = $cuser;
+				}
+
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->ref			     = $obj->nom;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datea);
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+}
+
+
+/**
+ *  \class 		AddressLine
+ *  \brief 		Class to manage one address line
+ */
+class AddressLine
+{
+
+	var $id;
+	var $date_creation;
+	var $date_update;
+	var $label;
+	var $name;
+	var $address;
+	var $zip;
+	var $town;
+	var $country_id;
+	var $country_code;
+	var $country;
+	var $phone;
+	var $fax;
+	var $note;
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDB		$db     Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+}
+?>

htdocs/societe/class/companybankaccount.class.php

@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2013   Peter Fontaine          <contact@peterfontaine.fr>
+ * Copyright (C) 2013   	Peter Fontaine          <contact@peterfontaine.fr>
  *
  * 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
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
 
 
 /**
- * 		\brief	Class to manage bank accounts description of third parties
+ * 	Class to manage bank accounts description of third parties
  */
 class CompanyBankAccount extends Account
 {
@@ -232,48 +232,56 @@ class CompanyBankAccount extends Account
     /**
      * Set RIB as Default
      *
-     * @param   int     $id     RIB id
+     * @param   int     $rib    RIB id
      * @return  int             0 if KO, 1 if OK
      */
-    function setAsDefault($id)
+    function setAsDefault($rib=0)
     {
-        if ($id) {
+    	$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
-            $sql1 = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
+    	$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
-            $sql1.= " WHERE rowid = ".$id;
 
-            $result1 = $this->db->query($sql1);
+    	dol_syslog(get_class($this).'::setAsDefault sql='.$sql1);
-            if ($result1) {
+    	$result1 = $this->db->query($sql1);
-                if ($this->db->num_rows($result1) == 0) {
+    	if ($result1)
-                    return 0;
+    	{
-                } else {
+    		if ($this->db->num_rows($result1) == 0)
-                    $obj = $this->db->fetch_object($result1);
+    		{
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0 ";
+    			return 0;
-                    $sql2.= "WHERE fk_soc = ".$obj->fk_soc;
+    		}
+    		else
+    		{
+    			$obj = $this->db->fetch_object($result1);
 
-                    $sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1 ";
+    			$this->db->begin();
-                    $sql3.= "WHERE rowid = ".$id;
 
-                    $this->db->begin();
+    			$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0 ";
+    			$sql2.= "WHERE fk_soc = ".$obj->fk_soc;
+    			dol_syslog(get_class($this).'::setAsDefault sql='.$sql2);
+    			$result2 = $this->db->query($sql2);
 
-                    $result2 = $this->db->query($sql2);
+    			$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1 ";
-                    $result3 = $this->db->query($sql3);
+    			$sql3.= "WHERE rowid = ".$obj->id;
+    			dol_syslog(get_class($this).'::setAsDefault sql='.$sql3);
+    			$result3 = $this->db->query($sql3);
 
-                    if (!$result2 || !$result3) {
+    			if (!$result2 || !$result3)
-                        dol_print_error($this->db);
+    			{
-                        $this->db->rollback();
+    				dol_print_error($this->db);
-                        return 0;
+    				$this->db->rollback();
-                    } else {
+    				return -1;
-                        $this->db->commit();
+    			}
-                        return 1;
+    			else
-                    }
+    			{
-                }
+    				$this->db->commit();
-            } else {
+    				return 1;
-                dol_print_error($this->db);
+    			}
-                return 0;
+    		}
-            }
+    	}
-        } else {
+    	else
-            return 0;
+    	{
-        }
+    		dol_print_error($this->db);
+    		return -1;
+    	}
     }
 }
 

test/phpunit/CompanyBankAccountTest.php

@@ -131,9 +131,9 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
     	$localobject->initAsSpecimen();
     	$result=$localobject->create($user);
 
+    	print __METHOD__." result=".$result." id=".$localobject->id."\n";
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+    	return $localobject->id;
-    	return $result;
     }
 
     /**
@@ -155,9 +155,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 
 		$localobject=new CompanyBankAccount($this->savdb);
     	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
     	return $localobject;
     }
 
@@ -178,7 +177,6 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
         $db=$this->savdb;
 
         $result=$localobject->setAsDefault($localobject->id);
-
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
         return $localobject;

test/phpunit/DateLibTest.php

@@ -258,7 +258,7 @@ class DateLibTest extends PHPUnit_Framework_TestCase
     	// Check %a and %b format for en_US
     	$result=dol_print_date(0,'%a %b',true,$outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu jan',$result);
+    	$this->assertEquals('Thu Jan',$result);
 
     	return $result;
     }

test/phpunit/DateLibTzFranceTest.php

@@ -193,7 +193,7 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
     	// Check %a and %b format for en_US
     	$result=dol_print_date(0,'%a %b',false,$outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu jan',$result);
+    	$this->assertEquals('Thu Jan',$result);
 
     	return $result;
     }

test/phpunit/WebservicesOrdersTest.php

@@ -174,183 +174,5 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
     	return $result;
     }
 
-
-
-    /**
-     * testWSOtherGetVersions
-     *
-     * @return int
-     */
-    public function testWSOtherGetVersions()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
-    	$WS_METHOD  = 'getVersions';
-    	$ns='http://www.dolibarr.org/ns/';
-
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	if ($WS_METHOD)
-    	{
-    		$parameters = array('authentication'=>$authentication);
-    		print __METHOD__." call method ".$WS_METHOD."\n";
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    		if (! $result)
-    		{
-    			//var_dump($soapclient);
-    			print $soapclient->error_str;
-    			print "<br>\n\n";
-    			print $soapclient->request;
-    			print "<br>\n\n";
-    			print $soapclient->response;
-    		}
-
-    		print __METHOD__." result=".$result."\n";
-    		$this->assertEquals('OK',$result['result']['result_code']);
-    	}
-
-    	return $result;
-    }
-
-
-    /**
-     * testWSThirdparty
-     *
-     * @return int
-     */
-    public function testWSThirdparty()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
-    	$WS_METHOD  = '';
-    	$ns='http://www.dolibarr.org/ns/';
-
-    	// Set the WebService URL
-    	print __METHOD__."create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	if ($WS_METHOD)
-    	{
-    		$parameters = array('authentication'=>$authentication);
-    		print __METHOD__." call method ".$WS_METHOD."\n";
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    		if (! $result)
-    		{
-    			//var_dump($soapclient);
-    			print $soapclient->error_str;
-    			print "<br>\n\n";
-    			print $soapclient->request;
-    			print "<br>\n\n";
-    			print $soapclient->response;
-    		}
-
-    		print __METHOD__." result=".$result."\n";
-	    	$this->assertEquals('OK',$result['result']['result_code']);
-    	}
-
-    	return $result;
-    }
-
-
-    /**
-     * testWSUser
-     *
-     * @return int
-     */
-    public function testWSUser()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
-    	$WS_METHOD  = '';
-    	$ns='http://www.dolibarr.org/ns/';
-
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	if ($WS_METHOD)
-    	{
-    		$parameters = array('authentication'=>$authentication);
-    		print __METHOD__." call method ".$WS_METHOD."\n";
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    		if (! $result)
-    		{
-    			//var_dump($soapclient);
-    			print $soapclient->error_str;
-    			print "<br>\n\n";
-    			print $soapclient->request;
-    			print "<br>\n\n";
-    			print $soapclient->response;
-    		}
-
-    		print __METHOD__." result=".$result."\n";
-	    	//$this->assertEquals('OK',$result['result']['result_code']);
-    	}
-
-    	return $result;
-    }
-
 }
 ?>