dolibarr/htdocs
Laurent Destailleur eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
..
accountancy Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
adherents Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
admin Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
api Fix #6365 2017-02-03 11:42:49 +01:00
asterisk
barcode
bookmarks Merge branch 'develop' into develop 2017-01-27 01:46:21 +01:00
cashdesk Merge pull request #6408 from gnovaro/patch-6 2017-02-12 20:41:55 +01:00
categories Fix css and look 5.0 2017-01-22 12:13:32 +01:00
comm Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
commande Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-16 22:09:37 +01:00
compta Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
conf
contact contact email not display on tooltip 2017-02-15 01:22:20 +01:00
contrat Merge branch 'develop' into prod-attr 2017-02-02 20:07:41 +01:00
core Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
cron Fix responsive 2017-01-17 20:04:41 +01:00
custom
don Fix regression: Textarea to enter data was crushed. 2017-02-07 01:13:04 +01:00
ecm Removed useless table-tr-td 2017-02-04 11:32:26 +01:00
expedition Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-16 22:09:37 +01:00
expensereport Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-16 22:09:37 +01:00
exports NEW Introduce fields that can be computed during export in export 2017-02-17 00:19:28 +01:00
externalsite
fichinter Little correction 2017-02-03 20:12:26 +01:00
fourn Merge pull request #6409 from IonAgorria/supplierorder-oldline 2017-02-12 20:45:20 +01:00
ftp
holiday Fix loading lang 2017-01-23 17:36:50 +01:00
hrm
imports
includes Default usage to send token is header. 2017-02-03 12:16:13 +01:00
install Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
langs Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
livraison In case Model for document generation is not defined, the criteria to select the model is now: 2017-01-16 21:16:05 +01:00
loan Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
mailmanspip
margin Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-28 15:12:14 +01:00
multicurrency/class
opensurvey Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
paybox
paypal
printing
product Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
projet Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
public Debug module variant 2017-02-08 12:52:31 +01:00
resource fix extrafield list of fileds 2017-01-26 15:44:09 +01:00
societe Accounting code not display on tooltip 2017-02-17 10:47:29 +01:00
supplier_proposal Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 01:48:43 +01:00
support
theme Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
user Debug of feature for browser notifications 2017-02-14 18:20:01 +01:00
variants Optimize code and performance of module variant 2017-02-08 14:07:54 +01:00
webservices
websites Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
.gitignore
cache.manifest
document.php
favicon.ico
filefunc.inc.php Fix fields into projet export 2017-01-26 10:41:02 +01:00
index.php Merge branch 'new_link_weather_board' of 2017-02-06 20:51:46 +01:00
main.inc.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-21 10:34:52 +01:00
master.inc.php
robots.txt
viewimage.php