Commit Graph

188 Commits

Author SHA1 Message Date
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Frédéric FRANCE
a3dd454f86 The property db does not exist on mod_arctic 2019-12-13 08:00:34 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Philippe GRAND
a0303e903a internationalization 2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea internationalization 2019-10-21 09:43:34 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1e49fd0d45 Translate 2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Philippe GRAND
18a56c7ef2 add some translation 2019-08-01 15:59:37 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Philippe GRAND
4d4b5abb7e translation 2019-06-22 12:08:08 +02:00
Frédéric FRANCE
315349a681 replace @public by @var 2019-04-18 18:41:02 +02:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
Philippe GRAND
327ac2973e update code 2019-04-09 09:27:25 +02:00
Philippe GRAND
d21dbe915b update with html5 compliant code 2019-03-14 14:26:08 +01:00
Frédéric FRANCE
c5c27fdb77 add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
e7706192b5 doc comment 2019-02-24 10:08:42 +01:00
Laurent Destailleur
0d8447ad39 Merge branch 'develop' of https://github.com/wdammak/dolibarr into
wdammak-develop

# Conflicts:
#	htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
2019-02-12 16:58:55 +01:00
Philippe Grand
92ec149fb6 Update modules_fichinter.php 2019-02-09 11:05:52 +01:00
Philippe GRAND
869f59de96 language internationalization 2019-02-09 10:56:59 +01:00
Laurent Destailleur
7625eb7cd4 Fix missing error management after afterPDFCreation hook.
Removed dead code
2019-02-08 19:54:24 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
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
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +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
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe Grand
b7304e3d82 Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Frédéric FRANCE
70ba223788 move phpcs:ignore 2018-09-06 21:27:18 +02:00