Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,692 Commits 36 Branches 189 Tags
7b1b51e752fc285850cae897637ed1a85421c660
Commit Graph

184 Commits

Author SHA1 Message Date
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
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
f1e40b4b22 translations 2019-06-27 09:31:42 +02:00
Laurent Destailleur
ec922d3d17 Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF 2019-05-20 14:54:09 +02:00
Frédéric FRANCE
bed3ed705c Update mod_contract_magre.php 
The property db does not exist on mod_contract_magre.
 2019-04-20 09:31:53 +02:00
Frédéric FRANCE
315349a681 replace @public by @var 2019-04-18 18:41:02 +02:00
Philippe GRAND
f833bbcb32 update code 2019-04-09 09:21:34 +02:00
Laurent Destailleur
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
Frédéric FRANCE
b69f63e7d7 replace html by html5 2019-03-10 09:32:19 +01:00
Frédéric FRANCE
bd2e541fd6 add visibility 2019-03-01 18:28:51 +01:00
Frédéric FRANCE
796ea6f4ea add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +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
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
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
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
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +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
Philippe GRAND
e9e6d8b9b5 Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 16:10:56 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Frédéric FRANCE
c6291b3e08 Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68 Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
b80d2fa12d fill empty catch with log 2018-10-26 21:09:46 +02:00
Philippe Grand
d5003c9d3c Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00