Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php

2015-04-18 23:38:14 +02:00

..

accountancy

…

adherents

Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613

2015-04-18 20:47:20 +02:00

admin

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

asterisk

…

barcode

…

bookmarks

Copyright

2015-04-18 20:50:03 +02:00

cashdesk

fix syntax errors

2015-04-18 18:07:41 +02:00

categories

Copyright

2015-04-18 20:50:03 +02:00

comm

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

commande

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

compta

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

conf

…

contact

Copyright

2015-04-18 20:50:03 +02:00

contrat

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

core

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

cron

…

custom

…

don

…

ecm

…

expedition

fix bug #2652

2015-04-18 22:59:20 +02:00

expensereport

fix syntax errors

2015-04-18 18:07:41 +02:00

exports

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

2015-04-13 13:08:46 +02:00

externalsite

…

fichinter

fix bug #2652

2015-04-18 22:59:20 +02:00

fourn

fix bug #2652

2015-04-18 22:59:20 +02:00

ftp

…

holiday

…

imports

…

includes

Update PEAR Mail_MIME to 1.8.9

2015-04-18 04:27:15 +02:00

install

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

langs

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

livraison

Copyright

2015-04-18 20:50:03 +02:00

loan

…

mailmanspip

…

margin

…

opensurvey

fix syntax errors

2015-04-18 18:07:41 +02:00

paybox

…

paypal

…

printing

…

product

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

projet

Copyright

2015-04-18 20:50:03 +02:00

public

…

resource

Fix: error when deleting resource

2015-04-18 18:07:59 +02:00

societe

Copyright

2015-04-18 20:50:03 +02:00

support

…

theme

Adjust CSS : missing color for input, textarea and select list

2015-04-18 19:01:33 +02:00

user

Copyright

2015-04-18 20:50:03 +02:00

webservices

Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613

2015-04-18 20:47:20 +02:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Revert "Sanitize for security."

2015-04-18 22:11:11 +02:00

index.php

…

main.inc.php

…

master.inc.php

…

robots.txt

…

viewimage.php

…