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

ChangeLog

@@ -25,6 +25,8 @@ For users:
 - New: Add an admin page to make a mass init of barcode values for all products.
 - New: Automatic events for sending mails showing info about mail linked objects. 
 - New: Price management enhancement (multiprice level, price by customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
+- New: Add filter on text and status into survey list. Can also sorter on id, text and date end.
+- New: Add option MAIN_FAVICON_URL
 - Fix: Project Task numbering rule customs rule works
 
 TODO
@@ -89,6 +91,13 @@ Fix: Action event SHIPPING_VALIDATE is not implemented
 Fix: The customer code was set to uppercase when using numbering module leopard. We
      must keep data safe of any change.
 Fix: Loading actions extrafields fails.
+Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid
+Fix: Corrected project contact types translation.
+Fix: [ bug #1206 ] PMP price is bad calculated.
+Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
+Fix: [ bug #1240 ] traduction.
+Fix: [ bug #1238 ] When creating accompte with a %, free product are used for calculation.
+Fix: [ bug #1280 ] service with not end of date was tagged as expired.
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:

build/makepack-dolibarr.pl

@@ -16,9 +16,6 @@
 use Cwd;
 
 $PROJECT="dolibarr";
-$MAJOR="3";
-$MINOR="6";
-$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -40,15 +37,6 @@ $RPMSUBVERSION="auto";	# auto use value found into BUILD
 "makensis.exe"=>"NSIS"
 );
 
-$FILENAME="$PROJECT";
-$FILENAMESNAPSHOT="$PROJECT-snapshot";
-$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEXZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
-$FILENAMEDEB="see later";
-$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
-$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
 if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
 if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake
@@ -120,6 +108,28 @@ if (! $TEMP || ! -d $TEMP) {
 $BUILDROOT="$TEMP/buildroot";
 
 
+# Get version $MAJOR, $MINOR and $BUILD
+$result = open( IN, "<" . $SOURCE . "/htdocs/filefunc.inc.php" );
+if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
+while (<IN>) {
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.]+)'\)/ ) { $PROJVERSION = $1; break; }
+}
+close IN;
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
+
+# Set vars for packaging
+$FILENAME            = "$PROJECT";
+$FILENAMESNAPSHOT    = "$PROJECT-snapshot";
+$FILENAMETGZ         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEZIP         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEXZ          = "$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMERPM         = "$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
+$FILENAMEDEB         = "see later";
+$FILENAMEAPS         = "$PROJECT-$MAJOR.$MINOR.$BUILD.app";
+$FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
+
+
 my $copyalreadydone=0;      # Use "-" before number of choice to avoid copy
 my $batch=0;
 for (0..@ARGV-1) {
@@ -133,7 +143,6 @@ for (0..@ARGV-1) {
 if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTI is defined
 if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTI is defined
 
-
 print "Makepack version $VERSION\n";
 print "Building package name: $PROJECT\n";
 print "Building package version: $MAJOR.$MINOR.$BUILD\n";

build/makepack-howto.txt

@@ -10,7 +10,6 @@ beta version of Dolibarr, step by step.
 - Check all files are commited.
 - Update version/info in /ChangeLog
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
-- Update version number with x.y.z-w in build/makepack-dolibarr.pl
 - Update version number with x.y.z-w in build/debian/changelog
 - Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z-w in build/rpm/*.spec
@@ -34,7 +33,6 @@ complete release of Dolibarr, step by step.
 - Check all files are commited.
 - Update version/info in ChangeLog
 - Update version number with x.y.z in htdocs/filefunc.inc.php
-- Update version number with x.y.z in build/makepack-dolibarr.pl
 - Update version number with x.y.z in build/debian/changelog
 - Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z in build/rpm/*.spec

htdocs/admin/prelevement.php

@@ -165,12 +165,16 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"
 
 print '</form>';
 
+dol_fiche_end();
+
 print '<br>';
 
+
 /*
  * Notifications
  */
 
+/* Disable this, there is no trigger with elementtype 'withdraw'
 if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 {
     $langs->load("mails");
@@ -242,20 +246,20 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
     print '</td>';
 
     print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
-}
-// List of current notifications for objet_type='withdraw'
-$sql = "SELECT u.lastname, u.firstname,";
-$sql.= " nd.rowid, ad.code, ad.label";
-$sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
-$sql.= " ".MAIN_DB_PREFIX."notify_def as nd,";
-$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as ad";
-$sql.= " WHERE u.rowid = nd.fk_user";
-$sql.= " AND nd.fk_action = ad.rowid";
-$sql.= " AND u.entity IN (0,".$conf->entity.")";
 
-$resql = $db->query($sql);
+	// List of current notifications for objet_type='withdraw'
-if ($resql)
+	$sql = "SELECT u.lastname, u.firstname,";
-{
+	$sql.= " nd.rowid, ad.code, ad.label";
+	$sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
+	$sql.= " ".MAIN_DB_PREFIX."notify_def as nd,";
+	$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as ad";
+	$sql.= " WHERE u.rowid = nd.fk_user";
+	$sql.= " AND nd.fk_action = ad.rowid";
+	$sql.= " AND u.entity IN (0,".$conf->entity.")";
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
 	    $num = $db->num_rows($resql);
 	    $i = 0;
 	    $var = false;
@@ -273,10 +277,12 @@ if ($resql)
 	        $i++;
 	    }
 	    $db->free($resql);
-}
+	}
 
-print '</table>';
+	print '</table>';
-print '</form>';
+	print '</form>';
+}
+*/
 
 $db->close();
 

htdocs/comm/action/fiche.php

@@ -116,14 +116,14 @@ if ($action == 'add_action')
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")).'</div>';
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'</div>';
 	}
 
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label'))
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")).'</div>';
 	}
 
 	// Initialisation objet cactioncomm
@@ -131,7 +131,7 @@ if ($action == 'add_action')
 	{
 		$error++;
 		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Type")).'</div>';
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
 	}
 	else
 	{

htdocs/comm/propal.php

@@ -825,9 +825,8 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 	}
 
 	// Define special_code for special lines
-	$special_code = 0;
+	$special_code=GETPOST('special_code');
-	if (! GETPOST('qty'))
+	if (! GETPOST('qty')) $special_code=3;
-		$special_code = 3;
 
 	// Check minimum price
 	$productid = GETPOST('productid', 'int');

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

@@ -2748,10 +2748,10 @@ class PropaleLigne  extends CommonObject
 	var $marge_tx;
 	var $marque_tx;
 
-    var $special_code;	// Liste d'options non cumulabels:
+    var $special_code;	// Tag for special lines (exlusive tags)
     // 1: frais de port
     // 2: ecotaxe
-    // 3: ??
+    // 3: option line (when qty = 0)
 
     var $info_bits = 0;	// Liste d'options cumulables:
     // Bit 0: 	0 si TVA normal - 1 si TVA NPR

htdocs/compta/facture.php

@@ -773,9 +773,13 @@ else if ($action == 'add' && $user->rights->facture->creer) {
 							if ($result > 0) {
 								$totalamount = 0;
 								$lines = $srcobject->lines;
-								$numlines = count($lines);
+								$numlines=count($lines);
-								for($i = 0; $i < $numlines; $i ++) {
+								for ($i=0; $i<$numlines; $i++)
-									$totalamount += $lines [$i]->total_ht;
+								{
+									$qualified=1;
+									if (empty($lines[$i]->qty)) $qualified=0;	// We discard qty=0, it is an option
+									if (! empty($lines[$i]->special_code)) $qualified=0;	// We discard special_code (frais port, ecotaxe, option, ...)
+									if ($qualified) $totalamount += $lines[$i]->total_ht;
 								}
 
 								if ($totalamount != 0) {
@@ -825,12 +829,12 @@ else if ($action == 'add' && $user->rights->facture->creer) {
 							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
 								$lines = $srcobject->fetch_lines();
 
-							$fk_parent_line = 0;
+							$fk_parent_line=0;
-							$num = count($lines);
+							$num=count($lines);
-
+							for ($i=0;$i<$num;$i++)
-							for($i = 0; $i < $num; $i ++) {
+							{
-								$label = (! empty($lines [$i]->label) ? $lines [$i]->label : '');
+								$label=(! empty($lines[$i]->label)?$lines[$i]->label:'');
-								$desc = (! empty($lines [$i]->desc) ? $lines [$i]->desc : $lines [$i]->libelle);
+								$desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle);
 
 								if ($lines [$i]->subprice < 0) {
 									// Negative line, we create a discount line

htdocs/compta/paiement/class/paiement.class.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C)      2005 Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2014      Marcos García <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -209,7 +210,15 @@ class Paiement extends CommonObject
                                 }
                             }
 
-                            if ($invoice->type != 0 && $invoice->type != 1 && $invoice->type != 2) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note. We do nothing more.");
+                            //Invoice types that are eligible for changing status to paid
+							$affected_types = array(
+								0,
+								1,
+								2,
+								3
+							);
+
+                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more.");
                             else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
                             else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else $result=$invoice->set_paid($user,'','');

htdocs/contrat/class/contrat.class.php

@@ -569,7 +569,7 @@ class Contrat extends CommonObject
 
 				if ($line->statut == 0) $this->nbofserviceswait++;
 				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == 4 && $line->date_fin_prevue < $now) $this->nbofservicesexpired++;
+				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
 				if ($line->statut == 5) $this->nbofservicesclosed++;
 
 				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
@@ -654,7 +654,7 @@ class Contrat extends CommonObject
 
 				if ($line->statut == 0) $this->nbofserviceswait++;
 				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == 4 && $line->date_fin_prevue < $now) $this->nbofservicesexpired++;
+				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
 				if ($line->statut == 5) $this->nbofservicesclosed++;
 
 				$this->lines[]        = $line;
@@ -1799,7 +1799,7 @@ class ContratLigne
 	 */
 	function getLibStatut($mode)
 	{
-		return $this->LibStatut($this->statut,$mode,(isset($this->date_fin_validite)?($this->date_fin_validite < dol_now()?1:0):-1));
+		return $this->LibStatut($this->statut,$mode,((! empty($this->date_fin_validite))?($this->date_fin_validite < dol_now()?1:0):-1));
 	}
 
 	/**

htdocs/contrat/fiche.php

@@ -92,9 +92,15 @@ if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->
 
 else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 {
+	if (! GETPOST('dateend'))
+	{
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),'errors');
+	}
+	if (! $error)
+	{
 	    $object->fetch($id);
 	    $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
-
 	    if ($result > 0)
 	    {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -103,6 +109,7 @@ else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->c
 	    else {
 	        $mesg=$object->error;
 	    }
+	}
 }
 
 // Si ajout champ produit predefini
@@ -921,7 +928,7 @@ else
     {
         $result=$object->fetch($id,$ref);
         if ($result < 0) dol_print_error($db,$object->error);
-        $result=$object->fetch_lines();
+        $result=$object->fetch_lines();	// This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
         if ($result < 0) dol_print_error($db,$object->error);
         $result=$object->fetch_thirdparty();
         if ($result < 0) dol_print_error($db,$object->error);
@@ -1506,7 +1513,7 @@ else
                     if ($objp->statut == 4)
                     {
                         print $langs->trans("DateEndReal").' ';
-                        $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline");
+                        $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1);
                     }
                 }
                 print '</td>';

htdocs/core/boxes/box_graph_invoices_permonth.php

@@ -95,7 +95,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-			if (GETPOST('DOL_AUTOSET_COOKIE'))
+			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 			{
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');

htdocs/core/boxes/box_graph_invoices_supplier_permonth.php

@@ -94,7 +94,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-			if (GETPOST('DOL_AUTOSET_COOKIE'))
+			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 			{
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');

htdocs/core/boxes/box_graph_orders_permonth.php

@@ -95,7 +95,8 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-			if (GETPOST('DOL_AUTOSET_COOKIE'))
+			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 			{
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');

htdocs/core/boxes/box_graph_orders_supplier_permonth.php

@@ -94,7 +94,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-			if (GETPOST('DOL_AUTOSET_COOKIE'))
+			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 			{
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');

htdocs/core/boxes/box_graph_product_distribution.php

@@ -86,7 +86,8 @@ class box_graph_product_distribution extends ModeleBoxes
 		$param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
 		$param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
 		$param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
-		if (GETPOST('DOL_AUTOSET_COOKIE'))
+		$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 		{
 			$year=GETPOST($param_year,'int');
 			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');

htdocs/core/boxes/box_graph_propales_permonth.php

@@ -95,7 +95,8 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
-			if (GETPOST('DOL_AUTOSET_COOKIE'))
+			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
 			{
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');

htdocs/core/db/Database.interface.php

@@ -382,13 +382,15 @@ interface Database
 	);
 
 	/**
-	 *    Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 *    19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-	function jdate($string);
+    function jdate($string, $gm=false);
 
 	/**
 	 *  Encrypt sensitive data in database

htdocs/core/db/mssql.class.php

@@ -554,17 +554,19 @@ class DoliDBMssql extends DoliDB
 	}
 
     /**
-	 *	Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-	function jdate($string)
+    function jdate($string, $gm=false)
     {
         $string=preg_replace('/([^0-9])/i','',$string);
         $tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4));
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
         return $date;
     }
 

htdocs/core/db/mysql.class.php

@@ -532,17 +532,19 @@ class DoliDBMysql extends DoliDB
 	}
 
     /**
-	 *	Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-	function jdate($string)
+    function jdate($string, $gm=false)
     {
         $string=preg_replace('/([^0-9])/i','',$string);
         $tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4));
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
         return $date;
     }
 

htdocs/core/db/mysqli.class.php

@@ -542,17 +542,19 @@ class DoliDBMysqli extends DoliDB
     }
 
     /**
-     *	Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-     * 	19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-    function jdate($string)
+    function jdate($string, $gm=false)
     {
         $string=preg_replace('/([^0-9])/i','',$string);
         $tmp=$string.'000000';
-        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4));
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
         return $date;
     }
 

htdocs/core/db/pgsql.class.php

@@ -753,17 +753,19 @@ class DoliDBPgsql extends DoliDB
 	}
 
     /**
-	 *	Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-	function jdate($string)
+    function jdate($string, $gm=false)
     {
         $string=preg_replace('/([^0-9])/i','',$string);
         $tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4));
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
         return $date;
     }
 

htdocs/core/db/sqlite.class.php

@@ -675,20 +675,23 @@ class DoliDBSqlite extends DoliDB
     }
 
     /**
-     *	Convert (by PHP) a PHP server TZ string date into a GM Timestamps date
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-     * 	19700101020000 -> 3600 with TZ+1
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
      *
      * 	@param	string	$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+	 *	@param	int		$gm			1=Input informations are GMT values, otherwise local to server TZ
      *	@return	date				Date TMS
      */
-    function jdate($string)
+    function jdate($string, $gmt=false)
     {
         $string=preg_replace('/([^0-9])/i','',$string);
         $tmp=$string.'000000';
-        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4));
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
         return $date;
     }
 
+
 	/**
 	 *	Format a SQL IF
 	 *

htdocs/core/lib/date.lib.php

@@ -585,7 +585,7 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
 }
 
 /**
- *	Fonction retournant le nombre de jour feries samedis et dimanches entre 2 dates entrees en timestamp
+ *	Fonction retournant le nombre de jour feries, samedis et dimanches entre 2 dates entrees en timestamp. Dates must be UTC with hour, day, min to 0
  *	Called by function num_open_day
  *
  *	@param	    timestamp	$timestampStart     Timestamp de debut
@@ -597,7 +597,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 {
 	$nbFerie = 0;
 
-	while ($timestampStart != $timestampEnd)
+	// Check to ensure we use correct parameters
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hour and be GMT dates';
+
+	while ($timestampStart < $timestampEnd)		// Loop end when equals
 	{
 		$ferie=false;
 		$countryfound=0;
@@ -707,20 +710,20 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 		// On incremente compteur
 		if ($ferie) $nbFerie++;
 
-		// Incrementation du nombre de jour (on avance dans la boucle)
+		// Increase number of days (on go up into loop)
 		$jour++;
-		$timestampStart=mktime(0,0,0,$mois,$jour,$annee);
+		$timestampStart=dol_mktime(0,0,0,$mois,$jour,$annee,1);	// Generate GMT date for next day
 	}
 
 	return $nbFerie;
 }
 
 /**
- *	Fonction retournant le nombre de jour entre deux dates
+ *	Function to return number of days between two dates (date must be UTC date !)
  *  Example: 2012-01-01 2012-01-02 => 1 if lastday=0, 2 if lastday=1
  *
- *	@param	   timestamp	$timestampStart     Timestamp de debut
+ *	@param	   timestamp	$timestampStart     Timestamp start UTC
- *	@param	   timestamp	$timestampEnd       Timestamp de fin
+ *	@param	   timestamp	$timestampEnd       Timestamp end UTC
  *	@param     int			$lastday            Last day is included, 0: non, 1:oui
  *	@return    int								Number of days
  */
@@ -745,9 +748,9 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
 /**
  *	Function to return number of working days (and text of units) between two dates (working days)
  *
- *	@param	   	timestamp	$timestampStart     Timestamp for start date
+ *	@param	   	timestamp	$timestampStart     Timestamp for start date (date must be UTC to avoid calculation errors)
- *	@param	   	timestamp	$timestampEnd       Timestamp for end date
+ *	@param	   	timestamp	$timestampEnd       Timestamp for end date (date must be UTC to avoid calculation errors)
- *	@param     	int			$inhour             0: return number of days, 1: return number of hours (72h max)
+ *	@param     	int			$inhour             0: return number of days, 1: return number of hours
  *	@param		int			$lastday            We include last day, 0: no, 1:yes
  *  @param		int			$halfday			Tag to define half day when holiday start and end
  *	@return    	int								Number of days or hours
@@ -765,7 +768,6 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
 	{
-		//print num_between_day($timestampStart, $timestampEnd, $lastday).' - '.num_public_holiday($timestampStart, $timestampEnd);
 		$nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday);
 		$nbOpenDay.= " " . $langs->trans("Days");
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");

htdocs/core/lib/files.lib.php

@@ -716,7 +716,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param  int		$nophperrors    Disable all PHP output errors
  *  @param	int		$nohook			Disable all hooks
  *  @param	object	$object			Current object in use
- *  @return boolean         		True if file is deleted, False if error
+ *  @return boolean         		True if file is deleted (or if glob is used and there's nothing to delete), False if error
  */
 function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=null)
 {
@@ -761,8 +761,8 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);  // The unlink encapsulated by dolibarr
+					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);  // The unlink encapsulated by dolibarr
+					else $ok=unlink($filename);
 					if ($ok) dol_syslog("Removed file ".$filename, LOG_DEBUG);
 					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 				}
@@ -771,8 +771,8 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 		}
 		else
 		{
-			if ($nophperrors) $ok=@unlink($file_osencoded);        // The unlink encapsulated by dolibarr
+			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);        // The unlink encapsulated by dolibarr
+			else $ok=unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
 			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}

htdocs/core/lib/security2.lib.php

@@ -287,6 +287,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	// Set jquery theme
 	$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
 	$favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico';
+	if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
 	$jquerytheme = 'smoothness';
 	if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 

htdocs/core/modules/modProduct.class.php

@@ -6,6 +6,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014      Christophe Battarel	<contact@altairis.fr>
+ * Copyright (C) 2014      Cédric Gross			<c.gross@kreiz-it.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
@@ -65,7 +66,7 @@ class modProduct extends DolibarrModules
 
 		// Dependencies
 		$this->depends = array();
-		$this->requiredby = array("modStock","modBarcode");
+		$this->requiredby = array("modStock","modBarcode","modProductBatch");
 
 		// Config pages
 		$this->config_page_url = array("product.php@product");

htdocs/core/modules/modProductBatch.class.php

@@ -0,0 +1,137 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\defgroup   productbatch     Module batch number management
+ *	\brief      Management module for batch number, eat-by and sell-by date for product
+ *  \file       htdocs/core/modules/modProductBatch.class.php
+ *  \ingroup    productbatch
+ *  \brief      Description and activation file for module productbatch
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module productdluo
+ */
+class modProductBatch extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+        global $langs,$conf;
+
+        $this->db = $db;
+		$this->numero = 39000;
+
+		$this->family = "products";
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->description = "Batch number, eat-by and sell-by date management module";
+
+		$this->rights_class = 'stock';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->special = 0;
+
+		$this->picto='stock';
+
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into productdluo/admin directory, to use to setup module.
+		$this->config_page_url = array();
+
+		// Dependencies
+		$this->depends = array("modProduct","modStock");		// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("productbatch");
+
+		// Constants
+		$this->const = array();
+
+        $this->tabs = array();
+
+        // Dictionnaries
+	    if (! isset($conf->productbatch->enabled))
+        {
+        	$conf->productbatch=new stdClass();
+        	$conf->productbatch->enabled=0;
+        }
+		$this->dictionnaries=array();
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Exports
+		$r=0;
+
+	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function init($options='')
+	{
+		$sql = array();
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *		Function called when module is disabled.
+	 *      Remove from database constants, boxes and permissions from Dolibarr database.
+	 *		Data directories are not deleted
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function remove($options='')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+
+}
+
+?>

htdocs/core/modules/modStock.class.php

@@ -66,7 +66,7 @@ class modStock extends DolibarrModules
 
 		// Dependencies
 		$this->depends = array("modProduct");
-		$this->requiredby = array();
+		$this->requiredby = array("modProductBatch");
 		$this->langfiles = array("stocks");
 
 		// Constants

htdocs/fichinter/fiche.php

@@ -991,7 +991,7 @@ if ($action == 'create')
 		// Contract
 		if ($conf->contrat->enabled)
 		{
-			$langs->load("contrat");
+			$langs->load("contracts");
 			print '<tr><td valign="top">'.$langs->trans("Contract").'</td><td>';
 			$numcontrat=$formcontract->select_contract($soc->id,GETPOST('contratid','int'),'contratid',0,1);
 			if ($numcontrat==0)

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

@@ -224,7 +224,8 @@ class CommandeFournisseur extends CommonOrder
                     $line->tva_tx              = $objp->tva_tx;
                     $line->localtax1_tx		   = $objp->localtax1_tx;
                     $line->localtax2_tx		   = $objp->localtax2_tx;
-                    $line->subprice            = $objp->subprice;
+                    $line->subprice            = $objp->subprice;	  // deprecated
+                    $line->pu_ht	           = $objp->subprice;	  // Unit price HT
                     $line->remise_percent      = $objp->remise_percent;
                     $line->total_ht            = $objp->total_ht;
                     $line->total_tva           = $objp->total_tva;
@@ -635,7 +636,9 @@ class CommandeFournisseur extends CommonOrder
                         {
                             $mouvP = new MouvementStock($this->db);
                             // We decrement stock of product (and sub-products)
-                            $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderApprovedInDolibarr",$this->ref));
+	                        $up_ht_disc=$this->lines[$i]->subprice;
+    	                    if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                            $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr",$this->ref));
                             if ($result < 0) { $error++; }
                         }
                     }
@@ -1228,7 +1231,7 @@ class CommandeFournisseur extends CommonOrder
      * @param 	int			$product	Id of product to dispatch
      * @param 	double		$qty		Qty to dispatch
      * @param 	int			$entrepot	Id of warehouse to add product
-     * @param 	double		$price		Price for PMP value calculation
+     * @param 	double		$price		Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
      * @param	string		$comment	Comment for stock movement
      * @return 	int						<0 if KO, >0 if OK
      */
