Prepare packaging

Merge remote-tracking branch 'origin/3.5' into 3.6
2026-02-08 09:01:40 +01:00 · 2015-05-16 17:04:36 +02:00 · 2015-05-16 16:54:54 +02:00 · 2015-05-16 16:49:03 +02:00 · 2015-05-16 16:38:47 +02:00 · 2015-05-16 16:08:05 +02:00
44 changed files with 918 additions and 801 deletions
--- a/13
+++ b/13
@@ -31,6 +31,12 @@ English Dolibarr ChangeLog
 - Fix: Bad SEPA xml file creation
 - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 - Fix: Showing system error if not enough stock of product into orders creation with lines
+- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract
+- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line
+- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project
+- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
+- Fix: [ bug #2542 ] Contracts store localtax preferences
+- Fix: Bad permission assignments for stock movements actions

 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
@@ -192,6 +198,13 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics
 Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
 Fix: [ bug #1846 ] Browser IE11 not detected
+Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
+Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
+Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
+Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
+Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
+Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
+Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error

 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,20 +1,6 @@
-dolibarr (3.6.2-3) unstable; urgency=low
+dolibarr (3.6.4-3) UNRELEASED; urgency=low

  [ Laurent Destailleur (eldy) ]
  * New upstream release.
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Sat, 27 dec 2014 12:00:00 +0100      
-
-dolibarr (3.6.1-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 23 Sep 2014 12:00:00 +0100      
-
-dolibarr (3.6.0-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 15 July 2014 12:00:00 +0100      
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2014 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -108,7 +108,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,nltechno*\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -12,7 +12,6 @@ beta version of Dolibarr, step by step.
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - 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
 - Commit all changes.
 - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
 - Create a branch (x.y).
@@ -34,7 +33,6 @@ complete release of Dolibarr, step by step.
 - Update version number with x.y.z in htdocs/filefunc.inc.php
 - 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
 - Commit all changes.

 - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -333,11 +333,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
- Upstream release
-
-* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
-
-* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
+__CHANGELOGSTRING__
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -569,12 +569,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
- Upstream release
-
-* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
-
-* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-
+__CHANGELOGSTRING__
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -338,12 +338,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
- Upstream release
-
-* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
-
-* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-
+__CHANGELOGSTRING__
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -349,12 +349,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
- Upstream release
-
-* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
-
-* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release
-
+__CHANGELOGSTRING__
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -6,7 +6,7 @@
 * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
 * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
- * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
 * Copyright (C) 2011-2012 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
 *
@@ -1116,7 +1116,7 @@ if ($id)

                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0;

-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';

                    // Active
                    print '<td align="center" class="nowrap">';
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -100,6 +100,7 @@ print '<br>';
 print '<br>';

 // Add hook to add information
+$parameters=array();
 $reshook=$hookmanager->executeHooks('addHomeSetup',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 if (empty($reshook))
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -7,7 +7,7 @@
 * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
 * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2012		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
 * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -1599,9 +1599,23 @@ if ($action == 'create' && $user->rights->commande->creer) {
 		print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
 		print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';

-		$newclassname = $classname;
-		if ($newclassname == 'Propal')
-			$newclassname = 'CommercialProposal';
+		switch ($classname) {
+			case 'Propal':
+				$newclassname = 'CommercialProposal';
+				break;
+			case 'Commande':
+				$newclassname = 'Order';
+				break;
+			case 'Expedition':
+				$newclassname = 'Sending';
+				break;
+			case 'Contrat':
+				$newclassname = 'Contract';
+				break;
+			default:
+				$newclassname = $classname;
+		}
+
 		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -6,6 +6,7 @@
 * Copyright (C) 2012      Juanjo Menent          <jmenent@2byte.es>
 * Copyright (C) 2013      Christophe Battarel    <christophe.battarel@altairis.fr>
 * Copyright (C) 2013      Cédric Salvador        <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015      Marcos García          <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -112,7 +113,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped
 llxHeader('',$langs->trans("Orders"),$help_url);

 $sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
-$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
+$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as facturee';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 // We'll need this table joined to the select in order to filter by sale
@@ -306,11 +307,11 @@ if ($resql)
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
 	print '</td>';
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre" align="right">';
    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="orderday" value="'.$orderday.'">';
    print '<input class="flat" type="text" size="1" maxlength="2" name="ordermonth" value="'.$ordermonth.'">';
    $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
-	print '</td><td class="liste_titre">';
+	print '</td><td class="liste_titre" align="right">';
    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
    print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
    $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
@@ -340,7 +341,7 @@ if ($resql)
 		print '</td>';

 		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
+		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_delivery)) < ($now - $conf->commande->client->warning_delay))
 			print img_picto($langs->trans("Late"),"warning");
 		if(!empty($objp->note_private))
 		{
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -130,7 +130,7 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").' '.$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
 }

 print '</table>';
@@ -179,7 +179,7 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").' '.$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
 }

 print '</table>';
@@ -238,7 +238,7 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").' '.$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
 }

 print "</table>";
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -3,6 +3,7 @@
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copytight (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -48,7 +49,7 @@ if ($action == 'add')
 	$mesg='';
 	$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 	$label = GETPOST('label','alpha');
-	$amount= GETPOST('amount','int');
+	$amount= GETPOST('amount');

 	if (! $label)
 	{
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -4,6 +4,7 @@
 * Copyright (C) 2005-2012	Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2012		Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Marcos García        <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -98,8 +99,14 @@ else if ($action == 'add' && $user->rights->deplacement->creer)
    {
        $error=0;

+	    $km = GETPOST('km');
+
+	    if ($km) {
+		    $km = price2num($km);
+	    }
+
        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
-        $object->km				= GETPOST('km','int');
+        $object->km				= $km;
        $object->type			= GETPOST('type','alpha');
        $object->socid			= GETPOST('socid','int');
        $object->fk_user		= GETPOST('fk_user','int');
@@ -157,8 +164,14 @@ else if ($action == 'update' && $user->rights->deplacement->creer)
    {
        $result = $object->fetch($id);

+	    $km = GETPOST('km');
+
+	    if ($km) {
+		    $km = price2num($km);
+	    }
+
        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
-        $object->km				= GETPOST('km','int');
+        $object->km				= $km;
        $object->type			= GETPOST('type','alpha');
        $object->socid			= GETPOST('socid','int');
        $object->fk_user		= GETPOST('fk_user','int');
@@ -200,12 +213,6 @@ else if ($action == 'setdated' && $user->rights->deplacement->creer)
    $result=$object->setValueFrom('dated',$dated,'','','date');
    if ($result < 0) dol_print_error($db, $object->error);
 }
-else if ($action == 'setkm' && $user->rights->deplacement->creer)
-{
-    $object->fetch($id);
-    $result=$object->setValueFrom('km',GETPOST('km','int'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}


 /*
@@ -348,7 +355,7 @@ else if ($id)

            // Km
            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
-            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+            print '<input name="km" class="flat" size="10" value="'.price($object->km).'">';
            print '</td></tr>';

            // Where
@@ -416,10 +423,12 @@ else if ($id)
            print '</td></tr>';

            // Type
+	        $form->load_cache_types_fees();
+
            print '<tr><td>';
            print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
            print '</td><td>';
-            print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+            print $form->editfieldval("Type",'type', $form->cache_types_fees[$object->type],$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
            print '</td></tr>';

            // Who
@@ -440,7 +449,7 @@ else if ($id)
            print '<tr><td valign="top">';
            print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
            print '</td><td>';
-            print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+            print $form->editfieldval("FeesKilometersOrAmout",'km',price($object->km),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
            print "</td></tr>";

            // Where
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -5,11 +5,12 @@
 * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
 * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
 * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
- * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent         <jmenent@2byte.es>
 * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
 * Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
 * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
 * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -990,8 +991,12 @@ if (empty($reshook)) {
 											$lines [$i]->fetch_optionals($lines [$i]->rowid);
 											$array_option = $lines [$i]->array_options;
 										}
+										
+										// View third's localtaxes for now
+										$localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client);
+										$localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client);

-										$result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $lines [$i]->localtax1_tx, $lines [$i]->localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $date_start, $date_end, 0, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $object->origin, $lines [$i]->rowid, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option);
+										$result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $date_start, $date_end, 0, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $object->origin, $lines [$i]->rowid, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option);

 										if ($result > 0) {
 											$lineid = $result;
@@ -2294,13 +2299,22 @@ if ($action == 'create')
 		print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
 		print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';

-		$newclassname = $classname;
-		if ($newclassname == 'Propal')
-			$newclassname = 'CommercialProposal';
-		elseif ($newclassname == 'Commande')
-			$newclassname = 'Order';
-		elseif ($newclassname == 'Expedition')
-			$newclassname = 'Sending';
+		switch ($classname) {
+			case 'Propal':
+				$newclassname = 'CommercialProposal';
+				break;
+			case 'Commande':
+				$newclassname = 'Order';
+				break;
+			case 'Expedition':
+				$newclassname = 'Sending';
+				break;
+			case 'Contrat':
+				$newclassname = 'Contract';
+				break;
+			default:
+				$newclassname = $classname;
+		}

 		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -649,13 +649,12 @@ if ($resql)
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
 			print '<td align="right">';
 			$cn=$facturestatic->getSumCreditNotesUsed();
-			if (! empty($objp->am)) print price($objp->am);
-			if (! empty($objp->am) && ! empty($cn)) print '+';
-			if (! empty($cn)) print price($cn);
+			$dep=$facturestatic->getSumDepositsUsed();
+			print price($objp->am + $cn + $dep);
 			print '</td>';

 			// Remain to receive
-			print '<td align="right">'.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):'&nbsp;').'</td>';
+			print '<td align="right">'.price($objp->total_ttc-$objp->am-$cn-$dep).'</td>';

 			// Status of invoice
 			print '<td align="right" class="nowrap">';
@@ -685,7 +684,7 @@ if ($resql)
 			$total_ht+=$objp->total_ht;
 			$total_tva+=($objp->total_tva + $tx1 + $tx2 + $revenuestamp);
 			$total_ttc+=$objp->total_ttc;
-			$total_paid+=$objp->am + $cn;
+			$total_paid+=$objp->am + $cn + $dep;

 			$i++;
 		}
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -1137,7 +1137,7 @@ else
        				$value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
        			}

-        			if ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) {
+        			if ($action == 'edit_extras' && $user->rights->contrat->creer && GETPOST('attribute') == $key) {
        				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formcontract">';
        				print '<input type="hidden" name="action" value="update_extras">';
        				print '<input type="hidden" name="attribute" value="' . $key . '">';
@@ -1150,7 +1150,7 @@ else
        				print '</form>';
        			} else {
        				print $extrafields->showOutputField($key, $value);
-        				if ($object->statut == 0 && $user->rights->commande->creer)
+        				if ($object->statut == 0 && $user->rights->contrat->creer)
        					print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . '</a>';
        			}
        			print '</td></tr>' . "\n";
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -184,7 +184,7 @@ class HookManager
                    		}*/
                    	}

-                    	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                    }
                    // Generic hooks that return a string or array (printSearchForm, printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -203,7 +203,7 @@ class Form
            else
 			{
 				if ($typeofdata == 'email')   $ret.=dol_print_email($value,0,0,0,0,1);
-                elseif ($typeofdata == 'amount')   $ret.=($value != '' ? price($value,'',$langs,0,0,-1,$conf->currency) : '');
+                elseif ($typeofdata == 'amount')   $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
                elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))  $ret.=dol_htmlentitiesbr($value);
                elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
                elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -416,7 +416,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t

 	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level==0)
 	{
-		print '<tr class="liste_total">';
+		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
 		if ($showproject) print '<td></td><td></td>';
 		print '<td></td>';
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -102,8 +102,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3103__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);

 -- Product - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2010      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2012-2015 Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -134,8 +134,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 	}

 	// Financial
-	$tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled)),
-	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read)),
+	$tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->fournisseur->enabled)),
+	'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire)),
 	'module'=>'comptabilite|accounting|facture|don|tax|salaries');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -1000,8 +1000,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 				if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/valo.php", $langs->trans("EnhancedValue"), 1, $user->rights->stock->lire);
 				if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
