Laurent Destailleur 7cbee97f6e Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	.travis.yml

2014-07-08 20:26:38 +02:00

..

accountancy

…

adherents

Merge branch 'syslog' of github.com:marcosgdf/dolibarr into

2014-07-04 13:43:50 +02:00

admin

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

asterisk

…

barcode

More substitutions

2014-06-12 11:31:53 +02:00

bookmarks

More substitutions

2014-06-12 11:31:53 +02:00

boutique

Align size for accounting account & Drop old table & Typo

2014-06-29 07:57:42 +02:00

cashdesk

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

2014-07-08 01:12:55 +02:00

categories

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

comm

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

commande

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

compta

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

conf

…

contact

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

2014-07-04 14:14:40 +02:00

contrat

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

2014-07-06 21:09:10 +02:00

core

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

2014-07-08 01:12:55 +02:00

cron

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

ecm

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

expedition

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

exports

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

externalsite

…

fichinter

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

2014-07-08 01:12:55 +02:00

fourn

[ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu

2014-07-04 16:48:42 +02:00

ftp

More substitutions

2014-06-12 11:31:53 +02:00

holiday

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

imports

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

includes

Try a fix when timezone string is not standard

2014-07-04 13:07:53 +02:00

install

Merge pull request #1710 from aspangaro/develop-accounting2

2014-07-07 21:28:35 +02:00

langs

Merge pull request #1710 from aspangaro/develop-accounting2

2014-07-07 21:28:35 +02:00

livraison

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

mailmanspip/class

…

margin

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

opensurvey

Removed new SQL double-debug

2014-07-02 21:29:07 +02:00

paybox

…

paypal

…

printipp

…

product

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

2014-07-08 01:12:55 +02:00

projet

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

2014-07-08 20:26:38 +02:00

public

…

resource

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

societe

Reduce memory print of object thirdparty.

2014-07-04 14:25:08 +02:00

support

…

theme

New: Add hook "searchAgendaFrom".

2014-06-29 02:45:55 +02:00

user

Qual: Removed useless function

2014-07-05 08:59:41 +02:00

webservices

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.7 development.

2014-06-26 21:48:57 +02:00

index.php

…

main.inc.php

restore min jquery

2014-07-05 11:19:49 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…