Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-09 10:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
f368ef377bb18cc8d71ef65b7fd9af5ef27d7d9d
dolibarr/htdocs
History
Laurent Destailleur f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
2019-07-20 16:02:15 +02:00
..
accountancy
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
adherents
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-15 22:45:29 +02:00
admin
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
api
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
asset
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
asterisk
Add @ignore so scrutinizer ignores duplicate definition of llxHeader
2019-06-22 18:06:14 +02:00
barcode
…
blockedlog
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
bom
FIX compatibility mysql 8. rank is reserved
2019-07-09 00:14:01 +02:00
bookmarks
…
cashdesk
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
categories
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
collab
…
comm
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
commande
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
compta
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 16:02:15 +02:00
conf
…
contact
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
contrat
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
core
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
cron
…
custom
…
datapolicy
Protect from dir scan
2019-06-18 14:51:57 +02:00
dav
…
debugbar
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
don
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
ecm
…
emailcollector
FIX #11421
2019-06-28 12:52:35 +02:00
expedition
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
expensereport
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 14:03:18 +02:00
exports
Fix sort order of export profiles
2019-06-21 13:25:40 +02:00
externalsite
…
fichinter
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
fourn
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
ftp
…
holiday
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
hrm
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
imports
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
includes
FIX #11498
2019-07-15 23:25:42 +02:00
install
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 14:03:18 +02:00
langs
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
livraison
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
loan
…
mailmanspip
…
margin
…
modulebuilder
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
mrp
FIX hook
2019-06-18 15:13:08 +02:00
multicurrency/class
…
opensurvey
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
paybox
…
paypal
…
printing
…
product
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
projet
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
public
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
reception
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
resource
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
societe
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 16:02:15 +02:00
stripe
Fix param
2019-07-19 03:53:34 +02:00
supplier_proposal
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
support
…
takepos
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-25 23:41:56 +02:00
theme
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
ticket
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
user
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:23:24 +02:00
variants
…
webservices
Fix position of modules
2019-06-23 20:05:15 +02:00
website
Protect from dir scan
2019-06-18 14:51:57 +02:00
.gitignore
…
cache.manifest
…
document.php
Add @ignore so scrutinizer ignores duplicate definition of llxHeader
2019-06-22 18:06:14 +02:00
favicon.ico
…
filefunc.inc.php
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-01 13:28:44 +02:00
index.php
…
main.inc.php
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 13:29:10 +02:00
master.inc.php
…
opcachepreload.php
Add opcodepreload.php file
2019-07-18 11:14:39 +02:00
robots.txt
…
viewimage.php
Add @ignore so scrutinizer ignores duplicate definition of llxHeader
2019-06-22 18:06:14 +02:00