lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Link

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-21 22:54:35 +00:00
parent 5f0d6f58b5
commit 600281323f
3 changed files with 7 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/deb/control
View File

@ -8,7 +8,7 @@ Section: web
Priority: optional Priority: optional
Recommends: firefox Recommends: firefox
Homepage: http://www.dolibarr.org Homepage: http://www.dolibarr.org
Description: Easy to use ERP & CRM software to manage your activity Description: Easy to use web based ERP & CRM software
Dolibarr ERP & CRM is an easy to use open source/free software for small Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship features for Enterprise Resource Planning (ERP) and Customer Relationship

34
htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -22,7 +22,7 @@
* \ingroup societe * \ingroup societe
* \brief File of class to build ODT documents for third parties * \brief File of class to build ODT documents for third parties
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id$ * \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
@ -196,37 +196,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT"); $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
// Add list of substitution keys // Add list of substitution keys
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>'; $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
/*$dummy=new User($db); $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$dummy=new Societe($db);
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}*/
$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
//var_dump($listofdir);
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
$texte.= '<table><tr><td>'; $texte.= '<table><tr><td>';
$texte.= '<textarea class="flat" cols="60" name="value1">'; $texte.= '<textarea class="flat" cols="60" name="value1">';
$texte.=$conf->global->FACTURE_ADDON_PDF_ODT_PATH; $texte.=$conf->global->FACTURE_ADDON_PDF_ODT_PATH;

34
htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -22,7 +22,7 @@
* \ingroup societe * \ingroup societe
* \brief File of class to build ODT documents for third parties * \brief File of class to build ODT documents for third parties
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id$ * \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
@ -115,37 +115,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT"); $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
// Add list of substitution keys // Add list of substitution keys
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>'; $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
/*$dummy=new User($db); $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$dummy=new Societe($db);
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
$texthelp.='{'.$key.'}<br>';
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}*/
$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
//var_dump($listofdir);
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
$texte.= '<table><tr><td>'; $texte.= '<table><tr><td>';
$texte.= '<textarea class="flat" cols="60" name="value1">'; $texte.= '<textarea class="flat" cols="60" name="value1">';
$texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH; $texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;