dolibarr/htdocs/admin
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
menus Change generic and setup image title 2015-04-18 23:13:48 +02:00
system Change generic and setup image title 2015-04-18 23:13:48 +02:00
tools Change generic and setup image title 2015-04-18 23:13:48 +02:00
agenda_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
agenda_extsites.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
agenda_other.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
agenda_xcal.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
agenda.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
askpricesupplier.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
bank_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
bank.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
barcode.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
boxes.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
clicktodial.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
commande.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
company.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
compta.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
confexped.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
const.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
contract.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
delais.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
dict.php Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
ecm.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
events.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
expedition.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
expensereport.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
external_rss.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
facture.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
fckeditor.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
fichinter.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
geoipmaxmind.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ihm.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
index.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ldap_contacts.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ldap_groups.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ldap_members.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ldap_users.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
ldap.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
limits.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
livraison.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
loan.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
mailing.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
mailman.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
mails.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
menus.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
modules.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
notification.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
order_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
orderdet_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
pdf.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
perms.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
prelevement.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
propal.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
proxy.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
salaries.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
security_file.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
security_other.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
security.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
sms.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
spip.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
stock.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplier_invoice.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplier_order.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplierinvoice_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplierinvoicedet_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplierorder_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
supplierorderdet_extrafields.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
syslog.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
taxes.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
translation.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
triggers.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
user.php Change generic and setup image title 2015-04-18 23:13:48 +02:00
workflow.php Change generic and setup image title 2015-04-18 23:13:48 +02:00