-                if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire);
-                if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire);
+                if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+                if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer);
 			}

 			// Expeditions
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -141,15 +141,18 @@ abstract class ModelNumRefExpedition
 }

 /**
- * 	Cree un bon d'expedition sur disque
+ * Cree un bon d'expedition sur disque
 *
- * 	@param	DoliDB		$db  			Objet base de donnee
- * 	@param	Object		$object			Object expedition
- * 	@param	string		$modele			Force le modele a utiliser ('' to not force)
- * 	@param	Translate	$outputlangs	Objet lang a utiliser pour traduction
- *  @return int             			<=0 if KO, >0 if OK
+ * @param	DoliDB		$db  			Objet base de donnee
+ * @param	Object		$object			Object expedition
+ * @param	string		$modele			Force le modele a utiliser ('' to not force)
+ * @param	Translate	$outputlangs	Objet lang a utiliser pour traduction
+ * @param	int			$hidedetails	Hide details of lines
+ * @param	int			$hidedesc		Hide description
+ * @param	int			$hideref		Hide ref
+ * @return	int			<=0 if KO, >0 if OK
 */
-function expedition_pdf_create($db, $object, $modele, $outputlangs)
+function expedition_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf,$user,$langs;

@@ -214,7 +217,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;

--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -182,7 +182,7 @@ class modProjet extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='ProjectsAndTasksLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("projet","export"));
-		$this->export_dependencies_array[$r]=array('task_time'=>'ppt.rowid');
+		$this->export_dependencies_array[$r]=array('task_time'=>'pt.rowid');
 		
 		$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle',
 		's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text',
