Laurent Destailleur
|
89068ffef1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
|
2018-12-18 21:55:14 +01:00 |
|
Laurent Destailleur
|
fb8c3f01a4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
|
2018-12-18 21:35:30 +01:00 |
|
Maxime Kohlhaas
|
8fea6338e1
|
Fix #6565
Fix pdf footer height for all documents
|
2018-12-02 18:51:49 +01:00 |
|
Philippe GRAND
|
803505b6b7
|
Standardize and update code
|
2018-09-20 12:27:06 +02:00 |
|
Frédéric FRANCE
|
85df267a5b
|
move phpcs:ignore
|
2018-09-05 20:36:44 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Laurent Destailleur
|
6bf4ef5ef4
|
Fix double "
Fix double "
|
2018-07-16 10:09:13 +02:00 |
|
Laurent Destailleur
|
751ddb46d2
|
Update pdf_blochet.class.php
|
2018-06-30 18:31:32 +02:00 |
|
Philippe GRAND
|
640f7697e4
|
update code
|
2018-06-30 11:45:49 +02:00 |
|
Laurent Destailleur
|
260beed512
|
NEW Generated files are now indexed in database
|
2017-08-18 23:19:55 +02:00 |
|
Laurent Destailleur
|
c4dd689b08
|
Clean unreachable code
|
2016-10-21 11:53:41 +02:00 |
|
Maxime Kohlhaas
|
02aa3f5688
|
Debug double conf
|
2016-04-24 12:14:03 +02:00 |
|
Maxime Kohlhaas
|
651213123f
|
Oups missing $conf
|
2016-04-23 17:45:38 +02:00 |
|
Maxime Kohlhaas
|
930b4a9be0
|
New var name
|
2016-04-23 17:36:55 +02:00 |
|
Maxime Kohlhaas
|
ad26fb2824
|
New option to show details in pdf page foot
|
2016-04-23 17:23:44 +02:00 |
|
Juanjo Menent
|
9d189b3c04
|
NEW #3510 : Working
|
2016-04-03 12:14:51 +02:00 |
|
Juanjo Menent
|
922c57da76
|
NEW #3510 : Standardize module
|
2016-03-23 22:45:04 +01:00 |
|