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
Laurent Destailleur
845f764f93
Increase default size of image
2014-05-07 12:21:14 +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
Raphaël Doursenaud
7852020b3d
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e
Qual: Wrong type in method documentation
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e
Qual: Wrong variable name
2014-04-23 18:24:10 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Laurent Destailleur
1fad693867
Fix: Removed useless strtolower
2014-03-31 02:25:35 +02:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +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
bf735cacbe
Fix PDF: Page break was ko when breaking 2 pages or more.
...
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
5f58bff981
Use _ instead of - for option SUPPLIER_REF_IN_NAME
2014-01-19 22:59:37 +01:00
Laurent Destailleur
cbf6e8563d
New: Add option SUPPLIER_REF_IN_NAME
2014-01-19 22:00:02 +01:00
Laurent Destailleur
b57ed72fc1
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +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
simnandez
59783cf556
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:52:57 +02:00
Florian Henry
b4d858828f
Add ref supplier into muscadet model
2013-09-03 20:07:08 +02:00
simnandez
5cbfa61731
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
Laurent Destailleur
339118d6f4
Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-24 20:20:31 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:05:39 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Laurent Destailleur
c6c4a83850
Fix: Removed deprecated code fo local tax type 7 since we can use now
...
the fiscal stamp that is a better implementation.
2013-06-04 12:04:04 +02:00
fhenry
2b0668bf81
Add paiement mode et delay on PDF muscadet
2013-04-06 13:38:32 +02:00
fhenry
9ff559b033
Add wished delivery date into supplier orders PDF muscadet
2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05
Fix order_supplier and invoice_supplier PDF model name
2013-04-06 13:00:41 +02:00
fhenry
cc465380da
Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)
2013-04-06 12:20:19 +02:00
Grand Philippe
6afa1cb2c9
normalize
2013-03-17 14:40:49 +01:00
Grand Philippe
3c7c5f262f
anglicization of comments
2013-03-15 16:03:03 +01:00
Laurent Destailleur
e97ca67c4a
Fix: Several problem with localtax into PDF generation
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1
Fix: Several problem with localtax into PDF generation
2013-03-07 12:04:12 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
d229d3a594
english standardization
2013-02-22 09:41:56 +01:00
Laurent Destailleur
7d1c51ab77
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
2013-02-13 16:45:53 +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
1667228d74
Fix: Normalize new trigger names.
2012-12-29 16:42:30 +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
