dolibarr/htdocs/admin
Laurent Destailleur b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
..
dolistore
menus
system Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-05 19:35:40 +02:00
tools
accountant.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
agenda_extrafields.php
agenda_extsites.php
agenda_other.php
agenda_reminder.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
agenda_xcal.php
agenda.php
bank_extrafields.php
bank.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
barcode.php
bom.php
boxes.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
chequereceipts.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
clicktodial.php
commande_fournisseur_dispatch_extrafields.php
commande.php
company.php
compta.php
confexped.php
const.php Merge pull request #11952 from aspangaro/11.0_https 2019-10-01 14:48:21 +02:00
contract.php
dav.php
debugbar.php
defaultvalues.php
delais.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
dict.php Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
ecm.php
emailcollector_card.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
emailcollector_list.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
events.php
expedition_extrafields.php
expedition.php
expeditiondet_extrafields.php
expensereport_extrafields.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
expensereport_ik.php
expensereport_rules.php
expensereport.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
export.php
external_rss.php
facture_situation.php
facture.php Merge pull request #11952 from aspangaro/11.0_https 2019-10-01 14:48:21 +02:00
fckeditor.php FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
fichinter.php
geoipmaxmind.php
holiday_extrafields.php NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
holiday.php
ihm.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
index.php Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
ldap_contacts.php
ldap_groups.php
ldap_members_types.php
ldap_members.php
ldap_users.php
ldap.php
limits.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
livraison_extrafields.php
livraison.php
livraisondet_extrafields.php
loan.php
mailing.php
mailman.php
mails_emailing.php
mails_senderprofile_list.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
mails_templates.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
mails.php
menus.php
modulehelp.php
modules.php
multicurrency.php
notification.php
oauth.php
oauthlogintokens.php
openinghours.php
order_extrafields.php
orderdet_extrafields.php
payment.php Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
pdf.php
perms.php
prelevement.php
propal.php
proxy.php
receiptprinter.php
reception_extrafields.php
reception_setup.php
resource_extrafields.php
resource.php
security_file.php
security_other.php
security.php
sms.php
socialnetworks.php
spip.php
stock.php
supplier_invoice.php
supplier_order.php
supplier_payment.php
supplier_proposal.php
supplierinvoice_extrafields.php
supplierinvoicedet_extrafields.php
supplierorder_extrafields.php
supplierorderdet_extrafields.php
syslog.php
taxes.php
ticket_extrafields.php
ticket_public.php Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-05 19:35:40 +02:00
ticket.php Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-05 19:35:40 +02:00
translation.php
triggers.php
user.php
usergroup.php
website_options.php
website.php
workflow.php