Laurent Destailleur ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php

2015-02-28 03:11:15 +01:00

..

accountancy

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

2015-02-26 13:36:07 +01:00

adherents

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

2015-02-28 03:11:15 +01:00

admin

Merge branch 'feature_Product_stock_subproduct_stock_independent' of

2015-02-24 17:23:23 +01:00

asterisk

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

2015-02-19 00:01:26 +01:00

barcode

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

2015-02-18 22:54:02 +01:00

bookmarks

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

2015-02-19 00:01:26 +01:00

cashdesk

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

2015-02-19 00:01:26 +01:00

categories

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

2015-02-28 03:11:15 +01:00

comm

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

2015-02-28 03:11:15 +01:00

commande

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

2015-02-28 03:11:15 +01:00

compta

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

2015-02-28 03:11:15 +01:00

conf

Fixed example

2015-02-21 10:00:31 +01:00

contact

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

2015-02-28 03:11:15 +01:00

contrat

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

2015-02-28 03:11:15 +01:00

core

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

2015-02-28 03:11:15 +01:00

cron

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

2015-02-26 13:36:07 +01:00

custom

…

ecm

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

2015-02-19 00:01:26 +01:00

expedition

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

2015-02-16 20:59:04 +01:00

expensereport

Merge pull request #2395 from aspangaro/develop-patch13

2015-02-24 17:02:08 +01:00

exports

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

externalsite

…

fichinter

…

fourn

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

2015-02-28 03:11:15 +01:00

ftp

…

holiday

FIXED: Update licence to GPLv3

2015-02-23 22:04:01 +01:00

imports

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

2015-02-24 15:42:28 +01:00

includes

Fix jodconverter can't work without the wrapper jodconverter.

2015-02-22 16:01:01 +01:00

install

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

2015-02-28 03:11:15 +01:00

langs

Translation

2015-02-26 16:02:03 +01:00

livraison

…

mailmanspip

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

margin

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

2015-02-23 14:59:24 +01:00

opensurvey

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

2015-02-16 20:59:04 +01:00

paybox

…

paypal

…

printing

Fix doxygen

2015-02-11 15:05:52 +01:00

product

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

2015-02-28 03:11:15 +01:00

projet

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

2015-02-28 03:11:15 +01:00

public

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

2015-02-28 03:11:15 +01:00

resource

…

societe

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

2015-02-28 03:11:15 +01:00

support

…

theme

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

2015-02-21 12:58:14 +01:00

user

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

2015-02-28 03:11:15 +01:00

webservices

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

2015-02-19 00:01:26 +01:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

…

index.php

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

2015-02-23 14:59:24 +01:00

main.inc.php

…

master.inc.php

…

robots.txt

…

viewimage.php

…