lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89068ffef1
dolibarr/htdocs
History
Laurent Destailleur 89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
2018-12-18 21:55:14 +01:00
..
accountancy Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
adherents Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
admin Fix sort of email templates 2018-12-13 12:13:28 +01:00
api Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
asset Fix filter on extrafields 2018-11-07 12:49:17 +01:00
asterisk
barcode
blockedlog Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00
bookmarks
cashdesk Clean code of POS modules 2018-12-16 14:59:51 +01:00
categories Fix phpcs 2018-11-19 16:35:37 +01:00
collab
comm Revert "Fix screen size fall" 2018-12-15 12:35:37 +01:00
commande Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00
compta Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00
conf fixed sql query error 2018-11-12 16:22:42 +01:00
contact Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
contrat Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-04 14:58:11 +01:00
core Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
cron Fix picto for status of cron task 2018-12-12 13:02:11 +01:00
custom
datapolicy Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
dav
don Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-28 16:57:39 +01:00
ecm Fix bad path 2018-12-10 00:19:46 +01:00
emailcollector FIX #10144 2018-12-01 19:45:30 +01:00
expedition FIX Extrafields on shipment module 2018-12-16 18:44:58 +01:00
expensereport FIX Css of amount on remain to pay on expense report 2018-12-17 13:57:30 +01:00
exports Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-16 13:39:16 +01:00
externalsite Fix use iframe to embed content 2018-12-10 19:06:34 +01:00
fichinter fix: Accss to global $conf needed 2018-11-27 18:22:12 +01:00
fourn Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
ftp
holiday Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
hrm Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
imports
includes Merge branch 'develop' into swiftmailer 2018-11-19 18:23:55 +01:00
install Debug website module 2018-12-17 17:29:04 +01:00
langs Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
livraison Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
mailmanspip
margin Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:28 +01:00
modulebuilder Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
multicurrency/class
opensurvey Fix opensurvey 2018-12-11 10:52:59 +01:00
paybox
paypal
printing
product Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
projet FIX Show warning when trying to create task on closed project 2018-12-10 15:06:54 +01:00
public Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
resource Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-26 23:08:06 +01:00
societe Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
stripe fix typo error 2018-11-26 14:35:29 +01:00
supplier_proposal Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
support
takepos Clean code of POS modules 2018-12-16 14:59:51 +01:00
theme Fix calculation of top menu entry of user 2018-12-18 17:01:57 +01:00
ticket Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
user Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
variants FIX : Typo errors 2018-11-26 16:09:05 +01:00
webservices
website Fix tooltip 2018-12-18 11:03:23 +01:00
.gitignore Ignore 2018-11-18 15:57:20 +01:00
cache.manifest
document.php Fix param attachment 2018-12-17 18:48:41 +01:00
favicon.ico
filefunc.inc.php Prepare 9.0 2018-12-04 16:08:36 +01:00
index.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
main.inc.php FIX #9629 #9625 2018-12-14 10:33:07 +01:00
master.inc.php
robots.txt
viewimage.php FIX Download of files with hashp when files are into user dir 2018-12-17 15:35:20 +01:00