Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New: Add object_hour as substitution tag for opendocument generation.

Browse Source
This commit is contained in:
Laurent Destailleur
2013-06-08 18:12:32 +02:00
parent 5d1dfdc7c1
commit 5a77828e62
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@@ -6,15 +6,17 @@ English Dolibarr ChangeLog
For users:
- New: [ task #877 ] Reorganize menus.
- New: [ task #858 ] Holiday module: note on manual holiday assignation.
- New: [ task #892 ] Add option in thridparty customer/supplier admin to hide non active in select_company method.
- New: [ task #531 ] Add a workload on tasks.
- New: [ task #892 ] Add option in thirdparty customer/supplier admin to hide non active
companies in select_company method.
- New: [ task #531 ] Add a workload field on tasks.
- New: Add graph of bank account input/output into input-output report page.
- New: Add script export-bank-receipts.
- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge.
PDF that has one payment on a specific bank account.*
- New: Add script export-bank-receipts.php
- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that
has one payment on a specific bank account.*
- New: [ task #901 ] Add Extrafeild on Fiche Inter.
- New: Show process id in all command line scripts.
- New: Module mailman can subscribe/unsubscribe to ML according to categories of member.
- New: Module mailman can subscribe/unsubscribe to ML according to categories or type of member.
- New: New: Add object_hour as substitution tag for opendocument generation.
For translators:
- Normalized sort order of all languages files with english ref file.
@@ -22,7 +24,9 @@ For translators:
For developers:
- New: DolGraph can build graph with three lines.
- New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO.
- New: Show version of client lib used by mysql drivers
- New: Show version of client lib used by mysql drivers.
- New: Add function to get content of an url (using all dolibarr setup like timeout, proxies...)
- New: Upgrade lib of TCPDF to 6.0
***** ChangeLog for 3.4 compared to 3.3.2 *****

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

@@ -219,8 +219,8 @@ abstract class CommonDocGenerator
return $array_other;
}
/**
* Define array with couple substitution key => substitution value
*
@@ -238,7 +238,8 @@ abstract class CommonDocGenerator
$array_key.'_ref'=>$object->ref,
$array_key.'_ref_ext'=>$object->ref_ext,
$array_key.'_ref_customer'=>$object->ref_client,
$array_key.'_date'=>dol_print_date($object->date,'day'),
$array_key.'_hour'=>dol_print_date($object->date,'hour'),
$array_key.'_date'=>dol_print_date($object->date,'day'),
$array_key.'_date_end'=>dol_print_date($object->fin_validite,'day'),
$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
$array_key.'_date_modification'=>dol_print_date($object->date_modification,'day'),

3
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@@ -102,6 +102,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
'object_ref'=>$object->ref,
'object_ref_ext'=>$object->ref_ext,
'object_ref_customer'=>$object->ref_client,
'object_hour'=>dol_print_date($object->date,'hour'),
'object_date'=>dol_print_date($object->date,'day'),
'object_date_delivery'=>dol_print_date($object->date_livraison,'dayhour'),
'object_date_creation'=>dol_print_date($object->date_creation,'day'),
@@ -544,7 +545,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
$this->error=$e->getMessage();
return -1;
}
}
}
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));

7
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@@ -112,6 +112,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_ref_customer'=>$object->ref_client,
'object_ref_supplier'=>(! empty($object->ref_fournisseur)?$object->ref_fournisseur:''),
'object_source_invoice_ref'=>$invoice_source->ref,
'object_hour'=>dol_print_date($object->date,'hour'),
'object_date'=>dol_print_date($object->date,'day'),
'object_date_limit'=>dol_print_date($object->date_lim_reglement,'day'),
'object_date_creation'=>dol_print_date($object->date_creation,'day'),
@@ -339,9 +340,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
$newfiletmp=$objectref.'_'.$newfiletmp;
// Get extension (ods or odt)
$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
@@ -524,7 +525,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$this->error=$e->getMessage();
return -1;
}
}
}
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));