Laurent Destailleur
9add45aea3
Qual: Mutualize code.
2014-05-07 13:22:02 +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
Raphaël Doursenaud
12ba751432
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0cb58e0b52
Qual: Wrong variable name
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
8b5b7203d5
Qual: Missing global declaration
2014-04-23 18:24:04 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +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
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
Florian Henry
7625629491
Fix [ bug #1294 ] Expedition model Merou having problems with long names
2014-03-15 16:40:29 +01:00
Florian Henry
18c4d890dd
Fix [ bug #1283 ] ROUGET Shipment PDF
2014-03-15 16:32:46 +01:00
Marcos García de La Fuente
4433f6e8b7
Missing copyright info
2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3
Corrected array indentation
2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +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
Laurent Destailleur
ca560b4f98
Fix: [ bug #1076 ] Shipment/Delivery PDFs
2013-10-23 18:02:16 +02:00
Maxime Kohlhaas
845deb9a63
Add multilang management in ODT models
2013-10-08 09:17:04 +02:00
Laurent Destailleur
072247f1c8
Fix: Use correct translation key
2013-09-25 19:07:25 +02:00
Laurent Destailleur
9826b202e9
New: Provide both tags for string formated amount and numeric amount
...
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
2013-09-16 12:42:01 +02:00
Laurent Destailleur
3a8784a6de
Qual: Mutualize code
2013-09-07 19:08:08 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Maxime Kohlhaas
7c24686532
Add good vars for odt generation
2013-07-19 17:27:22 +02:00
Maxime Kohlhaas
3c7f4a3548
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:55:33 +02:00
Maxime Kohlhaas
9d931b7b05
Task # 862 : ODT templates on shipment
2013-07-10 15:54:28 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +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
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Grand Philippe
6afa1cb2c9
normalize
2013-03-17 14:40:49 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
frederic34
9333fdb97f
WIP : Admin for Carriers
2013-02-23 15:23:33 +01:00
frederic34
de4bc7f39d
Fix : It was a bad idea to add COL in the code name of new carriers
2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520
New: Add some carrier
2013-02-21 11:23:12 +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
dbfe71922e
Fix: Avoid warnings
2012-10-31 12:35:52 +01:00
Maxime Kohlhaas
240d310a7f
Fix : shipment PDF rouget wasn't using the right var to access related internal contact
2012-10-31 08:57:56 +01:00
