dolibarr/htdocs
Florian Henry b4485efdeb Merge branch 'develop' into develop_926_927_928
Conflicts:
	htdocs/core/class/extrafields.class.php

Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536
2013-06-11 21:41:57 +02:00
..
accountancy
adherents Fix: EOF 2013-06-05 16:24:32 +02:00
admin - New: [ task #926 ] Add extrafield feature on order lines 2013-06-10 16:05:41 +02:00
asterisk
bookmarks Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
boutique
cashdesk Merge remote-tracking branch 'origin/3.4' into develop 2013-06-09 16:49:47 +02:00
categories Fix: EOF 2013-06-05 16:24:32 +02:00
comm - New: [ task #926 ] Add extrafield feature on order lines 2013-06-10 16:05:41 +02:00
commande - New: [ task #926 ] Add extrafield feature on order lines 2013-06-10 16:05:41 +02:00
compta - New: [ task #926 ] Add extrafield feature on order lines 2013-06-10 16:05:41 +02:00
conf
contact Fix: EOF 2013-06-05 16:24:32 +02:00
contrat Update contrat.class.php 2013-05-28 10:05:49 +02:00
core Merge branch 'develop' into develop_926_927_928 2013-06-11 21:41:57 +02:00
cron Fix: EOF 2013-06-05 16:24:32 +02:00
ecm Fixed some translation problems 2013-06-08 21:57:57 +02:00
expedition Merge remote-tracking branch 'origin/3.3' into develop 2013-04-28 01:24:58 +02:00
exports Fix: EOF 2013-06-05 16:24:32 +02:00
externalsite Merge remote-tracking branch 'origin/3.3' into develop 2013-04-22 01:39:49 +02:00
fichinter Fix: Some quality fixes 2013-06-10 19:04:04 +02:00
fourn Merge remote-tracking branch 'origin/3.4' into develop 2013-06-09 16:49:47 +02:00
ftp Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
holiday Merge remote-tracking branch 'origin/3.4' into develop 2013-06-09 16:49:47 +02:00
imports Fix: EOF 2013-06-05 16:24:32 +02:00
includes Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:49:02 +02:00
install Add extrafield tables 2013-06-10 14:13:44 +02:00
langs Merge branch 'develop' into develop_926_927_928 2013-06-11 21:41:57 +02:00
livraison [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
mailmanspip/class Fix: missing class 2013-06-09 12:56:20 +02:00
margin Missing succes message in margin module config page 2013-05-19 12:19:31 +02:00
opensurvey Fix: EOF 2013-06-05 16:24:32 +02:00
paybox
paypal Fix: proxy was not used everywhere, timeout was not set everywhere. 2013-06-07 20:09:15 +02:00
printipp
product Add hook into referent product screen 2013-06-11 11:46:38 +02:00
projet Fix: EOF 2013-06-05 16:24:32 +02:00
public Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working 2013-06-09 12:47:44 +02:00
societe Qual: Uniformize code 2013-06-05 22:01:35 +02:00
support Fix: EOF 2013-06-05 16:24:32 +02:00
theme Merge remote-tracking branch 'origin/3.4' into develop 2013-06-11 10:43:36 +02:00
user Normalized line endings to LF 2013-06-05 16:12:07 +02:00
webservices Normalized line endings to LF 2013-06-05 16:12:07 +02:00
.gitignore
cache.manifest Fix: Removed useless file (not correctly defined) to avoid cache 2013-05-26 03:57:34 +02:00
disabled.php
document.php fix: LF 2013-06-04 22:03:11 +02:00
favicon.ico
filefunc.inc.php Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
index.php Fix typo in contracts language file name 2013-05-26 19:36:24 +03:00
main.inc.php Merge remote-tracking branch 'origin/3.4' into develop 2013-06-09 16:49:47 +02:00
master.inc.php Fix: broken features with multicompany 2013-04-25 15:49:27 +02:00
robots.txt
viewimage.php Normalized line endings to LF 2013-06-05 16:12:07 +02:00