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

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/filefunc.inc.php

2017-08-17 22:21:30 +02:00

..

accounting.lib.php

Remove old code (journal)

2017-05-25 05:32:13 +02:00

admin.lib.php

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

2017-08-11 19:56:17 +02:00

agenda.lib.php

List before

2017-06-27 10:37:00 +02:00

ajax.lib.php

Fix for compatibility

2017-07-28 18:09:38 +02:00

bank.lib.php

…

barcode.lib.php

Fix use command standard @... to mark a change in official code

2017-07-17 20:09:19 +02:00

categories.lib.php

…

company.lib.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

contact.lib.php

…

contract.lib.php

…

cron.lib.php

…

date.lib.php

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

2017-08-04 15:29:54 +02:00

doc.lib.php

…

doleditor.lib.php

…

donation.lib.php

…

ecm.lib.php

…

emailing.lib.php

…

expedition.lib.php

…

expensereport.lib.php

New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE

2017-07-05 10:44:52 +02:00

fichinter.lib.php

…

files.lib.php

Fix pb in ecm

2017-08-01 18:44:34 +02:00

fiscalyear.lib.php

…

format_cards.lib.php

…

fourn.lib.php

…

functions2.lib.php

Several fixes (permission, missing method or class) in REST APIs

2017-07-28 11:03:30 +02:00

functions_ch.lib.php

…

functions.lib.php

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

2017-08-02 17:56:09 +02:00

functionsnumtoword.lib.php

…

geturl.lib.php

FIX Phpunit on file submit with REST API

2017-05-20 17:09:15 +02:00

holiday.lib.php

…

hrm.lib.php

…

images.lib.php

Add tool to fix missing thumbs

2017-08-01 15:53:22 +02:00

import.lib.php

…

index.html

…

invoice2.lib.php

…

invoice.lib.php

…

json.lib.php

Fix php 7.2

2017-06-20 00:50:30 +02:00

ldap.lib.php

…

loan.lib.php

…

mailmanspip.lib.php

…

member.lib.php

…

memory.lib.php

…

modulebuilder.lib.php

Debug modulebuilder

2017-08-05 11:44:27 +02:00

multicurrency.lib.php

…

oauth.lib.php

…

order.lib.php

…

parsemd.lib.php

…

payments.lib.php

…

pdf.lib.php

Fix font size

2017-08-07 15:43:42 +02:00

prelevement.lib.php

…

price.lib.php

…

product.lib.php

Fix look and feel v6

2017-08-02 14:10:43 +02:00

project.lib.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

propal.lib.php

…

receiptprinter.lib.php

…

report.lib.php

…

resource.lib.php

…

salaries.lib.php

…

security2.lib.php

Fix combo for multicompany not visible where there is other hooks by

2017-07-31 18:16:41 +02:00

security.lib.php

Fix: better check and security

2017-06-15 21:51:31 +02:00

sendings.lib.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

stock.lib.php

…

supplier_proposal.lib.php

…

tax.lib.php

Merge remote-tracking branch 'origin/5.0' into 6.0

2017-08-17 22:03:26 +02:00

treeview.lib.php

Fix menu editor

2017-07-30 19:41:45 +02:00

trip.lib.php

…

usergroups.lib.php

New: big refactorization of multicompany transverse mode

2017-06-06 10:23:33 +02:00

vat.lib.php

…

website.lib.php

Enhance image replacement

2017-07-28 17:17:40 +02:00

ws.lib.php

…

xcal.lib.php

…