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

htdocs/adherents/class/adherent.class.php

@@ -435,7 +435,8 @@ class Adherent extends CommonObject
             include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
             $hookmanager=new HookManager($this->db);
             $hookmanager->callHooks(array('memberdao'));
-            $parameters=array('socid'=>$socid);
+            $parameters=array('id'=>$this->id);
+            $action='';
             $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
             if (empty($reshook))
             {

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

@@ -921,6 +921,7 @@ class Propal extends CommonObject
 			if (is_object($hookmanager))
 			{
 			    $parameters=array('objFrom'=>$objFrom);
+				$action='';
 				$reshook=$hookmanager->executeHooks('createfrom',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 			}

htdocs/commande/class/commande.class.php

@@ -829,6 +829,7 @@ class Commande extends CommonObject
             if (is_object($hookmanager))
             {
                 $parameters=array('objFrom'=>$objFrom);
+                $action='';
                 $reshook=$hookmanager->executeHooks('createfrom',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
@@ -924,6 +925,7 @@ class Commande extends CommonObject
                 $hookmanager->callHooks(array('orderdao'));
 
                 $parameters=array('objFrom'=>$object);
+                $action='';
                 $reshook=$hookmanager->executeHooks('createfrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
 
@@ -1580,6 +1582,7 @@ class Commande extends CommonObject
         $this->stocks = array();
 
         // Tableau des id de produit de la commande
+		$array_of_product=array();
 		
 
         // Recherche total en stock pour chaque produit

htdocs/compta/facture/class/facture.class.php

@@ -570,6 +570,7 @@ class Facture extends CommonObject
 			if (is_object($hookmanager))
 			{
 			    $parameters=array('objFrom'=>$objFrom);
+			    $action='';
 				$reshook=$hookmanager->executeHooks('createfrom',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 			}
@@ -665,6 +666,7 @@ class Facture extends CommonObject
             $hookmanager->callHooks(array('invoicedao'));
 
             $parameters=array('objFrom'=>$object);
+            $action='';
 			$reshook=$hookmanager->executeHooks('createfrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 

htdocs/compta/prelevement/class/bon-prelevement.class.php

@@ -715,15 +715,15 @@ class BonPrelevement extends CommonObject
      *	Create a withdraw
      *
      *	@param 	int		$banque		code of bank
-     *	@param	int		$guichet	code of banck office
+     *	@param	int		$agence		code of bank office (guichet)
      *	@param	string	$mode		real=do action, simu=test only
      *	@return	int					<0 if KO, nbre of invoice withdrawed if OK
      */
-    function Create($banque=0, $guichet=0, $mode='real')
+    function Create($banque=0, $agence=0, $mode='real')
     {
         global $conf,$langs;
 
-        dol_syslog("BonPrelevement::Create banque=$banque guichet=$guichet");
+        dol_syslog("BonPrelevement::Create banque=$banque agence=$agence");
 
         require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
         require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");

htdocs/core/class/commonobject.class.php

@@ -2127,6 +2127,7 @@ abstract class CommonObject
                 if (empty($line->fk_parent_line))
                 {
                     $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
+                    $action='';
                     $reshook=$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 }
             }

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

@@ -1810,7 +1810,7 @@ class Form
                 $tmparray[$obj->rowid]['label']=$label;
                 $i++;
             }
-            $this->cache_demand_reason=dol_sort_array($tmparray,'label', $order='asc', $natsort, $case_sensitive);
+            $this->cache_demand_reason=dol_sort_array($tmparray,'label', $order='asc');
 
             unset($tmparray);
             return 1;

htdocs/core/lib/company.lib.php

@@ -480,11 +480,12 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
 
 /**
  * 		Show html area for list of contacts
- *		@param		conf		Object conf
+ * 
- * 		@param		langs		Object langs
+ *		@param	Conf		$conf		Object conf
- * 		@param		db			Database handler
+ * 		@param	Translate	$langs		Object langs
- * 		@param		object		Third party object
+ * 		@param	DoliDB		$db			Database handler
- *      @param      backtopage  Url to go once contact is created
+ * 		@param	Object		$object		Third party object
+ *      @param  string		$backtopage	Url to go once contact is created
  */
 function show_contacts($conf,$langs,$db,$object,$backtopage='')
 {
@@ -564,7 +565,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
             if ($conf->agenda->enabled && $user->rights->agenda->myactions->create)
             {
-                print '<td align="center"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtourl).'">';
+                print '<td align="center"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
                 print img_object($langs->trans("Rendez-Vous"),"action");
                 print '</a></td>';
             }
@@ -743,6 +744,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
 
 /**
  *    	Show html area with actions done
+ * 
  * 		@param		conf		Object conf
  * 		@param		langs		Object langs
  * 		@param		db			Object db
@@ -837,6 +839,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
                 $numaction++;
                 $i++;
             }
+	        $db->free($resql);
         }
         else
         {
@@ -967,8 +970,6 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         }
         $out.="</table>\n";
         $out.="<br>\n";
-
-        $db->free($result);
     }
 
     if ($noprint) return $out;

htdocs/core/lib/pdf.lib.php

@@ -685,6 +685,7 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
+		$action='';
 		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
@@ -929,6 +930,7 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0,$hookmanager=
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
 		return $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
@@ -959,6 +961,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanage
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
 		return $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
@@ -985,6 +988,7 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0,$hookmanager=fals
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else
@@ -1013,6 +1017,7 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0,$hookmanage
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else
@@ -1041,6 +1046,7 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0,$hookmana
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else
@@ -1069,6 +1075,7 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else
@@ -1099,6 +1106,7 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookma
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else
@@ -1136,6 +1144,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookman
 			$special_code = $object->lines[$i]->special_code;
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+			$action='';
 			return $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
 		else

htdocs/core/lib/usergroups.lib.php

@@ -142,9 +142,10 @@ function group_prepare_head($object)
 
 /**
  * 		Show list of themes. Show all thumbs of themes
- * 		@param		fuser				User concerned or '' for global theme
+ * 
- * 		@param		edit				1 to add edit form
+ * 		@param	User	$fuser				User concerned or '' for global theme
- * 		@param		foruserprofile		Show for user profile view
+ * 		@param	int		$edit				1 to add edit form
+ * 		@param	boolean	$foruserprofile		Show for user profile view
  */
 function show_theme($fuser,$edit=0,$foruserprofile=false)
 {
@@ -166,21 +167,21 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     // Title
     if ($foruserprofile)
     {
-    	print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td>';
+    	print '<tr class="liste_titre"><th width="25%">'.$langs->trans("Parameter").'</th><th width="25%">'.$langs->trans("DefaultValue").'</th>';
-    	print '<td colspan="2">&nbsp;</td>';
+    	print '<th colspan="2">&nbsp;</th>';
 	    print '</tr>';
     }
     else
     {
-    	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("DefaultSkin").'</td>';
+    	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
-    	print '<td align="right">';
+    	print '<th align="right">';
     	$url='http://www.dolistore.com/lang-en/4-skins';
     	if (preg_match('/fr/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-fr/4-themes';
     	//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
     	print '<a href="'.$url.'" target="_blank">';
     	print $langs->trans('DownloadMoreSkins');
     	print '</a>';
-    	print '</td></tr>';
+    	print '</th></tr>';
     }
 
     $var=false;
@@ -190,8 +191,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '<tr '.$bc[$var].'>';
 	    print '<td>'.$langs->trans("DefaultSkin").'</td>';
 	    print '<td>'.$conf->global->MAIN_THEME.'</td>';
-	    print '<td '.$bc[$var].' align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+	    print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	    print '<td '.$bc[$var].'>&nbsp;</td>';
+	    print '<td>&nbsp;</td>';
 	    print '</tr>';
     }
 
@@ -203,12 +204,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</tr>';
     }
 
-	if ($edit)
-	{
-		if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-		else $title=$langs->trans("ShowPreview");
-	}
-
     $var=!$var;
     print '<tr '.$bc[$var].'><td colspan="'.$colspan.'">';
 

htdocs/core/menus/standard/empty.php

@@ -56,10 +56,10 @@ class MenuTop {
         $classname='class="tmenu"';
 
 		print_start_menu_entry_empty($idsel);
-		print '<a class="tmenuimage" href="'.dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
+		print '<a class="tmenuimage" href="'.dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu="'.($this->atarget?' target="'.$this->atarget.'"':'').'>';
 		print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($atarget?" target=$atarget":"")).'>';
+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.DOL_URL_ROOT.'"'.($this->atarget?' target="'.$this->atarget.'"':'').'>';
 		print_text_menu_entry_empty($langs->trans("Home"));
 		print '</a>';
 		print_end_menu_entry_empty();

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

@@ -358,7 +358,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
-					$this->_tableau_versements($pdf, $fac, $posy);
+					$this->_tableau_versements($pdf, $object, $posy);
 				}
 
                 // Pied de page

htdocs/ftp/pre.inc.php

@@ -32,9 +32,14 @@ $user->getrights('ecm');
  * @param 	string	$title			HTML title
  * @param 	string	$help_url		Link to online url help
  * @param 	string	$morehtml		More content into html header
+ * @param 	string 	$target			Force target on menu links
+ * @param 	int    	$disablejs		More content into html header
+ * @param 	int    	$disablehead	More content into html header
+ * @param 	array  	$arrayofjs		Array of complementary js files
+ * @param 	array  	$arrayofcss		Array of complementary css files
  * @return	none
  */
-function llxHeader($head = '', $title='', $help_url='', $morehtml='')
+function llxHeader($head = '', $title='', $help_url='', $morehtml='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
 {
 	global $conf,$langs,$user;
 	$langs->load("ftp");

htdocs/langs/pt_PT/projects.lang

@@ -1,97 +1,98 @@
 # Dolibarr language file - pt_PT - projects
 CHARSET=UTF-8
-Project=Projecto
+Project=Projeto
-Projects=Projectos
+Projects=Projetos
-SharedProject=Projecto Partilhado
+SharedProject=Todos
-Myprojects=Os Meus Projectos
+PrivateProject=Contactos do projeto
-ProjectsArea=Área de Projectos
+MyProjectsDesc=Essa visão é limitada a projetos onde você é o contacto(seja qual for o tipo).
-NewProject=Novo Projecto
+ProjectsPublicDesc=Essa visão apresenta todos os projetos que está autorizado a ler.
-AddProject=Criar Projecto
+ProjectsDesc=Essa visão apresenta todos os projetos (as permissões de usuário concedar-lhe-ao permissão para ver tudo).
-DeleteAProject=Eliminar um Projecto
+MyTasksDesc=Essa visão é limitada a projetos ou tarefas que são de um contacto(seja qual for o tipo).
+TasksPublicDesc=Essa visão apresenta todos os projetos e tarefas que têm permissão para ler.
+TasksDesc=Essa visão apresenta todos os projetos e tarefas (as permissões de usuário concedar-lhe-ao permissão para ver tudo).
+Myprojects=Meus Projetos
+ProjectsArea=Área de Projetos
+NewProject=Novo Projeto
+AddProject=Adicionar Projeto
+DeleteAProject=Eliminar um Projeto
 DeleteATask=Eliminar uma Tarefa
-ConfirmDeleteAProject=¿Está seguro de querer eliminar este projecto?
+ConfirmDeleteAProject=Tem a certeza que quer eliminar este projeto?
-ConfirmDeleteATask=¿Está seguro de querer eliminar esta tarefa?
+ConfirmDeleteATask=Tem a certeza que quer eliminar esta tarefa?
-OfficerProject=Responsável do Projecto
+OfficerProject=Responsável pelo Projeto
-LastProjects=Os %s Ultimos Projectos
+LastProjects=Últimos Projetos
-AllProjects=Todos os Projectos
+AllProjects=Todos os Projetos
-ProjectsList=Lista de Projectos
+ProjectsList=Lista de Projetos
-ShowProject=Adicionar Projecto
+ShowProject=Mostrar Projeto
-SetProject=Definir Projecto
+SetProject=Definir Projeto
-NoProject=Nenhum Projecto Definido
+NoProject=Nenhum Projeto Definido
-NbOpenTasks=Nº Tarefas Abertas
+NbOpenTasks=Nº de Tarefas Abertas
-NbOfProjects=Nº de Projectos
+NbOfProjects=Nº de Projetos
-TimeSpent=Tempo Dedicado
+TimeSpent=Tempo Dispendido
-RefTask=Ref. Tarefa
+TimesSpent=Tempos Dispendidos
+RefTask=Ref. da Tarefa
 LabelTask=Etiqueta de Tarefa
-NewTimeSpent=Novo Tempo Dedicado
+NewTimeSpent=Novo Tempo Dispendido
-MyTimeSpent=O Meu Tempo Dedicado
+MyTimeSpent=Meu Tempo Dispendido
-MyTasks=As minhas Tarefas
+MyTasks=Minhas Tarefas
 Tasks=Tarefas
 Task=Tarefa
 NewTask=Nova Tarefa
 AddTask=Adicionar Tarefa
-AddDuration=Indicar Duração
+AddDuration=Adicionar Duração
-Activity=Actividade
+Activity=Atividade
-Activities=Tarefas/Actividades
+Activities=Tarefas/Atividades
-MyActivity=A Minha Actividade
+MyActivity=Minha Actividade
-MyActivities=As Tarefas/Actividades
+MyActivities=Minhas Tarefas/Actividades
-DurationEffective=Duração Efectiva
+MyProjects=Meus Projetos
-MyProjects=Os Meus Projectos
+DurationEffective=Duração Efetiva
-Time=Tempo
-ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projecto
-ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projecto
-ListInvoicesAssociatedProject=Lista de Facturas Associadas ao Projecto
-ListPredefinedInvoicesAssociatedProject=Lista de Facturas a Clientes Predefinidas Associadas ao Projecto
-ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projecto
-ListSupplierInvoicesAssociatedProject=Lista de Facturas de Fornecedor Associados ao Projecto
-ListContractAssociatedProject=Lista de Contratos Associados ao Projecto
-ActivityOnProjectThisWeek=Actividade ao Projecto esta Semana
-ActivityOnProjectThisMonth=Actividade ao Projecto este Mês
-ActivityOnProjectThisYear=Actividade ao Projecto este Ano
-ChildOfTask=Link da Tarefa
-NotOwnerOfProject=Não é responsável deste projecto privado
-AffectedTo=Atribuido a
-CantRemoveProject=Este projecto não pode ser eliminado porque está referenciado por muito objectos (facturas, pedidos e outros). ver a lista no separador referencias.
-
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> pt_PT
-PrivateProject=Contatos do projeto
-MyProjectsDesc=Essa visão é limitada a projetos que você está um contato para (seja qual for o tipo).
-ProjectsPublicDesc=Essa visão apresenta todos os projetos que estão autorizados a ler.
-ProjectsDesc=Essa visão apresenta todos os projectos (as permissões de usuário conceder-lhe permissão para ver tudo).
-MyTasksDesc=Essa visão é limitada a projetos ou tarefas que são de um contato para (seja qual for o tipo).
-TasksPublicDesc=Essa visão apresenta todos os projectos e tarefas que têm permissão para ler.
-TasksDesc=Essa visão apresenta todos os projectos e tarefas (as permissões de usuário conceder-lhe permissão para ver tudo).
 Progress=Progresso
-ListFichinterAssociatedProject=Lista de intervenções associadas ao projecto
+Time=Tempo
-ListTripAssociatedProject=Lista de viagens e as despesas associadas ao projecto
+ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
-ListActionsAssociatedProject=Lista de acções associadas ao projecto
+ListOrdersAssociatedProject=Lista de Encomendas Associadas ao Projeto
-ValidateProject=Validar projet
+ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto
-ConfirmValidateProject=Tem certeza que deseja validar esse projeto?
+ListPredefinedInvoicesAssociatedProject=Lista de Faturas a Clientes Predefinidas Associadas ao Projeto
+ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto
+ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associados ao Projeto
+ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
+ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
+ListTripAssociatedProject=Lista de viagens e despesas associadas ao projeto
+ListActionsAssociatedProject=Lista de eventos associados ao projeto
+ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
+ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
+ActivityOnProjectThisYear=Actividade do Projecto neste Ano
+ChildOfTask=Link do Projeto/Tarefa
+NotOwnerOfProject=Não é responsável por este projeto privado
+AffectedTo=Atribuido a
+CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por alguns objetos (faturas, pedidos e outros). ver lista de referencias.
+ValidateProject=Validar Projeto
+ConfirmValidateProject=Tem certeza que deseja validar este projeto?
 CloseAProject=Fechar projeto
 ConfirmCloseAProject=Tem certeza que quer fechar este projeto?
-ReOpenAProject=projeto Open
+ReOpenAProject=Abrir Projeto
-ConfirmReOpenAProject=Tem certeza que quer reabrir esse projeto?
+ConfirmReOpenAProject=Tem certeza que quer reabrir este projeto?
-ProjectContact=contatos Project
+ProjectContact=contatos do Projeto
-ActionsOnProject=Ações sobre o projecto
+ActionsOnProject=Ações sobre o projeto
-YouAreNotContactOfProject=Você não é um contato deste projecto privado
+YouAreNotContactOfProject=Não é um contato deste projeto privado
-DeleteATimeSpent=Excluir tempo gasto
+DeleteATimeSpent=Excluir o tempo gasto
-ConfirmDeleteATimeSpent=Tem certeza que quer deletar este tempo?
+ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado?
-DoNotShowMyTasksOnly=Veja também as tarefas que eu não sou afetado
+DoNotShowMyTasksOnly=Ver também as tarefas não atribuidas por mim
-ShowMyTasksOnly=Ver tarefas só sou afetado
+ShowMyTasksOnly=Ver tarefas atribuidas por mim
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
-NoTasks=As tarefas para este projeto
+NoTasks=Não existem tarefas para este projeto
-LinkedToAnotherCompany=Vinculado ao terceiro que
+LinkedToAnotherCompany=Vinculado a Terceiros
-TypeContact_project_internal_PROJECTLEADER=O líder do projeto
+TaskIsNotAffectedToYou=Tarefa não atribuida a si
-TypeContact_project_external_PROJECTLEADER=O líder do projeto
+ErrorTimeSpentIsEmpty=Tempo dispensado está vazio
+ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (<b>%s</b> tarefas no momento) e todas as entradas de tempo dispensadas.
+IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros.
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Líder do projeto
+TypeContact_project_external_PROJECTLEADER=Líder do projeto
 TypeContact_project_internal_CONTRIBUTOR=Contribuinte
 TypeContact_project_external_CONTRIBUTOR=Contribuinte
-TypeContact_project_task_internal_TASKEXECUTIVE=executivo Task
+TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executiva
-TypeContact_project_task_external_TASKEXECUTIVE=executivo Task
+TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executiva
 TypeContact_project_task_internal_CONTRIBUTOR=Contribuinte
 TypeContact_project_task_external_CONTRIBUTOR=Contribuinte
+# Documents models
 DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..)
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:37:05).

htdocs/product/canvas/service/actions_card_service.class.php

@@ -282,7 +282,7 @@ class ActionsCardService extends Product
 		}
 		else
 		{
-			dol_print_error($db,$sql);
+			dol_print_error($this->db,$sql);
 		}
 	}
 
@@ -298,6 +298,7 @@ class ActionsCardService extends Product
 	function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
 		global $conf;
+		global $search_categ,$sall,$sref,$sbarcode,$snom,$catid;
 
         $this->getFieldList();
 

htdocs/societe/class/societe.class.php

@@ -1005,40 +1005,6 @@ class Societe extends CommonObject
     }
 
 
-    /**
-     *    \brief     Retournes les factures impayees de la societe
-     *    \return    array   tableau des id de factures impayees
-     *
-     */
-    function factures_impayes()
-    {
-        $facimp = array();
-        /*
-         * Lignes
-         */
-        $sql = "SELECT f.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = '".$this->id . "'";
-        $sql .= " AND f.fk_statut = '1' AND f.paye = '0'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-
-            while ($i < $num)
-            {
-                $objp = $this->db->fetch_object($resql);
-                $array_push($facimp, $objp->rowid);
-                $i++;
-                print $i;
-            }
-
-            $this->db->free();
-        }
-        return $facimp;
-    }
-
     /**
      *    Update record to set prefix
      */

test/phpunit/SocieteTest.php

@@ -227,10 +227,6 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-    	$result=$localobject->factures_impayes();
-    	print __METHOD__." id=".$localobject->id." result=".join(',',$result)."\n";
-    	//$this->assertLessThan($result, 0);
-
         $result=$localobject->set_as_client();
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);