@@ -280,11 +280,9 @@ class modProjet extends DolibarrModules
        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet";
        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task,";
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .=' WHERE p.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND p.entity = '.$conf->entity;
-
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity;
 	}


--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -201,9 +201,9 @@ else {
 	<?php } ?>
 	</td>
 	<?php } ?>
-	<td align="right"><input type="text" size="2" name="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
+	<td align="right"><input type="text" size="2" id="qty" name="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
 	</td>
-	<td align="right" class="nowrap"><input type="text" size="1" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_percent); ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td>
+	<td align="right" class="nowrap"><input type="text" size="1" id="remise_percent" name="remise_percent" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>

 	<?php
 	if (! empty($usemargins))
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -176,8 +176,6 @@ class Expedition extends CommonObject

 		$now=dol_now();

-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->EXPEDITION_ADDON_PDF;
-
 		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 		$error = 0;

@@ -1542,6 +1540,8 @@ class Expedition extends CommonObject
 		if ($this->db->query($sql) )
 		{
 			//TODO: Option to set order billed if 100% of order is shipped
+			$this->billed=1;
+			$this->db->commit();
 			return 1;
 		}
 		else
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -219,7 +219,6 @@ if (empty($reshook)) {
            $action='create';
        }
    }
-
    /*
     * Build a receiving receipt
     */
