aspangaro 9cc7b53071 Merge remote-tracking branch 'Upstream/develop' into 4.0-p13

2016-04-03 10:50:33 +02:00

..

accountancy

FIX: Accountancy - Correct the display of account_parent

2016-04-02 06:22:31 +02:00

adherents

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

admin

Use natural_search for sql search forging

2016-04-02 16:30:17 +02:00

api

…

asterisk

…

barcode

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

bookmarks

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

cashdesk

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

categories

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

comm

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

commande

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

compta

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

conf

…

contact

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

contrat

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

core

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

2016-04-02 15:54:51 +02:00

cron

Lost sort params

2016-03-29 15:31:52 +02:00

custom

…

don

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

ecm

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

expedition

NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and

2016-04-01 18:44:23 +02:00

expensereport

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

exports

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

externalsite

…

fichinter

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

fourn

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

ftp

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

holiday

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

hrm

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

imports

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

includes

Merge pull request #4824 from FHenry/dev_jquery

2016-03-25 16:50:26 +01:00

install

FIX: Accountancy - Correct the display of account_parent

2016-04-02 06:22:31 +02:00

langs

FIX Some records were lost into margin per product report

2016-04-01 12:28:15 +02:00

livraison

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

loan

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

mailmanspip

…

margin

FIX Some records were lost into margin per product report

2016-04-01 12:28:15 +02:00

multicurrency/class

…

opensurvey

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

paybox

…

paypal

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

printing

…

product

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

projet

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

public

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

resource

Merge pull request #4871 from sbechet/develop

2016-03-25 17:57:29 +01:00

societe

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

supplier_proposal

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

support

…

theme

Minor fix in CSS

2016-04-02 16:53:55 +02:00

user

Minor fix in CSS

2016-04-02 16:53:55 +02:00

webservices

…

websites

…

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

…

index.php

Restore compatibility

2016-03-25 17:15:08 +01:00

main.inc.php

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

2016-03-30 16:27:14 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…