Laurent Destailleur 8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php		2019-03-02 19:13:37 +01:00
..
accounting.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
admin.lib.php	update with html5 compliant code	2019-02-19 17:42:12 +01:00
agenda.lib.php	update with html5 compliant code	2019-02-19 17:42:12 +01:00
ajax.lib.php	NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE	2019-03-02 12:16:37 +01:00
asset.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
bank.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
barcode.lib.php	update doc in barcode.lib.php	2019-02-13 22:23:14 +01:00
categories.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
company.lib.php	Company Lib : Fix contact events with no thirdparty	2019-02-21 09:49:46 +01:00
contact.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
contract.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
cron.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
date.lib.php	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
doc.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
doleditor.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
donation.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
ecm.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
emailing.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
expedition.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
expensereport.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
fichinter.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
files.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
fiscalyear.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
format_cards.lib.php	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
fourn.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
functions_ch.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
functions.lib.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-02 19:13:37 +01:00
functions2.lib.php	Fix declare functions2.lib.php for donations API	2019-02-24 20:51:00 +01:00
functionsnumtoword.lib.php	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
geturl.lib.php	IFTTT	2019-02-28 11:00:40 +01:00
holiday.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
hrm.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
images.lib.php	Update images.lib.php	2019-02-12 23:39:59 +01:00
import.lib.php	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
index.html
invoice.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
invoice2.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
json.lib.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-03-02 18:30:17 +01:00
ldap.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
loan.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
mailmanspip.lib.php	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
member.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
memory.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
modulebuilder.lib.php	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
multicurrency.lib.php
oauth.lib.php	Enhance OAuth module to store the stripe account in llx_oauth_token	2018-03-08 19:51:18 +01:00
order.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
parsemd.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
payments.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
pdf.lib.php	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
prelevement.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
price.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
product.lib.php	FIX wrong class name "CUnits instead CMeasuringUnits"	2019-02-19 09:24:30 +01:00
project.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
propal.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
receiptprinter.lib.php	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
reception.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
report.lib.php	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
resource.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
salaries.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
security.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
security2.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
sendings.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
signature.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
stock.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
supplier_proposal.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
tax.lib.php	fix doc in tax.lib.php	2019-02-12 23:25:26 +01:00
ticket.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
treeview.lib.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-12 19:02:19 +01:00
trip.lib.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
usergroups.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
vat.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
website.lib.php	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
ws.lib.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
xcal.lib.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00