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

Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php

2018-05-30 11:09:53 +02:00

..

accountancy

Fix sql error

2018-05-21 14:19:41 +08:00

adherents

FIX CVE-2018-10095

2018-04-18 12:32:19 +02:00

admin

Fix syntax error

2018-05-21 23:33:20 +02:00

api

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

asterisk

…

barcode

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

2018-02-22 12:17:25 +01:00

blockedlog

Fix: missing User object with API REST

2018-04-10 08:07:23 +02:00

bookmarks

Fix SQLi reported by op7ica

2018-03-15 01:55:16 +01:00

cashdesk

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

2018-05-18 11:52:48 +02:00

categories

FIX sanitize setup params

2018-04-18 12:19:23 +02:00

collab

…

comm

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

2018-05-25 13:15:38 +02:00

commande

Update list.php

2018-05-26 09:49:13 +02:00

compta

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

2018-05-30 11:09:53 +02:00

conf

…

contact

Fix: zip not filter

2018-04-17 10:43:25 +02:00

contrat

FIX Error in ContractLigne not return to Contract

2018-04-23 15:07:50 +02:00

core

FIX #8893 to get formatted price as substitution vars

2018-05-30 11:04:44 +02:00

cron

Fix multicompany compatibility for recurring invoice generation

2018-04-16 14:18:38 +02:00

custom

…

don

FIX Payment mode not correctly set in donation and document

2018-03-02 12:32:49 +01:00

ecm

…

expedition

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

2018-05-25 13:14:58 +02:00

expensereport

Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking

2018-04-30 17:45:34 +02:00

exports

FIX Missing extrafields in export

2018-05-23 17:48:18 +02:00

externalsite

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

fichinter

inversion of dateo and datee

2018-05-18 12:24:44 +02:00

fourn

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

2018-05-30 11:09:53 +02:00

ftp

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

holiday

FIX Not approved holidays must not be visible into timesheet

2018-04-26 17:44:36 +02:00

hrm

Better management of hidden option HOLIDAY_HIDE_BALANCE

2018-03-19 15:13:36 +01:00

imports

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

2018-02-25 12:21:10 +01:00

includes

…

install

Fix chart of account initial data for syscohada

2018-05-05 22:15:19 +02:00

langs

FIX : Bad substitution key used for default send proposal email

2018-05-30 10:14:34 +02:00

livraison

FIX Missing restore_lastsearch_values

2018-02-26 21:21:28 +01:00

loan

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

2018-03-12 20:16:23 +01:00

mailmanspip

…

margin

FIX sanitize setup params

2018-04-18 12:19:23 +02:00

modulebuilder

Remove useless files

2018-05-21 22:14:15 +02:00

multicurrency/class

…

opensurvey

Fix for multicompany

2018-02-06 10:57:53 +01:00

paybox

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

paypal

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

printing

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

product

Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling

2018-05-18 12:00:03 +02:00

projet

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

2018-05-18 11:38:26 +02:00

public

Fix state code for payment from indonesia

2018-05-25 16:21:13 +02:00

resource

Fix import supplier product price vat

2018-02-06 10:03:06 +01:00

societe

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

2018-05-25 13:14:58 +02:00

stripe

FIX #8580

2018-04-12 23:54:53 +02:00

supplier_proposal

FIX Projet is not prefilled when created from overwiew page

2018-05-01 14:15:11 +02:00

support

Fix debian package

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

theme

Fix css to restore focus undertext on select2 combo lists

2018-04-13 10:01:07 +02:00

user

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

2018-04-11 14:45:11 +02:00

variants

Fix delete all product variants of a parent product

2018-05-02 22:33:23 +02:00

webservices

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

website

Fix avoid error when homepage not set

2018-02-15 01:29:51 +01:00

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 7.0.3

2018-05-14 15:17:10 +02:00

index.php

…

main.inc.php

FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie

2018-04-19 13:54:43 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…