@@ -256,7 +255,7 @@ if (empty($reshook)) {
        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
        {
            $ret=$object->fetch($id);    // Reload to get new records
-            $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
+            $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
        }
        if ($result < 0)
        {
@@ -356,7 +355,7 @@ if (empty($reshook)) {
            $outputlangs = new Translate("",$conf);
            $outputlangs->setDefaultLang($newlang);
        }
-        $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
+        $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
        if ($result <= 0)
        {
            dol_print_error($db,$result);
@@ -707,6 +706,14 @@ if ($action == 'create')
            print '<td colspan="3">';
            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
            print "</td></tr>\n";
+            
+            // Document model
+            print "<tr><td>".$langs->trans("Model")."</td>";
+            print '<td colspan="3">';
+			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+			$liste = ModelePdfExpedition::liste_modeles($db);
+			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+            print "</td></tr>\n";

            // Other attributes
            $parameters=array('colspan' => ' colspan="3"');
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -328,7 +328,7 @@ class Export
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." ".$Value;
+		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
 		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
 *  \brief      File that include conf.php file and commons lib like functions.lib.php
 */

-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.3');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.4');
 if (! defined('EURO')) define('EURO',chr(128));

 // Define syslog constants
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -7,6 +7,7 @@
 * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
 * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -521,6 +522,10 @@ elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer)
        $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty);
        $remise_percent=GETPOST('remise_percent');

+	    if (empty($remise_percent)) {
+		    $remise_percent = 0;
+	    }
+
        $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent);
        if ($result >= 0)
        {
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -158,3 +158,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1682,22 +1682,28 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        }
 	    }

-	    // Link to bugtrack
-	    if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
-	    {
-	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+    	// Link to bugtrack
+		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-	        $bugbaseurl='https://doliforge.org/tracker/?';
-	        $bugbaseurl.='func=add&group_id=144&atid=246';
-	        $bugbaseurl.="&details=";
-	        $bugbaseurl.=urlencode("\n\n\n\n\n-------------\n");
-	        $bugbaseurl.=urlencode($langs->trans("Version").": ".DOL_VERSION."\n");
-	        $bugbaseurl.=urlencode($langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."\n");
-	        $bugbaseurl.=urlencode($langs->trans("PHP").": ".version_php()."\n");
-	        $bugbaseurl.=urlencode($langs->trans("Url").": ".$_SERVER["REQUEST_URI"]."\n");
-	        print '<div id="blockvmenubugtracker" class="blockvmenuhelp"><a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a></div>';
-	    }
-	    print "\n";
+			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
+			$bugbaseurl.= '?title=';
+			$bugbaseurl.= urlencode("Bug: ");
+			$bugbaseurl.= '&body=';
+			$bugbaseurl.= urlencode("# Environment\n");
+			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
+			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
+			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
+			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
+			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
+			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+			$bugbaseurl.= urlencode("\n");
+			$bugbaseurl.= urlencode("# Report\n");
+			print '<p id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
+			print '<a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
+			print '</p>';
+		}

 	    print "</div>\n";
 	    print "<!-- End left menu -->\n";
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
 * Copyright (C) 2007-2011 Jean Heimburger      <jean@tiaris.info>
 * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
@@ -1482,7 +1482,7 @@ class Product extends CommonObject
 				$this->date_modification		= $obj->tms;
 				$this->import_key				= $obj->import_key;
 				$this->entity					= $obj->entity;
-				
+
 				$this->ref_ext					= $obj->ref_ext;

 				$this->db->free($resql);
@@ -3376,7 +3376,7 @@ class Product extends CommonObject
 		$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier

 		// On efface l'image d'origine
-		dol_delete_file($file);
+		dol_delete_file($file, 0, 0, 0, $this); // For triggers

 		// Si elle existe, on efface la vignette
 		if (preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i',$filename,$regs))
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015	   Juanjo Menent        <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -387,7 +388,7 @@ if ($resql)
    {
        print "<div class=\"tabsAction\">\n";

-        if ($user->rights->stock->creer)
+        if ($user->rights->stock->mouvement->creer)
        {
            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("StockCorrection").'</a>';
        }
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -5,7 +5,7 @@
 * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2013      Cédric Salvador      <csalvador.gpcsolutions.fr>
- * Copyright (C) 2013      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2013-2015 Juanjo Menent	    <jmenent@2byte.es>
 * Copyright (C) 2014      Cédric Gross         <c.gross@kreiz-it.fr>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -343,7 +343,7 @@ if ($id > 0 || $ref)
 			if (! empty($conf->commande->enabled))
 			{
 				if ($found) print '<br>'; else $found=1;
-				print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_sendings['qty']);
+				print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_expedition['qty']);
 				$result=$product->load_stats_commande(0,'0');
 				if ($result < 0) dol_print_error($db,$product->error);
 				print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')';
@@ -543,7 +543,7 @@ if (empty($action) && $product->id)
 {
    print "<div class=\"tabsAction\">\n";

-    if ($user->rights->stock->creer)
+    if ($user->rights->stock->mouvement->creer)
    {
        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
    }
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -3,6 +3,7 @@
 * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -314,7 +315,14 @@ foreach ($listofreferent as $key => $value)
 				}

 				// Status
-				print '<td align="right">'.$element->getLibStatut(5).'</td>';
+				print '<td align="right">';
+				if ($element instanceof CommonInvoice) {
+					//This applies for Facture and FactureFournisseur
+					print $element->getLibStatut(5, $element->getSommePaiement());
+				} else {
+					print $element->getLibStatut(5);
+				}
+				print '</td>';

 				print '</tr>';

@@ -415,8 +423,31 @@ foreach ($listofreferent as $key => $value)
 				}
 			}

