Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

64 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +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
1d84dcbe17 update code 2019-04-09 09:34:26 +02:00
Frédéric FRANCE
7e31ca48d8 add visibility 2019-02-28 22:07:48 +01:00
Frédéric FRANCE
e7706192b5 doc comment 2019-02-24 10:08:42 +01:00
Frédéric FRANCE
152d8ffcbf Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2 GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +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
Laurent Destailleur
97248a830b FIX #10440 2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b FIX #10440 2019-01-30 16:24:27 +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
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Frédéric FRANCE
b80d2fa12d fill empty catch with log 2018-10-26 21:09:46 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe Grand
239be3b58c Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Philippe GRAND
50073fe98d Standardize and update code 2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d Standardize and update code 2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3 Standardize and update code 2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9 Standardize and update code 2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733 Standardize and update code 2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be Standardize and update code 2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af Standardize and update code 2018-09-20 12:00:10 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f Standardize and update code 2018-09-19 16:31:36 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Laurent Destailleur
963d5eeddf Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Frédéric FRANCE
7799774ca1 move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
9c3352d2de move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00