Laurent Destailleur 7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php

2017-06-03 01:55:05 +02:00

..

accounting.lib.php

Remove old code (journal)

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

admin.lib.php

Look and feel v6

2017-05-13 13:02:55 +02:00

agenda.lib.php

Clean code. Using 2 different key for a param is not more allowed.

2017-05-05 18:42:11 +02:00

ajax.lib.php

FIX #6784

2017-05-23 15:51:39 +02:00

bank.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

barcode.lib.php

…

categories.lib.php

…

company.lib.php

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

2017-05-29 10:41:51 +02:00

contact.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

contract.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

cron.lib.php

Fix responsive

2017-01-17 20:04:41 +01:00

date.lib.php

Fix error in total of tasks

2017-01-20 14:36:56 +01:00

doc.lib.php

NEW : interface

2016-11-25 11:04:42 +01:00

doleditor.lib.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 13:02:29 +02:00

donation.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

ecm.lib.php

…

emailing.lib.php

Set hidden option back

2016-12-10 11:49:35 +01:00

expedition.lib.php

…

expensereport.lib.php

Review old payment page for expense report

2017-05-27 08:18:53 +02:00

fichinter.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

files.lib.php

Removed duplicated code

2017-06-01 12:11:45 +02:00

fiscalyear.lib.php

…

format_cards.lib.php

…

fourn.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

functions2.lib.php

Replace {extra_ with {user_extra_

2017-05-31 19:45:54 +02:00

functions_ch.lib.php

…

functions.lib.php

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

2017-06-03 01:55:05 +02:00

functionsnumtoword.lib.php

Fix scrutinizer warning

2017-04-15 03:14:31 +02:00

geturl.lib.php

FIX Phpunit on file submit with REST API

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

holiday.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

hrm.lib.php

…

images.lib.php

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

2017-01-21 21:56:24 +01:00

import.lib.php

…

index.html

…

invoice2.lib.php

…

invoice.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

json.lib.php

…

ldap.lib.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

loan.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

mailmanspip.lib.php

…

member.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

memory.lib.php

…

multicurrency.lib.php

…

oauth.lib.php

Fix several problems into OAuth2 module.

2017-01-06 19:58:46 +01:00

order.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

parsemd.lib.php

Fix duplicate include.

2017-03-21 16:46:12 +01:00

payments.lib.php

Code standardization on online payment code

2017-05-13 14:03:09 +02:00

pdf.lib.php

Fix new generic substitution system

2017-06-01 13:32:20 +02:00

prelevement.lib.php

Fix NNE has been replaced with ICS

2016-07-02 11:26:55 +02:00

price.lib.php

Fix several running time errors

2017-01-16 09:30:28 +01:00

product.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

project.lib.php

NEW Can read time spent of others (hierarchy only or all if granted)

2017-06-02 13:24:45 +02:00

propal.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

receiptprinter.lib.php

…

report.lib.php

FIX serious bugs in accounting (error management, transactions, bad

2017-04-29 14:54:21 +02:00

resource.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

salaries.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

security2.lib.php

Complete work for mutualizing generic substitution system.

2017-06-01 01:57:22 +02:00

security.lib.php

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

2017-06-03 01:55:05 +02:00

sendings.lib.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

stock.lib.php

Fix warehouse presentation

2016-12-10 22:13:06 +01:00

supplier_proposal.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

tax.lib.php

Support of preview for pdf with several pages

2017-04-12 11:38:55 +02:00

treeview.lib.php

FIX protection against infinite loop on hierarchy

2017-02-21 23:52:13 +01:00

trip.lib.php

…

usergroups.lib.php

Removed deprecated code

2017-05-29 15:09:13 +02:00

vat.lib.php

VAT payment card - Uniformize presentation

2016-12-09 06:59:24 +01:00

website.lib.php

Work on module website

2017-02-24 21:13:40 +01:00

ws.lib.php

…

xcal.lib.php

…