dolibarr/htdocs
Laurent Destailleur 68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
..
accountancy Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
adherents Optioncss 2015-10-04 11:45:02 +02:00
admin Merge pull request #3652 from grandoc/develop 2015-10-04 19:57:12 +02:00
api [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
asterisk
barcode [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
bookmarks Optioncss not kept in list 2015-10-04 10:45:57 +02:00
cashdesk [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
categories Merge remote-tracking branch 'origin/3.8' into develop 2015-10-03 14:28:31 +02:00
comm Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
commande Merge pull request #3656 from frederic34/patch-15 2015-10-04 20:11:55 +02:00
compta Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
conf
contact Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
contrat Optioncss 2015-10-04 12:31:32 +02:00
core Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
cron Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
custom
don Optioncss 2015-10-04 12:31:32 +02:00
ecm [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
expedition Optioncss 2015-10-04 12:31:32 +02:00
expensereport Optioncss 2015-10-04 12:31:32 +02:00
exports fix : Missing argument 1 for CommonDocGenerator::__construct() 2015-09-27 11:30:23 +02:00
externalsite [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
fichinter Optioncss 2015-10-04 12:31:32 +02:00
fourn Optioncss 2015-10-04 13:34:55 +02:00
ftp [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
holiday Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
imports [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
includes Move a file that is not an external lib 2015-09-18 21:53:35 +02:00
install Add contact photo 2015-10-04 17:25:46 +02:00
langs Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
livraison Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
loan Optioncss 2015-10-04 11:45:02 +02:00
mailmanspip
margin Merge remote-tracking branch 'origin/3.8' into develop 2015-10-03 14:28:31 +02:00
opensurvey Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
paybox [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
paypal [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
printing Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
product Optioncss 2015-10-04 13:34:55 +02:00
projet Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
public Merge remote-tracking branch 'origin/3.8' into develop 2015-10-03 14:28:31 +02:00
resource Merge pull request #3591 from GPCsolutions/inherited 2015-09-26 11:23:59 +02:00
societe Merge remote-tracking branch 'origin/3.8' into develop 2015-10-04 20:57:00 +02:00
support
theme Merge pull request #3648 from frederic34/patch-17 2015-10-04 20:02:20 +02:00
user Optioncss 2015-10-04 13:34:55 +02:00
webservices [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
.gitignore Merge remote-tracking branch 'origin/3.8' into develop 2015-09-23 00:34:57 +02:00
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Prepare 3.8.1 2015-09-23 10:25:06 +02:00
index.php [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
main.inc.php Merge pull request #3546 from GPCsolutions/badincludepath 2015-10-04 20:14:13 +02:00
master.inc.php
robots.txt
viewimage.php