dolibarr/htdocs
Laurent Destailleur 06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
..
accountancy Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
adherents Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 13:03:54 +02:00
admin Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
api Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
asset Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
asterisk Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
barcode
blockedlog Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
bom Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
bookmarks
cashdesk Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
categories Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
collab
comm Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
commande Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
compta Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
conf Update example 2019-05-22 13:06:13 +02:00
contact FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
contrat Add hook 2019-06-24 22:59:00 +02:00
core Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 13:03:54 +02:00
cron Fix duplicate translation 2019-05-29 09:46:39 +02:00
custom
datapolicy Protect from dir scan 2019-06-18 14:51:57 +02:00
dav Fix move .lockdb into root dir 2019-05-10 09:57:15 +02:00
debugbar Code comment 2019-06-22 19:15:15 +02:00
don Clean code of deprecated method 2019-06-22 18:19:40 +02:00
ecm
emailcollector Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
expedition Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
expensereport Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-23 18:12:56 +02:00
exports Fix sort order of export profiles 2019-06-21 13:25:40 +02:00
externalsite
fichinter Clean code of deprecated method 2019-06-22 18:19:40 +02:00
fourn Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
ftp
holiday Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-23 18:12:30 +02:00
hrm Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
imports Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
includes Standardize code 2019-06-19 13:16:46 +02:00
install Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 13:03:54 +02:00
langs Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
livraison Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
loan fix scrutinizer 2019-06-05 16:03:42 +02:00
mailmanspip
margin FIX #11233 2019-05-24 12:48:44 +02:00
modulebuilder Removed dead code 2019-06-24 23:00:04 +02:00
mrp FIX hook 2019-06-18 15:13:08 +02:00
multicurrency/class multicurrency:fix display error message on failed update 2019-06-05 17:26:37 +02:00
opensurvey Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
paybox More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00
paypal Fix look and feel v10 2019-05-21 15:31:56 +02:00
printing
product Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
projet Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 13:03:54 +02:00
public FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
reception Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
resource Look and feel v10 2019-06-05 12:16:55 +02:00
societe Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
stripe FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
supplier_proposal FIX Missing hooks 2019-06-18 14:07:52 +02:00
support Fix responsive of help center 2019-05-13 09:47:58 +02:00
takepos Basic phone layout for Restaurants in TakePOS 2019-05-26 16:44:17 +02:00
theme Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 13:03:54 +02:00
ticket Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
user Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
variants FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
webservices Fix position of modules 2019-06-23 20:05:15 +02:00
website Protect from dir scan 2019-06-18 14:51:57 +02:00
.gitignore
cache.manifest
document.php Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
favicon.ico
filefunc.inc.php Prepare v11 alpha 2019-06-20 03:54:11 +02:00
index.php Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 02:15:01 +02:00
main.inc.php Remove deprecated 2019-06-22 18:29:24 +02:00
master.inc.php NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
robots.txt
viewimage.php Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00