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

Work on ODT generation

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-20 22:09:42 +00:00
parent 5be8bdbd27
commit 5782c17c0f
3 changed files with 59 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/core/class/commondocgenerator.class.php
View File

@ -42,7 +42,7 @@ class CommonDocGenerator
*
* @param $mysoc
*/
function get_substitutionarray_user($user)
function get_substitutionarray_user($user,$outputlangs)
{
global $conf;
@ -65,7 +65,7 @@ class CommonDocGenerator
*
* @param $mysoc
*/
function get_substitutionarray_mysoc($mysoc)
function get_substitutionarray_mysoc($mysoc,$outputlangs)
{
global $conf;
@ -100,6 +100,42 @@ class CommonDocGenerator
}
/**
* Define array with couple subtitution key => subtitution value
*
* @param $object
*/
function get_substitutionarray_thirdparty($object,$outputlangs)
{
global $conf;
return array(
'company_name'=>$object->name,
'company_email'=>$object->email,
'company_phone'=>$object->phone,
'company_fax'=>$object->fax,
'company_address'=>$object->address,
'company_zip'=>$object->zip,
'company_town'=>$object->town,
'company_country_code'=>$object->country_code,
'company_country'=>$outputlangs->transnoentitiesnoconv("Country".$object->country_code),
'company_web'=>$object->url,
'company_barcode'=>$object->gencod,
'company_vatnumber'=>$object->tva_intra,
'company_customercode'=>$object->code_client,
'company_suppliercode'=>$object->code_fournisseur,
'company_customeraccountancycode'=>$object->code_compta,
'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
'company_juridicalstatus'=>$object->forme_juridique,
'company_capital'=>$object->capital,
'company_idprof1'=>$object->idprof1,
'company_idprof2'=>$object->idprof2,
'company_idprof3'=>$object->idprof3,
'company_idprof4'=>$object->idprof4,
'company_note'=>$object->note
);
}
}
?>

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

@ -86,47 +86,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
}
/**
* Define array with couple subtitution key => subtitution value
*
* @param $object
*/
function get_substitutionarray_thirdparty($object)
{
global $conf;
return array(
'company_name'=>$object->name,
'company_email'=>$object->email,
'company_phone'=>$object->phone,
'company_fax'=>$object->fax,
'company_address'=>$object->address,
'company_zip'=>$object->zip,
'company_town'=>$object->town,
'company_country'=>$object->country,
'company_web'=>$object->url,
'company_barcode'=>$object->gencod,
'company_vatnumber'=>$object->tva_intra,
'company_customercode'=>$object->code_client,
'company_suppliercode'=>$object->code_fournisseur,
'company_customeraccountancycode'=>$object->code_compta,
'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
'company_juridicalstatus'=>$object->forme_juridique,
'company_capital'=>$object->capital,
'company_idprof1'=>$object->idprof1,
'company_idprof2'=>$object->idprof2,
'company_idprof3'=>$object->idprof3,
'company_idprof4'=>$object->idprof4,
'company_note'=>$object->note
);
}
/**
* Define array with couple subtitution key => subtitution value
*
* @param $object
*/
function get_substitutionarray_object($object)
function get_substitutionarray_object($object,$outputlangs)
{
global $conf;
@ -135,13 +100,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_ref'=>$object->ref,
'object_ref_customer'=>$object->ref_client,
'object_ref_supplier'=>$object->ref_fournisseur,
'object_date'=>$object->date,
'object_date_creation'=>$object->date_creation,
'object_date_validation'=>$object->date_validation,
'object_total_ht'=>$object->total_ht,
'object_total_vat'=>$object->total_tva,
'object_total_ttc'=>$object->total_ttc,
'object_vatrate'=>$object->tva,
'object_date'=>dol_print_date($object->date,'day'),
'object_date_creation'=>dol_print_date($object->date_creation,'dayhour'),
'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
'object_total_ht'=>price($object->total_ht),
'object_total_vat'=>price($object->total_tva),
'object_total_ttc'=>price($object->total_ttc),
'object_vatrate'=>vatrate($object->tva),
'object_note_private'=>$object->note,
'object_note'=>$object->note_public
);
@ -187,7 +152,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Add list of substitution keys
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
$dummy=new User($db);
$tmparray=$this->get_substitutionarray_user($dummy);
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -196,7 +161,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$dummy=new Societe($db);
$tmparray=$this->get_substitutionarray_mysoc($dummy);
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -204,7 +169,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$tmparray=$this->get_substitutionarray_thirdparty($dummy);
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -345,7 +310,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
);
// Make substitutions
$tmparray=$this->get_substitutionarray_user($user);
$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
//var_dump($tmparray); exit;
foreach($tmparray as $key=>$value)
{
@ -365,7 +330,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
}
}
$tmparray=$this->get_substitutionarray_mysoc($mysoc);
$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
//var_dump($tmparray); exit;
foreach($tmparray as $key=>$value)
{
@ -385,7 +350,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
}
}
$tmparray=$this->get_substitutionarray_thirdparty($socobject);
$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
foreach($tmparray as $key=>$value)
{
try {
@ -404,7 +369,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
}
}
$tmparray=$this->get_substitutionarray_object($object);
$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
foreach($tmparray as $key=>$value)
{
try {

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

@ -76,41 +76,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
/**
* Define array with couple subtitution key => subtitution value
*
* @param $object
*/
function get_substitutionarray_thirdparty($object)
{
global $conf;
return array(
'company_name'=>$object->name,
'company_email'=>$object->email,
'company_phone'=>$object->phone,
'company_fax'=>$object->fax,
'company_address'=>$object->address,
'company_zip'=>$object->zip,
'company_town'=>$object->town,
'company_country'=>$object->country,
'company_web'=>$object->url,
'company_barcode'=>$object->gencod,
'company_vatnumber'=>$object->tva_intra,
'company_customercode'=>$object->code_client,
'company_suppliercode'=>$object->code_fournisseur,
'company_customeraccountancycode'=>$object->code_compta,
'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
'company_juridicalstatus'=>$object->forme_juridique,
'company_capital'=>$object->capital,
'company_idprof1'=>$object->idprof1,
'company_idprof2'=>$object->idprof2,
'company_idprof3'=>$object->idprof3,
'company_idprof4'=>$object->idprof4,
'company_note'=>$object->note
);
}
/** \brief Return description of a module
* \return string Description
*/
@ -151,7 +116,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
// Add list of substitution keys
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
$dummy=new User($db);
$tmparray=$this->get_substitutionarray_user($dummy);
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -160,7 +125,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$dummy=new Societe($db);
$tmparray=$this->get_substitutionarray_mysoc($dummy);
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -168,7 +133,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$nb++;
if ($nb >= 5) { $texthelp.='...<br>'; break; }
}
$tmparray=$this->get_substitutionarray_thirdparty($dummy);
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
$nb=0;
foreach($tmparray as $key => $val)
{
@ -289,7 +254,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
//print $odfHandler->__toString()."\n";
// Make substitutions
$tmparray=$this->get_substitutionarray_user($user);
$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
//var_dump($tmparray); exit;
foreach($tmparray as $key=>$value)
{
@ -310,7 +275,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
}
}
$tmparray=$this->get_substitutionarray_mysoc($mysoc);
$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
//var_dump($tmparray); exit;
foreach($tmparray as $key=>$value)
{
@ -330,7 +295,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
}
}
$tmparray=$this->get_substitutionarray_thirdparty($object);
$tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs);
foreach($tmparray as $key=>$value)
{
try {