Ferran Marcet 602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 ...

# Conflicts:
#	htdocs/comm/propal/class/propal.class.php
#	htdocs/commande/class/commande.class.php
#	htdocs/expensereport/class/expensereport.class.php
#	htdocs/fourn/class/fournisseur.commande.class.php

2018-12-03 12:33:18 +01:00

..

accountancy

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

2018-10-19 14:16:53 +02:00

adherents

Merge pull request #9360 from frederic34/patch-18

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

admin

FIX #3234

2018-12-02 10:02:05 +01:00

api

Code comment

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

asterisk

…

barcode

…

blockedlog

…

bookmarks

…

cashdesk

…

categories

…

collab

…

comm

FIX Lines are not inserted correctly if VAT have code

2018-12-03 12:28:17 +01:00

commande

FIX Lines are not inserted correctly if VAT have code

2018-12-03 12:28:17 +01:00

compta

FIX Lines are not inserted correctly if VAT have code

2018-12-03 12:28:17 +01:00

conf

…

contact

FIX #8741

2018-12-01 17:01:11 +01:00

contrat

Merge remote-tracking branch 'origin/7.0' into 7.0

2018-12-03 12:33:18 +01:00

core

Merge pull request #10156 from grandoc/7.0_bug

2018-12-02 17:06:06 +01:00

cron

…

custom

…

don

…

ecm

Fix expense report in ecm auto dir

2018-12-01 19:39:00 +01:00

expedition

FIX : Keep same project when creating shipping from order

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

expensereport

FIX Lines are not inserted correctly if VAT have code

2018-12-03 12:28:17 +01:00

exports

…

externalsite

…

fichinter

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

2018-11-08 20:14:40 +01:00

fourn

FIX Lines are not inserted correctly if VAT have code

2018-12-03 12:28:17 +01:00

ftp

…

holiday

fix : display if error

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

hrm

…

imports

…

includes

…

install

Update 6.0.0-7.0.0.sql

2018-12-01 00:34:17 +01:00

langs

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

2018-09-27 19:00:09 +02:00

livraison

…

loan

…

mailmanspip

…

margin

Fix sign

2018-11-07 10:11:29 +01:00

modulebuilder

Fix sample doc

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

multicurrency/class

…

opensurvey

…

paybox

…

paypal

…

printing

…

product

Update price.php

2018-12-01 16:11:49 +01:00

projet

FIX : same on lines

2018-11-07 16:32:23 +01:00

public

…

resource

…

societe

FIX If we change customer/supplier rule we can't edit old thirdparty.

2018-11-08 17:15:35 +01: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

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

2018-10-24 02:40:57 +02:00

user

FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup

2018-10-08 15:41:31 +02:00

variants

…

webservices

…

website

…

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 7.0.5

2018-10-12 21:11:40 +02:00

index.php

…

main.inc.php

…

master.inc.php

…

robots.txt

…

viewimage.php

Code comment

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