+			switch ($classname) {
+				case 'FactureFournisseur':
+					$newclassname = 'SupplierInvoice';
+					break;
+				case 'Facture':
+					$newclassname = 'Bill';
+					break;
+				case 'Propal':
+					$newclassname = 'CommercialProposal';
+					break;
+				case 'Commande':
+					$newclassname = 'Order';
+					break;
+				case 'Expedition':
+					$newclassname = 'Sending';
+					break;
+				case 'Contrat':
+					$newclassname = 'Contract';
+					break;
+				default:
+					$newclassname = $classname;
+			}
+
 			print '<tr >';
-			print '<td align="left" >'.$classname.'</td>';
+			print '<td align="left" >'.$langs->trans($newclassname).'</td>';
 			print '<td align="right">'.$i.'</td>';
 			print '<td align="right">'.price($total_ht).'</td>';
 			print '<td align="right">'.price($total_ttc).'</td>';
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3091,7 +3091,7 @@ class Societe extends CommonObject
 		$alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		$remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		*/
-		$sql  = "SELECT sum(total) as amount FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
 		$sql .= " AND paye = 0";
 		$sql .= " AND fk_statut <> 0";	// Not a draft
@@ -3102,8 +3102,18 @@ class Societe extends CommonObject
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-   			return ($obj->amount);
+			$outstandingBill = 0;
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$facturestatic=new Facture($this->db);
+			while($obj=$this->db->fetch_object($resql)) {
+				$facturestatic->id=$obj->rowid;
+				$paiement = $facturestatic->getSommePaiement();
+				$creditnotes = $facturestatic->getSumCreditNotesUsed();
+				$deposits = $facturestatic->getSumDepositsUsed();
+				
+				$outstandingBill+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+   			}
+   			return $outstandingBill;
 		}
 		else
 			return 0;
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -4,6 +4,7 @@
 * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -382,7 +383,7 @@ if ($socid && $action != 'edit' && $action != "create")
        }

        if (count($rib_list) == 0) {
-            print '<tr><td colspan="5" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
+            print '<tr><td colspan="7" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
        }

        print '</table>';
--- a/htdocs/theme/amarok/img/object_margin.png
+++ b/htdocs/theme/amarok/img/object_margin.png
--- a/htdocs/theme/bureau2crea/img/statut4.png
+++ b/htdocs/theme/bureau2crea/img/statut4.png
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'user', $id, '&user', $feature2);
 * Actions
 */

-if ($action == 'update' && ! $_POST['cancel'])
+if ($action == 'update' && ! GETPOST('cancel'))
 {
 	$edituser = new User($db);
 	$edituser->fetch($id);
@@ -138,6 +138,11 @@ if ($id > 0)
        	print '</tr>';
        }

+        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+        print '<td class="valeur">';
+        print '<input name="poste" value="'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'"></td>';
+        print "</tr>\n";
+
        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>';
        print '<td class="valeur">';
        print '<input name="login" value="'.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').'"></td>';
@@ -148,11 +153,6 @@ if ($id > 0)
        print '<input name="password" value="'.(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'').'"></td>';
        print "</tr>\n";

-        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">';
-        print '<input name="poste" value="'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'"></td>';
-        print "</tr>\n";
-
        print '</table>';

        print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -185,15 +185,20 @@ if ($id > 0)
        	print '</td>';
        	print '</tr>';
        }
+
+        print '<tr><td width="25%" valign="top" class="fieldrequired">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+        print '<td class="valeur">'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'</td>';
+        print "</tr>";
+        
        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Login").'</td>';
        print '<td class="valeur">'.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').'</td>';
        print '</tr>';
+        
        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("Password").'</td>';
        print '<td class="valeur">'.preg_replace('/./','*',(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'')).'</a></td>';
        print "</tr>\n";
