dolibarr/htdocs
Laurent Destailleur b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
..
accountancy
adherents Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
admin [ bug #1049 ] agenda isn't save preferences 2013-09-11 11:08:38 +02:00
asterisk
bookmarks
boutique
cashdesk CSS fixes 2013-09-05 20:54:19 +02:00
categories Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
comm Fix: Permission to read an event should depend on agenda module 2013-09-18 11:56:42 +02:00
commande changed parameter 2013-09-16 14:17:53 +02:00
compta Merge remote-tracking branch 'origin/3.4' into develop 2013-09-22 20:01:33 +02:00
conf Doxygen: More comments 2013-09-18 17:59:57 +02:00
contact changed parameter 2013-09-16 14:17:53 +02:00
contrat changed parameter 2013-09-16 14:17:53 +02:00
core Merge remote-tracking branch 'origin/3.4' into develop 2013-09-22 20:01:33 +02:00
cron Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
ecm Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
expedition Merge remote-tracking branch 'origin/3.4' into develop 2013-09-09 20:00:12 +02:00
exports Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
externalsite
fichinter changed parameter 2013-09-16 14:17:53 +02:00
fourn Merge remote-tracking branch 'origin/3.4' into develop 2013-09-19 01:02:53 +02:00
ftp Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
holiday Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
imports Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
includes natural search in list pages 2013-09-16 14:17:53 +02:00
install Fix: Add missing field info_bits into predefined invoices. 2013-09-19 14:58:35 +02:00
langs Work on openif authentication mode 2013-09-18 21:22:24 +02:00
livraison Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
mailmanspip/class Fix: Missing class 2013-08-31 16:58:25 +02:00
margin Merge remote-tracking branch 'origin/3.4' into develop 2013-09-19 01:02:53 +02:00
opensurvey CSS fixes 2013-09-05 20:54:19 +02:00
paybox Fix: Permissions on files 2013-08-06 00:36:21 +02:00
paypal Fix: Permissions on files 2013-08-06 00:36:21 +02:00
printipp Qual: Doxygen 2013-08-22 16:49:23 +02:00
product Merge pull request #1239 from csalvador/replenishment-fix 2013-09-16 10:39:35 -07:00
projet changed parameter 2013-09-16 14:17:53 +02:00
public Qual: Doxygen 2013-08-22 16:49:23 +02:00
societe get thirdparty's contacts as Contact objects 2013-09-20 10:38:17 +02:00
support CSS fixes 2013-09-05 20:54:19 +02:00
theme Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
user Work on openif authentication mode 2013-09-18 21:22:24 +02:00
webservices Merge remote-tracking branch 'origin/3.4' into develop 2013-09-11 23:12:47 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Doxygen: More comments 2013-09-18 17:59:57 +02:00
index.php Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
main.inc.php Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-21 12:31:38 +02:00
master.inc.php
robots.txt
viewimage.php