@@ -1284,6 +1287,7 @@ class CommandeFournisseur extends CommonOrder
                 $mouv = new MouvementStock($this->db);
                 if ($product > 0)
                 {
+                	// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
                     $result=$mouv->reception($user, $product, $entrepot, $qty, $price, $comment);
                     if ($result < 0)
                     {

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

@@ -907,7 +907,9 @@ class FactureFournisseur extends CommonInvoice
                     {
                         $mouvP = new MouvementStock($this->db);
                         // We increase stock for product
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->pu_ht, $langs->trans("InvoiceValidatedInDolibarr",$num));
+                        $up_ht_disc=$this->lines[$i]->pu_ht;
+                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
                         if ($result < 0) { $error++; }
                     }
                 }

htdocs/fourn/commande/dispatch.php

@@ -42,7 +42,7 @@ $langs->load('products');
 $langs->load('stocks');
 
 // Security check
-$id = isset($_GET["id"])?$_GET["id"]:'';
+$id = GETPOST("id",'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
 
@@ -64,7 +64,9 @@ $mesg='';
 if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->receptionner)
 {
 	$commande = new CommandeFournisseur($db);
-	$commande->fetch($_GET["id"]);
+	$commande->fetch($id);
+
+	$db->begin();
 
 	foreach($_POST as $key => $value)
 	{
@@ -73,7 +75,7 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 			$prod = "product_".$reg[1];
 			$qty = "qty_".$reg[1];
 			$ent = "entrepot_".$reg[1];
-			$pu = "pu_".$reg[1];
+			$pu = "pu_".$reg[1];	// This is unit price including discount
 			if ($_POST[$ent] > 0)
 			{
 				$result = $commande->DispatchProduct($user, $_POST[$prod], $_POST[$qty], $_POST[$ent], $_POST[$pu], $_POST["comment"]);
@@ -96,17 +98,19 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 		$result_trigger=$interface->run_triggers('ORDER_SUPPLIER_DISPATCH',$commande,$user,$langs,$conf);
 		if ($result_trigger < 0) { $error++; $commande->errors=$interface->errors; }
 		// Fin appel triggers
-
-		$db->commit();
 	}
 
 	if ($result > 0)
 	{
+		$db->commit();
+
 		header("Location: dispatch.php?id=".$_GET["id"]);
 		exit;
 	}
 	else
 	{
+		$db->rollback();
+
 		$mesg='<div class="error">'.$langs->trans($commande->error).'</div>';
 	}
 }
@@ -232,12 +236,12 @@ if ($id > 0 || ! empty($ref))
 				$db->free($resql);
 			}
 
-			$sql = "SELECT l.fk_product, l.subprice, SUM(l.qty) as qty,";
+			$sql = "SELECT l.fk_product, l.subprice, l.remise_percent, SUM(l.qty) as qty,";
 			$sql.= " p.ref, p.label";
 			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
 			$sql.= " WHERE l.fk_commande = ".$commande->id;
-			$sql.= " GROUP BY p.ref, p.label, l.fk_product, l.subprice";	// Calculation of amount dispatched is done per fk_product so we must group by fk_product
+			$sql.= " GROUP BY p.ref, p.label, l.fk_product, l.subprice, l.remise_percent";	// Calculation of amount dispatched is done per fk_product so we must group by fk_product
 			$sql.= " ORDER BY p.ref, p.label";
 
 			$resql = $db->query($sql);
@@ -283,12 +287,16 @@ if ($id > 0 || ! empty($ref))
 							print "<tr ".$bc[$var].">";
 							print '<td>';
 							print '<a href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.'</a>';
-							print ' - '.$objp->label;
+							print ' - '.$objp->label."\n";
 							// To show detail cref and description value, we must make calculation by cref
 							//print ($objp->cref?' ('.$objp->cref.')':'');
 							//if ($objp->description) print '<br>'.nl2br($objp->description);
-							print '<input name="product_'.$i.'" type="hidden" value="'.$objp->fk_product.'">';
+							print '<input name="product_'.$i.'" type="hidden" value="'.$objp->fk_product.'">'."\n";
-							print '<input name="pu_'.$i.'" type="hidden" value="'.$objp->subprice.'">';
+
+	                        $up_ht_disc=$objp->subprice;
+    	                    if (! empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
+
+							print '<input name="pu_'.$i.'" type="hidden" value="'.$up_ht_disc.'">'."<!-- This is a up including discount -->\n";
 							print "</td>\n";
 
 							print '<td align="right">'.$objp->qty.'</td>';

htdocs/holiday/class/holiday.class.php

@@ -44,8 +44,10 @@ class Holiday extends CommonObject
     var $fk_user;
     var $date_create='';
     var $description;
-    var $date_debut='';
+    var $date_debut='';			// Date start in PHP server TZ
-    var $date_fin='';
+    var $date_fin='';			// Date end in PHP server TZ
+    var $date_debut_gmt='';		// Date start in GMT
+    var $date_fin_gmt='';		// Date end in GMT
     var $halfday='';
     var $statut='';			// 1=draft, 2=validated, 3=approved
     var $fk_validator;
@@ -214,6 +216,8 @@ class Holiday extends CommonObject
                 $this->description = $obj->description;
                 $this->date_debut = $this->db->jdate($obj->date_debut);
                 $this->date_fin = $this->db->jdate($obj->date_fin);
+                $this->date_debut_gmt = $this->db->jdate($obj->date_debut,1);
+                $this->date_fin_gmt = $this->db->jdate($obj->date_fin,1);
                 $this->halfday = $obj->halfday;
                 $this->statut = $obj->statut;
                 $this->fk_validator = $obj->fk_validator;
@@ -317,6 +321,8 @@ class Holiday extends CommonObject
                 $tab_result[$i]['description'] = $obj->description;
                 $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
                 $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
+                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
+                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
                 $tab_result[$i]['halfday'] = $obj->halfday;
                 $tab_result[$i]['statut'] = $obj->statut;
                 $tab_result[$i]['fk_validator'] = $obj->fk_validator;
@@ -426,6 +432,8 @@ class Holiday extends CommonObject
                 $tab_result[$i]['description'] = $obj->description;
                 $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
                 $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
+                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
+                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
                 $tab_result[$i]['halfday'] = $obj->halfday;
                 $tab_result[$i]['statut'] = $obj->statut;
                 $tab_result[$i]['fk_validator'] = $obj->fk_validator;

htdocs/holiday/fiche.php

@@ -64,6 +64,8 @@ if ($action == 'create')
 
     $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
     $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
     $starthalfday=GETPOST('starthalfday');
     $endhalfday=GETPOST('endhalfday');
     $halfday=0;
@@ -105,7 +107,7 @@ if ($action == 'create')
     }
 
     // Si aucun jours ouvrés dans la demande
