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

Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php

2017-12-10 21:46:23 +01:00

..

accounting.lib.php

Accountancy - Finish moving admin to specific menu & some cleaning

2017-09-16 06:53:29 +02:00

admin.lib.php

Fix length of month too large

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

agenda.lib.php

Simplify and standardize code for agenda pages

2017-11-25 00:12:45 +01:00

ajax.lib.php

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

2017-12-10 15:46:35 +01: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

Fix look and feel v7

2017-12-04 20:17:07 +01: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

Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and

2017-09-11 03:30:10 +02: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

Work on module builder

2017-11-19 16:26:39 +01:00

fiscalyear.lib.php

…

format_cards.lib.php

…

fourn.lib.php

…

functions2.lib.php

Fix return code

2017-11-17 15:27:59 +01:00

functions_ch.lib.php

…

functions.lib.php

Fix substition for menus title and urls

2017-12-09 15:35:01 +01: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

…

import.lib.php

…

index.html

…

invoice2.lib.php

…

invoice.lib.php

…

json.lib.php

Scrutinizer Auto-Fixes

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

ldap.lib.php

NEW add members types ldap group management

2017-09-16 21:41:30 +02:00

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

Work on reminders

2017-10-31 23:10:29 +01:00

multicurrency.lib.php

…

oauth.lib.php

…

order.lib.php

NEW Show badge with nbr of shipment on shimpen tab of order

2017-11-02 12:38:36 +01:00

parsemd.lib.php

…

payments.lib.php

Fix test on vat amount

2017-12-05 19:47:46 +01:00

pdf.lib.php

Fix ref supplier must be output if it exists, even for free products

2017-11-13 11:30:41 +01:00

prelevement.lib.php

…

price.lib.php

NEW Add a protection so we can't journalize non balanced transactions

2017-11-27 17:12:48 +01:00

product.lib.php

Fix missing the badge on virtual product tab

2017-12-01 17:48:51 +01:00

project.lib.php

Removed useless code

2017-11-22 21:26:24 +01:00

propal.lib.php

…

receiptprinter.lib.php

…

report.lib.php

…

resource.lib.php

…

salaries.lib.php

…

security2.lib.php

generate doc on cron jobs

2017-11-09 23:39:28 +01:00

security.lib.php

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

2017-12-10 21:46:23 +01: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: make vat reports work with expensereports

2017-11-03 21:06:56 +01:00

treeview.lib.php

…

trip.lib.php

…

usergroups.lib.php

Fix style

2017-12-10 15:24:47 +01:00

vat.lib.php

…

website.lib.php

Debug website module

2017-12-10 20:34:35 +01:00

ws.lib.php

…

xcal.lib.php

FIX #7671

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