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

htdocs/admin/modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -268,6 +268,7 @@ $h++;
 
 dol_fiche_head($head, $mode, $langs->trans("Modules"));
 
+$var=true;
 
 if ($mode != 'marketplace')
 {
@@ -286,7 +287,6 @@ if ($mode != 'marketplace')
 
     // Show list of modules
 
-    $var=true;
     $oldfamily='';
 
     $familylib=array(

htdocs/commande/class/commande.class.php

@@ -1521,7 +1521,22 @@ class Commande extends CommonOrder
         $nb=0;
         foreach($this->lines as $line)
         {
-            if ($line->fk_product_type == 0) $nb++;
+            if ($line->product_type == 0) $nb++;
+        }
+        return $nb;
+    }
+
+    /**
+     *	Return number of line with type service.
+     *
+     *	@return		int		<0 if KO, Nbr of service lines if OK
+     */
+    function getNbOfServicesLines()
+    {
+        $nb=0;
+        foreach($this->lines as $line)
+        {
+            if ($line->product_type == 1) $nb++;
         }
         return $nb;
     }

htdocs/core/ajax/saveinplace.php

@@ -66,21 +66,21 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
+	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
+	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
+	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $element = 'adherent';
+	else if ($element == 'member') $newelement = 'adherent';
 	else if ($element == 'order_supplier') {
-		$element = 'fournisseur';
+		$newelement = 'fournisseur';
 		$subelement = 'commande';
 	}
 	else if ($element == 'invoice_supplier') {
-		$element = 'fournisseur';
+		$newelement = 'fournisseur';
 		$subelement = 'facture';
 	}
 
-	if (! empty($user->rights->$element->creer) || ! empty($user->rights->$element->write)
+	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->write)
-	|| (isset($subelement) && (! empty($user->rights->$element->$subelement->creer) || ! empty($user->rights->$element->$subelement->write)))
+	|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
 	|| ($element == 'payment' && $user->rights->facture->paiement)
 	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	{

htdocs/core/boxes/box_members.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.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
@@ -73,7 +73,7 @@ class box_members extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT a.rowid, a.nom as lastname, a.prenom as firstname, a.societe, a.fk_soc,";
+			$sql = "SELECT a.rowid, a.nom as lastname, a.prenom as firstname, a.societe as company, a.fk_soc,";
 			$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
 			$sql.= " t.cotisation";
 			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";

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

@@ -89,7 +89,7 @@ class Form
         // TODO change for compatibility
         if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
         {
-            if ($perm)
+            if (! empty($perm))
             {
                 $tmp=explode(':',$typeofdata);
                 $ret.= '<div class="editkey_'.$tmp[0].(! empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';

htdocs/core/modules/modAccounting.class.php

@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.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
@@ -83,6 +84,7 @@ class modAccounting extends DolibarrModules
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'accounting';
+		$r=0;
 
 		$this->rights[$r][0] = 50401;
 		$this->rights[$r][1] = 'Lire le plan de compte';
@@ -90,6 +92,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 1;
 		$this->rights[$r][4] = 'plancompte';
 		$this->rights[$r][5] = 'lire';
+		$r++;
 
 		$this->rights[$r][0] = 50402;
 		$this->rights[$r][1] = 'Creer/modifier un plan de compte';
@@ -97,6 +100,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'plancompte';
 		$this->rights[$r][5] = 'creer';
+		$r++;
 
 		$this->rights[$r][0] = 50403;
 		$this->rights[$r][1] = 'Cloturer plan de compte';
@@ -104,6 +108,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'plancompte';
 		$this->rights[$r][5] = 'cloturer';
+		$r++;
 
 		$this->rights[$r][0] = 50411;
 		$this->rights[$r][1] = 'Lire les mouvements comptables';
@@ -111,6 +116,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 1;
 		$this->rights[$r][4] = 'mouvements';
 		$this->rights[$r][5] = 'lire';
+		$r++;
 
 		$this->rights[$r][0] = 50412;
 		$this->rights[$r][1] = 'Creer/modifier/annuler les mouvements comptables';
@@ -118,6 +124,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
 		$this->rights[$r][5] = 'creer';
+		$r++;
 
 		$this->rights[$r][0] = 50415;
 		$this->rights[$r][1] = 'Lire CA, bilans, resultats, journaux, grands livres';
@@ -125,6 +132,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'comptarapport';
 		$this->rights[$r][5] = 'lire';
+		$r++;
 	}
 
 

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

@@ -525,7 +525,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Show payments conditions
-		if (isset($object->type) && $object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
+		if (! empty($conf->global->PROPALE_PDF_PAIEMENT_ENABLED) && ($object->cond_reglement_code || $object->cond_reglement))
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -542,7 +542,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 
-		if (isset($object->type) && $object->type != 2)
+		if (! empty($conf->global->PROPALE_PDF_PAIEMENT_ENABLED))
 		{
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)

htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php

@@ -65,9 +65,10 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
+ *  @param		HookManager	$hookmanager	Hook manager instance
  *  @return     int         				0 if KO, 1 if OK
  */
-function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
 {
 	global $conf, $user, $langs;
 
@@ -136,7 +137,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided
 		// 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, $hidedetails, $hidedesc) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 

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

@@ -132,7 +132,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
      *  @param		object	$hookmanager		Hookmanager object
      *  @return 	int             			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
 	{
 		global $user,$langs,$conf,$mysoc;
 
@@ -284,10 +284,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
 
-// We suppose that a too long description is moved completely on next page
+					// We suppose that a too long description is moved completely on next page
-if ($pageposafter > $pageposbefore) {
+					if ($pageposafter > $pageposbefore) {
-	$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-}
+					}
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
@@ -809,9 +809,10 @@ if ($pageposafter > $pageposbefore) {
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -887,6 +888,12 @@ if ($pageposafter > $pageposbefore) {
 			$pdf->MultiCell(100, 4, strtolower($outputlangs->transnoentities("OrderToProcess")), '', 'R');
 		}
 
+		$posy+=2;
+		$pdf->SetTextColor(0,0,60);
+
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+
 		if ($showaddress)
 		{
 			// Sender properties

htdocs/core/modules/supplier_order/modules_commandefournisseur.php

@@ -147,9 +147,10 @@ abstract class ModeleNumRefSuppliersOrders
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
+ *  @param		HookManager	$hookmanager	Hook manager instance
  *  @return     int          				0 if KO, 1 if OK
  */
-function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
 {
 	global $conf, $user, $langs;
 	$langs->load("suppliers");
@@ -217,14 +218,14 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet
 		// 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, $hidedetails, $hidedesc) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
 			// we delete preview files
         	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_delete_preview($object);
-			
+
 			// Appel des triggers
 			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 			$interface=new Interfaces($db);

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

@@ -296,10 +296,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
 
-// We suppose that a too long description is moved completely on next page
+					// We suppose that a too long description is moved completely on next page
-if ($pageposafter > $pageposbefore) {
+					if ($pageposafter > $pageposbefore) {
-	$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-}
+					}
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
@@ -908,9 +908,10 @@ if ($pageposafter > $pageposbefore) {
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -992,6 +993,10 @@ if ($pageposafter > $pageposbefore) {
 		}
 
 		$posy+=2;
+		$pdf->SetTextColor(0,0,60);
+
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
 
 		if ($showaddress)
 		{

htdocs/fourn/commande/fiche.php

@@ -307,7 +307,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             	}
 
                 $ret=$object->fetch($id);    // Reload to get new records
-                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
             }
             unset($_POST['qty']);
             unset($_POST['type']);
@@ -369,7 +369,7 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
     else
@@ -395,7 +395,7 @@ else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->r
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
     else
@@ -429,7 +429,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
     else
@@ -582,7 +582,7 @@ else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
     exit;
 }
@@ -597,7 +597,7 @@ else if ($action == 'down' && $user->rights->fournisseur->commande->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
     exit;
 }
@@ -621,7 +621,7 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	/
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
+    $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     if ($result	<= 0)
     {
         dol_print_error($db,$result);

htdocs/fourn/facture/fiche.php

@@ -542,7 +542,7 @@ elseif ($action == 'addline')
     		$outputlangs = new Translate("",$conf);
     		$outputlangs->setDefaultLang($newlang);
     	}
-        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
+        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
 
         unset($_POST['qty']);
         unset($_POST['type']);
@@ -593,7 +593,7 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
             $outputlangs = new Translate("",$conf);
             $outputlangs->setDefaultLang($_REQUEST['lang_id']);
         }
-        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
+        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     }
 }
 
@@ -817,7 +817,7 @@ elseif ($action	== 'builddoc')
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    $result=supplier_invoice_pdf_create($db,$object,$object->modelpdf,$outputlangs);
+    $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     if ($result	<= 0)
     {
         dol_print_error($db,$result);
@@ -1522,7 +1522,7 @@ else
         }
 
         // Other options
-        $parameters=array();
+        $parameters=array('colspan' => ' colspan="3"');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 
         print '</table>';
@@ -2053,4 +2053,4 @@ else
 // End of page
 llxFooter();
 $db->close();
-?>
+?>