Laurent Destailleur 5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php

2018-10-19 14:27:15 +02:00

..

accounting.lib.php

…

admin.lib.php

FIX Maxi debug to allow to load chart of account with multicompany

2018-09-17 21:02:07 +02:00

agenda.lib.php

Fix responsive

2018-09-16 12:48:36 +02: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

Upgrade works

2018-05-11 21:48:22 +02:00

bank.lib.php

…

barcode.lib.php

…

categories.lib.php

…

company.lib.php

Merge

2018-10-09 17:06:08 +02:00

contact.lib.php

…

contract.lib.php

…

cron.lib.php

…

date.lib.php

remove var_dump

2018-10-12 22:34:23 +02:00

doc.lib.php

…

doleditor.lib.php

…

donation.lib.php

…

ecm.lib.php

…

emailing.lib.php

…

expedition.lib.php

…

expensereport.lib.php

…

fichinter.lib.php

…

files.lib.php

FIX shared link ko on proposals

2018-10-11 11:59:14 +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

FIX trans on null object

2018-08-30 17:01:49 +02:00

functions_ch.lib.php

…

functions.lib.php

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

2018-10-19 14:27:15 +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

…

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

…

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

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

2018-10-19 14:27:15 +02:00

pdf.lib.php

FIX qty not visible for a lot when making shipment on a dedicated stock

2018-10-11 11:56:52 +02:00

prelevement.lib.php

…

price.lib.php

Fix for compatibility with lines with no prices (some external modules)

2018-08-29 14:50:12 +02:00

product.lib.php

variant on services

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

project.lib.php

Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0

2018-09-16 13:29:13 +02:00

propal.lib.php

…

receiptprinter.lib.php

…

report.lib.php

…

resource.lib.php

…

salaries.lib.php

…

security2.lib.php

…

security.lib.php

Fix: better sql request with multicompany transverse mode

2018-07-02 10:09:56 +02:00

sendings.lib.php

FIX qty not visible for a lot when making shipment on a dedicated stock

2018-10-11 11:56:52 +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

Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression

2018-09-27 12:42:52 +02:00

ticket.lib.php

Fix name of constant for module TICKET

2018-07-06 13:09:07 +02:00

treeview.lib.php

…

trip.lib.php

…

usergroups.lib.php

Fix permission to see HR tab on user. All HR on same tabs.

2018-07-09 15:38:00 +02:00

vat.lib.php

…

website.lib.php

FIX website in inline edit mode

2018-07-19 16:06:48 +02:00

ws.lib.php

…

xcal.lib.php

…