Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
ecc30b8ffecf073ac6fd0786cc074e2a9c9cf41f
dolibarr-fork/htdocs
History
Laurent Destailleur ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
..
accountancy
Merge pull request #10401 from aspangaro/10.0_accountancy2
2019-01-27 18:06:08 +01:00
adherents
Merge pull request #10429 from frederic34/patch-17
2019-01-27 18:00:52 +01:00
admin
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
api
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
asset
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
asterisk
…
barcode
…
blockedlog
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
bookmarks
update with html5 compliant code
2019-01-22 13:56:14 +01:00
cashdesk
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
categories
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
collab
…
comm
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
commande
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
compta
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
conf
…
contact
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
contrat
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
core
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
cron
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
custom
…
datapolicy
…
dav
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
don
Merge pull request #10368 from ptibogxiv/patch-91
2019-01-27 18:07:46 +01:00
ecm
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
emailcollector
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
expedition
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
expensereport
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
exports
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
externalsite
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
fichinter
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
fourn
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
ftp
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
holiday
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
hrm
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
imports
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
includes
NEW Introduce PhpSpreadsheet for export (need php5.6+)
2019-01-21 14:06:01 +01:00
install
Fix missing field into migration
2019-01-27 18:11:18 +01:00
langs
Remove absolut divs and add Dolistore POS category link to TakePOS
2019-01-27 01:28:32 +01:00
livraison
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
loan
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
mailmanspip
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
margin
update with html5 compliant code
2019-01-19 12:52:34 +01:00
modulebuilder
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
multicurrency/class
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
opensurvey
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
paybox
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
paypal
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
printing
…
product
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
projet
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
public
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
reception
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
resource
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
societe
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
stripe
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
supplier_proposal
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
support
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
takepos
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
theme
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-23 19:22:42 +01:00
ticket
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
user
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-27 18:27:58 +01:00
variants
FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
2018-12-25 08:34:26 +01:00
webservices
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
website
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
.gitignore
…
cache.manifest
…
document.php
…
favicon.ico
…
filefunc.inc.php
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
index.php
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
main.inc.php
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
master.inc.php
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
robots.txt
…
viewimage.php
…