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

Conflicts:
	htdocs/langs/en_US/errors.lang

2018-02-08 17:27:36 +01:00

..

accountancy

Fix accounting module with multicompany

2018-02-06 01:00:35 +01:00

adherents

Fix look and feel v7

2018-01-30 11:30:03 +01:00

admin

Fix translation

2018-02-04 10:55:09 +01:00

api

Api interventions

2018-02-03 20:58:26 +01:00

asterisk

…

barcode

…

blockedlog

Fix various payments

2018-01-29 19:07:42 +01:00

bookmarks

…

cashdesk

Revert

2018-02-02 17:46:25 +01:00

categories

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

2018-01-31 20:25:24 +01:00

collab

…

comm

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

2018-02-08 15:20:24 +01:00

commande

Merge branch 'develop' into new_order_min_amount

2018-02-08 14:20:53 +01:00

compta

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

2018-02-08 17:27:36 +01:00

conf

…

contact

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

2018-01-31 20:25:24 +01:00

contrat

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

2018-02-08 17:27:36 +01:00

core

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

2018-02-08 15:20:24 +01:00

cron

Fix look and feel v7

2018-01-26 10:21:53 +01:00

custom

…

don

…

ecm

…

expedition

New: Add a tab of Docments to expedition module

2018-02-07 22:56:14 +08:00

expensereport

Error management

2018-02-08 14:25:44 +01:00

exports

NEW Filter export model by user

2018-01-18 12:34:22 +01:00

externalsite

…

fichinter

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

2018-02-08 17:27:36 +01:00

fourn

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

2018-02-08 15:20:24 +01:00

ftp

…

holiday

…

hrm

…

imports

…

includes

…

install

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

2018-02-08 15:20:24 +01:00

langs

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

2018-02-08 17:27:36 +01:00

livraison

…

loan

…

mailmanspip

…

margin

Merge pull request #8048 from ATM-Nicolas/add_margin_filters

2018-02-08 15:15:30 +01:00

modulebuilder

Merge pull request #8122 from frederic34/patch-6

2018-02-08 13:07:20 +01:00

multicurrency/class

…

opensurvey

Fix for multicompany

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

paybox

…

paypal

…

printing

…

product

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

2018-02-08 15:20:24 +01:00

projet

Fix css

2018-02-07 20:53:13 +01:00

public

Fix: amount into form must be numeric without format

2018-02-04 23:06:37 +01:00

resource

Fix import supplier product price vat

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

societe

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

2018-02-08 17:27:36 +01:00

stripe

…

supplier_proposal

Fix for multicompany

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

support

…

theme

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

2018-02-08 15:20:24 +01:00

user

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

2018-02-08 15:20:24 +01:00

variants

…

webservices

…

website

…

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 7.0

2018-02-05 20:50:15 +01:00

index.php

Better balance css columns in dashboard

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

main.inc.php

Fix code comment

2018-01-24 14:22:11 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…