dolibarr/htdocs
Laurent Destailleur 358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
..
accountancy Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
adherents Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
admin Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
api Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
asset Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
asterisk Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
barcode Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
blockedlog Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
bom Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
bookmarks Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
cashdesk Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
categories Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
collab
comm Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
commande Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
compta Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
conf Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
contact Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
contrat Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
core Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
cron Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
custom Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
datapolicy Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
dav Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
debugbar Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
delivery Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
don Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
ecm Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
emailcollector Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
eventorganization Merge pull request #17232 from dolibit-ut/patch-270 2021-04-13 15:56:24 +02:00
expedition Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
expensereport Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
exports Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
externalsite Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
fichinter Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
fourn Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
ftp Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
holiday Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
hrm Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
imports Delete index.html 2021-04-12 19:25:19 +02:00
includes Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
install Merge pull request #17097 from NextGestion/dolibarr_partnership 2021-04-13 16:33:54 +02:00
intracommreport Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
langs Merge pull request #17097 from NextGestion/dolibarr_partnership 2021-04-13 16:33:54 +02:00
loan Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
mailmanspip/class Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
margin Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
modulebuilder Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
mrp Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
multicurrency FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
opensurvey Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
partnership Fix declaration of property 2021-04-09 15:43:19 +01:00
paybox Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
paypal Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
printing Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
product Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
projet Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
public Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
reception Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
recruitment Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
resource Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
salaries Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
societe Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
stripe Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
supplier_proposal Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
support
takepos Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
theme Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
ticket Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
user Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
variants Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
webservices FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
website Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
workstation Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
zapier Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
.gitignore
.htaccess Create .htaccess 2021-04-12 19:48:42 +02:00
cache.manifest
document.php Fix var_dump 2021-03-29 13:53:54 +02:00
favicon.ico
filefunc.inc.php Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
index.php update subscription and type 2021-03-18 23:23:57 +01:00
main.inc.php Work on split module fournisseur 2021-04-12 05:50:57 +02:00
master.inc.php update subscription and type 2021-03-18 23:23:57 +01:00
opcachepreload.php
robots.txt
security.txt
viewimage.php