Laurent Destailleur e163b0237f Merge branch 'develop' of github.com:aspangaro/dolibarr into ...

aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php

2014-09-22 23:39:26 +02:00

..

accountancy

compta_mode -> accounting_mode

2014-09-21 20:42:46 +02:00

adherents

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

admin

compta_mode -> accounting_mode

2014-09-21 20:42:46 +02:00

asterisk

…

barcode

…

bookmarks

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

boutique

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

cashdesk

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

2014-09-15 22:58:39 +02:00

categories

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

comm

Merge branch 'develop' of github.com:aspangaro/dolibarr into

2014-09-22 23:34:56 +02:00

commande

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

compta

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +02:00

conf

Clean path dolibarr_main_url_root to avoid duplicate /.

2014-08-06 00:06:27 +02:00

contact

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

contrat

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

core

Merge branch 'develop' of github.com:aspangaro/dolibarr into

2014-09-22 23:34:56 +02:00

cron

Uniformize code $_SERVER["PHP_SELF"]

2014-09-18 20:13:38 +02:00

ecm

Fix: Message show when dir is out of sync with database cache was wrong.

2014-09-03 16:09:14 +02:00

expedition

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

exports

Fix: Missing field tobuy into service export.

2014-08-29 20:26:27 +02:00

externalsite

…

fichinter

Merge branch 'develop' of github.com:aspangaro/dolibarr into

2014-09-22 23:39:26 +02:00

fourn

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

ftp

…

holiday

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

imports

…

includes

Fix: Missing source

2014-09-14 21:52:52 +02:00

install

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +02:00

langs

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +02:00

livraison

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

mailmanspip

…

margin

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

opensurvey

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

2014-09-15 22:58:39 +02:00

paybox

…

paypal

…

printipp

…

product

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

projet

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

public

Uniformize code $_SERVER["PHP_SELF"]

2014-09-18 20:13:38 +02:00

resource

Merge

2014-09-07 12:22:04 +02:00

societe

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

support

Look: Refresh install style with more neutral colors. Select line style

2014-08-03 11:18:32 +02:00

theme

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

2014-09-15 22:58:39 +02:00

user

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

webservices

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

2014-09-19 11:09:51 +02:00

.gitignore

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

2014-09-18 10:17:43 +02:00

cache.manifest

Look: Refresh install style with more neutral colors. Select line style

2014-08-03 11:18:32 +02:00

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Clean path dolibarr_main_url_root to avoid duplicate /.

2014-08-06 00:06:27 +02:00

index.php

Qual: Renamed all files & links "liste.php" into "list.php"

2014-09-18 20:33:37 +02:00

main.inc.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

master.inc.php

trigger on total

2014-08-12 11:40:24 +02:00

robots.txt

…

viewimage.php

…