dolibarr/htdocs/admin
Laurent Destailleur d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
..
menus Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
system Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
tools Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
accounting.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
agenda_extrafields.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
agenda_extsites.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
agenda_xcal.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
agenda.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
barcode.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
boxes.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
clicktodial.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
commande.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
company.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
compta.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
confexped.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
const.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
contract.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
delais.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
dict.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
dons.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
events.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
expedition.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
external_rss.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
facture.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fckeditor.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fichinter.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fournisseur.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
geoipmaxmind.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ihm.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
index.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
ldap_contacts.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ldap_groups.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ldap_members.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ldap_users.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ldap.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
limits.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
livraison.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
mailing.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
mails.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
menus.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
modules.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
notification.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
osc-languages.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
pdf.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
perms.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
prelevement.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
project.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
propal.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
proxy.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
security_other.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
security.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
sms.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
stock.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
syslog.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
taxes.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
translation.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
triggers.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
user.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
workflow.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00