-    $nbopenedday=num_open_day($date_debut, $date_fin, 0, 1, $halfday);
+    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
     if($nbopenedday < 1)
     {
         header('Location: fiche.php?action=request&error=DureeHoliday');
@@ -147,6 +149,8 @@ if ($action == 'update')
 {
 	$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
 	$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+	$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+	$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
 	$starthalfday=GETPOST('starthalfday');
 	$endhalfday=GETPOST('endhalfday');
 	$halfday=0;
@@ -198,7 +202,7 @@ if ($action == 'update')
             }
 
             // Si pas de jours ouvrés dans la demande
-            $nbopenedday=num_open_day($date_debut, $date_fin, 0, 1, $halfday);
+            $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
             if ($nbopenedday < 1)
             {
                 header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday');
@@ -331,7 +335,7 @@ if ($action == 'confirm_send')
             // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
             if ($cp->getConfCP('AlertValidatorSolde'))
             {
-            	$nbopenedday=num_open_day($cp->date_debut,$cp->date_fin,0,1,$cp->halfday);
+            	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
                 if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
                 {
                     $message.= "\n";
@@ -387,7 +391,7 @@ if($action == 'confirm_valid')
         if ($verif > 0)
         {
             // Calculcate number of days consummed
-            $nbopenedday=num_open_day($cp->date_debut,$cp->date_fin,0,1);
+            $nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1);
 
             $soldeActuel = $cp->getCpforUser($cp->fk_user);
             $newSolde = $soldeActuel - ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
@@ -552,7 +556,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
         if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
         {
         	// Calculcate number of days consummed
-        	$nbopenedday=num_open_day($cp->date_debut,$cp->date_fin,0,1,$cp->halfday);
+        	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
 
         	$soldeActuel = $cp->getCpforUser($cp->fk_user);
         	$newSolde = $soldeActuel + ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
@@ -979,7 +983,7 @@ else
                 }
                 print '<tr>';
                 print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
-                print '<td>'.num_open_day($cp->date_debut, $cp->date_fin, 0, 1, $cp->halfday).'</td>';
+                print '<td>'.num_open_day($cp->date_debut_gmt, $cp->date_fin_gmt, 0, 1, $cp->halfday).'</td>';
                 print '</tr>';
 
                 // Status

htdocs/holiday/index.php

@@ -366,7 +366,7 @@ if (! empty($holiday->holiday))
 		print '<td align="center">'.dol_print_date($infos_CP['date_debut'],'day').'</td>';
 		print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
 		print '<td align="right">';
-		$nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']);
+		$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']);
 		print $nbopenedday.' '.$langs->trans('DurationDays');
 		print '<td align="right" colspan="2">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
 		print '</tr>'."\n";

htdocs/holiday/month_report.php

@@ -119,13 +119,8 @@ if($num == '0') {
 
 		$start_date=$db->jdate($holiday['date_debut']);
 		$end_date=$db->jdate($holiday['date_fin']);
-		/*if(substr($holiday['date_debut'],5,2)==$month-1){
+		$start_date_gmt=$db->jdate($holiday['date_debut'],1);
-			$holiday['date_debut'] = date('Y-'.$month.'-01');
+		$end_date_gmt=$db->jdate($holiday['date_fin'],1);
-		}
-
-		if(substr($holiday['date_fin'],5,2)==$month+1){
-			$holiday['date_fin'] = date('Y-'.$month.'-t');
-		}*/
 
 		print '<tr '.$bc[$var].'>';
 		print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
@@ -135,7 +130,7 @@ if($num == '0') {
 		print '<td>'.dol_print_date($end_date,'day');
 		print '</td>';
 		print '<td align="right">';
-		$nbopenedday=num_open_day($start_date, $end_date, 0, 1, $holiday['halfday']);
+		$nbopenedday=num_open_day($start_date_gmt, $end_date_gmt, 0, 1, $holiday['halfday']);
 		print $nbopenedday;
 		print '</td>';
 		print '</tr>';

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

@@ -18,10 +18,10 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 ALTER TABLE llx_bookmark ADD COLUMN entity integer DEFAULT 1 NOT NULL;
-
 ALTER TABLE llx_bookmark MODIFY COLUMN url varchar(255) NOT NULL;
 
-ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1 AFTER canedit;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
 -- ALTER TABLE llx_opensurvey_sondage DROP COLUMN survey_link_visible;
 -- ALTER TABLE llx_opensurvey_sondage DROP INDEX idx_id_sondage_admin;
 -- ALTER TABLE llx_opensurvey_sondage DROP COLUMN id_sondage_admin;
@@ -33,6 +33,7 @@ ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN mailsonde mailsonde tinyint NOT
 ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN titre titre TEXT NOT NULL;
 ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN date_fin date_fin DATETIME NOT NULL;
 ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN format format VARCHAR(2) NOT NULL;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 ALTER TABLE llx_facture_rec CHANGE COLUMN usenewprice usenewprice INTEGER DEFAULT 0;
 
@@ -1010,3 +1011,29 @@ create table llx_product_customer_price_log
   fk_user				integer,
  import_key			varchar(14)                  -- Import key
 )ENGINE=innodb;
+
+--Batch number managment
+ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL;
+
+CREATE TABLE IF NOT EXISTS `llx_product_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product_stock` int(11) NOT NULL,
+  `eatby` datetime DEFAULT NULL,
+  `sellby` datetime DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  KEY `ix_fk_product_stock` (`fk_product_stock`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `llx_expeditiondet_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `fk_expeditiondet` int(11) NOT NULL,
+  `eatby` date DEFAULT NULL,
+  `sellby` date DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `fk_origin_stock` int(11) NOT NULL,
+  KEY `ix_fk_expeditiondet` (`fk_expeditiondet`)
+) ENGINE=InnoDB;

htdocs/install/mysql/migration/repair.sql

@@ -94,3 +94,10 @@ UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps
 -- DROP TABLE llx_product_fournisseur;
 -- ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur;
 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;
+
+-- Fix: deprecated tag to new one
+update llx_opensurvey_sondage set format = 'D' where format = 'D+';
+update llx_opensurvey_sondage set format = 'A' where format = 'A+';
+
+
+

htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql

@@ -0,0 +1,19 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.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
+-- 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/>.
+--
+-- ============================================================================
+ALTER TABLE llx_expeditiondet_batch ADD INDEX ix_fk_expeditiondet (fk_expeditiondet);
+ALTER TABLE llx_expeditiondet_batch ADD CONSTRAINT fk_expeditiondet_batch_fk_expeditiondet FOREIGN KEY (fk_expeditiondet) REFERENCES llx_expeditiondet (rowid) ON DELETE CASCADE;

htdocs/install/mysql/tables/llx_expeditiondet_batch.sql

@@ -0,0 +1,27 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+CREATE TABLE llx_expeditiondet_batch (
+  `rowid` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `fk_expeditiondet` int NOT NULL,
+  `eatby` date DEFAULT NULL,
+  `sellby` date DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `fk_origin_stock` int NOT NULL
+) ENGINE=InnoDB;
+

htdocs/install/mysql/tables/llx_opensurvey_sondage.sql

@@ -17,6 +17,7 @@
 
 CREATE TABLE llx_opensurvey_sondage (
 	id_sondage VARCHAR(16) PRIMARY KEY,
+	entity integer DEFAULT 1 NOT NULL,	         -- multi company id
     commentaires text,
 	mail_admin VARCHAR(128),
 	nom_admin VARCHAR(64),

htdocs/install/mysql/tables/llx_product.sql

@@ -50,6 +50,7 @@ create table llx_product
   fk_user_author			integer,
   tosell					tinyint      DEFAULT 1,
   tobuy						tinyint      DEFAULT 1,
+  tobatch					tinyint      DEFAULT 0 NOT NULL,
   fk_product_type			integer      DEFAULT 0,			-- Type 0 for regular product, 1 for service, 9 for other (used by external module)
   duration					varchar(6),
   seuil_stock_alerte		integer      DEFAULT 0,

htdocs/install/mysql/tables/llx_product_batch.key.sql

@@ -0,0 +1,19 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.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
+-- 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/>.
+--
+-- ============================================================================
+ALTER TABLE llx_product_batch ADD INDEX ix_fk_product_stock (fk_product_stock);
+ALTER TABLE llx_product_batch ADD CONSTRAINT fk_product_batch_fk_product_stock FOREIGN KEY (fk_product_stock) REFERENCES llx_product_stock (rowid) ON DELETE CASCADE;

htdocs/install/mysql/tables/llx_product_batch.sql

@@ -0,0 +1,28 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+CREATE TABLE `llx_product_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product_stock` int(11) NOT NULL,
+  `eatby` datetime DEFAULT NULL,
+  `sellby` datetime DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT 0,
+  `import_key` varchar(14) DEFAULT NULL
+) ENGINE=InnoDB;
+

htdocs/langs/ar_SA/admin.lang

@@ -287,7 +287,7 @@ CurrentVersion=Dolibarr النسخة الحالية
 CallUpdatePage=الذهاب إلى صفحة التحديثات وdatas هيكل قاعدة البيانات : ٪ s.
 LastStableVersion=آخر نسخة مستقرة
 GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
-# GenericMaskCodes2=<b>{cccc}</b> the client code<br><b>{cccc000}</b> the client code on n characters is followed by a client's ref counter without offset and zeroized with the global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
+# GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
 GenericMaskCodes4a=<u>ومثال على 99th ق ٪ من طرف ثالث TheCompany عمله 2007-01-31 :</u> <br>
 GenericMaskCodes4b=<u>ومثال على طرف ثالث على خلق 2007-03-01 :</u> <br>
@@ -345,8 +345,6 @@ SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
 EnterRefToBuildUrl=أدخل مرجع لكائن %s
 GetSecuredUrl=الحصول على عنوان محسوب
 # ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-# ProductVatMassChange=Mass VAT change
-# ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 # OldVATRates=Old VAT rate
 # NewVATRates=New VAT rate
 # PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -381,6 +379,16 @@ ExtrafieldPrice = الأسعار
 # DefaultLink=Default link
 # ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
 # ExternalModule=External module - Installed into directory %s
+# BarcodeInitForThirdparties=Mass barcode init for thirdparties
+# BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+# CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+# InitEmptyBarCode=Init value for next %s empty records
+# EraseAllCurrentBarCode=Erase all current barcode values
+# ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
+# AllBarcodeReset=All barcode values have been removed
+# NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+# NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+
 
 # Modules
 Module0Name=& مجموعات المستخدمين
@@ -510,6 +518,8 @@ Module50200Desc= وحدة لتقديم على صفحة الدفع عبر الإ
 # Module59000Desc=Module to manage margins
 # Module60000Name=Commissions
 # Module60000Desc=Module to manage commissions
+# Module150010Name=Batch number, eat-by date and sell-by date
+# Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=قراءة الفواتير
 Permission12=خلق الفواتير
 Permission13=تعديل الفواتير
@@ -726,8 +736,8 @@ Permission50202=استيراد المعاملات
 # Permission55002=Create/modify surveys
 # Permission59001=Read commercial margins
 # Permission59002=Define commercial margins
-# DictionaryCompanyType=Company types
+# DictionaryCompanyType=Thirdparties type
-# DictionaryCompanyJuridicalType=Juridical kinds of company
+# DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
 # DictionaryProspectLevel=Prospect potential level
 # DictionaryCanton=State/Cantons
 # DictionaryRegion=Regions
@@ -959,7 +969,7 @@ SimpleNumRefModelDesc=عودة الرقم المرجعي للتنسيق مع nnn
 ShowProfIdInAddress=إظهار رقم حرفي مع عناوين على وثائق
 # ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 TranslationUncomplete=ترجمة جزئية
-SomeTranslationAreUncomplete=قد تكون بعض اللغات مترجمة جزئيا أو قد يحتوي على أخطاء. إذا كنت الكشف عن بعض، يمكنك <b>إصلاح.</b> ملفات نصية <b>لانج</b> في <b>htdocs</b> الدليل <b>/ langs</b> ورفعها على المنتدى في <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a> .
+# SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=جعل القائمة العمودية hidable (يجب أن لا يتم تعطيل خيار جافا سكريبت)
 MAIN_DISABLE_METEO=تعطيل ميتيو رأي
 TestLoginToAPI=اختبار الدخول إلى API
@@ -985,6 +995,7 @@ ExtraFields=تكميلية سمات
 # ExtraFieldsProjectTask=Complementary attributes (tasks)
 ExtraFieldHasWrongValue=قيمة الخاصية %s له قيمة خاطئة.
 # AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
+# AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendingMailSetup=الإعداد من sendings عن طريق البريد الإلكتروني
 SendmailOptionNotComplete=تحذير، في بعض أنظمة لينكس، لإرسال البريد الإلكتروني من البريد الإلكتروني الخاص بك، يجب أن تنسخ الإعداد تنفيذ conatins الخيار، على درجة البكالوريوس (mail.force_extra_parameters المعلمة في ملف php.ini الخاص بك). إذا كان بعض المستفيدين لم تلقي رسائل البريد الإلكتروني، في محاولة لتعديل هذه المعلمة PHP مع mail.force_extra_parameters =-BA).
 PathToDocuments=الطريق إلى وثائق
@@ -1269,7 +1280,7 @@ ForANonAnonymousAccess=لصحتها accès (لكتابة الحصول على س
 # YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
 # NotInstalled=Not installed, so your server is not slow down by this.
 # ApplicativeCache=Applicative cache
-# MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server. More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note that a lot of web hosting provider does not provide such cache server.
+# MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 # OPCodeCache=OPCode cache
 # NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
 # HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)

htdocs/langs/ar_SA/agenda.lang

@@ -52,6 +52,7 @@ InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة ا
 SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة البريد الإلكتروني
 SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني
 ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني
+# ShippingValidated= Shipping %s validated
 InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني
 NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي
 DateActionPlannedStart= التاريخ المخطط للبدء

htdocs/langs/ar_SA/cashdesk.lang

@@ -37,3 +37,4 @@ ShowCompany=عرض شركة
 ShowStock=عرض مستودع
 DeleteArticle=انقر لإزالة هذه المادة
 # FilterRefOrLabelOrBC=Search (Ref/Label)
+# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.

htdocs/langs/ar_SA/errors.lang

@@ -26,8 +26,11 @@ ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكو
 ErrorBadThirdPartyName=سوء قيمة اسم طرف ثالث
 # ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة
+# ErrorBadBarCodeSyntax=Bad syntax for bar code
 ErrorCustomerCodeRequired=رمز العميل المطلوبة
+# ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء
+# ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=المطلوب ببادئة
 ErrorUrlNotValid=موقع معالجة صحيحة
 ErrorBadSupplierCodeSyntax=مورد سوء تركيب لمدونة
@@ -63,6 +66,7 @@ ErrorSizeTooLongForVarcharType=وقتا طويلا لنوع السلسلة (%s
 # ErrorNoValueForRadioType=Please fill value for radio list
 # ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=ميدان <b>٪ ق</b> يجب ألا يحتوي على أحرف خاصة.
+# ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
 ErrorNoAccountancyModuleLoaded=أي وحدة المحاسبة وتفعيل
 # ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.

htdocs/langs/ar_SA/exports.lang

@@ -123,6 +123,10 @@ BankCode=رمز المصرف
 DeskCode=مدونة مكتبية
 BankAccountNumber=رقم الحساب
 BankAccountNumberKey=مفتاح
+# SpecialCode=Special code
+# ExportStringFilter=%% allows replacing one or more characters in the text
+# ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filters by one year/month/day<br>'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filters over a range of years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the following years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the previous years/months/days
+# ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 # SelectFilterFields=If you want to filter on some values, just input values here.
 # FilterableFields=Champs Filtrables

htdocs/langs/ar_SA/mails.lang

@@ -79,6 +79,13 @@ MailingStatusRead=قرأ
 # ActivateCheckRead=Allow to use the "Unsubcribe" link
 # ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
 # EMailSentToNRecipients=EMail sent to %s recipients.
+# EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
+# MailTopicSendRemindUnpaidInvoices=Remind of invoice %s (%s)
+# SendRemind=Send remind by EMails
+# RemindSent=%S remind(s) sent
+# AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
+# NoRemindSent=No remind by EMail sent
+# ResultOfMassSending=Result of mass remind sending by EMail
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=اتصالات لجميع الأطراف الثالثة (العملاء ، والاحتمال ، والمورد ،...)

htdocs/langs/ar_SA/main.lang

@@ -572,7 +572,7 @@ TotalWoman=المجموع
 TotalMan=المجموع
 NeverReceived=لم يتلق
 Canceled=ألغى
-# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionnary
+# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
 Color=لون
 Documents=ربط الملفات
 DocumentsNb=ملفات مرتبطة (%s)

htdocs/langs/ar_SA/opensurvey.lang

@@ -35,6 +35,7 @@
 # TitleChoice=Choice label
 # ExportSpreadsheet=Export result spreadsheet
 ExpireDate=الحد من التاريخ
+# NbOfSurveys=Number of surveys
 # NbOfVoters=Nb of voters
 # SurveyResults=Results
 # PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.

htdocs/langs/ar_SA/orders.lang

@@ -55,6 +55,7 @@ DraftOrWaitingShipped=مشروع مصادق عليه أو لم تشحن
 MenuOrdersToBill=أوامر لمشروع قانون
 # MenuOrdersToBill2=Orders to bill
 SearchOrder=من أجل البحث
+# SearchACustomerOrder=Search a customer order
 ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
@@ -164,3 +165,4 @@ OrderByPhone=هاتف
 # OrderCreated=Your orders have been created
 # OrderFail=An error happened during your orders creation
 # CreateOrders=Create orders
+# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".

htdocs/langs/ar_SA/other.lang

@@ -49,14 +49,15 @@ Miscellaneous=متفرقات
 NbOfActiveNotifications=عدد الإخطارات
 PredefinedMailTest=هذا هو الاختبار الإلكتروني. تكون مفصولة \\ nThe سطرين من قبل حرف إرجاع.
 PredefinedMailTestHtml=هذا هو البريد <b>الاختبار</b> (الاختبار يجب أن تكون في كلمة جريئة). <br> وتفصل بين الخطين من قبل حرف إرجاع.
-# PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n You will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n We would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n You will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n You will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n You will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n You will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n You will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-# PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n You will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr الاتفاق هو تخطيط موارد المؤسسات وإدارة علاقات العملاء وتتكون من عدة وحدات وظيفية. وقال ان العرض يشمل جميع وحدات لا يعني اي شيء يحدث هذا أبدا. بذلك ، عرض عدة ملامح المتاحة.
 ChooseYourDemoProfil=اختيار عرض ملف المباراة التي أنشطتك...
 DemoFundation=أعضاء في إدارة مؤسسة

htdocs/langs/ar_SA/products.lang

@@ -13,6 +13,10 @@ NewProduct=منتجات جديدة
 NewService=خدمة جديدة
 ProductCode=رمز المنتج
 ServiceCode=قانون الخدمة
+# ProductVatMassChange=Mass VAT change
+# ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
+# MassBarcodeInit=Mass barcode init
+# MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
 ProductAccountancyBuyCode=المحاسبة الرمز (شراء)
 ProductAccountancySellCode=المحاسبة الرمز (بيع)
 ProductOrService=المنتج أو الخدمة
@@ -173,8 +177,8 @@ CustomCode=قانون الجمارك
 CountryOrigin=بلد المنشأ
 HiddenIntoCombo=مخبأة في قوائم مختارة
 Nature=طبيعة
-# ProductCodeModel=Product code template
+# ProductCodeModel=Product ref template
-# ServiceCodeModel=Service code template
+# ServiceCodeModel=Service ref template
 # AddThisProductCard=Create product card
 # HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
 # AddThisServiceCard=Create service card
@@ -216,5 +220,10 @@ QtyNeed=الكمية
 # DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
 # BarCodeDataForProduct=Barcode information of product %s :
 # BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-# BarcodeStickersMask=xxx
+# ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-
+# PriceByCustomer=Price by customer
+# PriceCatalogue=Catalogue Price
+# PricingRule=Pricing Rules
+# AddCustomerPrice=Add price by customers
+# ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+# PriceByCustomerLog=Price by customer log

htdocs/langs/ar_SA/projects.lang

@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
+# RefProject=Ref. project
+# ProjectId=Project Id
 Project=المشروع
 Projects=المشاريع
 SharedProject=مشاريع مشتركة
@@ -30,11 +32,18 @@ TimeSpent=الوقت الذي تستغرقه
 TimesSpent=قضى وقتا
 RefTask=المرجع. مهمة
 LabelTask=علامة مهمة
+# TaskTimeSpent=Time spent on tasks
+# TaskTimeUser=Task time user
+# TaskTimeNote=Task time note
+# TaskTimeDate=Task time date
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
 MyTasks=مهمتي
 Tasks=المهام
 Task=مهمة
+# TaskDateStart=Task start date
+# TaskDateEnd=Task end date
+# TaskDescription=Task description
 NewTask=مهمة جديدة
 AddTask=إضافة مهمة
 AddDuration=تضاف المدة
@@ -100,12 +109,12 @@ IfNeedToUseOhterObjectKeepEmpty=إذا كانت بعض الكائنات (فات
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=مشروع زعيم
 TypeContact_project_external_PROJECTLEADER=مشروع زعيم
-TypeContact_project_internal_CONTRIBUTOR=مساهم
+# TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_CONTRIBUTOR=مساهم
+# TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
 TypeContact_project_task_internal_TASKEXECUTIVE=المهمة التنفيذية
 TypeContact_project_task_external_TASKEXECUTIVE=المهمة التنفيذية
-TypeContact_project_task_internal_CONTRIBUTOR=مساهم
+# TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_CONTRIBUTOR=مساهم
+# TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 # SelectElement=Select element
 # AddElement=Link to element
 # Documents models

htdocs/langs/ar_SA/stocks.lang

@@ -94,14 +94,20 @@ SelectWarehouseForStockIncrease=اختيار مستودع لاستخدامها
 # StockToBuy=To order
 # Replenishment=Replenishment
 # ReplenishmentOrders=Replenishment orders
-# UseVirtualStock=Use virtual stock instead of physical stock
+# VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+# UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+# UseVirtualStock=Use virtual stock
+# UsePhysicalStock=Use physical stock
+# CurentSelectionMode=Curent selection mode
+# CurentlyUsingVirtualStock=Virtual stock
+# CurentlyUsingPhysicalStock=Physical stock
 # RuleForStockReplenishment=Rule for stocks replenishment
 # SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
 # AlertOnly= Alerts only
 # WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 # WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 # ForThisWarehouse=For this warehouse
-# ReplenishmentStatusDesc=This is list of all product with a physical stock lower than desired stock (or alert value if checkbox "alert only" is checked) and suggest you to create supplier orders to fill the difference.
+# ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
 # ReplenishmentOrdersDesc=This is list of all opened supplier orders
 # Replenishments=Replenishments
 # NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)

htdocs/langs/bg_BG/admin.lang

@@ -287,7 +287,7 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
 LastStableVersion=Последна стабилна версия
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-# GenericMaskCodes2=<b>{cccc}</b> the client code<br><b>{cccc000}</b> the client code on n characters is followed by a client's ref counter without offset and zeroized with the global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
+# GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
@@ -345,8 +345,6 @@ SecurityTokenIsUnique=Използвайте уникална параметър
 EnterRefToBuildUrl=Въведете справка за обект %s
 GetSecuredUrl=Изчислява URL
 ButtonHideUnauthorized=Скриване на бутоните за неправомерни действия, вместо да се показва с увреждания бутони
-ProductVatMassChange=Промяната в масата ДДС
-ProductVatMassChangeDesc=Тази страница може да се използва за промяна на ДДС ставката, определена за продукти или услуги от стойността на друг. Внимание, тази промяна се прави на цялата база данни.
 OldVATRates=Old ставка на ДДС
 NewVATRates=Нов ставка на ДДС
 PriceBaseTypeToChange=Промяна на цените с база референтна стойност, определена на
@@ -381,6 +379,16 @@ ExtrafieldRadio=Радио бутон
 # DefaultLink=Default link
 # ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
 ExternalModule=Външен модул - инсталиран в директория %s
+# BarcodeInitForThirdparties=Mass barcode init for thirdparties
+# BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+# CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+# InitEmptyBarCode=Init value for next %s empty records
+# EraseAllCurrentBarCode=Erase all current barcode values
+# ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
+# AllBarcodeReset=All barcode values have been removed
+# NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+# NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+
 
 # Modules
 Module0Name=Потребители и групи
@@ -510,6 +518,8 @@ Module59000Name=Полета
 Module59000Desc=Модул за управление на маржовете
 Module60000Name=Комисии
 Module60000Desc=Модул за управление на комисии
+# Module150010Name=Batch number, eat-by date and sell-by date
+# Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Клиентите фактури
 Permission12=Създаване / промяна на фактури на клиентите
 Permission13=Unvalidate клиентите фактури
@@ -726,8 +736,8 @@ Permission50202=Сделки на внос
 # Permission55002=Create/modify surveys
 # Permission59001=Read commercial margins
 # Permission59002=Define commercial margins
-# DictionaryCompanyType=Company types
+# DictionaryCompanyType=Thirdparties type
-# DictionaryCompanyJuridicalType=Juridical kinds of company
+# DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
 # DictionaryProspectLevel=Prospect potential level
 # DictionaryCanton=State/Cantons
 # DictionaryRegion=Regions
@@ -959,7 +969,7 @@ SimpleNumRefModelDesc=Върнете референтен номер с форм
 ShowProfIdInAddress=Покажи professionnal номер с адреси на документи
 # ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 TranslationUncomplete=Частичен превод
-SomeTranslationAreUncomplete=Някои езици може да бъдат частично преведени или може да съдържат грешки. Ако забележите грешки, можете да редактирате <b>.lang</b> текстовите файлове в директорията <b>htdocs/langs</b> и да ни ги предоставите във форума <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a> .
+# SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Направете вертикално меню hidable (опция JavaScript не трябва да бъде забранена)
 MAIN_DISABLE_METEO=Изключване метео изглед
 TestLoginToAPI=Тествайте влезете в API
@@ -985,6 +995,7 @@ ExtraFields=Допълнителни атрибути
 # ExtraFieldsProjectTask=Complementary attributes (tasks)
 ExtraFieldHasWrongValue=Attribut %s има грешна стойност.
 AlphaNumOnlyCharsAndNoSpace=само героите alphanumericals без пространство
+# AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendingMailSetup=Настройка на изпращане по имейл
 SendmailOptionNotComplete=Внимание, на някои системи Linux, за да изпратите имейл от електронната си поща, Sendmail изпълнение настройка трябва conatins опция-ба (параметър mail.force_extra_parameters във вашия php.ini файл). Ако някои получатели никога не получават имейли, опитайте се да редактирате тази PHP параметър с mail.force_extra_parameters = ба).
 PathToDocuments=Път до документи
@@ -1269,7 +1280,7 @@ ForANonAnonymousAccess=За заверено достъп (достъп за п
 # YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
 # NotInstalled=Not installed, so your server is not slow down by this.
 # ApplicativeCache=Applicative cache
-# MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server. More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note that a lot of web hosting provider does not provide such cache server.
+# MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 # OPCodeCache=OPCode cache
 # NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
 # HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)

htdocs/langs/bg_BG/agenda.lang

@@ -52,6 +52,7 @@ InvoiceSentByEMail=, Изпратени по електронната поща %
 SupplierOrderSentByEMail=%s доставчик реда, изпратени по електронната поща
 SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура
 ShippingSentByEMail=Доставка %s изпращат по електронна поща
+# ShippingValidated= Shipping %s validated
 InterventionSentByEMail=Намеса %s изпращат по електронна поща
 NewCompanyToDolibarr= Създадено от трета страна
 DateActionPlannedStart= Планирана начална дата

htdocs/langs/bg_BG/cashdesk.lang

@@ -37,3 +37,4 @@ ShowCompany=Покажи фирмата
 ShowStock=Покажи склад
 DeleteArticle=Кликнете, за да се премахне тази статия
 # FilterRefOrLabelOrBC=Search (Ref/Label)
+# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.

htdocs/langs/bg_BG/errors.lang

@@ -26,8 +26,11 @@ ErrorFromToAccountsMustDiffers=Източника и целите на банк
 ErrorBadThirdPartyName=Неправилна стойност за името на трета страна
 # ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad синтаксис за код на клиента
+# ErrorBadBarCodeSyntax=Bad syntax for bar code
 ErrorCustomerCodeRequired=Клиентите изисква код
+# ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Клиентът код вече се използва
+# ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Префикс изисква
 ErrorUrlNotValid=Адресът на интернет страницата е неправилно
 ErrorBadSupplierCodeSyntax=Bad синтаксис за код на доставчика
@@ -63,6 +66,7 @@ ErrorSizeTooLongForVarcharType=Размер твърде дълго за низ
 # ErrorNoValueForRadioType=Please fill value for radio list
 # ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=Полеви <b>%s,</b> не трябва да съдържа специални знаци.
+# ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
 ErrorNoAccountancyModuleLoaded=Не е активиран модула Счетоводство
 # ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr LDAP съвпадение не е пълна.
@@ -107,7 +111,7 @@ ErrorBadLoginPassword=Неправилна стойност за потреби
 ErrorLoginDisabled=Вашият акаунт е забранено
 ErrorFailedToRunExternalCommand=Не може да се работи на външна команда. Уверете се, тя е достъпна и изпълнима от PHP на вашия сървър. Ако PHP <b>Safe Mode</b> е активирана, тази команда е вътре в директория, определена от параметър <b>safe_mode_exec_dir.</b>
 ErrorFailedToChangePassword=Неуспешно да смените паролата
-ErrorLoginDoesNotExists=Потребителят с вход <b>%s</b> не може да бъде намерен.
+ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
 ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ...
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен

htdocs/langs/bg_BG/exports.lang

@@ -123,6 +123,10 @@ BankCode=Банков код
 DeskCode=Бюро код
 BankAccountNumber=Номер на сметка
 BankAccountNumberKey=Ключ
+# SpecialCode=Special code
+# ExportStringFilter=%% allows replacing one or more characters in the text
+# ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filters by one year/month/day<br>'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filters over a range of years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the following years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the previous years/months/days
+# ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 # SelectFilterFields=If you want to filter on some values, just input values here.
 # FilterableFields=Champs Filtrables

htdocs/langs/bg_BG/mails.lang

@@ -79,6 +79,13 @@ MailtoEMail=Хипер-връзка на приятел
 ActivateCheckRead=Оставя се да се използва за четене тракер получаване и връзката unsubcribe
 ActivateCheckReadKey=Key използване за криптиране на използването на URL адрес за обратна разписка и функция unsubcribe
 # EMailSentToNRecipients=EMail sent to %s recipients.
+# EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
+# MailTopicSendRemindUnpaidInvoices=Remind of invoice %s (%s)
+# SendRemind=Send remind by EMails
+# RemindSent=%S remind(s) sent
+# AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
+# NoRemindSent=No remind by EMail sent
+# ResultOfMassSending=Result of mass remind sending by EMail
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=Контакти на всички трети лица (клиенти, перспектива, доставчици, ...)

htdocs/langs/bg_BG/main.lang

@@ -572,7 +572,7 @@ TotalWoman=Общо
 TotalMan=Общо
 NeverReceived=Никога не са получавали
 Canceled=Отменен
-# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionnary
+# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
 Color=Цвят
 Documents=Свързани файлове
 DocumentsNb=Свързани файлове (%s)

htdocs/langs/bg_BG/opensurvey.lang

@@ -35,6 +35,7 @@ AddNewColumn=Добавяне на нова колона
 TitleChoice=Избор на етикет
 # ExportSpreadsheet=Export result spreadsheet
 ExpireDate=Крайната дата
+# NbOfSurveys=Number of surveys
 NbOfVoters=Брой гласове
 SurveyResults=Резултати
 # PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.

htdocs/langs/bg_BG/orders.lang

@@ -55,6 +55,7 @@ DraftOrWaitingShipped=Проект или потвърдено все още н
 MenuOrdersToBill=Доставени поръчки
 # MenuOrdersToBill2=Orders to bill
 SearchOrder=Търсене за
+# SearchACustomerOrder=Search a customer order
 ShipProduct=Кораб продукт
 Discount=Отстъпка
 CreateOrder=Създаване на поръчка
@@ -164,3 +165,4 @@ OrderByPhone=Телефон
 # OrderCreated=Your orders have been created
 # OrderFail=An error happened during your orders creation
 # CreateOrders=Create orders
+# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".

htdocs/langs/bg_BG/other.lang

@@ -49,14 +49,15 @@ Miscellaneous=Разни
 NbOfActiveNotifications=Брой на уведомленията
 PredefinedMailTest=Това е тестов имейл.\nДвата реда са разделени с нов ред.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Това е <b>тестов</b> имейл (думата тестов трябва да бъде с удебелен шрифт). <br>Двата реда са разделени с нов ред.<br><br> __SIGNATURE__
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Тук ще намерите фактура __ FACREF__ \n\n от __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Бихме искали да ви предупредя, че фактурата FACREF__ __ изглежда не се заплащат. Така че това е фактурата в прикачения файл отново, за напомняне. \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Тук ще намерите търговския propoal __ PROPREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Тук ще намерите за __ ORDERREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Тук ще намерите нашата цел __ ORDERREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Тук ще намерите фактура __ FACREF__ \n\n от __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Тук ще намерите корабоплаването __ SHIPPINGREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Тук ще намерите намесата __ FICHINTERREF__ \n\n __ PERSONALIZED__Sincerely \n\n __ SIGNATURE__
+# PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+# PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr е компактен ERP / CRM състои от няколко функционални модули. Демо, което включва всички модули не означава нищо, тъй като това никога не се случва. Така че, няколко демо профили са на разположение.
 ChooseYourDemoProfil=Изберете профила демо, които съответстват на вашата дейност ...
 DemoFundation=Управление на членовете на организацията
@@ -175,12 +176,12 @@ StartUpload=Започнете качване
 CancelUpload=Анулиране на качването
 FileIsTooBig=Files е твърде голям
 PleaseBePatient=Моля, бъдете търпеливи ...
-# 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
-# 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=Ако не сте заявили промяната, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място.
 
 ##### Calendar common #####
 AddCalendarEntry=Добави запис в календара %s

htdocs/langs/bg_BG/products.lang

@@ -13,6 +13,10 @@ NewProduct=Нов продукт
 NewService=Нова услуга
 ProductCode=Код на продукта
 ServiceCode=Код на услугата
+# ProductVatMassChange=Mass VAT change
+# ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
+# MassBarcodeInit=Mass barcode init
+# MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
 ProductAccountancyBuyCode=Счетоводен код (покупка)
 ProductAccountancySellCode=Счетоводен код (продажба)
 ProductOrService=Продукт или Услуга
@@ -173,8 +177,8 @@ CustomCode=Customs code
 CountryOrigin=Държава на произход
 HiddenIntoCombo=Hidden into select lists
 Nature=Природа
-ProductCodeModel=Код на продукта модел
+# ProductCodeModel=Product ref template
-ServiceCodeModel=Service код модел
+# ServiceCodeModel=Service ref template
 AddThisProductCard=Създаване на карта на продукт
 HelpAddThisProductCard=Тази опция ви позволява да създадете или да клонирате продукт, ако не съществува.
 AddThisServiceCard=Създаване на карта на услуга
@@ -216,5 +220,10 @@ QtyNeed=Количество
 # DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
 # BarCodeDataForProduct=Barcode information of product %s :
 # BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-# BarcodeStickersMask=xxx
+# ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-
+# PriceByCustomer=Price by customer
+# PriceCatalogue=Catalogue Price
+# PricingRule=Pricing Rules
+# AddCustomerPrice=Add price by customers
+# ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+# PriceByCustomerLog=Price by customer log

htdocs/langs/bg_BG/projects.lang

@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
+# RefProject=Ref. project
+# ProjectId=Project Id
 Project=Проект
 Projects=Проекти
 SharedProject=Всички
@@ -30,11 +32,18 @@ TimeSpent=Времето, прекарано
 TimesSpent=Времето, прекарано
 RefTask=Реф. задача
 LabelTask=Label задача
+# TaskTimeSpent=Time spent on tasks
+# TaskTimeUser=Task time user
+# TaskTimeNote=Task time note
+# TaskTimeDate=Task time date
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
 MyTasks=Моите задачи
 Tasks=Задачи
 Task=Задача
+# TaskDateStart=Task start date
+# TaskDateEnd=Task end date
+# TaskDescription=Task description
 NewTask=Нова задача
 AddTask=Добавяне на задача
 AddDuration=Добави продължителността
@@ -100,12 +109,12 @@ ErrorShiftTaskDate=Невъзможно е да се смени датата н
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Ръководител на проекта
 TypeContact_project_external_PROJECTLEADER=Ръководител на проекта
-TypeContact_project_internal_CONTRIBUTOR=Сътрудник
+# TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_CONTRIBUTOR=Сътрудник
+# TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
 TypeContact_project_task_internal_TASKEXECUTIVE=Задача изпълнителен
 TypeContact_project_task_external_TASKEXECUTIVE=Задача изпълнителен
-TypeContact_project_task_internal_CONTRIBUTOR=Сътрудник
+# TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_CONTRIBUTOR=Сътрудник
+# TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 # SelectElement=Select element
 # AddElement=Link to element
 # Documents models

htdocs/langs/bg_BG/stocks.lang

@@ -94,14 +94,20 @@ DesiredStock=Желана наличност
 # StockToBuy=To order
 # Replenishment=Replenishment
 # ReplenishmentOrders=Replenishment orders
-# UseVirtualStock=Use virtual stock instead of physical stock
+# VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+# UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+# UseVirtualStock=Use virtual stock
+# UsePhysicalStock=Use physical stock
+# CurentSelectionMode=Curent selection mode
+# CurentlyUsingVirtualStock=Virtual stock
+# CurentlyUsingPhysicalStock=Physical stock
 # RuleForStockReplenishment=Rule for stocks replenishment
 SelectProductWithNotNullQty=Изберете най-малко един продукт с количество различно от 0 и доставчик
 AlertOnly= Само известия
 # WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 # WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=За този склад
-# ReplenishmentStatusDesc=This is list of all product with a physical stock lower than desired stock (or alert value if checkbox "alert only" is checked) and suggest you to create supplier orders to fill the difference.
+# ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
 # ReplenishmentOrdersDesc=This is list of all opened supplier orders
 Replenishments=Попълване
 # NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)

htdocs/langs/bg_BG/users.lang

@@ -54,7 +54,7 @@ NewGroup=Нова група
 CreateGroup=Създаване
 RemoveFromGroup=Премахване от групата
 PasswordChangedAndSentTo=Паролата е сменена и изпратена на <b>%s</b>.
-PasswordChangeRequestSent=Заявка за промяна на парола за <b>%s,</b> изпратени до <b>%s.</b>
+PasswordChangeRequestSent=Заявка за промяна на паролата на <b>%s,</b> е изпратена на <b>%s.</b>
 MenuUsersAndGroups=Потребители и Групи
 LastGroupsCreated=Последните %s създадени групи
 LastUsersCreated=Последните %s създадени потребители

htdocs/langs/bs_BA/admin.lang

@@ -287,7 +287,7 @@ ThisIsProcessToFollow=Ove postavke su za procesuiranje:
 # CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 # LastStableVersion=Last stable version
 # GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-# GenericMaskCodes2=<b>{cccc}</b> the client code<br><b>{cccc000}</b> the client code on n characters is followed by a client's ref counter without offset and zeroized with the global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
+# GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
 # GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 # GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 # GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -345,8 +345,6 @@ ExamplesWithCurrentSetup=Primjeri sa trenutnim postavkama
 # EnterRefToBuildUrl=Enter reference for object %s
 # GetSecuredUrl=Get calculated URL
 # ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-# ProductVatMassChange=Mass VAT change
-# ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 # OldVATRates=Old VAT rate
 # NewVATRates=New VAT rate
 # PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -381,6 +379,16 @@ ExtrafieldParamHelpsellist=Popis Parametri su došli iz tabele <br><br> na primj
 # DefaultLink=Default link
 ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postabkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
 ExternalModule=Eksterni moduli - Instalirani u direktorij %s
+# BarcodeInitForThirdparties=Mass barcode init for thirdparties
+# BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+# CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+# InitEmptyBarCode=Init value for next %s empty records
+# EraseAllCurrentBarCode=Erase all current barcode values
+# ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
+# AllBarcodeReset=All barcode values have been removed
+# NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+# NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+
 
 # Modules
 # Module0Name=Users & groups
@@ -510,6 +518,8 @@ Module55000Desc=Modul za kreiranje online anketa (kao Doodle, Studs, Rdvz, ...)
 # Module59000Desc=Module to manage margins
 # Module60000Name=Commissions
 # Module60000Desc=Module to manage commissions
+# Module150010Name=Batch number, eat-by date and sell-by date
+# Module150010Desc=batch number, eat-by date and sell-by date management for product
 # Permission11=Read customer invoices
 # Permission12=Create/modify customer invoices
 # Permission13=Unvalidate customer invoices
@@ -726,8 +736,8 @@ Permission55001=Pročitajte ankete
 Permission55002=Napravi/izmijeni ankete
 Permission59001=Pročitajte komercijalne margine
 Permission59002=Definirajte komercijalne margine
-# DictionaryCompanyType=Company types
+# DictionaryCompanyType=Thirdparties type
-# DictionaryCompanyJuridicalType=Juridical kinds of company
+# DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
 # DictionaryProspectLevel=Prospect potential level
 # DictionaryCanton=State/Cantons
 # DictionaryRegion=Regions
@@ -959,7 +969,7 @@ InfoPerf=Informacije o performansama
 # ShowProfIdInAddress=Show professionnal id with addresses on documents
 # ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 # TranslationUncomplete=Partial translation
-# SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix <b>.lang</b> text files into directory <b>htdocs/langs</b> and submit them on the forum at <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a>.
+# SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 # MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled)
 # MAIN_DISABLE_METEO=Disable meteo view
 # TestLoginToAPI=Test login to API
@@ -985,6 +995,7 @@ ExtraFieldsProject=Dopunski atributi (projekti)
 ExtraFieldsProjectTask=Dopunski atributi (zadaci)
 # ExtraFieldHasWrongValue=Attribut %s has a wrong value.
 # AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
+# AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 # SendingMailSetup=Setup of sendings by email
 # SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
 # PathToDocuments=Path to documents
@@ -1269,7 +1280,7 @@ PerfDolibarr=Izvještaj o perfomansama postavki/optimizacije
 YouMayFindPerfAdviceHere=Na ovoj stranici ćete pronaći neke provjere ili savjete vezane za performanse.
 NotInstalled=Nije instalirano, tako da vaš server nije usporen ovim.
 ApplicativeCache=Aplikativni cache
-MemcachedNotAvailable=Aplikativni cache nije pronađen. Možete poboljšati performanse instaliranjem cache server Memcached i modula koji koristi ovaj cache server. Više informacija možete pronaći na http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Imajte na umu da mnogo web hosting snabdjevača ne pruža takav cache server.
+# MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=OPCode cache nije pronađen. Možda koristite drugu OPCode cache pored XCache ili eAccelerator (dobro), možda nemate OPCode cache (jako loše).
 HTTPCacheStaticResources=HTTP cache za statičke resurse (css, img, javascript)

htdocs/langs/bs_BA/agenda.lang

@@ -40,18 +40,19 @@ ActionsEvents= Događaji za koje će Dolibarr stvoriti akciju u dnevni red autom
 PropalValidatedInDolibarr= Prijedlog %s potvrđen
 InvoiceValidatedInDolibarr= Faktura %s potvrđena
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
-InvoiceDeleteDolibarr=Faktura %s izbrisana
+InvoiceDeleteDolibarr=Faktura %s obrisana
 OrderValidatedInDolibarr= Narudžba %s potvrđena
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
 OrderCanceledInDolibarr=Narudžba %s otkazana
 InterventionValidatedInDolibarr=Intervencija %s potvrđena
-ProposalSentByEMail=Trgovački prijedlog %s poslan putem e-maila
+ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
 OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
 InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
 SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila
 SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila
 ShippingSentByEMail=Dostava %s poslana putem e-maila
+# ShippingValidated= Shipping %s validated
 InterventionSentByEMail=Intervencija %s poslana putem e-maila
 NewCompanyToDolibarr= Trća stranka kreirana
 DateActionPlannedStart= Planirani datum početka

htdocs/langs/bs_BA/banks.lang

@@ -68,7 +68,7 @@ BankType2=Gotovinski račun
 IfBankAccount=If bankovni račun
 AccountsArea=Područje za račune
 AccountCard=Kartica računa
-DeleteAccount=Brisanje računa
+DeleteAccount=Obriši račun
 ConfirmDeleteAccount=Jeste li sigurni da želite obrisati ovaj račun?
 Account=Račun
 ByCategories=Po kategorijama
@@ -119,15 +119,15 @@ TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s j
 CheckTransmitter=Otpremnik
 ValidateCheckReceipt=Potvrditi ovu priznanicu čeka?
 ConfirmValidateCheckReceipt=Jeste li sigurni da želite potvrditi priznanicu čeka, promjena neće biti moguća kada se to uradi?
-DeleteCheckReceipt=Izbrisati ovu priznanicu čeka?
+DeleteCheckReceipt=Obrisati ovu priznanicu čeka?
 ConfirmDeleteCheckReceipt=Jeste li sigurni da želite obrisati ovu priznanicu čeka?
 BankChecks=Bankovni ček
 BankChecksToReceipt=Čekovi čekaju depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
 NumberOfCheques=Broj čeka
-DeleteTransaction=Brisanje transakcije
+DeleteTransaction=Obrisati transakciju
 ConfirmDeleteTransaction=Jeste li sigurni da želite obrisati ovu transakciju?
-ThisWillAlsoDeleteBankRecord=Ovo će također izbrisati generisane bankovne transakcije
+ThisWillAlsoDeleteBankRecord=Ovo će također obrisati generisane bankovne transakcije
 BankMovements=Promet
 CashBudget=Novčani proračun
 PlannedTransactions=Planirana transakcije

htdocs/langs/bs_BA/bills.lang

@@ -58,7 +58,7 @@ Payments=Uplate
 PaymentsBack=Povrat uplata
 PaidBack=Uplaćeno nazad
 DatePayment=Datum uplate
-DeletePayment=Brisanje uplate
+DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Jeste li sigurni da želite obrisati ovu uplatu?
 # ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
 SupplierPayments=Uplate dobavljača
@@ -207,7 +207,7 @@ ToBill=Za fakturisati
 RemainderToBill=Ostatak za naplatiti
 SendBillByMail=Pošalji fakturu na e-mail
 SendReminderBillByMail=Pošalji opomenu na e-mail
-# RelatedCommercialProposals=Related commercial proposals
+RelatedCommercialProposals=Vezani poslovni prijedlozi
 MenuToValid=Za važeći
 DateMaxPayment=Rok plaćanja do
 DateEcheance=Datum isteka roka za plaćanje

htdocs/langs/bs_BA/boxes.lang

@@ -7,7 +7,7 @@ BoxLastSupplierBills=Zadnje fakture dobavljača
 BoxLastCustomerBills=Zadnje fakture kupca
 BoxOldestUnpaidCustomerBills=Najstarije neplaćene fakture kupca
 BoxOldestUnpaidSupplierBills=Najstarije neplaćene fakture dobavljača
-BoxLastProposals=Zadnji trgovački prijedlozi
+BoxLastProposals=Zadnji poslovni prijedlozi
 # BoxLastProspects=Last modified prospects
 BoxLastCustomers=Zadnji izmijenjeni kupci
 BoxLastSuppliers=Zadnji izmijenjeni dobavljači

htdocs/langs/bs_BA/cashdesk.lang

@@ -1,39 +1,40 @@
 # Language file - Source file is en_US - cashdesk
-# CashDeskMenu=Point of sale
+CashDeskMenu=Prodajno mjesto
-# CashDesk=Point of sale
+CashDesk=Prodajno mjesto
-# CashDesks=Point of sales
+CashDesks=Prodajna mjesta
-# CashDeskBank=Bank account
+CashDeskBank=Bakovni račun
-# CashDeskBankCash=Bank account (cash)
+CashDeskBankCash=Bankovni račun (gotovina)
-# CashDeskBankCB=Bank account (card)
+CashDeskBankCB=Bankovni račun (kartica)
-# CashDeskBankCheque=Bank account (cheque)
+CashDeskBankCheque=Bankovni račun (ček)
-# CashDeskWarehouse=Warehouse
+CashDeskWarehouse=Skladište
-# CashdeskShowServices=Selling services
+CashdeskShowServices=Prodajne usluge
-# CashDeskProducts=Products
+CashDeskProducts=Proizvodi
-# CashDeskStock=Stock
+CashDeskStock=Zalihe
-# CashDeskOn=on
+CashDeskOn=uključen u
-# CashDeskThirdParty=Third party
+CashDeskThirdParty=Subjekt
-# CashdeskDashboard=Point of sale access
+CashdeskDashboard=Pristup prodajnom mjestu
-# ShoppingCart=Shopping cart
+ShoppingCart=Korpa
-# NewSell=New sell
+NewSell=Nova prodaja
-# BackOffice=Back office
+BackOffice=Administracija
-# AddThisArticle=Add this article
+AddThisArticle=Dodaj ovaj proizvod
-# RestartSelling=Go back on sell
+RestartSelling=Nazad na prodaju
-# SellFinished=Sell finished
+SellFinished=Prodaja završena
-# PrintTicket=Print ticket
+PrintTicket=Isprintaj račun
-# NoProductFound=No article found
+NoProductFound=Nema pronađenih proizvoda
-# ProductFound=product found
+ProductFound=proizvod pronađen
-# ProductsFound=products found
+ProductsFound=proizvodi pronađeni
-# NoArticle=No article
+NoArticle=Nema proizvoda
-# Identification=Identification
+Identification=Identifikacija
-# Article=Article
+Article=Proizvod
-# Difference=Difference
+Difference=Razlika
-# TotalTicket=Total ticket
+TotalTicket=Ukupno račun
-# NoVAT=No VAT for this sale
+NoVAT=Nema PDV-a na ovu prodaju
-# Change=Excess received
+Change=Primljeni višak
-# CalTip=Click to view the calendar
+CalTip=Klikni da vidiš kalendar
-# CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
+CashDeskSetupStock=Tražite da smanjite zalihu na kreaciji fakture, ali skladište za ovo nije definisano. <br> Promijenite postavke modula, ili izaberite skladište.
-# BankToPay=Charge Account
+BankToPay=Dozvola za kupovinu na kredit
-# ShowCompany=Show company
+ShowCompany=Prikaži kompaniju
-# ShowStock=Show warehouse
+ShowStock=Prikaži skladište
-# DeleteArticle=Click to remove this article
+DeleteArticle=Klikni da uklonis ovaj proizvod
-# FilterRefOrLabelOrBC=Search (Ref/Label)
+FilterRefOrLabelOrBC=Traži (Ref/Oznaku)
+# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.

htdocs/langs/bs_BA/categories.lang

@@ -67,8 +67,8 @@ ContentsVisibleByAll=Sadržaj će biti vidljiv svima
 ContentsVisibleByAllShort=Sadržaj vidljiv svima
 ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
 CategoriesTree=Stablo kategorija
-DeleteCategory=Izbrisati kategoriju
+DeleteCategory=Obriši kategoriju
-ConfirmDeleteCategory=Jeste li sigurni da želite izbrisati ovu kategoriju?
+ConfirmDeleteCategory=Jeste li sigurni da želite obrisati ovu kategoriju?
 RemoveFromCategory=Uklonite vezu sa kategorijom
 RemoveFromCategoryConfirm=Jeste li sigurni da želite ukloniti vezu između transakcije i kategorije?
 NoCategoriesDefined=Nema definisane kategorije

htdocs/langs/bs_BA/companies.lang

@@ -1,88 +1,88 @@
 # Dolibarr language file - Source file is en_US - companies
-# ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorCompanyNameAlreadyExists=Ime kompanije %s već postoji. Izaberite neko drugo.
-# ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
+ErrorPrefixAlreadyExists=Prefiks %s već postoji. Izaberite neko drugo.
-# ErrorSetACountryFirst=Set the country first
+ErrorSetACountryFirst=Odberite prvo zemlju
-# SelectThirdParty=Select a third party
+SelectThirdParty=Odaberite subjekt
-# DeleteThirdParty=Delete a third party
+DeleteThirdParty=Obrisati subjekta
-# ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
+ConfirmDeleteCompany=Jeste li sigurni da želite obrisati ove kompanije i podatke vezane za istu?
-# DeleteContact=Delete a contact/address
+DeleteContact=Obrisati kontakt/uslugu
-# ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
+ConfirmDeleteContact=Jeste li sigurni da želite obrisati ovaj kontakt i sve podatke vezane za isti?
-# MenuNewThirdParty=New third party
+MenuNewThirdParty=Novi subjekt
-# MenuNewCompany=New company
+MenuNewCompany=Nova kompanija
-# MenuNewCustomer=New customer
+MenuNewCustomer=Novi kupac
-# MenuNewProspect=New prospect
+MenuNewProspect=Novi mogući klijent
-# MenuNewSupplier=New supplier
+MenuNewSupplier=Novi dobavljač
-# MenuNewPrivateIndividual=New private individual
+MenuNewPrivateIndividual=Nova privatna individua
-# MenuSocGroup=Groups
+MenuSocGroup=Grupe
-# NewCompany=New company (prospect, customer, supplier)
+NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
-# NewThirdParty=New third party (prospect, customer, supplier)
+NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
-# NewSocGroup=New company group
+NewSocGroup=Nova grupa kompanije
-# NewPrivateIndividual=New private individual (prospect, customer, supplier)
+NewPrivateIndividual=Nova privatna individua (mogući klijent, kupac, dobavljač)
-# ProspectionArea=Prospection area
+ProspectionArea=Područje za moguće kupce
-# SocGroup=Group of companies
+SocGroup=Grupa kompanija
-# IdThirdParty=Id third party
+IdThirdParty=ID subjekta
-# IdCompany=Company Id
+IdCompany=ID kompanije
-# IdContact=Contact Id
+IdContact=ID kontakta
-# Contacts=Contacts/Addresses
+Contacts=Kontakti/Adrese
-# ThirdPartyContacts=Third party contacts
+ThirdPartyContacts=Kontakti subjekta
-# ThirdPartyContact=Third party contact/address
+ThirdPartyContact=Kontakt/Adresa subjekta
-# StatusContactValidated=Status of contact/address
+StatusContactValidated=Status kontakta/adrese
-# Company=Company
+Company=Kompanija
-# CompanyName=Company name
+CompanyName=Ime kompanije
-# Companies=Companies
+Companies=Kompanije
-# CountryIsInEEC=Country is inside European Economic Community
+CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
-# ThirdPartyName=Third party name
+ThirdPartyName=Ime subjekta
-# ThirdParty=Third party
+ThirdParty=Subjekt
-# ThirdParties=Third parties
+ThirdParties=Subjekti
-# ThirdPartyAll=Third parties (all)
+ThirdPartyAll=Subjekti (svi)
-# ThirdPartyProspects=Prospects
+ThirdPartyProspects=Mogući klijenti
-# ThirdPartyProspectsStats=Prospects
+ThirdPartyProspectsStats=Mogući klijenti
-# ThirdPartyCustomers=Customers
+ThirdPartyCustomers=Kupci
-# ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersStats=Kupci
-# ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
-# ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Dobavljači
-# ThirdPartyType=Third party type
+ThirdPartyType=Tip subjekta
-# Company/Fundation=Company/Foundation
+Company/Fundation=Kompanija/Fondacija
-# Individual=Private individual
+Individual=Privatna individua
-# ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Ovo će automatski kreirati fizički kontakt sa istim informacijama
-# ParentCompany=Parent company
+ParentCompany=Matična kompanija
-# Subsidiary=Subsidiary
+Subsidiary=Podružnica
-# Subsidiaries=Subsidiaries
+Subsidiaries=Podružnice
-# NoSubsidiary=No subsidiary
+NoSubsidiary=Nema podružnica
-# ReportByCustomers=Report by customers
+ReportByCustomers=Izvještaj po kupcima
-# ReportByQuarter=Report by rate
+ReportByQuarter=Izvještaj po stopama
 # CivilityCode=Civility code
-# RegisteredOffice=Registered office
+RegisteredOffice=Registrovan ured
-# Name=Name
+Name=Naziv
-# Lastname=Last name
+Lastname=Prezime
-# Firstname=First name
+Firstname=Ime
-# PostOrFunction=Post/Function
+PostOrFunction=Položaj/Funkcija
-# UserTitle=Title
+UserTitle=Titula
-# Surname=Surname/Pseudo
+Surname=Prezime/pseudonim
-# Address=Address
+Address=Adresa
-# State=State/Province
+State=Država/Provincija
-# Region=Region
+Region=Region
-# Country=Country
+Country=Država
-# CountryCode=Country code
+CountryCode=Šifra države
-# CountryId=Country id
+CountryId=ID države
-# Phone=Phone
+Phone=Telefon
-# Skype=Skype
+Skype=Skajp
-# Call=Call
+Call=Pozovi
-# Chat=Chat
+Chat=Chat
-# PhonePro=Prof. phone
+PhonePro=Službeni telefon
-# PhonePerso=Pers. phone
+PhonePerso=Privatni telefon
-# PhoneMobile=Mobile
+PhoneMobile=Mobitel
 # No_Email=Don't send mass e-mailings
-# Fax=Fax
+Fax=Fax
-# Zip=Zip Code
+Zip=ZIP kod
-# Town=City
+Town=Grad
-# Web=Web
+Web=Web
-# Poste= Position
+Poste= Pozicija
-# DefaultLang=Language by default
+DefaultLang=Defaultni jezik
-# VATIsUsed=VAT is used
+VATIsUsed=Oporeziva osoba
-# VATIsNotUsed=VAT is not used
+VATIsNotUsed=Neoporeziva osoba
-# CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Popuni adresu sa adresom subjekta
-# NoEmailDefined=There is no email defined
+NoEmailDefined=Nema definisanog emaila
 ##### Local Taxes #####
 # LocalTax1IsUsedES= RE is used
 # LocalTax1IsNotUsedES= RE is not used
@@ -90,12 +90,12 @@
 # LocalTax2IsNotUsedES= IRPF is not used
 # LocalTax1ES=RE
 # LocalTax2ES=IRPF
-# ThirdPartyEMail=%s
+ThirdPartyEMail=%s
-# WrongCustomerCode=Customer code invalid
+WrongCustomerCode=Nevažeća šifra kupca
-# WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Nevažeća šifra dobavljača
-# CustomerCodeModel=Customer code model
+CustomerCodeModel=Model šifre kupca
-# SupplierCodeModel=Supplier code model
+SupplierCodeModel=Model šifre dobavljača
-# Gencod=Bar code
+Gencod=Barkod
 ##### Professional ID #####
 # ProfId1Short=Prof. id 1
 # ProfId2Short=Prof. id 2
@@ -109,301 +109,301 @@
 # ProfId4=Professional ID 4
 # ProfId5=Professional ID 5
 # ProfId6=Professional ID 6
-# ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId1AR=Prof Id 1 (CUIT / CUIL)
-# ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId2AR=Prof Id 2 (Revenu brutes)
-# ProfId3AR=-
+ProfId3AR=-
-# ProfId4AR=-
+ProfId4AR=-
-# ProfId5AR=-
+ProfId5AR=-
-# ProfId6AR=-
+ProfId6AR=-
-# ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Prof Id 1 (ABN)
-# ProfId2AU=-
+ProfId2AU=-
-# ProfId3AU=-
+ProfId3AU=-
-# ProfId4AU=-
+ProfId4AU=-
-# ProfId5AU=-
+ProfId5AU=-
-# ProfId6AU=-
+ProfId6AU=-
-# ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Prof Id 1 (Professional number)
-# ProfId2BE=-
+ProfId2BE=-
-# ProfId3BE=-
+ProfId3BE=-
-# ProfId4BE=-
+ProfId4BE=-
-# ProfId5BE=-
+ProfId5BE=-
-# ProfId6BE=-
+ProfId6BE=-
-# ProfId1BR=-
+ProfId1BR=-
-# ProfId2BR=IE (Inscricao Estadual)
+ProfId2BR=IE (Inscricao Estadual)
-# ProfId3BR=IM (Inscricao Municipal)
+ProfId3BR=IM (Inscricao Municipal)
-# ProfId4BR=CPF
+ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-# ProfId1CH=-
+ProfId1CH=-
-# ProfId2CH=-
+ProfId2CH=-
 # ProfId3CH=Prof Id 1 (Federal number)
 # ProfId4CH=Prof Id 2 (Commercial Record number)
-# ProfId5CH=-
+ProfId5CH=-
-# ProfId6CH=-
+ProfId6CH=-
 # ProfId1CL=Prof Id 1 (R.U.T.)
-# ProfId2CL=-
+ProfId2CL=-
-# ProfId3CL=-
+ProfId3CL=-
-# ProfId4CL=-
+ProfId4CL=-
-# ProfId5CL=-
+ProfId5CL=-
-# ProfId6CL=-
+ProfId6CL=-
 # ProfId1CO=Prof Id 1 (R.U.T.)
-# ProfId2CO=-
+ProfId2CO=-
-# ProfId3CO=-
+ProfId3CO=-
-# ProfId4CO=-
+ProfId4CO=-
-# ProfId5CO=-
+ProfId5CO=-
-# ProfId6CO=-
+ProfId6CO=-
 # ProfId1DE=Prof Id 1 (USt.-IdNr)
 # ProfId2DE=Prof Id 2 (USt.-Nr)
 # ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
-# ProfId4DE=-
+ProfId4DE=-
 # ProfId5DE=-
-# ProfId6DE=-
+ProfId6DE=-
 # ProfId1ES=Prof Id 1 (CIF/NIF)
 # ProfId2ES=Prof Id 2 (Social security number)
 # ProfId3ES=Prof Id 3 (CNAE)
 # ProfId4ES=Prof Id 4 (Collegiate number)
-# ProfId5ES=-
+ProfId5ES=-
-# ProfId6ES=-
+ProfId6ES=-
 # ProfId1FR=Prof Id 1 (SIREN)
 # ProfId2FR=Prof Id 2 (SIRET)
 # ProfId3FR=Prof Id 3 (NAF, old APE)
 # ProfId4FR=Prof Id 4 (RCS/RM)
-# ProfId5FR=-
+ProfId5FR=-
-# ProfId6FR=-
+ProfId6FR=-
-# ProfId1GB=Registration Number
+ProfId1GB=Registracijski broj
-# ProfId2GB=-
+ProfId2GB=-
-# ProfId3GB=SIC
+ProfId3GB=SIC
-# ProfId4GB=-
+ProfId4GB=-
-# ProfId5GB=-
+ProfId5GB=-
-# ProfId6GB=-
+ProfId6GB=-
 # ProfId1HN=Id prof. 1 (RTN)
-# ProfId2HN=-
+ProfId2HN=-
-# ProfId3HN=-
+ProfId3HN=-
-# ProfId4HN=-
+ProfId4HN=-
-# ProfId5HN=-
+ProfId5HN=-
-# ProfId6HN=-
+ProfId6HN=-
 # ProfId1IN=Prof Id 1 (TIN)
 # ProfId2IN=Prof Id 2 (PAN)
 # ProfId3IN=Prof Id 3 (SRVC TAX)
 # ProfId4IN=Prof Id 4
 # ProfId5IN=Prof Id 5
-# ProfId6IN=-
+ProfId6IN=-
 # ProfId1MA=Id prof. 1 (R.C.)
 # ProfId2MA=Id prof. 2 (Patente)
 # ProfId3MA=Id prof. 3 (I.F.)
 # ProfId4MA=Id prof. 4 (C.N.S.S.)
-# ProfId5MA=-
+ProfId5MA=-
-# ProfId6MA=-
+ProfId6MA=-
 # ProfId1MX=Prof Id 1 (R.F.C).
 # ProfId2MX=Prof Id 2 (R..P. IMSS)
 # ProfId3MX=Prof Id 3 (Profesional Charter)
-# ProfId4MX=-
+ProfId4MX=-
-# ProfId5MX=-
+ProfId5MX=-
-# ProfId6MX=-
+ProfId6MX=-
 # ProfId1NL=KVK nummer
-# ProfId2NL=-
+ProfId2NL=-
-# ProfId3NL=-
+ProfId3NL=-
 # ProfId4NL=Burgerservicenummer (BSN)
-# ProfId5NL=-
+ProfId5NL=-
-# ProfId6NL=-
+ProfId6NL=-
 # ProfId1PT=Prof Id 1 (NIPC)
 # ProfId2PT=Prof Id 2 (Social security number)
 # ProfId3PT=Prof Id 3 (Commercial Record number)
 # ProfId4PT=Prof Id 4 (Conservatory)
-# ProfId5PT=-
+ProfId5PT=-
-# ProfId6PT=-
+ProfId6PT=-
 # ProfId1SN=RC
 # ProfId2SN=NINEA
-# ProfId3SN=-
+ProfId3SN=-
-# ProfId4SN=-
+ProfId4SN=-
-# ProfId5SN=-
+ProfId5SN=-
-# ProfId6SN=-
+ProfId6SN=-
 # ProfId1TN=Prof Id 1 (RC)
 # ProfId2TN=Prof Id 2 (Fiscal matricule)
 # ProfId3TN=Prof Id 3 (Douane code)
 # ProfId4TN=Prof Id 4 (BAN)
-# ProfId5TN=-
+ProfId5TN=-
-# ProfId6TN=-
+ProfId6TN=-
 # ProfId1RU=Prof Id 1 (OGRN)
 # ProfId2RU=Prof Id 2 (INN)
 # ProfId3RU=Prof Id 3 (KPP)
 # ProfId4RU=Prof Id 4 (OKPO)
-# ProfId5RU=-
+ProfId5RU=-
-# ProfId6RU=-
+ProfId6RU=-
-# VATIntra=VAT number
+VATIntra=PDV broj
-# VATIntraShort=VAT number
+VATIntraShort=PDV broj
-# VATIntraVeryShort=VAT
+VATIntraVeryShort=PDV
-# VATIntraSyntaxIsValid=Syntax is valid
+VATIntraSyntaxIsValid=Sintaksa je nevažeća
-# VATIntraValueIsValid=Value is valid
+VATIntraValueIsValid=Vrijednost je nevažeća
-# ProspectCustomer=Prospect / Customer
+ProspectCustomer=Mogući klijent / Kupac
-# Prospect=Prospect
+Prospect=Mogući klijent
-# CustomerCard=Customer Card
+CustomerCard=Kartica kupca
-# Customer=Customer
+Customer=Kupac
-# CustomerDiscount=Customer Discount
+CustomerDiscount=Popust kupca
-# CustomerRelativeDiscount=Relative customer discount
+CustomerRelativeDiscount=Relativni popust kupca
-# CustomerAbsoluteDiscount=Absolute customer discount
+CustomerAbsoluteDiscount=Fiksni popust kupca
-# CustomerRelativeDiscountShort=Relative discount
+CustomerRelativeDiscountShort=Relativni popust
-# CustomerAbsoluteDiscountShort=Absolute discount
+CustomerAbsoluteDiscountShort=Fiksni popust
-# CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
-# CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+CompanyHasNoRelativeDiscount=Ovaj kupac nema relativnog popusta po defaultu
-# CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Ovaj kupac još uvijek ima zasluga za popust ili depozit za <b>%s</b> %s
 # CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
-# CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
-# CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
+CustomerAbsoluteDiscountAllUsers=Fiksni popust (odobren od strane svih korisnika)
-# CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountMy=Fiksni popust (odobren od strane sebe)
-# DefaultDiscount=Default discount
+DefaultDiscount=Defaultni popust
-# AvailableGlobalDiscounts=Absolute discounts available
+AvailableGlobalDiscounts=Fiksni popust dostupan
-# DiscountNone=None
+DiscountNone=Ništa
-# Supplier=Supplier
+Supplier=Dobavljač
-# CompanyList=Company's list
+CompanyList=Lista kompanije
-# AddContact=Add contact
+AddContact=Dodaj kontakt
-# AddContactAddress=Add contact/address
+AddContactAddress=Dodaj kontakt/adresu
-# EditContact=Edit contact
+EditContact=Uredi kontakt
-# EditContactAddress=Edit contact/address
+EditContactAddress=Uredi kontakt/adresu
-# Contact=Contact
+Contact=Kontakt
-# ContactsAddresses=Contacts/Addresses
+ContactsAddresses=Kontakti/Adrese
-# NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
-# NoContactDefined=No contact defined
+NoContactDefined=Nijedan kontakt definiran
-# DefaultContact=Default contact/address
+DefaultContact=Defaultni kontakt/adresa
-# AddCompany=Add company
+AddCompany=Dodaj kompaniju
-# AddThirdParty=Add third party
+AddThirdParty=Dodaj subjekta
-# DeleteACompany=Delete a company
+DeleteACompany=Obrisati kompaniju
-# PersonalInformations=Personal data
+PersonalInformations=Osobni podaci
-# AccountancyCode=Accountancy code
+AccountancyCode=Šifra računovodstva
-# CustomerCode=Customer code
+CustomerCode=Šifra kupca
-# SupplierCode=Supplier code
+SupplierCode=Šifra dobavljača
-# CustomerAccount=Customer account
+CustomerAccount=Račun kupca
-# SupplierAccount=Supplier account
+SupplierAccount=Račun dobavljača
-# CustomerCodeDesc=Customer code, unique for all customers
+CustomerCodeDesc=Šifra kupca, jedinstvena za sve kupce
-# SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Šifra dobavljača, jedinstvena za sve dobavljače
-# RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfCustomer=Potrebno ako je subjekt kupac ili mogući klijent
-# RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Potrebno ako je subjekt dobavljač
-# ValidityControledByModule=Validity controled by module
+ValidityControledByModule=Porvjera valjanosti se kontroliše modulom
-# ThisIsModuleRules=This is rules for this module
+ThisIsModuleRules=Ovo us pravila za ovaj modul
-# LastProspect=Last
+LastProspect=Zadnji
-# ProspectToContact=Prospect to contact
+ProspectToContact=Mogući klijent za kontaktirati
-# CompanyDeleted=Company "%s" deleted from database.
+CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
-# ListOfContacts=List of contacts/addresses
+ListOfContacts=Lista kontakta/adresa
-# ListOfContactsAddresses=List of contacts/adresses
+ListOfContactsAddresses=Lista kontakta/adresa
-# ListOfProspectsContacts=List of prospect contacts
+ListOfProspectsContacts=Lista kontakata mogućeg klijenta
-# ListOfCustomersContacts=List of customer contacts
+ListOfCustomersContacts=Lista kontakata kupca
-# ListOfSuppliersContacts=List of supplier contacts
+ListOfSuppliersContacts=Lista kontakata dobavljača
-# ListOfCompanies=List of companies
+ListOfCompanies=Lista kompanija
-# ListOfThirdParties=List of third parties
+ListOfThirdParties=Lista subjekata
-# ShowCompany=Show company
+ShowCompany=Prikaži kompaniju
-# ShowContact=Show contact
+ShowContact=Prikaži kontakt
-# ContactsAllShort=All (No filter)
+ContactsAllShort=Svi (bez filtera)
-# ContactType=Contact type
+ContactType=Tip kontakta
-# ContactForOrders=Order's contact
+ContactForOrders=Kontakt narudžbe
-# ContactForProposals=Proposal's contact
+ContactForProposals=Kontakt prijedloga
-# ContactForContracts=Contract's contact
+ContactForContracts=Kontakt ugovora
-# ContactForInvoices=Invoice's contact
+ContactForInvoices=Kontakt fakture
-# NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrder=Ovaj kontakt nije kontakt za bilo koju narudžbu
-# NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlog
-# NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
-# NoContactForAnyInvoice=This contact is not a contact for any invoice
+NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
-# NewContact=New contact
+NewContact=Novi kontakt
-# NewContactAddress=New contact/address
+NewContactAddress=Novi kontakt/adresa
-# LastContacts=Last contacts
+LastContacts=Zadnji kontakti
-# MyContacts=My contacts
+MyContacts=Moji kontakti
-# Phones=Phones
+Phones=Telefoni
-# Capital=Capital
+Capital=Kapital
-# CapitalOf=Capital of %s
+CapitalOf=Kapital od %s
-# EditCompany=Edit company
+EditCompany=Uredi kompaniju
-# EditDeliveryAddress=Edit delivery address
+EditDeliveryAddress=Uredi adresu za dostavu
-# ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=OVaj korisnik nije mogući klijent, kupac niti dobavljač
-# VATIntraCheck=Check
+VATIntraCheck=Provjeri
-# VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
+VATIntraCheckDesc=Link <b>%s</b> dozvoljava upit za evopski PDV servis za provjeru. Potrebno je imati pristup internetu na serveru za ovu uslugu.
-# VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 # VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
 # VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
-# ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
-# NorProspectNorCustomer=Nor prospect, nor customer
+NorProspectNorCustomer=Niti mogući klijent, niti kupac
-# JuridicalStatus=Juridical status
+JuridicalStatus=Pravni status
-# Staff=Staff
+Staff=Osoblje
-# ProspectLevelShort=Potential
+ProspectLevelShort=Potencijal
-# ProspectLevel=Prospect potential
+ProspectLevel=Potencijal mogućeg klijenta
-# ContactPrivate=Private
+ContactPrivate=Privatno
-# ContactPublic=Shared
+ContactPublic=Zajedničko
-# ContactVisibility=Visibility
+ContactVisibility=Vidljivost
-# OthersNotLinkedToThirdParty=Others, not linked to a third party
+OthersNotLinkedToThirdParty=Drugo, koje nije povezano sa subjektom
-# ProspectStatus=Prospect status
+ProspectStatus=Status mogućeg klijenta
-# PL_NONE=None
+PL_NONE=Nema potencijala
-# PL_UNKNOWN=Unknown
+PL_UNKNOWN=Nepoznat potencijal
-# PL_LOW=Low
+PL_LOW=Nizak potencijal
-# PL_MEDIUM=Medium
+PL_MEDIUM=Srednji potencijal
-# PL_HIGH=High
+PL_HIGH=Veliki potencijal
-# TE_UNKNOWN=-
+TE_UNKNOWN=-
-# TE_STARTUP=Startup
+TE_STARTUP=Nova kompanija
-# TE_GROUP=Large company
+TE_GROUP=Velika kompanija
-# TE_MEDIUM=Medium company
+TE_MEDIUM=Srednja kompanija
-# TE_ADMIN=Governmental
+TE_ADMIN=Državna kompanija
-# TE_SMALL=Small company
+TE_SMALL=Mala kompanija
-# TE_RETAIL=Retailer
+TE_RETAIL=Maloprodaja
-# TE_WHOLE=Wholetailer
+TE_WHOLE=Veleprodaja
-# TE_PRIVATE=Private individual
+TE_PRIVATE=Privatna individua
-# TE_OTHER=Other
+TE_OTHER=Ostalo
-# StatusProspect-1=Do not contact
+StatusProspect-1=Ne kontaktirati
-# StatusProspect0=Never contacted
+StatusProspect0=Nikada kontaktirano
-# StatusProspect1=To contact
+StatusProspect1=Kontaktirati
-# StatusProspect2=Contact in process
+StatusProspect2=Kontaktiranje u toku
-# StatusProspect3=Contact done
+StatusProspect3=Kontaktirano
-# ChangeDoNotContact=Change status to 'Do not contact'
+ChangeDoNotContact=Promijeni status u 'Ne kontaktirati'
-# ChangeNeverContacted=Change status to 'Never contacted'
+ChangeNeverContacted=Promjeni status na 'Nikada kontaktirano'
-# ChangeToContact=Change status to 'To contact'
+ChangeToContact=Promjeni status na 'Kontaktirati'
-# ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactInProcess=Promjeni status na 'Kontaktiranje u toku'
-# ChangeContactDone=Change status to 'Contact done'
+ChangeContactDone=Promjeni status na 'Kontaktirano'
-# ProspectsByStatus=Prospects by status
+ProspectsByStatus=Mogući klijenti po statusu
-# BillingContact=Billing contact
+BillingContact=Kontakt za naplatu
-# NbOfAttachedFiles=Number of attached files
+NbOfAttachedFiles=Broj vezanih fajlova
-# AttachANewFile=Attach a new file
+AttachANewFile=Prikači novi fajl
 # NoRIB=No BAN defined
-# NoParentCompany=None
+NoParentCompany=Bez
-# ExportImport=Import-Export
+ExportImport=Uvoz-Izvoz
-# ExportCardToFormat=Export card to format
+ExportCardToFormat=Izvod podataka u formatu
-# ContactNotLinkedToCompany=Contact not linked to any third party
+ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
-# DolibarrLogin=Dolibarr login
+DolibarrLogin=Dolibarr login
-# NoDolibarrAccess=No Dolibarr access
+NoDolibarrAccess=Nema Dolibarr pristupa
-# ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i svojstva
-# ExportDataset_company_2=Contacts and properties
+ExportDataset_company_2=Kontakti i osobine
-# ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i svojstva
-# ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_2=Kontakti/Adrese (od subjekata ili ne) i atributi
-# ImportDataset_company_3=Bank details
+ImportDataset_company_3=Detalji banke
-# PriceLevel=Price level
+PriceLevel=Visina cijene
-# DeliveriesAddress=Delivery addresses
+DeliveriesAddress=Adrese za dostavu
-# DeliveryAddress=Delivery address
+DeliveryAddress=Adresa za dostavu
-# DeliveryAddressLabel=Delivery address label
+DeliveryAddressLabel=Oznaka za adresu za dostavu
-# DeleteDeliveryAddress=Delete a delivery address
+DeleteDeliveryAddress=Obrisani adresu za dostavu
-# ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
+ConfirmDeleteDeliveryAddress=Jeste li sigurni da želite obrisati ovu adresu za dostavu?
-# NewDeliveryAddress=New delivery address
+NewDeliveryAddress=Nova adresa za dostavu
-# AddDeliveryAddress=Add address
+AddDeliveryAddress=Dodaj adresu
-# AddAddress=Add address
+AddAddress=Dodaj adresu
-# NoOtherDeliveryAddress=No alternative delivery address defined
+NoOtherDeliveryAddress=Nema definisane alternativne adrese za dostavu
-# SupplierCategory=Supplier category
+SupplierCategory=Kategorija dobavljača
-# JuridicalStatus200=Independant
+JuridicalStatus200=Nezavisno
-# DeleteFile=Delete file
+DeleteFile=Obriši fajl
-# ConfirmDeleteFile=Are you sure you want to delete this file?
+ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovaj fajl?
-# AllocateCommercial=Assigned to sale representative
+AllocateCommercial=Dodijeljeno predstavniku prodaje
-# SelectCountry=Select a country
+SelectCountry=Odaberi državu
-# SelectCompany=Select a third party
+SelectCompany=Odaberi subjekta
-# Organization=Organization
+Organization=Organizacija
-# AutomaticallyGenerated=Automatically generated
+AutomaticallyGenerated=Automatski generisano
-# FiscalYearInformation=Information on the fiscal year
+FiscalYearInformation=Informacije o fiskalnoj godini
-# FiscalMonthStart=Starting month of the fiscal year
+FiscalMonthStart=Početni mjesec fiskalne godine
-# YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications.
+YouMustCreateContactFirst=Morate prvo kreirati emailove kontakata za subjekte da bi mogli dodati email notifikacije
-# ListSuppliersShort=List of suppliers
+ListSuppliersShort=Lista dobavljača
-# ListProspectsShort=List of prospects
+ListProspectsShort=Lista mogućih klijenata
-# ListCustomersShort=List of customers
+ListCustomersShort=Lista kupaca
-# ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Područje za subjekte
-# LastModifiedThirdParties=Last %s modified third parties
+LastModifiedThirdParties=Zadnjih %s izmijenjenih subjekata
-# UniqueThirdParties=Total of unique third parties
+UniqueThirdParties=Ukupno unikatnih subjekata
-# InActivity=Open
+InActivity=Otvori
-# ActivityCeased=Closed
+ActivityCeased=Zatvoreno
-# ActivityStateFilter=Activity status
+ActivityStateFilter=Status aktivnosti
-# ProductsIntoElements=List of products into
+ProductsIntoElements=Lista informacija o proizvodu
-# CurrentOutstandingBill=Current outstanding bill
+CurrentOutstandingBill=Trenutni neplaćeni račun
-# OutstandingBill=Max. for outstanding bill
+OutstandingBill=Max. za neplaćeni račun
-# OutstandingBillReached=Reached max. for outstanding bill
+OutstandingBillReached=Dostugnut je max. za neplaćeni račun
 # 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.
+MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 # Leopard
-# LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.

htdocs/langs/bs_BA/compta.lang

@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - compta
-# Accountancy=Accountancy
+Accountancy=Računovodstvo
-# AccountancyCard=Accountancy card
+AccountancyCard=Kartica računovodstva
-# Treasury=Treasury
+Treasury=Blagajna
-# MenuFinancial=Financial
+MenuFinancial=Finansijski
 # TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-# OptionMode=Option for accountancy
+OptionMode=Opcija za računovodstvo
-# OptionModeTrue=Option Incomes-Expenses
+OptionModeTrue=Opcija Prihodi-Rashodi
-# OptionModeVirtual=Option Claims-Debts
+OptionModeVirtual=Opcija Potraživanja-Zaduženost
 # OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
 # OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
 # FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
 # VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-# Param=Setup
+Param=Postavke
-# RemainingAmountPayment=Amount payment remaining :
+RemainingAmountPayment=Iznos preostale uplate :
-# AmountToBeCharged=Total amount to pay :
+AmountToBeCharged=Ukupan iznos za plaćanje:
-# AccountsGeneral=Accounts
+AccountsGeneral=Računi
-# Account=Account
+Account=Račun
-# Accounts=Accounts
+Accounts=Računi
 # Accountparent=Account parent
 # Accountsparent=Accounts parent
 # BillsForSuppliers=Bills for suppliers

htdocs/langs/bs_BA/cron.lang

@@ -2,17 +2,17 @@
 #
 # About page
 #
-# About = About
+About = O programu
-# CronAbout = About Cron
+CronAbout = O Cron-u
-# CronAboutPage = Cron about page
+CronAboutPage = Stranica o Cron-u
 
 #
 # Right
 #
-# Permission23101 = Read Scheduled task
+Permission23101 = Pročitaj redovne zadatke
-# Permission23102 = Create/update Scheduled task
+Permission23102 = Kreiraj/Ažuriraj redovni zadatak
-# Permission23103 = Delete Scheduled task
+Permission23103 = Obriši redovan zadatak
-# Permission23104 = Execute Scheduled task
+Permission23104 = Izvrši redovan zadatak
 
 #
 # Admin
@@ -20,7 +20,7 @@
 # CronSetup= Scheduled job management setup
 # URLToLaunchCronJobs=URL to check and launch cron jobs if required
 # OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
+KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron poslova
 # FileToLaunchCronJobs=Command line to launch cron jobs
 # CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
 # CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
@@ -30,85 +30,85 @@
 # Menu
 #
 # CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
+CronListActive= Lista aktivnih poslova
-# CronListInactive= List of disabled jobs
+CronListInactive= Lista onemogućenih poslova
-# CronListActive= List of active jobs
+CronListActive= Lista aktivnih poslova
 
 
 #
 # Page list
 #
-# CronDateLastRun=Last run
+CronDateLastRun=Zadnje pokretanje
-# CronLastOutput=Last run output
+CronLastOutput=Izvještaj o zadnjem pokretanju
-# CronLastResult=Last result code
+CronLastResult=Šifra rezultat zadnjeg pokretanja
-# CronListOfCronJobs=List of scheduled jobs
+CronListOfCronJobs=Lista redovnih poslova
-# CronCommand=Command
+CronCommand=Komanda
 # CronList=Jobs list
-# CronDelete= Delete cron jobs
+CronDelete= Obriši kron posao
 # CronConfirmDelete= Are you sure you want to delete this cron job ?
 # CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
+CronConfirmExecute= Jeste li sigurni sada da izvrši ovaj posao sada
-# CronInfo= Jobs allow to execute task that have been planned
+CronInfo= Poslovi omogućavaju da se izvrše zadatci koji su planirani
 # CronWaitingJobs=Wainting jobs
 # CronTask=Job
-# CronNone= None
+CronNone= Ništa
-# CronDtStart=Start date
+CronDtStart=Datum početka
 # CronDtEnd=End date
-# CronDtNextLaunch=Next execution
+CronDtNextLaunch=Sljedeće izvršenje
-# CronDtLastLaunch=Last execution
+CronDtLastLaunch=Zadnje izvršenje
-# CronFrequency=Frequancy
+CronFrequency=Frekvencija
 # CronClass=Classe
-# CronMethod=Method
+CronMethod=Metoda
-# CronModule=Module
+CronModule=Modul
-# CronAction=Action
+CronAction=Akcija
-# CronStatus=Status
+CronStatus=Status
 # CronStatusActive=Enabled
 # CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
+CronNoJobs=Nema registrovanih poslova
-# CronPriority=Priority
+CronPriority=Prioritet
-# CronLabel=Description
+CronLabel=Opis
-# CronNbRun=Nb. launch
+CronNbRun=Broj pokretanja
 # CronEach=Every
 # JobFinished=Job launched and finished
 
 #
 #Page card
 #
-# CronAdd= Add jobs
+CronAdd= Dodaj posao
-# CronHourStart= Start Hour and date of task
+CronHourStart= Vrijeme početka i datum zadatka
-# CronEvery= And execute task each
+CronEvery= I izvrši zadatak vaki
-# CronObject= Instance/Object to create
+CronObject= Instanca/Objekat za kreirati
-# CronArgs=Parameters
+CronArgs=PArametri
 # CronSaveSucess=Save succesfully
-# CronNote=Comment
+CronNote=Komentar
-# CronFieldMandatory=Fields %s is mandatory
+CronFieldMandatory=Polja %s su obavezna
-# CronErrEndDateStartDt=End date cannot be before start date
+CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 # CronStatusActiveBtn=Enable
 # CronStatusInactiveBtn=Disable
 # CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
+CronDtLastResult=Datum zadnjeg rezultata
-# CronId=Id
+CronId=ID
 # CronClassFile=Classes (filename.class.php)
 # CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
 # CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
 # CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
 # CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 # CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
+CronCommandHelp=Sistemska komanda za izvršenje
 
 #
 # Info
 #
-# CronInfoPage=Information
+CronInfoPage=Inromacije
 
 
 #
 # Common
 #
-# CronType=Task type
+CronType=Tip zadatka
 # CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
+CronType_command=Shell komanda
-# CronMenu=Cron
+CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
 
 # UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.

htdocs/langs/bs_BA/deliveries.lang

@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - deliveries
-# Delivery=Delivery
+Delivery=Dostava
-# Deliveries=Deliveries
+Deliveries=Dostave
-# DeliveryCard=Delivery card
+DeliveryCard=Kartica dostave
-# DeliveryOrder=Delivery order
+DeliveryOrder=Narudžba dostave
-# DeliveryOrders=Delivery orders
+DeliveryOrders=Narudžbe dostave
-# DeliveryDate=Delivery date
+DeliveryDate=Datum dostave
-# DeliveryDateShort=Deliv. date
+DeliveryDateShort=Datum dostave
-# CreateDeliveryOrder=Generate delivery order
+CreateDeliveryOrder=Generiši narudžbu dostave
-# QtyDelivered=Qty delivered
+QtyDelivered=Kol. dostavljena
-# SetDeliveryDate=Set shipping date
+SetDeliveryDate=Postavi datum otpremanja
-# ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceipt=Potvrdi dostavnicu
-# ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ?
+ValidateDeliveryReceiptConfirm=Jeste li sigurni da želite potvrditi ovu dostavnicu?
-# DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceipt=Obriši dostavnicu
-# DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b> ?
+DeleteDeliveryReceiptConfirm=Jeste li sigurni da želite obrisati dostavnicu <b>%s</b> ?
-# DeliveryMethod=Delivery method
+DeliveryMethod=Način dostave
-# TrackingNumber=Tracking number
+TrackingNumber=Broj za praćenje
-# DeliveryNotValidated=Delivery not validated
+DeliveryNotValidated=Dostava nije potvrđena
 # merou PDF model
-# NameAndSignature=Name and Signature :
+NameAndSignature=Ime i potpis:
-# ToAndDate=To___________________________________ on ____/_____/__________
+ToAndDate=Za ___________________________________ na ____/____/__________
-# GoodStatusDeclaration=Have received the goods above in good condition,
+GoodStatusDeclaration=Primio sam robu navedenu gore u dobrom stanju.
-# Deliverer=Deliverer :
+Deliverer=Dostavljač:
-# Sender=Sender
+Sender=Pošiljalac
-# Recipient=Recipient
+Recipient=Primalac

htdocs/langs/bs_BA/dict.lang

@@ -1,329 +1,329 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
+CountryFR=Francuska
-# CountryBE=Belgium
+CountryBE=Belgija
-# CountryIT=Italy
+CountryIT=Italija
-# CountryES=Spain
+CountryES=Španija
-# CountryDE=Germany
+CountryDE=Njemačka
-# CountryCH=Switzerland
+CountryCH=Švicarska
-# CountryGB=Great Britain
+CountryGB=Velika Britanija
-# CountryUK=United Kingdom
+CountryUK=Ujedinjeno Kraljevstvo
-# CountryIE=Ireland
+CountryIE=Irska
-# CountryCN=China
+CountryCN=Kina
-# CountryTN=Tunisia
+CountryTN=Tunis
-# CountryUS=United States
+CountryUS=Sjedinjene Države
-# CountryMA=Morocco
+CountryMA=Maroko
-# CountryDZ=Algeria
+CountryDZ=Alžir
-# CountryCA=Canada
+CountryCA=Kanada
-# CountryTG=Togo
+CountryTG=Togo
-# CountryGA=Gabon
+CountryGA=Gabon
-# CountryNL=Netherlands
+CountryNL=Holandija
-# CountryHU=Hungary
+CountryHU=Mađarska
-# CountryRU=Russia
+CountryRU=Rusija
-# CountrySE=Sweden
+CountrySE=Švedska
-# CountryCI=Ivoiry Coast
+CountryCI=Obala Slonovače
-# CountrySN=Senegal
+CountrySN=Senegal
-# CountryAR=Argentina
+CountryAR=Argentina
-# CountryCM=Cameroon
+CountryCM=Kamerun
-# CountryPT=Portugal
+CountryPT=Portugal
-# CountrySA=Saudi Arabia
+CountrySA=Saudijska Arabija
-# CountryMC=Monaco
+CountryMC=Monako
-# CountryAU=Australia
+CountryAU=Australija
-# CountrySG=Singapore
+CountrySG=Singapur
-# CountryAF=Afghanistan
+CountryAF=Avganistan
-# CountryAX=Åland Islands
+CountryAX=Alandi
-# CountryAL=Albania
+CountryAL=Albanija
-# CountryAS=American Samoa
+CountryAS=Američka Samoa
-# CountryAD=Andorra
+CountryAD=Andora
-# CountryAO=Angola
+CountryAO=Angola
-# CountryAI=Anguilla
+CountryAI=Anguilla
-# CountryAQ=Antarctica
+CountryAQ=Antarktika
-# CountryAG=Antigua and Barbuda
+CountryAG=Antigva i Barbuda
-# CountryAM=Armenia
+CountryAM=Armenija
-# CountryAW=Aruba
+CountryAW=Aruba
-# CountryAT=Austria
+CountryAT=Austrija
-# CountryAZ=Azerbaijan
+CountryAZ=Azerbejdžan
-# CountryBS=Bahamas
+CountryBS=Bahami
-# CountryBH=Bahrain
+CountryBH=Bahrein
-# CountryBD=Bangladesh
+CountryBD=Bangladeš
-# CountryBB=Barbados
+CountryBB=Barbados
-# CountryBY=Belarus
+CountryBY=Bjelorusija
-# CountryBZ=Belize
+CountryBZ=Belize
-# CountryBJ=Benin
+CountryBJ=Benin
-# CountryBM=Bermuda
+CountryBM=Bermuda
-# CountryBT=Bhutan
+CountryBT=Butan
-# CountryBO=Bolivia
+CountryBO=Bolivija
-# CountryBA=Bosnia and Herzegovina
+CountryBA=Bosna i Hercegovina
-# CountryBW=Botswana
+CountryBW=Bocvana
-# CountryBV=Bouvet Island
+CountryBV=Bouvet Otok
-# CountryBR=Brazil
+CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
+CountryIO=Britanska Indijsko Okeanska Teritorija
-# CountryBN=Brunei Darussalam
+CountryBN=Brunei
-# CountryBG=Bulgaria
+CountryBG=Bugarska
-# CountryBF=Burkina Faso
+CountryBF=Burkina Faso
-# CountryBI=Burundi
+CountryBI=Burundi
-# CountryKH=Cambodia
+CountryKH=Kambodža
-# CountryCV=Cape Verde
+CountryCV=Cape Verde
-# CountryKY=Cayman Islands
+CountryKY=Kajmanski otoci
-# CountryCF=Central African Republic
+CountryCF=Srednjoafrička Republika
-# CountryTD=Chad
+CountryTD=Čad
-# CountryCL=Chile
+CountryCL=Čile
-# CountryCX=Christmas Island
+CountryCX=Božićni otok
-# CountryCC=Cocos (Keeling) Islands
+CountryCC=Cocos (Keeling)
-# CountryCO=Colombia
+CountryCO=Kolumbija
-# CountryKM=Comoros
+CountryKM=Komori
-# CountryCG=Congo
+CountryCG=Kongo
-# CountryCD=Congo, The Democratic Republic of the
+CountryCD=Kongo, Demokratska Republika
-# CountryCK=Cook Islands
+CountryCK=Cook Islands
-# CountryCR=Costa Rica
+CountryCR=Kostarika
-# CountryHR=Croatia
+CountryHR=Hrvatska
-# CountryCU=Cuba
+CountryCU=Kuba
-# CountryCY=Cyprus
+CountryCY=Kipar
-# CountryCZ=Czech Republic
+CountryCZ=Češka
-# CountryDK=Denmark
+CountryDK=Danska
-# CountryDJ=Djibouti
+CountryDJ=Džibuti
-# CountryDM=Dominica
+CountryDM=Dominika
-# CountryDO=Dominican Republic
+CountryDO=Dominikanska Republika
-# CountryEC=Ecuador
+CountryEC=Ekvador
-# CountryEG=Egypt
+CountryEG=Egipat
-# CountrySV=El Salvador
+CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
+CountryGQ=Ekvatorska Gvineja
-# CountryER=Eritrea
+CountryER=Eritreja
-# CountryEE=Estonia
+CountryEE=Estonija
-# CountryET=Ethiopia
+CountryET=Etiopija
-# CountryFK=Falkland Islands
+CountryFK=Falklandski Otoci
-# CountryFO=Faroe Islands
+CountryFO=Farski Otoci
-# CountryFJ=Fiji Islands
+CountryFJ=Fiji Islands
-# CountryFI=Finland
+CountryFI=Finska
-# CountryGF=French Guiana
+CountryGF=Francuska Gvajana
-# CountryPF=French Polynesia
+CountryPF=Francuska Polinezija
-# CountryTF=French Southern Territories
+CountryTF=Francuski južni teritoriji
-# CountryGM=Gambia
+CountryGM=Gambija
-# CountryGE=Georgia
+CountryGE=Gruzija
-# CountryGH=Ghana
+CountryGH=Gana
-# CountryGI=Gibraltar
+CountryGI=Gibraltar
-# CountryGR=Greece
+CountryGR=Grčka
-# CountryGL=Greenland
+CountryGL=Grenland
-# CountryGD=Grenada
+CountryGD=Grenada
-# CountryGP=Guadeloupe
+CountryGP=Guadeloupe
-# CountryGU=Guam
+CountryGU=Guam
-# CountryGT=Guatemala
+CountryGT=Gvatemala
-# CountryGN=Guinea
+CountryGN=Gvineja
-# CountryGW=Guinea-Bissau
+CountryGW=Gvineja Bisau
-# CountryGY=Guyana
+CountryGY=Gvajana
-# CountryHT=Haïti
+CountryHT=Haiti
-# CountryHM=Heard Island and McDonald
+CountryHM=Čuo Island i McDonald
-# CountryVA=Holy See (Vatican City State)
+CountryVA=Sveta Stolica (Vatikan State)
-# CountryHN=Honduras
+CountryHN=Honduras
-# CountryHK=Hong Kong
+CountryHK=Hongkong
-# CountryIS=Icelande
+CountryIS=Island
-# CountryIN=India
+CountryIN=Indija
-# CountryID=Indonesia
+CountryID=Indonezija
-# CountryIR=Iran
+CountryIR=Iran
-# CountryIQ=Iraq
+CountryIQ=Irak
-# CountryIL=Israel
+CountryIL=Izrael
-# CountryJM=Jamaica
+CountryJM=Jamajka
-# CountryJP=Japan
+CountryJP=Japan
-# CountryJO=Jordan
+CountryJO=Jordan
-# CountryKZ=Kazakhstan
+CountryKZ=Kazahstan
-# CountryKE=Kenya
+CountryKE=Kenija
-# CountryKI=Kiribati
+CountryKI=Kiribati
-# CountryKP=North Korea
+CountryKP=Severna Koreja
-# CountryKR=South Korea
+CountryKR=Južna Koreja
-# CountryKW=Kuwait
+CountryKW=Kuvajt
-# CountryKG=Kyrghyztan
+CountryKG=Kyrghyztan
-# CountryLA=Lao
+CountryLA=Lao
-# CountryLV=Latvia
+CountryLV=Letonija
-# CountryLB=Lebanon
+CountryLB=Liban
-# CountryLS=Lesotho
+CountryLS=Lesoto
-# CountryLR=Liberia
+CountryLR=Liberija
-# CountryLY=Libyan
+CountryLY=Libijski
-# CountryLI=Liechtenstein
+CountryLI=Lihtenštajn
-# CountryLT=Lituania
+CountryLT=Litva
-# CountryLU=Luxembourg
+CountryLU=Luksemburg
-# CountryMO=Macao
+CountryMO=Makao
-# CountryMK=Macedonia, the former Yugoslav of
+CountryMK=Makedonije, bivše Jugoslavija od
-# CountryMG=Madagascar
+CountryMG=Madagaskar
-# CountryMW=Malawi
+CountryMW=Malavi
-# CountryMY=Malaysia
+CountryMY=Malezija
-# CountryMV=Maldives
+CountryMV=Maldivi
-# CountryML=Mali
+CountryML=Mali
-# CountryMT=Malta
+CountryMT=Malta
-# CountryMH=Marshall Islands
+CountryMH=Maršalovi otoci
-# CountryMQ=Martinique
+CountryMQ=Martinique
-# CountryMR=Mauritania
+CountryMR=Mauritanija
-# CountryMU=Mauritius
+CountryMU=Mauricijus
-# CountryYT=Mayotte
+CountryYT=Mayotte
-# CountryMX=Mexico
+CountryMX=Meksiko
-# CountryFM=Micronesia
+CountryFM=Mikronezija
-# CountryMD=Moldova
+CountryMD=Moldavija
-# CountryMN=Mongolia
+CountryMN=Mongolija
-# CountryMS=Monserrat
+CountryMS=Monserrat
-# CountryMZ=Mozambique
+CountryMZ=Mozambik
-# CountryMM=Birmania (Myanmar)
+CountryMM=Birma (Myanmar)
-# CountryNA=Namibia
+CountryNA=Namibija
-# CountryNR=Nauru
+CountryNR=Nauru
-# CountryNP=Nepal
+CountryNP=Nepal
-# CountryAN=Netherlands Antilles
+CountryAN=Holandski Antili
-# CountryNC=New Caledonia
+CountryNC=Nova Kaledonija
-# CountryNZ=New Zealand
+CountryNZ=Novi Zeland
-# CountryNI=Nicaragua
+CountryNI=Nikaragva
-# CountryNE=Niger
+CountryNE=Niger
-# CountryNG=Nigeria
+CountryNG=Nigerija
-# CountryNU=Niue
+CountryNU=Niue
-# CountryNF=Norfolk Island
+CountryNF=Norfolk otok
-# CountryMP=Northern Mariana Islands
+CountryMP=Sjeverni Marijanski otoci
-# CountryNO=Norway
+CountryNO=Norveška
-# CountryOM=Oman
+CountryOM=Oman
-# CountryPK=Pakistan
+CountryPK=Pakistan
-# CountryPW=Palau
+CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
+CountryPS=Palestinska teritorija, Zauzeto
-# CountryPA=Panama
+CountryPA=Panama
-# CountryPG=Papua New Guinea
+CountryPG=Papua Nova Gvineja
-# CountryPY=Paraguay
+CountryPY=Paragvaj
-# CountryPE=Peru
+CountryPE=Peru
-# CountryPH=Philippines
+CountryPH=Filipini
-# CountryPN=Pitcairn Islands
+CountryPN=Pitcairn Islands
-# CountryPL=Poland
+CountryPL=Poljska
-# CountryPR=Puerto Rico
+CountryPR=Portoriko
-# CountryQA=Qatar
+CountryQA=Katar
-# CountryRE=Reunion
+CountryRE=Ponovno sjedinjenje
-# CountryRO=Romania
+CountryRO=Rumunija
-# CountryRW=Rwanda
+CountryRW=Ruanda
-# CountrySH=Saint Helena
+CountrySH=Sveta Helena
-# CountryKN=Saint Kitts and Nevis
+CountryKN=Sveti Kristofor i Nevis
-# CountryLC=Saint Lucia
+CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
+CountryPM=Saint Pierre i Miquelon
-# CountryVC=Saint Vincent and Grenadines
+CountryVC=Sveti Vincent i Grenadini
-# CountryWS=Samoa
+CountryWS=Samoa
-# CountrySM=San Marino
+CountrySM=San Marino
-# CountryST=Sao Tome and Principe
+CountryST=Sao Tome i Principe
-# CountryRS=Serbia
+CountryRS=Srbija
-# CountrySC=Seychelles
+CountrySC=Sejšeli
-# CountrySL=Sierra Leone
+CountrySL=Sierra Leone
-# CountrySK=Slovakia
+CountrySK=Slovačka
-# CountrySI=Slovenia
+CountrySI=Slovenija
-# CountrySB=Solomon Islands
+CountrySB=Solomonski otoci
-# CountrySO=Somalia
+CountrySO=Somalija
-# CountryZA=South Africa
+CountryZA=Južna Afrika
-# CountryGS=South Georgia and the South Sandwich Islands
+CountryGS=Južna Džordžija i Otoci Južni Sendvič
-# CountryLK=Sri Lanka
+CountryLK=Šri Lanka
-# CountrySD=Sudan
+CountrySD=Sudan
-# CountrySR=Suriname
+CountrySR=Surinam
-# CountrySJ=Svalbard and Jan Mayen
+CountrySJ=Svalbard i Jan Mayen
-# CountrySZ=Swaziland
+CountrySZ=Svazi
-# CountrySY=Syrian
+CountrySY=Sirijski
-# CountryTW=Taiwan
+CountryTW=Tajvan
-# CountryTJ=Tajikistan
+CountryTJ=Tadžikistan
-# CountryTZ=Tanzania
+CountryTZ=Tanzanija
-# CountryTH=Thailand
+CountryTH=Tajland
-# CountryTL=Timor-Leste
+CountryTL=Istočni Timor
-# CountryTK=Tokelau
+CountryTK=Tokelau
-# CountryTO=Tonga
+CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
+CountryTT=Trinidad i Tobago
-# CountryTR=Turkey
+CountryTR=Turska
-# CountryTM=Turkmenistan
+CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
+CountryTC=Turci i Cailos Islands
-# CountryTV=Tuvalu
+CountryTV=Tuvalu
-# CountryUG=Uganda
+CountryUG=Uganda
-# CountryUA=Ukraine
+CountryUA=Ukrajina
-# CountryAE=United Arab Emirates
+CountryAE=Ujedinjeni Arapski Emirati
-# CountryUM=United States Minor Outlying Islands
+CountryUM=Sjedinjene Države manji zabačeni otoci
-# CountryUY=Uruguay
+CountryUY=Urugvaj
-# CountryUZ=Uzbekistan
+CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
+CountryVU=Vanuatu
-# CountryVE=Venezuela
+CountryVE=Venezuela
-# CountryVN=Viet Nam
+CountryVN=Vijetnam
-# CountryVG=Virgin Islands, British
+CountryVG=Britanski Djevičanski otoci
-# CountryVI=Virgin Islands, U.S.
+CountryVI=Djevičanski otoci, US
-# CountryWF=Wallis and Futuna
+CountryWF=Wallis i Futuna
-# CountryEH=Western Sahara
+CountryEH=Zapadna Sahara
-# CountryYE=Yemen
+CountryYE=Jemen
-# CountryZM=Zambia
+CountryZM=Zambija
-# CountryZW=Zimbabwe
+CountryZW=Zimbabve
-# CountryGG=Guernsey
+CountryGG=Guernsey
-# CountryIM=Isle of Man
+CountryIM=Mana ostrvo
-# CountryJE=Jersey
+CountryJE=Jersey
-# CountryME=Montenegro
+CountryME=Crna Gora
-# CountryBL=Saint Barthelemy
+CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
+CivilityMME=Gospođa
-# CivilityMR=Mr.
+CivilityMR=Gospodin
-# CivilityMLE=Ms.
+CivilityMLE=Gospođica
-# CivilityMTRE=Master
+CivilityMTRE=Master
-# CivilityDR=Doctor
+CivilityDR=Doktor
 
 ##### Currencies #####
-# Currencyeuros=Euros
+Currencyeuros=EUR
-# CurrencyAUD=AU Dollars
+CurrencyAUD=Australski dolari
-# CurrencySingAUD=AU Dollar
+CurrencySingAUD=Australaski dolar
-# CurrencyCAD=CAN Dollars
+CurrencyCAD=Kanadski dolari
-# CurrencySingCAD=CAN Dollar
+CurrencySingCAD=Kanadski dolar
-# CurrencyCHF=Swiss Francs
+CurrencyCHF=Švicarski franci
-# CurrencySingCHF=Swiss Franc
+CurrencySingCHF=Švicarski franak
-# CurrencyEUR=Euros
+CurrencyEUR=EUR
-# CurrencySingEUR=Euro
+CurrencySingEUR=EUR
-# CurrencyFRF=French Francs
+CurrencyFRF=Francuski franci
-# CurrencySingFRF=French Franc
+CurrencySingFRF=Francuski franak
-# CurrencyGBP=GB Pounds
+CurrencyGBP=Engleske funte
-# CurrencySingGBP=GB Pound
+CurrencySingGBP=Engleska funta
-# CurrencyINR=Indian rupees
+CurrencyINR=Indijske rupije
-# CurrencySingINR=Indian rupee
+CurrencySingINR=Indijska rupija
-# CurrencyMAD=Dirham
+CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
+CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
+CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
+CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
+CurrencyMUR=Mauricijke rupije
-# CurrencySingMUR=Mauritius rupee
+CurrencySingMUR=Mauricijska rupija
-# CurrencyNOK=Norwegian krones
+CurrencyNOK=Norveške krune
-# CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norveška kruna
-# CurrencyTND=Tunisian dinars
+CurrencyTND=Tuniski dinari
-# CurrencySingTND=Tunisian dinar
+CurrencySingTND=Tuniski dinar
-# CurrencyUSD=US Dollars
+CurrencyUSD=Američki dolari
-# CurrencySingUSD=US Dollar
+CurrencySingUSD=Američki dolar
-# CurrencyUAH=Hryvnia
+CurrencyUAH=Grivna
-# CurrencySingUAH=Hryvnia
+CurrencySingUAH=Grivna
-# CurrencyXAF=CFA Francs BEAC
+CurrencyXAF=CFA franci BEAC
-# CurrencySingXAF=CFA Franc BEAC
+CurrencySingXAF=CFA franak BEAC
-# CurrencyXOF=CFA Francs BCEAO
+CurrencyXOF=CFA franci BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
+CurrencySingXOF=CFA Franak BCEAO
-# CurrencyXPF=CFP Francs
+CurrencyXPF=CFP franci
-# CurrencySingXPF=CFP Franc
+CurrencySingXPF=CFP franak
 
-# CurrencyCentSingEUR=cent
+CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
+CurrencyThousandthSingTND=hiljaditi
 
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_MAIL=Mailing kampanje
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=Emailing kampanja
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_PHO=Telefonska kampanja
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax kampanja
-# DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_COMM=Poslovni kontakti
-# DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_SHOP=Kontakt u prodavnici
-# DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Riječ usta
-# DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SPONSORING=Pokroviteljstvo
 
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
+PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
+PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
+PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
+PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
+PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
+PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
+PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
+PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
+PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatUSLEDGER=Format Ledger / Tabloid
-# PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatCAP6=Format P6 Canada

htdocs/langs/bs_BA/donations.lang

@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
+Donation=Donacija
-# Donations=Donations
+Donations=Donacije
-# DonationRef=Donation ref.
+DonationRef=Donacija ref.
-# Donor=Donor
+Donor=Donator
-# Donors=Donors
+Donors=Donatori
-# AddDonation=Add a donation
+AddDonation=Dodaj donaciju
-# NewDonation=New donation
+NewDonation=Nova donacija
-# ShowDonation=Show donation
+ShowDonation=Prikaži donaciju
-# DonationPromise=Gift promise
+DonationPromise=Obećanje za poklon
-# PromisesNotValid=Not validated promises
+PromisesNotValid=Nepotvrđena obećanja
-# PromisesValid=Validated promises
+PromisesValid=Potvrđena obećanja
-# DonationsPaid=Donations paid
+DonationsPaid=Uplaćene donacije
-# DonationsReceived=Donations received
+DonationsReceived=Primljene donacije
-# PublicDonation=Public donation
+PublicDonation=Javne donacije
-# DonationsNumber=Donation number
+DonationsNumber=Broj donacije
-# DonationsArea=Donations area
+DonationsArea=Područje za donacije
-# DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseNotValidated=Nacrt obećanja
-# DonationStatusPromiseValidated=Validated promise
+DonationStatusPromiseValidated=Potvrđena obećanja
-# DonationStatusPaid=Donation received
+DonationStatusPaid=Primljena donacija
-# DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseNotValidatedShort=Nacrt
-# DonationStatusPromiseValidatedShort=Validated
+DonationStatusPromiseValidatedShort=Potvrđena donacija
-# DonationStatusPaidShort=Received
+DonationStatusPaidShort=Primljena donacija
-# ValidPromess=Validate promise
+ValidPromess=Potvrdi obećanje
-# DonationReceipt=Donation receipt
+DonationReceipt=Priznanica za donaciju
-# BuildDonationReceipt=Build receipt
+BuildDonationReceipt=Napravi priznanicu
-# DonationsModels=Documents models for donation receipts
+DonationsModels=Modeli dokumenata za priznanicu donacije
-# LastModifiedDonations=Last %s modified donations
+LastModifiedDonations=Zadnje %s izmijenjene donacije
-# SearchADonation=Search a donation
+SearchADonation=Traži donaciju
-# DonationRecipient=Donation recipient
+DonationRecipient=Primalac donacije
-# ThankYou=Thank You
+ThankYou=Hvala Vam
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos

htdocs/langs/bs_BA/ecm.lang

@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - ecm
-# MenuECM=Documents
+MenuECM=Dokumenti
-# DocsMine=My documents
+DocsMine=Moji dokumenti
-# DocsGenerated=Generated documents
+DocsGenerated=Generisani doumenti
-# DocsElements=Elements documents
+DocsElements=Elementi dokumenata
-# DocsThirdParties=Documents third parties
+DocsThirdParties=Dokumenti subjekata
-# DocsContracts=Documents contracts
+DocsContracts=Dokumenti ugovora
-# DocsProposals=Documents proposals
+DocsProposals=Dokumenti prijedloga
-# DocsOrders=Documents orders
+DocsOrders=Dokumenti narudžbi
-# DocsInvoices=Documents invoices
+DocsInvoices=Dokumenti faktura
-# ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=Broj dokumenata u direktoriju
-# ECMNbOfDocsSmall=Nb of doc.
+ECMNbOfDocsSmall=Br. dok.
-# ECMSection=Directory
+ECMSection=Direktorij
-# ECMSectionManual=Manual directory
+ECMSectionManual=Ručni direktorij
-# ECMSectionAuto=Automatic directory
+ECMSectionAuto=Automatski direktorij
-# ECMSectionsManual=Manual tree
+ECMSectionsManual=Ručna struktura
-# ECMSectionsAuto=Automatic tree
+ECMSectionsAuto=Automatska struktura
-# ECMSections=Directories
+ECMSections=Direktoriji
-# ECMRoot=Root
+ECMRoot=Root
-# ECMNewSection=New directory
+ECMNewSection=Novi direktorij
-# ECMAddSection=Add directory
+ECMAddSection=Dodaj direktorij
-# ECMNewDocument=New document
+ECMNewDocument=Novi dokument
-# ECMCreationDate=Creation date
+ECMCreationDate=Datum kreacije
-# ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfFilesInDir=Broj fajlova u direktoriju
-# ECMNbOfSubDir=Number of sub-directories
+ECMNbOfSubDir=Broj poddirektorija
-# ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Broj fajlova u poddirektoriju
-# ECMCreationUser=Creator
+ECMCreationUser=Kreator
-# ECMArea=EDM area
+ECMArea=Područje za EDM
-# ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc=Područje za EDM (Elektronsko upravljanje dokumentima) vam omogućava da snimite, podijelite ili brzo tražite sve tipove dokumenata u Dolibarr-u.
-# ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMAreaDesc2=* Automatski direktoriji se popunjavaju automatski nakon dodavanja dokumenata sa kartice elementa. <br> * Manuelni direktoriji se mogu koristit za snimanje dokumenata koji nisu povezani za određeni element.
-# ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasRemoved=Direktorij <b>%s</b> je obrisan.
-# ECMDocumentsSection=Document of directory
+ECMDocumentsSection=Dokument u direktoriju
-# ECMSearchByKeywords=Search by keywords
+ECMSearchByKeywords=Traži po ključnim riječima
-# ECMSearchByEntity=Search by object
+ECMSearchByEntity=Traži po objektu
-# ECMSectionOfDocuments=Directories of documents
+ECMSectionOfDocuments=Direktoriji dokumenata
-# ECMTypeManual=Manual
+ECMTypeManual=Ručno
-# ECMTypeAuto=Automatic
+ECMTypeAuto=Automatski
-# ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Dokumenti vezani za socijalne doprinose
-# ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByThirdParties=Dokumenti vezani sza subjekte
-# ECMDocsByProposals=Documents linked to proposals
+ECMDocsByProposals=Dokumenti vezani za prijedloge
-# ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByOrders=Dokumenti vezani za narudžbe kupaca
-# ECMDocsByContracts=Documents linked to contracts
+ECMDocsByContracts=Dokumenti vezani za ugovore
-# ECMDocsByInvoices=Documents linked to customers invoices
+ECMDocsByInvoices=Dokumenti vezani za fakture klijenata
-# ECMDocsByProducts=Documents linked to products
+ECMDocsByProducts=Dokumenti vezani za proizvode
-# ECMDocsByProjects=Documents linked to projects
+ECMDocsByProjects=Dokumenti vezani za projekte
-# ECMNoDirectoryYet=No directory created
+ECMNoDirectoryYet=Nema kreiranih direktorija
-# ShowECMSection=Show directory
+ShowECMSection=Prikaži direktorij
-# DeleteSection=Remove directory
+DeleteSection=Ukloni direktorij
-# ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
+ConfirmDeleteSection=Možete li potvrditi da želite obrisati direktorij <b>%s</b> ?
-# ECMDirectoryForFiles=Relative directory for files
+ECMDirectoryForFiles=Relativni direktorij za fajlove
-# CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFiles=Nemoguće ukloniti jer sadrži fajlove
-# ECMFileManager=File manager
+ECMFileManager=Updavljanje fajlovima
-# ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Odaberi direktorij u lijevoj strukturi
-# DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Ovaj direktorij je napravljen ili izmijenjen izvan ECM modula. Morate prvo kliknuti na dugme "Osvježi" da bi sinhronizovali disk i bazu podataka da bi dobili sadržaj ovog direktorija.
 

htdocs/langs/bs_BA/errors.lang

@@ -26,8 +26,11 @@
 # ErrorBadThirdPartyName=Bad value for third party name
 # ErrorProdIdIsMandatory=The %s is mandatory
 # ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+# ErrorBadBarCodeSyntax=Bad syntax for bar code
 # ErrorCustomerCodeRequired=Customer code required
+# ErrorBarCodeRequired=Bar code required
 # ErrorCustomerCodeAlreadyUsed=Customer code already used
+# ErrorBarCodeAlreadyUsed=Bar code already used
 # ErrorPrefixRequired=Prefix required
 # ErrorUrlNotValid=The website address is incorrect
 # ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
@@ -63,6 +66,7 @@
 # ErrorNoValueForRadioType=Please fill value for radio list
 # ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
 # ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
+# ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
 # ErrorNoAccountancyModuleLoaded=No accountancy module activated
 # ErrorExportDuplicateProfil=This profile name already exists for this export set.
 # ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.

htdocs/langs/bs_BA/exports.lang

@@ -123,6 +123,10 @@
 # DeskCode=Desk code
 # BankAccountNumber=Account number
 # BankAccountNumberKey=Key
+# SpecialCode=Special code
+# ExportStringFilter=%% allows replacing one or more characters in the text
+# ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filters by one year/month/day<br>'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filters over a range of years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the following years/months/days<br>'&gt;AAAA' '&gt;AAAAMM' '&gt;AAAAMMJJ': filters on the previous years/months/days
+# ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 # SelectFilterFields=If you want to filter on some values, just input values here.
 # FilterableFields=Champs Filtrables

htdocs/langs/bs_BA/externalsite.lang

@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
+ExternalSiteSetup=Podesi link za eksterni web sajt
-# ExternalSiteURL=External Site URL
+ExternalSiteURL=Link do eksternog web sajta
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.

htdocs/langs/bs_BA/ftp.lang

@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-# FTPClientSetup=FTP Client module setup
+FTPClientSetup=Postavke modula FTP klijent
-# NewFTPClient=New FTP connection setup
+NewFTPClient=Postavke nove FTP konekcije
-# FTPArea=FTP Area
+FTPArea=Područje za FTP
-# FTPAreaDesc=This screen show you content of a FTP server view
+FTPAreaDesc=Ovaj prozor prikazuje sadržaj FTP servera
-# SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
+SetupOfFTPClientModuleNotComplete=Postavke modula FTP klijent nisu završene
-# FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP funkcije
-# FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServer=Neuspjelo povezivanje na FTP server (server %s port %s)
-# FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FailedToConnectToFTPServerWithCredentials=Neuspio login na FTP server sa definisanim login/šifra
-# FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveFile=Neuspjelo uklanjanje fajla <b>%s</b>.
-# FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
+FTPFailedToRemoveDir=Neuspjelo uklanjanje direktorija <b>%s</b> (Provjerite dozvole i da li je direktorij prazan)
-# FTPPassiveMode=Passive mode
+FTPPassiveMode=Pasivni način

htdocs/langs/bs_BA/help.lang

@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - help
-# CommunitySupport=Forum/Wiki support
+CommunitySupport=Forum/Wiki podrška
-# EMailSupport=Emails support
+EMailSupport=Email podrška
-# RemoteControlSupport=Online real time / remote support
+RemoteControlSupport=Online uživo / daljinska podrška
-# OtherSupport=Other support
+OtherSupport=Druge podrške
-# ToSeeListOfAvailableRessources=To contact/see available resources:
+ToSeeListOfAvailableRessources=Za kontaktirati/vidjeti dosupne resurse:
-# ClickHere=Click here
+ClickHere=Klikni ovdje
-# HelpCenter=Help center
+HelpCenter=Centar za pomoć
-# DolibarrHelpCenter=Dolibarr help and support center
+DolibarrHelpCenter=Dolibarr pomoć u centri za podršku
-# ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
+ToGoBackToDolibarr=U suprotnom, klikni <a href="%s">ovdje za korištenje Dolibarr</a>
-# TypeOfSupport=Source of support
+TypeOfSupport=Izvorna podrška
-# TypeSupportCommunauty=Community (free)
+TypeSupportCommunauty=Zajednica (besplatno)
-# TypeSupportCommercial=Commercial
+TypeSupportCommercial=Poslovno
-# TypeOfHelp=Type
+TypeOfHelp=Tip
-# NeedHelpCenter=Need help or support ?
+NeedHelpCenter=Trebate pomoć ili podršku?
-# Efficiency=Efficiency
+Efficiency=Efikasnost
-# TypeHelpOnly=Help only
+TypeHelpOnly=Samo pomoć
-# TypeHelpDev=Help+Development
+TypeHelpDev=Pomoć + razvoj
-# TypeHelpDevForm=Help+Development+Formation
+TypeHelpDevForm=Pomoć + razvoj + formiranje
-# ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
+ToGetHelpGoOnSparkAngels1=Neke kompanije mogu omogućiti brzu (nekada i trenutnu) i efikasniju online podršku tako što preuzmu kontrolu nad vašim računarom. Takvu pomoć možete naći na <b>%s</b> web sajtu:
-# ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
+ToGetHelpGoOnSparkAngels3=Također možete otići na listu svih dostupnik trenera za Dolibarr, za ovo kliknite na dugme
-# ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
+ToGetHelpGoOnSparkAngels2=Ponekad, nema dostupnih kompanija kada tražite, zato razmislite da promijenite filter da tražite "Sva dostupnost". Moći ćete poslati više zahtjeva.
-# BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
+BackToHelpCenter=U suprotnom, kliknite ovdje <a href="%s">da idete nazad na centralnu početnu stranicu</a>.
-# LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+LinkToGoldMember=Možete pozvati jednog od unaprijed izabranih Dolibarr trenera za vas jezik (%s) klikom na Widget (statusi i maksimalne cijene su automatski ažurirani)
-# PossibleLanguages=Supported languages
+PossibleLanguages=Podržani jezici
-# MakeADonation=Help Dolibarr project, make a donation
+MakeADonation=Pomozite Dolibarr projektu, donirajte
-# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Pomozite dolibar projekti, pretplatite se fondaciji
-# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Za oficijelnu Dolibarr podršku za vaš jezik: <br><b><a href="%s" target="_blank">%s</a></b>

htdocs/langs/bs_BA/holiday.lang

@@ -1,152 +1,152 @@
 # Dolibarr language file - Source file is en_US - holiday
-# HRM=HRM
+HRM=Kadrovska služba
-# Holidays=Holidays
+Holidays=Godišnji odmori
-# CPTitreMenu=Holidays
+CPTitreMenu=Godišnji odmori
-# MenuReportMonth=Monthly statement
+MenuReportMonth=Mjesečni izvještaj
-# MenuAddCP=Apply for holidays
+MenuAddCP=Prijavi se za godišnji odmor
-# NotActiveModCP=You must enable the module holidays to view this page.
+NotActiveModCP=Morate omogućiti modul godišnji odmori da bi vidjeli ovu stranicu.
-# NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NotConfigModCP=Morate konfigurisati modul godišnji odmori da bi vidjeli ovu stranicu. Da bi ste uradili ovo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">kliknite ovdje<a>.
-# NoCPforUser=You don't have a demand for holidays.
+NoCPforUser=Nema te zahtjeva za godišnje odmore.
-# AddCP=Apply for holidays
+AddCP=Prijavi se za godišnji odmor
-# CPErrorSQL=An SQL error occurred:
+CPErrorSQL=Desila se SQL greška:
-# Employe=Employee
+Employe=Zaposlenik
-# DateDebCP=Start date
+DateDebCP=Datum početka
-# DateFinCP=End date
+DateFinCP=Datum završetka
-# DateCreateCP=Creation date
+DateCreateCP=Datum kreiranja
-# DraftCP=Draft
+DraftCP=Nacrt
-# ToReviewCP=Awaiting approval
+ToReviewCP=Čeka na odobrenje
-# ApprovedCP=Approved
+ApprovedCP=Odobren
-# CancelCP=Canceled
+CancelCP=Otkazan
-# RefuseCP=Refused
+RefuseCP=Odbijen
-# ValidatorCP=Approbator
+ValidatorCP=Osoba koja odobrava
-# ListeCP=List of holidays
+ListeCP=Lista godišnjih odmora
-# ReviewedByCP=Will be reviewed by
+ReviewedByCP=Bit će pregledano od strane
-# DescCP=Description
+DescCP=Opis
-# SendRequestCP=Creating demand for holidays
+SendRequestCP=Kreiranje zahtjeva za godišnji odmor
-# DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
+DelayToRequestCP=Aplikacija za godišnji odmor mora biti napravljena bar <b>%s dan(a)</b> prije samog odmora.
-# MenuConfCP=Edit balance of holidays
+MenuConfCP=Izmjena stanja za godišnje odmore.
-# UpdateAllCP=Update the holidays
+UpdateAllCP=Ažuriranje godišnjih odmora
-# SoldeCPUser=Holidays balance is <b>%s</b> days.
+SoldeCPUser=Stanje godišnjih odmora je <b>%s</b> dana.
-# ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorEndDateCP=Datum završetka mora biti poslije datuma početka.
-# ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja: 
-# ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=Desila se greška, zahtjev za odmor ne postoji.
-# ReturnCP=Return to previous page
+ReturnCP=Vrati se na prethodnu stranicu
-# ErrorUserViewCP=You are not authorized to read this request for holidays.
+ErrorUserViewCP=Niste autorizovani da čitate ovaj zahtjev za godišnji odmor.
-# InfosCP=Information of the demand of holidays
+InfosCP=Informacije o zahtjevu za odmor
-# InfosWorkflowCP=Information Workflow
+InfosWorkflowCP=Workflow informacija
-# DateCreateCP=Creation date
+DateCreateCP=Datum kreiranja
-# RequestByCP=Requested by
+RequestByCP=Zahtjev poslao
-# TitreRequestCP=Sheet of holidays
+TitreRequestCP=Lista godišnjih odmora
-# NbUseDaysCP=Number of days of holidays consumed
+NbUseDaysCP=Broj iskorištenih dana godišnjeg odmora
-# EditCP=Edit
+EditCP=Izmjena
-# DeleteCP=Delete
+DeleteCP=Obrisati
-# ActionValidCP=Validate
+ActionValidCP=Potvrdi
-# ActionRefuseCP=Refuse
+ActionRefuseCP=Odbij
-# ActionCancelCP=Cancel
+ActionCancelCP=Poništi
-# StatutCP=Status
+StatutCP=Status
-# SendToValidationCP=Send to validation
+SendToValidationCP=Posalji na potvrđivanje
-# TitleDeleteCP=Delete the request of holidays
+TitleDeleteCP=Obrisati zahtjev za godišnji odmor
-# ConfirmDeleteCP=Confirm the deletion of this request for holidays?
+ConfirmDeleteCP=Potvrda brisanja ovog zahtjeva za godišnji odmor?
-# ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
+ErrorCantDeleteCP=Greška nemate pravo da obriše ovaj zahtjev za godišnji odmor.
-# CantCreateCP=You don't have the right to apply for holidays.
+CantCreateCP=Nemaš prava da se prijave za godišnji odmor.
-# InvalidValidatorCP=You must choose an approbator to your holiday request.
+InvalidValidatorCP=Morate odabrati osobu za odobravanja vašeg godišnjeg odmora.
-# UpdateButtonCP=Update
+UpdateButtonCP=Ažuriranje
-# CantUpdate=You cannot update this request of holidays.
+CantUpdate=Ne možete ažurirati ovaj zahtjev za godišnji odmor.
-# NoDateDebut=You must select a start date.
+NoDateDebut=Morate odabrati datum početka.
-# NoDateFin=You must select an end date.
+NoDateFin=Morate odabrati datum završetka.
-# ErrorDureeCP=Your request for holidays does not contain working day.
+ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan.
-# TitleValidCP=Approve the request holidays
+TitleValidCP=Odobri zahtjev za godišnji odmor
-# ConfirmValidCP=Are you sure you want to approve the holiday request?
+ConfirmValidCP=Jeste li sigurni da želite da odobrite zahtjev za godišnji odmor?
-# DateValidCP=Date approved
+DateValidCP=Datum odobrenja
-# TitleToValidCP=Send request holidays
+TitleToValidCP=Pošalji zahtjev za godišnji odmor
-# ConfirmToValidCP=Are you sure you want to send the request of holidays?
+ConfirmToValidCP=Jeste li sigurni da želite poslati zahtjev za godišnji odmor?
-# TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Odbiti zahtjev za godišnji odmor
-# ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+ConfirmRefuseCP=Jeste li sigurni da želite odbiti zahtjev za godišnji odmor?
-# NoMotifRefuseCP=You must choose a reason for refusing the request.
+NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva.
-# TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Poništi zahtjev za godišnji odmor
-# ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
+ConfirmCancelCP=Jeste li sigurni da želite otkazati zahtjev za godišnji odmor?
-# DetailRefusCP=Reason for refusal
+DetailRefusCP=Razlog za odbijanje
-# DateRefusCP=Date of refusal
+DateRefusCP=Datum odbijanja
-# DateCancelCP=Date of cancellation
+DateCancelCP=Datum poništavanja
-# DefineEventUserCP=Assign an exceptional leave for a user
+DefineEventUserCP=Dodijeli izuzetno odsustvo za korisnika
-# addEventToUserCP=Assign leave
+addEventToUserCP=Dodijeli odsustvo
-# MotifCP=Reason
+MotifCP=Razlog
-# UserCP=User
+UserCP=Korisnik
-# ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva.
-# AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+AddEventToUserOkCP=Dodavanje izuzetno odsustva je kopmletirano.
-# MenuLogCP=View logs of holidays
+MenuLogCP=Pogledaj izvjestaje za godišnje odmore
-# LogCP=Log of updates of holidays
+LogCP=Izvještaji ažuriranja godišnjih odmora
-# ActionByCP=Performed by
+ActionByCP=Izvršeno od strane
-# UserUpdateCP=For the user
+UserUpdateCP=Za korisnika
-# PrevSoldeCP=Previous Balance
+PrevSoldeCP=Prethodno stanje
-# NewSoldeCP=New Balance
+NewSoldeCP=Novo stanje
-# alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period.
-# UserName=Name
+UserName=Naziv
-# Employee=Employee
+Employee=Zaposlenik
-# FirstDayOfHoliday=First day of holiday
+FirstDayOfHoliday=Prvi dan godišnjeg odmora
-# LastDayOfHoliday=Last day of holiday
+LastDayOfHoliday=Zadnji dan godišnjeg odmora
-# HolidaysMonthlyUpdate=Monthly update
+HolidaysMonthlyUpdate=Mjesečno ažuriranje
-# ManualUpdate=Manual update
+ManualUpdate=Ručno ažuriranje
-# HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Poništavanje godišnjih odmora
 
 ## Configuration du Module ##
-# ConfCP=Configuration of holidays module
+ConfCP=Konfiguracija modula za godišnje odmore
-# DescOptionCP=Description of the option
+DescOptionCP=Opis opcije
-# ValueOptionCP=Value
+ValueOptionCP=Vrijednost
-# GroupToValidateCP=Group with the ability to approve holidays
+GroupToValidateCP=Grupa sa mogućnosti da odobrava godišnje odmore
-# ConfirmConfigCP=Validate the configuration
+ConfirmConfigCP=Potvrdite konfiguraciju
-# LastUpdateCP=Last updated automatically of holidays
+LastUpdateCP=Zadnje ažuriranje automatskih godišnjih odmora
-# UpdateConfCPOK=Updated successfully.
+UpdateConfCPOK=Uspješno ažuriranje.
-# ErrorUpdateConfCP=An error occurred during the update, please try again.
+ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo.
-# AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom ovdje</a>.
-# DelayForSubmitCP=Deadline to apply for holidays
+DelayForSubmitCP=Rok za prijavu za godišnji odmor
-# AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima
-# AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
+AlertValidatorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi odgađanje
-# AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
+AlertValidorSoldeCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi trenutno stanje
-# nbUserCP=Number of users supported in the module holidays
+nbUserCP=Broj podržanih korisnika u modulu za godišnje odmore
-# nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
+nbHolidayDeductedCP=Broj godišnjih odmora za odbijanje po danu uzetog odmora
-# nbHolidayEveryMonthCP=Number of holidays added every month
+nbHolidayEveryMonthCP=Broj dana godišnjeg odmora za dodati svaki mjesec
-# Module27130Name= Management of holidays
+Module27130Name= Upravljanje godišnjim odmorima
-# Module27130Desc= Management of holidays
+Module27130Desc= Upravljanje godišnjim odmorima
-# TitleOptionMainCP=Main settings of holidays
+TitleOptionMainCP=Glavne postavke godišnjih odmora
-# TitleOptionEventCP=Settings of holidays related to events
+TitleOptionEventCP=Postavke za godišnje odmore povezane sa događajima
-# ValidEventCP=Validate
+ValidEventCP=Potvrdi
-# UpdateEventCP=Update events
+UpdateEventCP=Ažuriraj događaje
-# CreateEventCP=Create
+CreateEventCP=Kreiraj
-# NameEventCP=Event name
+NameEventCP=Naziv događaja
-# OkCreateEventCP=The addition of the event went well.
+OkCreateEventCP=Dodavanje događaja uspješno.
-# ErrorCreateEventCP=Error creating the event.
+ErrorCreateEventCP=Greška pri kreiranju događaja.
-# UpdateEventOkCP=The update of the event went well.
+UpdateEventOkCP=Ažuriranje događaja uspješno.
-# ErrorUpdateEventCP=Error while updating the event.
+ErrorUpdateEventCP=Greška pri ažuriranju događaja.
-# DeleteEventCP=Delete Event
+DeleteEventCP=Obriši događaj
-# DeleteEventOkCP=The event has been deleted.
+DeleteEventOkCP=Događaj je obrisan.
-# ErrorDeleteEventCP=Error while deleting the event.
+ErrorDeleteEventCP=Greška pri brisanju događaja.
-# TitleDeleteEventCP=Delete a exceptional leave
+TitleDeleteEventCP=Obrisati izuzetno odsustvo
-# TitleCreateEventCP=Create a exceptional leave
+TitleCreateEventCP=Kreiraj izuzetno odsustvo
-# TitleUpdateEventCP=Edit or delete a exceptional leave
+TitleUpdateEventCP=Izmijeni ili obriši izuzetno odsustvo
-# DeleteEventOptionCP=Delete
+DeleteEventOptionCP=Obriši
-# UpdateEventOptionCP=Update
+UpdateEventOptionCP=Ažuriraj
-# ErrorMailNotSend=An error occurred while sending email:
+ErrorMailNotSend=Desila se greška prilikom slanja emaila:
-# NoCPforMonth=No leave this month.
+NoCPforMonth=Nema odsustva za ovaj mjesec.
-# nbJours=Number days
+nbJours=Broj dana
-# TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Konfiguracija godišnjih odmora
 
 #Messages
-# Hello=Hello
+Hello=Zdravo
-# HolidaysToValidate=Validate holidays
+HolidaysToValidate=Potvrdi godišnje odmore
-# HolidaysToValidateBody=Below is a request for holidays to validate
+HolidaysToValidateBody=Ispod su zahtjevi godišnjih odmora za potvrđivanje.
-# HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
+HolidaysToValidateDelay=Ovaj zahtjev za godišji odmor će se desiti u periodu od manje od %s dana.
-# HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
+HolidaysToValidateAlertSolde=Korisnici koji su postavili ovaj zahtjev nemaju dovoljan broj dostupnih dana.
-# HolidaysValidated=Validated holidays
+HolidaysValidated=Potvrđeni godišnji odmori
-# HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
+HolidaysValidatedBody=Vaš zahtjev za godišnji odmor od %s do %s je potvrđen.
-# HolidaysRefused=Denied holidays
+HolidaysRefused=Odbijeni godišnji odmori
-# HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
+HolidaysRefusedBody=Vaš zahtjev za godišnji odmor od %s do %s je odbijen zbog: 
-# HolidaysCanceled=Canceled holidays
+HolidaysCanceled=Poništeni godišnji odmori
-# HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
+HolidaysCanceledBody=Vaš zahtjev za godišnji odmor od %s fo %s je poništen.
 
-# Permission20001=Read/create/modify their holidays
+Permission20001=Pročitaj/kreiraj/izmijeni njigove godišnje odmore
-# Permission20002=Read/modify all requests of holidays
+Permission20002=Pročitaj/kreiraj/izmijeni sve zahtjeve za godišnje odmore
-# Permission20003=Delete their holidays requests
+Permission20003=Obriši njihove zahtjeve za godišnje odmore
-# Permission20004=Define users holidays
+Permission20004=Definiši korisnikove godišnje odmore
-# Permission20005=Review log of modified holidays
+Permission20005=Pregledaj izvještaj o izmijenjenim godišnjim odmorima
-# Permission20006=Access holidays monthly report
+Permission20006=Pristupi mjesečnom izvještaj za godišnje odmore

htdocs/langs/bs_BA/interventions.lang

@@ -1,42 +1,42 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
+Intervention=Intervencija
-# Interventions=Interventions
+Interventions=Intervencije
-# InterventionCard=Intervention card
+InterventionCard=Kartica intervencija
-# NewIntervention=New intervention
+NewIntervention=Nova intervencija
-# AddIntervention=Add intervention
+AddIntervention=Dodaj intervenciju
-# ListOfInterventions=List of interventions
+ListOfInterventions=Lista intervencija
-# EditIntervention=Edit intervention
+EditIntervention=Izimijeni intervenciju
-# ActionsOnFicheInter=Actions on intervention
+ActionsOnFicheInter=Akcije na intervencijama
-# LastInterventions=Last %s interventions
+LastInterventions=Zadnjih %s intervencija
-# AllInterventions=All interventions
+AllInterventions=Sve intervencije
-# CreateDraftIntervention=Create draft
+CreateDraftIntervention=Kreiraj nacrt
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
+CustomerDoesNotHavePrefix=Kupac nema prefiks
-# InterventionContact=Intervention contact
+InterventionContact=Kontakt za intervenciju
-# DeleteIntervention=Delete intervention
+DeleteIntervention=Obriši intervenciju
-# ValidateIntervention=Validate intervention
+ValidateIntervention=Potvrdi intervenciju
-# ModifyIntervention=Modify intervention
+ModifyIntervention=Izmijeni intervenciju
-# DeleteInterventionLine=Delete intervention line
+DeleteInterventionLine=Obriši tekst intervencije
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmDeleteIntervention=Jeste li sigurni da želite obrisati ovu intervenciju?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmValidateIntervention=Jeste li sigurni da želite potvrditi ovu intervenciju pod nazivom <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmModifyIntervention=Jeste li sigurni da želite izmijeniti ovu intervenciju?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+ConfirmDeleteInterventionLine=Jeste li sigurni da želite obrisati ovaj tekst intervencije?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfInternalContact=Ime i potpis servisera:
-# NameAndSignatureOfExternalContact=Name and signature of customer :
+NameAndSignatureOfExternalContact=Ime i potpis kupca:
-# DocumentModelStandard=Standard document model for interventions
+DocumentModelStandard=Standardni dokument za intervencije
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionCardsAndInterventionLines=Intervencije i tekstovi intervencija
-# ClassifyBilled=Classify "Billed"
+ClassifyBilled=Klasifikuj "Fakturisane"
-# StatusInterInvoiced=Billed
+StatusInterInvoiced=Fakturisano
-# RelatedInterventions=Related interventions
+RelatedInterventions=Povezane intervencije
-# ShowIntervention=Show intervention
+ShowIntervention=Prikaži intervenciju
 ##### Types de contacts #####
-# TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERREPFOLL=Predstavnik koji kontroliše intervenciju
-# TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_internal_INTERVENING=Serviser
-# TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_BILLING=Kontakt kupca za fakturianje
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_external_CUSTOMER=Kontakt kupca za kontrolu
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelDesc1=Opšti model broja
-# ArcticNumRefModelError=Failed to activate
+ArcticNumRefModelError=Neuspjelo aktiviranje
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelDesc1=Vratiti broj sa formatom %syymm-nnnn, gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PacificNumRefModelError=Kartica intervencije koja počinje sa $syymm već postoji i nije kompatibilna sa ovim modelom nizda. Odstrani ili promijeni da bi se modul mogao aktivirati.
-# PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinter=Isprintaj proizvode sa kartice intervencije
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=za intervencije generisano sa narudžbi

htdocs/langs/bs_BA/ldap.lang

@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - ldap
-# DomainPassword=Password for domain
+DomainPassword=Šifra za domenu
-# YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+YouMustChangePassNextLogon=Šifra za korisnika <b>%s</b> na domeni <b>%s</b> mora biti promijenjena.
-# UserMustChangePassNextLogon=User must change password on the domain %s
+UserMustChangePassNextLogon=Korisnik mora promijeniti šifru na domeni %s
-# LdapUacf_NORMAL_ACCOUNT=User account
+LdapUacf_NORMAL_ACCOUNT=Korisnički račun
-# LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires
+LdapUacf_DONT_EXPIRE_PASSWORD=Šifra nikada ne ističe
-# LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s
+LdapUacf_ACCOUNTDISABLE=Račun je onemogućen na domeni %s
 # LDAPInformationsForThisContact=Information in LDAP database for this contact
 # LDAPInformationsForThisUser=Information in LDAP database for this user
 # LDAPInformationsForThisGroup=Information in LDAP database for this group

htdocs/langs/bs_BA/mails.lang

@@ -1,132 +1,139 @@
 # Dolibarr language file - Source file is en_US - mails
-# Mailing=EMailing
+Mailing=E-pošta
-# EMailing=EMailing
+EMailing=E-pošta
-# Mailings=EMailings
+Mailings=E-pošte
-# EMailings=EMailings
+EMailings=E-pošte
-# AllEMailings=All eMailings
+AllEMailings=Sva e-pošta
-# MailCard=EMailing card
+MailCard=Kartica e-pošte
-# MailTargets=Targets
+MailTargets=Mete
-# MailRecipients=Recipients
+MailRecipients=Primaoci
-# MailRecipient=Recipient
+MailRecipient=Primalac
-# MailTitle=Description
+MailTitle=Opis
-# MailFrom=Sender
+MailFrom=Pošiljalac
-# MailErrorsTo=Errors to
+MailErrorsTo=Greške prema
-# MailReply=Reply to
+MailReply=Odgovori na
-# MailTo=Receiver(s)
+MailTo=Primalac(oci)
-# MailCC=Copy to
+MailCC=Kopiraj na
-# MailCCC=Cached copy to
+MailCCC=Cached kopija na
-# MailTopic=EMail topic
+MailTopic=Tema emaila
-# MailText=Message
+MailText=Poruka
-# MailFile=Attached files
+MailFile=Priloženi fajlovi
-# MailMessage=EMail body
+MailMessage=Tijelo emaila
-# ShowEMailing=Show emailing
+ShowEMailing=Prikažu e-poštu
-# ListOfEMailings=List of emailings
+ListOfEMailings=Lista e-pošta
-# NewMailing=New emailing
+NewMailing=Nova e-pošta
-# EditMailing=Edit emailing
+EditMailing=Uredi e-poštu
-# ResetMailing=Resend emailing
+ResetMailing=Ponovo pošalji e-poštu
-# DeleteMailing=Delete emailing
+DeleteMailing=Obriši e-poštu
-# DeleteAMailing=Delete an emailing
+DeleteAMailing=Brisanje e-pošte
-# PreviewMailing=Preview emailing
+PreviewMailing=Pregledati e-poštu
-# PrepareMailing=Prepare emailing
+PrepareMailing=Pripremiti e-poštu
-# CreateMailing=Create emailing
+CreateMailing=Kreirati e-poštu
-# MailingDesc=This page allows you to send emailings to a group of people.
+MailingDesc=Ova stranica omogućava slanje e-pošte grupi ljudi
-# MailingResult=Sending emails result
+MailingResult=Rezultati slanja e-pošte
-# TestMailing=Test email
+TestMailing=Testirati slanje
-# ValidMailing=Valid emailing
+ValidMailing=Potvrdi e-poštu
-# ApproveMailing=Approve emailing
+ApproveMailing=Odobri e-poštu
-# MailingStatusDraft=Draft
+MailingStatusDraft=Nacrt
-# MailingStatusValidated=Validated
+MailingStatusValidated=Potvrđeno
-# MailingStatusApproved=Approved
+MailingStatusApproved=Odobreno
-# MailingStatusSent=Sent
+MailingStatusSent=Poslano
-# MailingStatusSentPartialy=Sent partialy
+MailingStatusSentPartialy=Poslano djelimično
-# MailingStatusSentCompletely=Sent completely
+MailingStatusSentCompletely=Poslano poptuno
-# MailingStatusError=Error
+MailingStatusError=Greška
-# MailingStatusNotSent=Not sent
+MailingStatusNotSent=Nije poslano
-# MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=E-pošta uspješno poslana (od %s do %s)
-# MailingSuccessfullyValidated=EMailing successfully validated
+MailingSuccessfullyValidated=E-pošta uspješno potvrđena
-# MailUnsubcribe=Unsubscribe
+MailUnsubcribe=Ispisati se
-# Unsuscribe=Unsubscribe
+Unsuscribe=Ispisati se
-# MailingStatusNotContact=Don't contact anymore
+MailingStatusNotContact=Nemoj kontaktirati više
-# ErrorMailRecipientIsEmpty=Email recipient is empty
+ErrorMailRecipientIsEmpty=Primalac e-pošte je prazan
-# WarningNoEMailsAdded=No new Email to add to recipient's list.
+WarningNoEMailsAdded=Nema nove e-pošte za dodati na listu primaoca.
-# ConfirmValidMailing=Are you sure you want to validate this emailing ?
+ConfirmValidMailing=Jeste li sigurni da želite potvrditi ovu e-poštu?
-# ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ?
+ConfirmResetMailing=Upozorenje, ponovnom inicijalizacijom e-pošte <b>%s</b>, omogućavate ponovno masovno slanje e-pošte. Jeste li sigurni da je ovo ono što želite?
-# ConfirmDeleteMailing=Are you sure you want to delete this emailling ?
+ConfirmDeleteMailing=Jeste li sigurni da želite obrisati ovu e-poštu?
-# NbOfRecipients=Number of recipients
+NbOfRecipients=Broj primaoca
-# NbOfUniqueEMails=Nb of unique emails
+NbOfUniqueEMails=Broj jedinstvenih e-pošta
-# NbOfEMails=Nb of EMails
+NbOfEMails=Broj e-pošta
-# TotalNbOfDistinctRecipients=Number of distinct recipients
+TotalNbOfDistinctRecipients=Broj posebnih primaoca
-# NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoTargetYet=Nema definisanih primaoca (Idi na tab 'Primaoci')
-# AddRecipients=Add recipients
+AddRecipients=Dodao primaoce
-# RemoveRecipient=Remove recipient
+RemoveRecipient=Ukloni primaoca
-# CommonSubstitutions=Common substitutions
+CommonSubstitutions=Zajedničke zamjene
-# YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+YouCanAddYourOwnPredefindedListHere=Da bi ste kreirali modul selektor e-pošte , pogledajte htdocs/core/modules/mailings/README.
-# EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+EMailTestSubstitutionReplacedByGenericValues=Kada se koristi testni način, promjenjive varijable se mijenjaju sa generičkim vrijednostima
-# MailingAddFile=Attach this file
+MailingAddFile=Priloži ovaj fajl
-# NoAttachedFiles=No attached files
+NoAttachedFiles=Nema priloženih fajlova
-# BadEMail=Bad value for EMail
+BadEMail=Pogrešna vrijednost za e-poštu
-# CloneEMailing=Clone Emailing
+CloneEMailing=Kloniraj  e-poštu
-# ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
+ConfirmCloneEMailing=Jeste li sigurni da želite da klonirati ovu e-poštu?
-# CloneContent=Clone message
+CloneContent=Kloniraj poruku
-# CloneReceivers=Cloner recipients
+CloneReceivers=Kloniraj primaoce
-# DateLastSend=Date of last sending
+DateLastSend=Datum zadnjeg slanja
-# DateSending=Date sending
+DateSending=Datum slanja
-# SentTo=Sent to <b>%s</b>
+SentTo=Poslano na <b>%s</b>
-# MailingStatusRead=Read
+MailingStatusRead=Pročitaj
-# CheckRead=Read Receipt
+CheckRead=Pročitaj potvrdu
-# YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
+YourMailUnsubcribeOK=E-pošta <b>%s</b> je uspješno ispisana sa liste e-pošte
-# MailtoEMail=Hyper link to email
+MailtoEMail=Hyper link na e-poštu
-# ActivateCheckRead=Allow to use the "Unsubcribe" link
+ActivateCheckRead=Dozvoli korištenje "Ispiši se" linka
-# ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=Kljul korišten za enkriptovanje linka koristi se za "Pročitaj potvrdu" i "Ispiši se" mogućnosti
-# EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentToNRecipients=E-pošta poslana %s primaocima
+# EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
+# MailTopicSendRemindUnpaidInvoices=Remind of invoice %s (%s)
+# SendRemind=Send remind by EMails
+# RemindSent=%S remind(s) sent
+# AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
+# NoRemindSent=No remind by EMail sent
+# ResultOfMassSending=Result of mass remind sending by EMail
 
 # Libelle des modules de liste de destinataires mailing
-# MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...)
+MailingModuleDescContactCompanies=Kontakti/Adrese za subjekte (kupac, mogući klijent, dobavljač, ...)
-# MailingModuleDescDolibarrUsers=Dolibarr users
+MailingModuleDescDolibarrUsers=Dolibarr korisnici
-# MailingModuleDescFundationMembers=Foundation members with emails
+MailingModuleDescFundationMembers=Članovi fondacije sa e-poštom
-# MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other)
+MailingModuleDescEmailsFromFile=E-pošta iz tekst fajlova (email:lastname;firstname;other)
-# MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
+MailingModuleDescEmailsFromUser=E-pošta iz korisničkog unosa (email:lastname;firstname;other)
-# MailingModuleDescContactsCategories=Third parties (by category)
+MailingModuleDescContactsCategories=Subjekt (po kategoriji)
-# MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
+MailingModuleDescDolibarrContractsLinesExpired=Subjekti sa isteklim stavkama ugovora
-# MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category)
+MailingModuleDescContactsByCompanyCategory=Kontakti/adrese subjekata (po kategoriji subjekata)
-# MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
+MailingModuleDescContactsByCategory=Kontakti/adrese subjekata po kategoriji
-# MailingModuleDescMembersCategories=Foundation members (by categories)
+MailingModuleDescMembersCategories=Članovi fondacije (po kategorijama)
-# MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function)
+MailingModuleDescContactsByFunction=Kontakti/adrese subjekata (po poziciji/funkciji)
 
 
-# LineInFile=Line %s in file
+LineInFile=Linija %s u fajlu
-# RecipientSelectionModules=Defined requests for recipient's selection
+RecipientSelectionModules=Definisani zahtjevi za odabir primaoca
-# MailSelectedRecipients=Selected recipients
+MailSelectedRecipients=Odabrani primaoci
-# MailingArea=EMailings area
+MailingArea=Područje za e-poštu
-# LastMailings=Last %s emailings
+LastMailings=Zadnjih %s e-pošta
-# TargetsStatistics=Targets statistics
+TargetsStatistics=Mete statistike
-# NbOfCompaniesContacts=Unique contacts/addresses
+NbOfCompaniesContacts=Jedinstveni kontakti/adrese
-# MailNoChangePossible=Recipients for validated emailing can't be changed
+MailNoChangePossible=Primaoci za potvrđenu e-poštu ne mogu biti promijenjeni
-# SearchAMailing=Search mailing
+SearchAMailing=Traži e-poštu
-# SendMailing=Send emailing
+SendMailing=Pošalji e-poštu
-# SendMail=Send email
+SendMail=Pošalji e-mail
-# SentBy=Sent by
+SentBy=Poslano od
-# MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Iz sigurnosnih razloga, slanje e-pošte je bolje kada se vrši sa komandne lnije. Ako imate pristup, pitajte vašeg server administratora da pokrene slijedeću liniju za slanje e-pošte svim primaocima:
-# MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo
-# ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
+ConfirmSendingEmailing=Ako ne možete ili preferirate slanje preko www pretraživača, molim potvrdite da ste sigurni da želite poslati e-poštu sa vašeg pretraživača?
-# LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Napomena: Slanje e-pošte preko interneta je ograničeno iz sigurnosnih razloga i timeout razloga primaocima <b>%s</b> od strane sesije za slanje.
-# TargetsReset=Clear list
+TargetsReset=Očisti listu
-# ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToClearAllRecipientsClickHere=Klikni ovdje da očistite listu primaoca za ovu e-poštu
-# ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+ToAddRecipientsChooseHere=Odaberi primaoce biranjem sa liste
-# NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsReceived=Masovno slanje e-pošte primljeno
-# IdRecord=ID record
+IdRecord=ID zapisa
-# DeliveryReceipt=Delivery Receipt
+DeliveryReceipt=Potvrda prijema
-# YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+YouCanUseCommaSeparatorForSeveralRecipients=Možete koristiti <b>zarez</b> kao separator da biste naveli više primaoca.
-# TagCheckMail=Track mail opening
+TagCheckMail=Prati otvaranje mailova
-# TagUnsubscribe=Unsubscribe link
+TagUnsubscribe=Link za ispisivanje
-# TagSignature=Signature sending user
+TagSignature=Korisnik sa slanjem potpisa
-# TagMailtoEmail=Recipient EMail
+TagMailtoEmail=E-pošta primalac
 
 # Module Notifications
-# Notifications=Notifications
+Notifications=Notifikacije
-# NoNotificationsWillBeSent=No email notifications are planned for this event and company
+NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
-# ANotificationsWillBeSent=1 notification will be sent by email
+ANotificationsWillBeSent=1 notifikacija će biti poslana emailom
-# SomeNotificationsWillBeSent=%s notifications will be sent by email
+SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom
-# AddNewNotification=Activate a new email notification request
+AddNewNotification=Aktivirati novi zahtjev za notifikacije o slanje emaila
-# ListOfActiveNotifications=List all active email notification requests
+ListOfActiveNotifications=Lista svih aktivnih zahtjeva za notifikacije slanja emaila
-# ListOfNotificationsDone=List all email notifications sent
+ListOfNotificationsDone=Lista svih notifikacija o slanju emaila

htdocs/langs/bs_BA/main.lang

@@ -340,7 +340,7 @@ SeparatorThousand=None
 # Ref=Ref.
 # RefSupplier=Ref. supplier
 # RefPayment=Ref. payment
-# CommercialProposalsShort=Commercial proposals
+CommercialProposalsShort=Poslovni prijedlozi
 # Comment=Comment
 # Comments=Comments
 # ActionsToDo=Events to do
@@ -572,7 +572,7 @@ SeparatorThousand=None
 # TotalMan=Total
 # NeverReceived=Never received
 # Canceled=Canceled
-# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionnary
+# YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
 # Color=Color
 # Documents=Linked files
 # DocumentsNb=Linked files (%s)

htdocs/langs/bs_BA/opensurvey.lang

@@ -35,6 +35,7 @@
 # TitleChoice=Choice label
 # ExportSpreadsheet=Export result spreadsheet
 # ExpireDate=Limit date
+# NbOfSurveys=Number of surveys
 # NbOfVoters=Nb of voters
 # SurveyResults=Results
 # PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.

htdocs/langs/bs_BA/orders.lang

@@ -55,6 +55,7 @@
 # MenuOrdersToBill=Orders delivered
 # MenuOrdersToBill2=Orders to bill
 # SearchOrder=Search order
+# SearchACustomerOrder=Search a customer order
 # ShipProduct=Ship product
 # Discount=Discount
 # CreateOrder=Create Order
@@ -164,3 +165,4 @@
 # OrderCreated=Your orders have been created
 # OrderFail=An error happened during your orders creation
 # CreateOrders=Create orders
+# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".

htdocs/langs/bs_BA/oscommerce.lang

@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
+OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
+OSCommerceSetup=OS Commerce podešavanje modula
-# OSCommerceSetupSaved=OS Commerce setup saved
+OSCommerceSetupSaved=OS Commerce postavke snimljene
-# OSCommerceServer=OS Commerce server host/ip
+OSCommerceServer=OS Commerce server host / IP
-# OSCommerceDatabaseName=OS Commerce database name
+OSCommerceDatabaseName=OS Commerce ime baze podataka
-# OSCommercePrefix=OS Commerce tables prefix
+OSCommercePrefix=OS Commerce prefiks tabela
-# OSCommerceUser=OS Commerce database login
+OSCommerceUser=OS Commerce login baze podataka