Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
5f79b2d0c6ac293f3b585c015e5df1aa7c2b26d0
dolibarr-fork/htdocs
History
Laurent Destailleur 5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
..
accountancy
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
adherents
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
admin
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
api
…
asterisk
…
barcode
…
bookmarks
…
cashdesk
Merge pull request #6408 from gnovaro/patch-6
2017-02-12 20:41:55 +01:00
categories
Fix deletion of bank category/tag
2017-02-27 12:14:32 +01:00
comm
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
commande
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
compta
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
conf
…
contact
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-23 02:55:50 +01:00
contrat
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
core
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
cron
Fix parameters
2017-02-27 00:22:11 +01:00
custom
…
don
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
ecm
Work on module website
2017-02-24 21:13:40 +01:00
expedition
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-03 14:31:35 +01:00
expensereport
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
exports
NEW Introduce fields that can be computed during export in export
2017-02-17 00:19:28 +01:00
externalsite
…
fichinter
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
fourn
Clean and uniformize code
2017-02-24 15:16:53 +01:00
ftp
…
holiday
…
hrm
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
imports
…
includes
Try jSignature
2017-03-03 15:26:51 +01:00
install
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
langs
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
livraison
…
loan
…
mailmanspip
…
margin
…
multicurrency/class
…
opensurvey
…
paybox
…
paypal
…
printing
…
product
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
projet
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-03 14:31:35 +01:00
public
Work on module website
2017-02-24 21:13:40 +01:00
resource
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-23 02:55:50 +01:00
societe
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:11:35 +01:00
supplier_proposal
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
support
Clean admin menu entries
2017-02-22 02:19:50 +01:00
theme
Clean CSS
2017-03-04 17:49:44 +01:00
user
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-03 14:31:35 +01:00
variants
Optimize code and performance of module variant
2017-02-08 14:07:54 +01:00
webservices
…
websites
Work on module website
2017-02-24 21:13:40 +01:00
.gitignore
…
cache.manifest
…
document.php
…
favicon.ico
…
filefunc.inc.php
Prepare final 5.0
2017-02-21 12:03:08 +01:00
index.php
Rewrite working board to prepare new features
2017-03-03 16:55:22 +01:00
main.inc.php
Work on module website
2017-02-24 21:13:40 +01:00
master.inc.php
…
robots.txt
…
viewimage.php
…