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

htdocs/comm/action/fiche.php

@@ -53,7 +53,7 @@ $contactid=GETPOST('contactid','int');
 $socid = GETPOST('socid','int');
 $id = GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id');
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id');
 
 $error=GETPOST("error");
 $mesg='';

htdocs/compta/facture.php

@@ -1,28 +1,28 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
-* Copyright (C) 2004-2013 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur   <eldy@users.sourceforge.net>
-* Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
-* Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
-* Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
+ * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
-* Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
-* Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
-* Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
+ * Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
-* Copyright (C) 2013      Florian Henry		 <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Florian Henry		 <florian.henry@open-concept.pro>
-*
+ *
-* This program is free software; you can redistribute it and/or modify
+ * 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
+ * it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
+ * (at your option) any later version.
-*
+ *
-* This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+ * GNU General Public License for more details.
-*
+ *
-* You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 /**
  *	\file       htdocs/compta/facture.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('invoicecard'));
 
 /*
  * Actions
-*/
+ */
 
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -872,14 +872,18 @@ else if ($action == 'add' && $user->rights->facture->creer)
 
 				if ($id > 0)
 				{
-					//If deposit invoice
+					// If deposit invoice
-					if ($_POST['type'] == 3) {
+					if ($_POST['type'] == 3)
+					{
 						$typeamount=GETPOST('typedeposit','alpha');
 						$valuedeposit=GETPOST('valuedeposit','int');
 
-						if ($typeamount=='amount') {
+						if ($typeamount=='amount')
+						{
 							$amountdeposit=$valuedeposit;
-						}else {
+						}
+						else
+						{
 							$amountdeposit=0;
 
 							dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
@@ -887,19 +891,20 @@ else if ($action == 'add' && $user->rights->facture->creer)
 							$classname = ucfirst($subelement);
 							$srcobject = new $classname($db);
 
-							dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add deposit line");
+							dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add deposit lines");
 							$result=$srcobject->fetch($object->origin_id);
 							if ($result > 0)
 							{
 								$totalamount=0;
 								$lines = $srcobject->lines;
-								$num=count($lines);
+								$numlines=count($lines);
-								for ($i=0;$i<$num;$i++)
+								for ($i=0; $i<$numlines; $i++)
 								{
-									$totalamount=+$lines[$i]->subprice;
+									$totalamount += $lines[$i]->subprice;
 								}
 
-								if ($totalamount!=0) {
+								if ($totalamount!=0) 
+								{
 									$amountdeposit=($totalamount*$valuedeposit)/100;
 								}
 							}
@@ -1537,7 +1542,7 @@ else if ($action == 'down' && $user->rights->facture->creer)
 
 /*
  * Add file in email form
-*/
+ */
 if (GETPOST('addfile'))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1552,7 +1557,7 @@ if (GETPOST('addfile'))
 
 /*
  * Remove file in email form
-*/
+ */
 if (! empty($_POST['removedfile']))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1568,7 +1573,7 @@ if (! empty($_POST['removedfile']))
 
 /*
  * Send mail
-*/
+ */
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'])
 {
 	$langs->load('mails');
@@ -1742,7 +1747,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 /*
  * Generate document
-*/
+ */
 else if ($action == 'builddoc')	// En get ou en post
 {
 	$object->fetch($id);
@@ -2000,8 +2005,7 @@ if ($action == 'create')
 	// Ref
 	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
 
-	// Tiers
+	// Thirdparty
-	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 	if($soc->id > 0)
 	{
@@ -2018,7 +2022,7 @@ if ($action == 'create')
 	}
 	print '</tr>'."\n";
 
-	// Factures predefinies
+	// Predefined invoices
 	if (empty($origin) && empty($originid) && $socid > 0)
 	{
 		$sql = 'SELECT r.rowid, r.titre, r.total_ttc';
@@ -2125,10 +2129,13 @@ if ($action == 'create')
 		print '</td><td valign="middle" class="nowrap">';
 		$desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
 		print '<table class="nobordernopadding"><tr><td>'.$desc.'</td>';
-		if (($origin=='propal') ) {
+		if (($origin=='propal'))
-			print '<td><select name="typedeposit"><option value="amount">'.$langs->trans('FixAmount').'</option>';
+		{
-			print '<option value="variable">'.$langs->trans('VarAmount').'</option></select></td>';
+			print '<td class="nowrap" style="padding-left: 5px">';
-			print '<td>'.$langs->trans('Value').':<input type="text" name="valuedeposit" size="3" value="'.GETPOST('valuedeposit','int').'"/>';
+			$arraylist=array('amount'=>'FixAmount','variable'=>'VarAmount');
+			print $form->selectarray('typedeposit',$arraylist, GETPOST('typedeposit'), 0, 0, 0, '', 1);
+			print '</td>';
+			print '<td class="nowrap" style="padding-left: 5px">'.$langs->trans('Value').':<input type="text" name="valuedeposit" size="3" value="'.GETPOST('valuedeposit','int').'"/>';
 		}
 		print '</td></tr></table>';
 		print '</td></tr>'."\n";
@@ -2395,6 +2402,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 
+	print '<br>';
 }
 else if ($id > 0 || ! empty($ref))
 {

htdocs/core/modules/action/rapport.pdf.php

@@ -145,7 +145,7 @@ class CommActionRapport
 
 			$nbpage = $this->_pages($pdf, $outputlangs);
 
-			$pdf->AliasNbPages();
+			if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 			$pdf->Close();
 
 			$pdf->Output($file,'F');

htdocs/core/modules/cheque/pdf/pdf_blochet.class.php

@@ -161,7 +161,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		// Pied de page
 		$this->_pagefoot($pdf,'',$outputlangs);
-		$pdf->AliasNbPages();
+		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 		$pdf->Close();
 

htdocs/core/modules/commande/doc/pdf_einstein.modules.php

@@ -467,7 +467,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php

@@ -169,7 +169,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
 
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Sending"));
@@ -323,7 +323,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

@@ -469,7 +469,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php

@@ -319,7 +319,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				}
 
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

@@ -432,7 +432,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				// Check product remaining to be delivered
 				// TODO doit etre modifie
@@ -492,7 +492,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 					$this->_pagefoot($pdf,$object,$outputlangs);
 
-					$pdf->AliasNbPages();
+					if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 				}*/
 
 				$pdf->Close();
@@ -728,7 +728,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pdf->MultiCell(60, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
 				}
 			}
-			
+
 			$posy=$Yoff;
 		}
 

htdocs/core/modules/project/pdf/pdf_baleine.modules.php

@@ -287,7 +287,7 @@ class pdf_baleine extends ModelePDFProjects
 				 * Pied de page
 				 */
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/propale/doc/pdf_azur.modules.php

@@ -468,7 +468,7 @@ class pdf_azur extends ModelePDFPropales
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/rapport/pdf_paiement.class.php

@@ -210,7 +210,7 @@ class pdf_paiement
 
 		$this->Body($pdf, 1, $lines, $outputlangs);
 
-		$pdf->AliasNbPages();
+		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 		$pdf->Close();
 

htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php

@@ -407,7 +407,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 

htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

@@ -466,9 +466,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 
-				// Pied de page
+                // Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
+				$this->_pagefoot($pdf, $object, $outputlangs);
-				$pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
@@ -576,7 +576,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
         	$posy=$pdf->GetY()+2;
         }
 
-		
+
 		return $posy;
 	}