-        print '<tr><td width="25%" valign="top">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">'.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'</td>';
-        print "</tr></table>\n";
+        
+        print "</table>\n";
    }

    print "</div>\n";
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -961,7 +961,7 @@ else

    if ($id > 0)
    {
-        $object->fetch($id);
+        $res=$object->fetch($id);
        if ($res < 0) { dol_print_error($db,$object->error); exit; }
        $res=$object->fetch_optionals($object->id,$extralabels);
Author	SHA1	Message	Date
Laurent Destailleur	a4df49f6c8	Prepare packaging	2015-05-16 17:04:36 +02:00
Laurent Destailleur	5b00ba11fd	Prepare packaging	2015-05-16 16:54:54 +02:00
Laurent Destailleur	cabbb9e421	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2015-05-16 16:49:03 +02:00
Laurent Destailleur	e8fb89f89f	Prepare packaging 3.7	2015-05-16 16:38:47 +02:00
Laurent Destailleur	4dcdea5219	Prepare package 3.5.7 Removed hardcoded version from rpm spec files, so it will not be necessary to update this files when making a new release.	2015-05-16 16:08:05 +02:00
Laurent Destailleur	1d8a3809f0	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2015-05-16 15:27:18 +02:00
Laurent Destailleur	80943111cc	Prepare 3.5.7	2015-05-16 15:26:34 +02:00
Laurent Destailleur	f8e8fe6f34	Merge pull request #2816 from marcosgdf/bug-2757 Close bug #2757 Deleting product category photo gives "Forbidden access" error	2015-05-12 22:36:33 +02:00
Marcos García de La Fuente	190f12c4c4	Merge branch '3.5' into bug-2757 Conflicts: ChangeLog	2015-05-12 10:16:48 +02:00
Marcos García de La Fuente	ea7eb241e3	Close bug #2757 Deleting product category photo gives "Forbidden access" error	2015-05-12 10:15:43 +02:00
Laurent Destailleur	973e2253bf	Merge pull request #2797 from hregis/3.6 Fix: add $object for use with triggers	2015-05-12 00:14:22 +02:00
Laurent Destailleur	2a486f471b	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/product/class/product.class.php	2015-05-11 23:39:45 +02:00
Laurent Destailleur	5f594d55ac	Merge pull request #2805 from marcosgdf/bug-2758 FIX #2758 Product::update sets product note to "null" when $prod->note is null	2015-05-11 23:00:25 +02:00
Marcos García de La Fuente	f6616deef3	Removed debugging function	2015-05-10 01:28:40 +02:00
Marcos García de La Fuente	f8e8b39ff2	FIX #2758 Product::update sets product note to "null" when $prod->note is null	2015-05-10 01:27:28 +02:00
Juanjo Menent	b7228e191c	Merge pull request #2801 from FHenry/3.6 FIX : [ bug #1926 ] [contract] Wrong Rights Checked	2015-05-07 20:21:05 +02:00
Florian HENRY	5395465cfd	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-05-07 17:24:51 +02:00
Florian HENRY	29f562460a	fix [ bug #1926 ] [contract] Wrong Rights Checked	2015-05-07 17:23:32 +02:00
Regis Houssin	9a32d7ec2f	Fix: add $object for use with triggers	2015-05-07 12:02:24 +02:00
Regis Houssin	c976d32e7d	Merge remote-tracking branch 'dolibarr/3.6' into 3.6	2015-05-07 11:46:05 +02:00
Regis Houssin	1b56144cb8	Revert "Fix: use global $object instead parameter" This reverts commit `179309710c`.	2015-05-07 11:41:14 +02:00
Juanjo Menent	5d65d666f7	Merge pull request #2778 from atm-maxime/3.6 Fix : shipment PDF was not using generation params	2015-05-06 21:00:49 +02:00
Regis Houssin	179309710c	Fix: use global $object instead parameter	2015-05-06 16:44:47 +02:00
Maxime Kohlhaas	42455f771a	Missing comments	2015-05-06 12:43:41 +02:00
Maxime Kohlhaas	d2603d5308	Fix : shipment was not considered as billed after classifybilled function	2015-05-06 12:39:10 +02:00
Maxime Kohlhaas	b203263e91	Fix : shipment PDF was not using generation params	2015-05-06 12:16:36 +02:00
Raphaël Doursenaud	a6b0f6cfac	Allow exporting projects without a third party FIX #2729	2015-05-01 15:56:39 +02:00
Juanjo Menent	6309d2133f	Merge pull request #2731 from GPCsolutions/dolibarr-2729 Allow exporting projects without a third party	2015-05-01 15:55:40 +02:00
Raphaël Doursenaud	f1032baaab	Allow exporting projects without a third party FIX #2729	2015-04-30 11:48:32 +02:00
Laurent Destailleur	43efd76b24	Fix remove warnings	2015-04-29 23:39:34 +02:00
Laurent Destailleur	7419319c0f	Protection into packager	2015-04-29 22:39:42 +02:00
Laurent Destailleur	290856db1c	Fix remove warning	2015-04-29 22:37:04 +02:00
Juanjo Menent	cfaaf56428	Change bugtracker to github in all maintened versions	2015-04-27 20:34:26 +02:00
Laurent Destailleur	fdd34c582c	Merge pull request #2665 from atm-maxime/3.6 Fix : include facture class for outstanding bill	2015-04-19 00:59:21 +02:00
Maxime Kohlhaas	5a66e1f98a	Fix : include facture class for outstanding bill	2015-04-19 00:26:05 +02:00
Laurent Destailleur	ab77158757	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/expedition/fiche.php	2015-04-18 23:55:17 +02:00
Laurent Destailleur	b8c512a3d5	Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5	2015-04-18 23:34:42 +02:00
Laurent Destailleur	be9ddb7748	Merge pull request #2595 from marcosgdf/bug-2576 Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref	2015-04-18 22:24:21 +02:00
Marcos García de La Fuente	37d8dafd40	Merge branch '3.5' into bug-2576 Conflicts: ChangeLog	2015-04-18 21:44:24 +02:00
Laurent Destailleur	4de4c66bb7	git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5	2015-04-18 20:56:40 +02:00
Laurent Destailleur	ed6abb0f79	Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 Conflicts: ChangeLog	2015-04-18 20:56:27 +02:00
Laurent Destailleur	e49a46a386	Merge pull request #2653 from atm-maxime/3.6 Fix : menu financial was not displayed when only supplier module is acti...	2015-04-18 20:30:24 +02:00
Laurent Destailleur	5f49b2a9bb	git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5	2015-04-18 20:12:49 +02:00
Laurent Destailleur	b7cf0ded00	Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 Conflicts: ChangeLog	2015-04-18 20:12:27 +02:00
Maxime Kohlhaas	7b035d3b5f	Fix : menu financial was not displayed when only supplier module is activated	2015-04-18 20:11:19 +02:00
Laurent Destailleur	b75722d450	git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5	2015-04-18 20:10:41 +02:00
Laurent Destailleur	9b69b64626	Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 Conflicts: ChangeLog	2015-04-18 20:10:06 +02:00
Laurent Destailleur	4201cf9f7f	Merge pull request #2638 from atm-maxime/fix_cust_outstanding Fix cust outstanding	2015-04-18 18:56:23 +02:00
Laurent Destailleur	7375256b99	Merge pull request #2643 from atm-maxime/3.6 Fix : price in editkeyval function was forcing a price rounding	2015-04-18 18:49:40 +02:00
Maxime Kohlhaas	51522decf3	Fix : price in editkeyval function was forcing a price rounding	2015-04-18 18:33:46 +02:00
Maxime Kohlhaas	8b307aac56	Fix : customer outstanding was not calculated properly	2015-04-18 18:06:27 +02:00
Maxime Kohlhaas	e0af2feced	Fix : on impayees remain to pay did not include deposits	2015-04-18 18:06:02 +02:00
Laurent Destailleur	0000043c96	Merge pull request #2629 from atm-maxime/3.5_fix_shipment_model Fix : shipment model selection	2015-04-18 15:23:52 +02:00
Maxime Kohlhaas	2b8efc302a	Fix : shipment model selection	2015-04-18 11:24:55 +02:00
Laurent Destailleur	ae41d38a96	Merge pull request #2616 from atm-maxime/3.6 Fix : discount were not working anymore on supplier order and bill	2015-04-18 03:34:14 +02:00
Maxime Kohlhaas	3073aab48b	Fix : discount were not working anymore on supplier order and bill	2015-04-17 23:31:51 +02:00
Laurent Destailleur	0b6c3cada3	Merge pull request #2608 from GPCsolutions/3.6-2607 Fixed typo in task export	2015-04-14 20:02:41 +02:00
Raphaël Doursenaud	54b8aa8a0b	Fixed typo in task export Closes #2607, #2609	2015-04-14 19:14:16 +02:00
Laurent Destailleur	c0ddfbfab7	Merge pull request #2597 from marcosgdf/bug-1906 Fixes for bugs #1906 and #1905	2015-04-13 01:04:23 +02:00
Marcos García de La Fuente	8f0c41dbd2	Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card	2015-04-12 22:02:25 +02:00
Marcos García de La Fuente	6173706531	Fix: [ bug #1906 ] Deplacement does not allow translated decimal format	2015-04-12 21:55:20 +02:00
Marcos García de La Fuente	9cfb295675	Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref	2015-04-12 21:05:26 +02:00
Marcos García de La Fuente	bbd01c0c8d	Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project	2015-04-12 20:59:58 +02:00
Marcos García de La Fuente	728b64e334	Fix Bug #2583 : Unable to create a bank transfer with localized numbers	2015-04-12 20:24:22 +02:00
Laurent Destailleur	aba83b6467	Merge pull request #2585 from aspangaro/3.6 Fix #2582 - Untranslated table header in /compta/bank/search.php	2015-04-09 21:37:53 +02:00
aspangaro	1f5ca497d3	Bug: Untranslated table header in /compta/bank/search.php	2015-04-09 20:50:19 +02:00
Laurent Destailleur	0e2bc5608d	Merge pull request #2578 from braito4/patch-1 minor bug drag and drop total line in tasks list	2015-04-09 18:30:59 +02:00
braito4	914b324a67	minor bug drag and drop total line in tasks list	2015-04-09 10:37:54 +02:00
Laurent Destailleur	bb83eb0f68	Merge pull request #2561 from frederic34/patch-5 Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 23:50:17 +02:00
Juanjo Menent	9d8cb459f1	Fix: Bad permission assignments for stock movements actions	2015-04-07 20:28:45 +02:00
Juanjo Menent	35a6ed90a0	Solves #2542 Bug: Contracts store localtax preferences	2015-04-07 20:02:12 +02:00
Juanjo Menent	345b609ff0	Closes #2545 Bug: Missing object_margin.png in Amarok theme	2015-04-07 18:41:40 +02:00
Frédéric FRANCE	06c749942a	Update index.php	2015-04-07 18:40:19 +02:00
Frédéric FRANCE	7a2942684c	Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 12:45:25 +02:00
Laurent Destailleur	6afde94acf	git push origin 3.6Merge branch 'marcosgdf-bug-2535' into 3.6	2015-04-06 12:52:49 +02:00
Laurent Destailleur	a42eb7b787	Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535 Conflicts: ChangeLog	2015-04-06 12:52:33 +02:00
Laurent Destailleur	a92c8ccbd5	git push origin 3.6Merge branch 'marcosgdf-bug-2534' into 3.6	2015-04-06 12:49:12 +02:00
Laurent Destailleur	8ce66aad79	Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534 Conflicts: ChangeLog	2015-04-06 12:48:55 +02:00
Laurent Destailleur	d8b50722f3	Merge pull request #2548 from marcosgdf/bug-2540 Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty	2015-04-06 12:41:38 +02:00
Laurent Destailleur	f9608bf41d	Merge pull request #2547 from marcosgdf/bug-2543 Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract	2015-04-06 12:38:54 +02:00
Laurent Destailleur	54645f0a3b	Merge pull request #2555 from FHenry/3.6 FIX : [ bug #1916 ] uniformize icon status4 in theme bureau2crea	2015-04-06 12:26:59 +02:00
Marcos García de La Fuente	5c8e92d52a	Closes #2535 Bug: Untranslated string in "Linked objects" page of a project	2015-04-04 17:52:05 +02:00
Marcos García de La Fuente	50091dfe8b	Closes #2534 SQL error when editing a supplier invoice line	2015-04-04 17:44:52 +02:00
Marcos García de La Fuente	611406b75e	Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty	2015-04-04 17:34:06 +02:00
Marcos García de La Fuente	65f4a818d4	Merge branch '3.6' into bug-2543	2015-04-04 17:29:17 +02:00
Marcos García de La Fuente	40860a84d1	Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract	2015-04-04 17:28:24 +02:00
Florian HENRY	092dd38851	FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets	2015-04-03 15:33:41 +02:00
Florian HENRY	dfe4837dbc	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-04-03 09:20:35 +02:00
Laurent Destailleur	f38212f20e	Merge pull request #2508 from FHenry/3.6 FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year	2015-04-02 11:22:18 +02:00
Florian HENRY	104bbfdc1c	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-03-30 19:14:49 +02:00
Florian HENRY	65ec02bae1	FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year	2015-03-30 19:13:55 +02:00
Laurent Destailleur	fd8d09c8c0	Fix avoid warning	2015-03-29 17:53:05 +02:00
Laurent Destailleur	b5690142aa	Prepare 3.6.3	2015-03-29 16:26:31 +02:00
Laurent Destailleur	253955dc31	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-03-28 17:13:05 +01:00
Laurent Destailleur	ffe1ee0d84	Target 98 to publish of dolibarr sevrer is now working	2015-03-28 17:12:31 +01:00
Laurent Destailleur	d0e4d8046b	Merge pull request #2480 from marcosgdf/minor-2 Corrected search box alignment in Customer orders list	2015-03-27 01:09:06 +01:00
Laurent Destailleur	78638a30cd	Merge pull request #2477 from atm-maxime/3.6 Fix : Quantity displayed for virtual stock explanations was wrong	2015-03-27 01:01:37 +01:00
Marcos García de La Fuente	e59fed9f38	Corrected search box alignment in Customer orders list	2015-03-26 11:08:34 +01:00
Maxime Kohlhaas	b250c5588e	Fix : Quantity displayed for virtual stock explanations was wrong	2015-03-25 16:11:36 +01:00
Laurent Destailleur	2a4687834d	Merge pull request #2474 from netfab/3.6 Fix displaying of the warning image.	2015-03-23 23:26:09 +01:00
Fab	ea7f00e777	Fix displaying of the warning image. Since last commit, $objp->date_livraison returns nothing ; max() will then returns wrong result, and the warning image will be displayed when it should not.	2015-03-23 20:05:31 +01:00
Laurent Destailleur	b52ee1d069	Merge pull request #2465 from marcosgdf/bug-delivery_date Fixed delivery date in order list not showing up	2015-03-21 01:24:17 +01:00
Marcos García de La Fuente	56295ed438	Fixed delivery date in order list not showing up	2015-03-20 11:28:23 +01:00