Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b
Fix: CRLF
2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f
Fix: When number reach 9999 with default numbering module, next number
...
will be 10000 instead of 0000 and error.
2014-05-21 19:44:53 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Raphaël Doursenaud
e561cc87f7
Qual: Wrong variable name
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2abbc8845f
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
0d92abc037
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
BENKE Charles
0b78a04756
Update doc_generic_project_odt.modules.php
2014-04-19 12:32:01 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Laurent Destailleur
f115501ddf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-24 00:16:47 +01:00
Laurent Destailleur
466de67b5b
Fix: Solve pb of too many embedded tables
2014-03-23 20:18:07 +01:00
Laurent Destailleur
2f10198064
Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
...
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
358175b357
Merge remote-tracking branch 'origin/3.4' into develop
2013-11-20 23:48:06 +01:00
Florian Henry
f88e9425ec
Remove useless code (the tag replacement into footer and header is
...
already done by SetVar method)
2013-11-20 14:01:43 +01:00
Laurent Destailleur
16bcd6b5e5
Add error management to avoid blank page when there is no permission to
...
read file.
2013-10-23 19:19:54 +02:00
Maxime Kohlhaas
845deb9a63
Add multilang management in ODT models
2013-10-08 09:17:04 +02:00
Laurent Destailleur
c2ba7956ab
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48
Fix: Better management of pdf generation when tcpdf not available.
2013-09-22 19:53:27 +02:00
Florian Henry
29396bd51a
Change SQL syntax
2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb
adjust spacing
2013-08-28 16:50:38 +02:00
Florian Henry
650689d294
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-08-28 16:49:22 +02:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Cédric Salvador
35faff04e9
fix pdf model import
2013-07-23 15:59:41 +02:00
Florian Henry
ee82330292
On going sync/merge from other repo
2013-07-17 19:17:54 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
jfefe
8835868749
Implement MAIN_DOC_USE_TIMING into project and order ODT
2013-04-26 08:48:44 +02:00
fhenry
ee4839c92e
Better management for ODT to PDF
2013-04-22 15:50:26 +02:00
fhenry
413ee7ec78
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if
...
libreoffice/jodconverter/exec shell right)
2013-04-20 10:44:01 +02:00
Laurent Destailleur
3cec5bfc40
doxygen
2013-04-14 11:22:00 +02:00
fhenry
629ef78dc8
Add subtitution inside header and fotter document
2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2
Add hook for substitution
2013-04-11 17:31:24 +02:00
fhenry
98ddd02a32
Qual : PHP Code_Sniffer
2013-04-10 19:55:21 +02:00
fhenry
c2be118efd
Add more information in ODT project template
2013-03-28 20:51:00 +01:00
fhenry
9507f4258b
Add inforamtion on Project into ODT project
2013-03-26 23:32:22 +01:00
fhenry
9dd4ed9cb8
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 19:28:34 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
59a305f6f1
New: no dash line if last item.
2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5
New: Add option to add slashes lines between lines into PDF.
2012-11-21 19:07:03 +01:00
Laurent Destailleur
19c617e4a0
Fix: Solve double ";;"
2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0
Fix: Not enought space for free text. To avoid to edit again and again
...
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73
Again 2 pixels missings
2012-11-03 00:37:10 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
a68483d72f
Uniformize code.
2012-09-19 14:49:13 +02:00
