Laurent Destailleur b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php

2015-10-01 11:16:35 +02:00

..

accountancy

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-09-09 12:45:22 +02:00

adherents

A paswword can be set on member card but member can't login. Too much

2015-10-01 10:15:07 +02:00

admin

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

api

…

asterisk

…

barcode

Fix PHPCS

2015-08-13 03:06:25 +02:00

bookmarks

…

cashdesk

Fix javascript error on POS

2015-09-18 14:13:15 +02:00

categories

Fix duplicate log

2015-09-25 11:47:24 +02:00

comm

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

commande

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

compta

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

conf

…

contact

Fix SQL injections #3300

2015-09-12 11:36:19 +02:00

contrat

the form should be outside table to avoid errors

2015-08-15 16:03:09 +02:00

core

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

cron

Fix several minor bugs

2015-08-31 12:13:23 +02:00

custom

…

don

Fix: Correct directory where the donation is generated & add the action to remove_file who are generated

2015-08-25 08:09:14 +02:00

ecm

Fix: use get instead getJSON for avoid freezing

2015-09-20 09:05:52 +02:00

expedition

FIX #3534

2015-09-16 22:04:03 +02:00

expensereport

Fix: ER payments are on the bank credit

2015-09-13 16:33:02 +02:00

exports

fix : Missing argument 1 for CommonDocGenerator::__construct()

2015-09-27 11:30:23 +02:00

externalsite

…

fichinter

FIX: display error on extrafields on ficheinter

2015-09-29 16:57:05 +02:00

fourn

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-09-22 16:28:34 +02:00

ftp

Fix duplicate translation/encoding on setEventMessage

2015-09-12 12:55:20 +02:00

holiday

Fix duplicate translation/encoding on setEventMessage

2015-09-12 12:55:20 +02:00

imports

Fix: examples ko for import

2015-09-10 12:47:25 +02:00

includes

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00

install

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

langs

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-01 11:16:35 +02:00

livraison

correction on permissions

2015-08-29 17:14:41 +02:00

loan

…

mailmanspip

…

margin

Merge remote-tracking branch 'origin/3.7' into develop

2015-09-03 10:49:41 +02:00

opensurvey

Fix #3413 Translation of ExpireDate

2015-09-12 18:09:47 +02:00

paybox

Fix several minor bugs

2015-08-31 12:13:23 +02:00

paypal

Fix several minor bugs

2015-08-31 12:13:23 +02:00

printing

Fix #3236

2015-08-07 10:12:10 +02:00

product

Merge pull request #3571 from fmarcet/3.8

2015-09-24 18:40:06 +02:00

projet

Merge pull request #3614 from marcosgdf/bug-3572

2015-10-01 10:32:32 +02:00

public

FIX Payment form for paypal and paybox was not centered.

2015-09-30 19:37:41 +02:00

resource

Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr

2015-08-14 17:53:52 +02:00

societe

FIX #3599 Not saving legal form

2015-09-25 08:50:00 +02:00

support

Fix css for support page

2015-08-28 20:39:30 +02:00

theme

FIX Bad title line in project view when using jmobile

2015-09-27 16:50:47 +02:00

user

FIX Removed warnings

2015-09-17 00:47:56 +02:00

webservices

…

.gitignore

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-09-22 16:28:34 +02:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.8.1

2015-09-23 10:25:06 +02:00

index.php

New: Add number of expense reports to pay

2015-08-17 05:29:12 +02:00

main.inc.php

Merge pull request #3294 from GPCsolutions/totalvalidator

2015-08-10 20:56:31 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…