dolibarr/htdocs
Regis Houssin db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
..
accountancy Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
adherents Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
admin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
api Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +02:00
asterisk New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
barcode Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
blockedlog Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +02:00
bookmarks Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
cashdesk Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-07 10:50:35 +02:00
categories Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
collab Debug module website 2017-07-03 12:04:45 +02:00
comm Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
commande Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
compta Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
conf New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
contact Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
contrat Merge pull request #7404 from atm-florian/dev_add_search_on_extrafield_contractline 2017-09-15 15:58:30 +02:00
core Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
cron Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
custom Fix doc 2017-09-04 11:22:53 +02:00
don Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
ecm Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
expedition Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
expensereport Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
exports Can export Websites pages. 2017-07-28 14:54:13 +02:00
externalsite Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-18 21:13:48 +02:00
fichinter USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
fourn Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
ftp FIX #6945 2017-06-06 10:53:53 +02:00
holiday Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
hrm Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
imports Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
includes Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-14 11:49:02 +02:00
install Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
langs NEW All setup of accountancy can be done from menu "Accountancy-Setup" 2017-09-15 14:09:42 +02:00
livraison USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-08-22 18:49:40 +02:00
mailmanspip
margin USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
modulebuilder Rename var $mode to avoid conflicts 2017-09-15 15:57:07 +02:00
multicurrency/class New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
opensurvey USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
paybox Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
paypal Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
printing
product Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
projet Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
public Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
resource Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
societe Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
stripe Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
supplier_proposal Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-15 16:45:49 +02:00
support Fix link http 2017-08-21 20:49:12 +02:00
theme Merge pull request #7390 from atm-arnaud/FIX_task_comment_design 2017-09-14 12:21:58 +02:00
user Pour ne pas charger les membres d'un groupe lorsque l'on charge les groupe d'un user (sinon avec 200 user et 30 groupes = 6000 objects . trop lourd) 2017-09-15 12:58:13 +02:00
variants USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
webservices FIX #7265 2017-08-23 12:47:59 +02:00
websites Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
.gitignore Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:25:07 +02:00
cache.manifest
document.php FIX Security fixes (filter onload js, less verbose error message in 2017-09-06 11:39:30 +02:00
favicon.ico
filefunc.inc.php Prepare 6.0.1 2017-09-04 12:13:12 +02:00
index.php Enhancement for smartphone 2017-09-04 09:25:53 +02:00
main.inc.php Fix ref must be 50 2017-09-12 11:51:51 +02:00
master.inc.php NEW The lot of a product uses the link and picto when shown into list. 2017-09-15 10:45:41 +02:00
robots.txt
viewimage.php FIX Security fixes (filter onload js, less verbose error message in 2017-09-06 11:39:30 +02:00