Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-23 09:13:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
04934cc4aa539a4569e5366dfd80ab6b401b3b2c
dolibarr/htdocs
History
Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
..
accountancy
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
adherents
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
admin
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
api
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
asterisk
…
barcode
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-22 12:17:25 +01:00
blockedlog
Fix various payments
2018-01-29 19:07:42 +01:00
bookmarks
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
cashdesk
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
categories
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
collab
Clean translation files
2017-11-03 14:38:00 +01:00
comm
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
commande
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
compta
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
conf
NEW Add param $dolibarr_main_restrict_ip in config file to limit ips
2018-02-15 19:49:50 +01:00
contact
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
contrat
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
core
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
cron
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
custom
…
don
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
ecm
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
expedition
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
expensereport
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
exports
NEW Can export leave requests
2018-02-09 16:08:28 +01:00
externalsite
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
fichinter
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
fourn
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
ftp
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
holiday
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
hrm
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
imports
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-25 12:21:10 +01:00
includes
Don't check for windows/linux, just call soffice (without the extension) will work on windows too.
2018-02-15 14:38:21 +01:00
install
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
langs
NEW Add extrafield type "html"
2018-02-27 17:30:13 +01:00
livraison
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
loan
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-28 09:56:40 +01:00
mailmanspip
…
margin
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
modulebuilder
code sample
2018-02-27 10:07:38 +01:00
multicurrency/class
…
opensurvey
Fix for multicompany
2018-02-06 10:57:53 +01:00
paybox
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
paypal
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
printing
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
product
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
projet
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
public
CSS
2018-02-25 11:00:50 +01:00
resource
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
societe
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
stripe
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
supplier_proposal
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
support
Fix debian package
2018-02-16 18:21:18 +01:00
theme
Fix search on dates on template invoices
2018-02-27 19:04:21 +01:00
user
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
variants
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
webservices
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-27 19:18:43 +01:00
website
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
.gitignore
…
cache.manifest
…
document.php
fetched from dolibarr/dolibarr
2018-02-15 16:02:13 +01:00
favicon.ico
…
filefunc.inc.php
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-17 01:19:17 +01:00
index.php
Better balance css columns in dashboard
2018-02-08 15:11:05 +01:00
main.inc.php
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-02-20 14:59:40 +01:00
master.inc.php
Fix constant MAIN_LANG_DEFAULT not used
2017-12-19 00:24:38 +01:00
robots.txt
…
viewimage.php
fetched from dolibarr/dolibarr
2018-02-15 16:02:13 +01:00