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

Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php

2018-09-19 14:52:43 +02:00

..

accountancy

Update accountancycategory.class.php

2018-09-09 23:12:16 +02:00

adherents

Merge pull request #9360 from frederic34/patch-18

2018-09-01 13:28:16 +02:00

admin

Fix firstname/lastname

2018-08-13 01:10:51 +02:00

api

Code comment

2018-08-02 17:51:04 +02:00

asterisk

…

barcode

…

blockedlog

…

bookmarks

…

cashdesk

…

categories

…

collab

…

comm

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

2018-08-29 18:53:39 +02:00

commande

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

2018-08-12 19:25:44 +02:00

compta

Fix syntax error

2018-09-12 18:05:20 +02:00

conf

…

contact

Fix datec and tms missing in fetch method for API

2018-08-26 18:08:10 +02:00

contrat

…

core

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

2018-09-19 14:52:43 +02:00

cron

…

custom

…

don

…

ecm

…

expedition

FIX : Keep same project when creating shipping from order

2018-07-30 15:16:53 +02:00

expensereport

FIX #8984 button create expense report

2018-07-09 14:35:22 +02:00

exports

FIX Missing extrafields in export

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

externalsite

…

fichinter

FIX: intervention: extrafield regression in commit b5f37301a5

2018-06-07 15:17:22 +02:00

fourn

FIX : wrong var name

2018-09-13 16:11:42 +02:00

ftp

…

holiday

fix : display if error

2018-08-06 11:28:34 +02:00

hrm

Fix error message

2018-06-29 19:08:35 +02:00

imports

…

includes

…

install

Fix missing field

2018-09-12 16:45:12 +02:00

langs

Update blockedlog.lang

2018-08-29 23:08:13 +02:00

livraison

…

loan

Fix: missing "paid" field

2018-07-03 13:47:53 +02:00

mailmanspip

…

margin

…

modulebuilder

Fix sample doc

2018-08-23 17:49:14 +02:00

multicurrency/class

…

opensurvey

…

paybox

…

paypal

…

printing

…

product

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

2018-09-05 20:39:38 +02:00

projet

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

2018-08-23 19:47:31 +02:00

public

Fix state code for payment from indonesia

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

resource

Fix extrafields resource

2018-06-28 16:39:37 +02:00

societe

Fix entity

2018-08-31 11:26:53 +02:00

stripe

FIX Force stripe api version to avoid trouble if we update stripe api

2018-09-01 12:03:44 +02:00

supplier_proposal

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

2018-08-12 19:23:45 +02:00

support

…

theme

…

user

FIX #9328

2018-08-29 18:40:12 +02:00

variants

…

webservices

…

website

FIX combo into popup become crazy with IE10

2018-06-28 12:16:12 +02:00

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 7.0.4

2018-06-23 14:55:33 +02:00

index.php

Fix : division by 0 on homepage if nothing to do

2018-06-28 12:54:19 +02:00

main.inc.php

FIX SQL Injections reported by mu shcor (ADLab of Venustech)

2018-06-25 14:06:09 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

Code comment

2018-08-29 18:56:57 +02:00