Laurent Destailleur 919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/theme/md/style.css.php

2018-10-24 02:40:57 +02:00

..

accounting.lib.php

…

admin.lib.php

Escape db

2018-03-16 12:17:20 +01:00

agenda.lib.php

Fix duplicate search field

2018-01-16 18:02:36 +01:00

ajax.lib.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-10-24 02:40:57 +02:00

bank.lib.php

Fix badge and use of data-html instead of html tag

2017-12-10 15:46:35 +01:00

barcode.lib.php

Scrutinizer Auto-Fixes

2017-11-27 13:48:36 +00:00

categories.lib.php

…

company.lib.php

OMG!!!! var_dump....

2018-10-05 10:35:32 +02:00

contact.lib.php

NEW add possibility to hide LDAP tab for non admin

2017-10-04 09:13:41 +02:00

contract.lib.php

…

cron.lib.php

…

date.lib.php

Fix missing worload

2018-01-04 19:54:30 +01:00

doc.lib.php

…

doleditor.lib.php

…

donation.lib.php

…

ecm.lib.php

Standardize file names for ECM

2017-11-20 19:40:34 +01:00

emailing.lib.php

…

expedition.lib.php

…

expensereport.lib.php

…

fichinter.lib.php

…

files.lib.php

FIX Deletion of files in migration

2018-07-27 12:33:36 +02:00

fiscalyear.lib.php

…

format_cards.lib.php

…

fourn.lib.php

…

functions2.lib.php

Can remove comment added due to lack of test

2018-03-20 16:46:09 +01:00

functions_ch.lib.php

…

functions.lib.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-10-24 02:40:57 +02:00

functionsnumtoword.lib.php

…

geturl.lib.php

Fix the switch show more/less

2017-12-10 19:03:18 +01:00

holiday.lib.php

…

hrm.lib.php

…

images.lib.php

Fix svg image preview ko

2018-02-13 18:15:39 +01:00

import.lib.php

Update import.lib.php

2018-10-14 10:21:06 +02:00

index.html

…

invoice2.lib.php

…

invoice.lib.php

…

json.lib.php

Must be able to export lockedlog for a dedicated year.

2018-01-25 12:57:36 +01:00

ldap.lib.php

…

loan.lib.php

…

mailmanspip.lib.php

…

member.lib.php

NEW add possibility to hide LDAP tab for non admin

2017-10-04 09:13:41 +02:00

memory.lib.php

…

modulebuilder.lib.php

FIX: modulebuilder: handle 'price' fieldtype

2018-04-11 12:18:54 +02:00

multicurrency.lib.php

…

oauth.lib.php

…

order.lib.php

Several fixes

2017-12-12 16:11:40 +01:00

parsemd.lib.php

…

payments.lib.php

reduce complexity of payments.lib.php

2018-10-14 10:56:03 +02:00

pdf.lib.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-10-04 17:50:19 +02:00

prelevement.lib.php

…

price.lib.php

Code comment

2018-01-05 01:26:57 +01:00

product.lib.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-01-11 01:03:13 +01:00

project.lib.php

Fix for multicompany

2018-02-06 10:57:53 +01:00

propal.lib.php

…

receiptprinter.lib.php

…

report.lib.php

…

resource.lib.php

FIX #8189

2018-02-15 13:40:17 +01:00

salaries.lib.php

…

security2.lib.php

Code comment

2018-01-24 14:37:26 +01:00

security.lib.php

FIX : missing english name for object

2018-04-27 20:54:48 +02:00

sendings.lib.php

Change order or field

2017-12-02 11:34:56 +01:00

signature.lib.php

Introduce main_doc into table of objects to know what is main doc.

2017-10-19 11:40:40 +02:00

stock.lib.php

…

supplier_proposal.lib.php

…

tax.lib.php

Fix log and duplicate vat_by_date function

2018-03-27 14:37:29 +02:00

treeview.lib.php

…

trip.lib.php

…

usergroups.lib.php

Debug blockedlog:

2017-12-15 16:56:08 +01:00

vat.lib.php

…

website.lib.php

Fix output dir of grab

2018-02-20 06:02:53 +01:00

ws.lib.php

…

xcal.lib.php

FIX #7671

2017-10-22 03:22:31 +02:00