lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cce1549f66
dolibarr/htdocs
History
Laurent Destailleur cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
..
accountancy FIX journalization for bank journal should not rely on a label. 2017-09-08 17:50:39 +02:00
adherents Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-13 20:55:22 +02:00
admin Merge pull request #7353 from hregis/6.0_htmlentities 2017-09-11 14:08:37 +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 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
cashdesk Fix responsive 2017-06-13 20:07:28 +02:00
categories Fix count into loop 2017-09-14 21:35:14 +02:00
collab Debug module website 2017-07-03 12:04:45 +02:00
comm Fix this->db 2017-09-14 21:27:14 +02:00
commande Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 11:02:34 +02:00
compta Update remisecheque.class.php 2017-09-14 12:06:41 +02:00
conf New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
contact Fix: missing parameters for filter and sort (contact list) 2017-09-09 09:46:21 +02:00
contrat Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
core Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 11:02:34 +02:00
cron Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
custom
don Escape all status 2017-09-08 13:23:12 +02:00
ecm Fix pb in ecm 2017-08-01 18:44:34 +02:00
expedition Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
expensereport Escape all status 2017-09-08 13:23:12 +02:00
exports Fix better management of export of extrafield computed. 2017-06-13 18:50:31 +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 Complete #7361 2017-09-11 14:50:00 +02:00
fourn Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 11:02:34 +02:00
ftp FIX #6945 2017-06-06 10:53:53 +02:00
holiday Fix duplicate code 2017-08-29 17:52:10 +02:00
hrm Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
imports NEW Can import users 2017-04-17 04:22:53 +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 '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 11:02:34 +02:00
langs Merge pull request #7383 from inoveaconseil/patch-8 2017-09-14 12:15:32 +02:00
livraison Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
loan Fix missing $form 2017-08-22 10:02:45 +02:00
mailmanspip
margin FIX #7312 2017-09-02 01:28:19 +02:00
modulebuilder FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
multicurrency/class New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
opensurvey Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
paybox Look and feel v6 2017-05-15 10:39:14 +02:00
paypal Look and feel v6 2017-05-15 10:39:14 +02:00
printing Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
product Fix bug reported by scrutinizer 2017-09-12 19:12:39 +02:00
projet Update time.php 2017-09-14 12:03:36 +02:00
public Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 11:02:34 +02:00
resource Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
societe Fix responsive 2017-09-13 22:56:24 +02:00
stripe Look and feel v6 2017-05-15 10:39:14 +02:00
supplier_proposal Update card.php 2017-09-14 13:25:01 +02:00
support Fix link http 2017-08-21 20:49:12 +02:00
theme Fix css pb 2017-09-13 17:10:04 +02:00
user Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
variants Fix travis error 2017-08-01 01:28:07 +02:00
webservices FIX #7265 2017-08-23 12:47:59 +02:00
websites Revert "Fix include fails" 2017-07-28 12:07:05 +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 Fix missing translation of page "disabled" and "offline". 2016-12-02 17:49:39 +01:00
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 Fix bad table alignement 2017-08-20 16:21:07 +02:00
main.inc.php FIX Security fixes (filter onload js, less verbose error message in 2017-09-06 11:39:30 +02:00
master.inc.php Fix too much code into the NOREQUIREDB 2017-07-02 13:18:23 +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