Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php

2018-05-05 14:40:39 +02:00

..

accounting.lib.php

…

admin.lib.php

Move setup of email for module module into email templates

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

agenda.lib.php

Fix duplicate search field

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

ajax.lib.php

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

2018-04-13 23:19:22 +02:00

asset.lib.php

Standardize code

2018-04-29 19:52:14 +02:00

bank.lib.php

…

barcode.lib.php

…

categories.lib.php

…

company.lib.php

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

2018-04-29 20:11:47 +02:00

contact.lib.php

…

contract.lib.php

…

cron.lib.php

…

date.lib.php

Update date.lib.php

2018-04-27 09:55:44 +02:00

doc.lib.php

FIX: supplier discounts: wrong source invoice ref in DOCs

2018-03-05 11:49:04 +01:00

doleditor.lib.php

…

donation.lib.php

…

ecm.lib.php

…

emailing.lib.php

…

expedition.lib.php

…

expensereport.lib.php

…

fichinter.lib.php

…

files.lib.php

NEW Add dol_is_link function

2018-04-25 17:59:05 +02:00

fiscalyear.lib.php

…

format_cards.lib.php

…

fourn.lib.php

Contact tab after main tab

2018-03-08 20:35:50 +01:00

functions2.lib.php

Debug API for ticket module

2018-04-29 18:06:31 +02:00

functions_ch.lib.php

…

functions.lib.php

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

2018-05-05 14:40:39 +02:00

functionsnumtoword.lib.php

…

geturl.lib.php

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02: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

…

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

Make sending of email for member module ok with new email template archi

2018-03-23 19:35:25 +01:00

memory.lib.php

…

modulebuilder.lib.php

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

2018-04-12 13:31:14 +02: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

…

parsemd.lib.php

…

payments.lib.php

Clean duplicate code for payment page. Redirect on common page.

2018-03-25 19:15:55 +02:00

pdf.lib.php

Removed deprecated FPDI option and reorganise PDF setup page

2018-04-30 09:28:24 +02:00

prelevement.lib.php

…

price.lib.php

Fix phpunit

2018-04-27 09:18:25 +02:00

product.lib.php

variant on services

2018-04-24 11:01:17 +02:00

project.lib.php

Add tab "time spent" in project view. Can swith gantt/list.

2018-05-04 11:25:21 +02:00

propal.lib.php

Fix: use "multidir_output" instead "dir_output"

2018-02-26 11:35:30 +01:00

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

Code comment

2018-05-01 20:31:57 +02:00

sendings.lib.php

Clean code from $var = True

2018-04-22 19:27:37 +02:00

signature.lib.php

…

stock.lib.php

…

supplier_proposal.lib.php

NEW Add tab contact on supplier proposals

2018-03-16 10:21:53 +01:00

tax.lib.php

Fix phpcs

2018-04-29 20:18:50 +02:00

ticketsup.lib.php

Debug ticketsup

2018-04-19 15:11:26 +02:00

treeview.lib.php

…

trip.lib.php

…

usergroups.lib.php

Clean code

2018-04-15 20:09:09 +02:00

vat.lib.php

Add linked file tab to vat

2018-01-16 16:22:32 +01:00

website.lib.php

Fix scrutinizer errors

2018-03-04 11:09:53 +01:00

ws.lib.php

…

xcal.lib.php

…