Laurent Destailleur
|
5e0946bdc2
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
|
2014-11-05 16:37:07 +01:00 |
|
Laurent Destailleur
|
167ec6917a
|
Can add prefix into generated filename. This will save time for script
to build kit of files for book keeper.
|
2014-11-01 20:15:51 +01:00 |
|
aspangaro
|
57f49ec5d4
|
GPLv3
|
2014-10-30 20:41:08 +01:00 |
|
Marcos García de La Fuente
|
4b3191b64e
|
Removed deprecated usage of facture_pdf_create
|
2014-09-16 20:49:05 +02:00 |
|
Marcos García de La Fuente
|
9fbd7806f0
|
More substitutions
|
2014-06-12 11:31:53 +02:00 |
|
Raphaël Doursenaud
|
c48c3a9d91
|
Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
|
2014-05-26 13:51:25 +02:00 |
|
Laurent Destailleur
|
e2b63bb8dd
|
Fix: Bad date ranges
|
2013-07-15 21:47:45 +02:00 |
|
Laurent Destailleur
|
28c28bd217
|
New: Add option excludethirdparties and onlythirdparties into merge pdf
scripts.
|
2013-07-15 20:56:43 +02:00 |
|
Laurent Destailleur
|
17f3d98fb3
|
New: Add option to exclude some thirdparties
|
2013-07-15 18:44:59 +02:00 |
|
Laurent Destailleur
|
1d8b9949d6
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
|
2013-06-24 20:02:02 +02:00 |
|
Regis Houssin
|
05bd035488
|
Fix: convert line delimiters
|
2013-06-24 17:34:22 +02:00 |
|
Regis Houssin
|
c9a71439b2
|
Fix: EOF
|
2013-06-05 16:24:32 +02:00 |
|
Laurent Destailleur
|
49735b8d39
|
New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
merge PDF that has one payment on a specific bank account.
|
2013-05-15 17:52:56 +02:00 |
|
Laurent Destailleur
|
840dcfec38
|
Fix: Bad detection of PDF format.
|
2013-04-29 09:25:42 +02:00 |
|
Laurent Destailleur
|
4d0dd0d56c
|
Fix: Function to generate pdf
|
2013-04-10 20:50:05 +02:00 |
|
Laurent Destailleur
|
70b7cb1fa3
|
Fix: Restore suffix
|
2013-04-10 19:50:54 +02:00 |
|
Laurent Destailleur
|
f1f7ff315f
|
Fix: CRLF
|
2013-01-16 15:54:07 +01:00 |
|
Laurent Destailleur
|
297c10d16b
|
Qual: externalise code of merging PDFs into a library.
|
2013-01-14 11:39:30 +01:00 |
|