dolibarr/htdocs
Laurent Destailleur 65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
..
accountancy Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr 2018-10-24 02:54:57 +02:00
adherents Update adherent.class.php 2018-10-15 08:53:47 +02:00
admin Merge pull request #9772 from ptibogxiv/patch-76 2018-10-16 21:39:30 +02:00
api code comment 2018-10-20 13:47:51 +02:00
asset Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
asterisk
barcode
blockedlog
bookmarks Fix log bookmark create 2018-10-09 12:53:45 +02:00
cashdesk Save pos station into invoice 2018-10-08 22:28:30 +02:00
categories code comment categories class 2018-10-21 19:19:35 +02:00
collab
comm Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
commande Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
compta Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2018-10-24 03:39:33 +02:00
conf
contact Standardize and update code 2018-10-13 09:59:33 +02:00
contrat do not trim int 2018-10-16 23:20:13 +02:00
core Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2018-10-24 03:39:33 +02:00
cron Standardize and update code 2018-10-10 09:20:50 +02:00
custom
datapolicy cut long lines >500 2018-10-16 21:05:15 +02:00
dav
don Standardize and update code 2018-10-10 09:20:50 +02:00
ecm NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
expedition Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
expensereport remove deprecated form_confirm 2018-10-22 21:57:18 +02:00
exports
externalsite
fichinter Standardize and update code 2018-10-13 10:39:27 +02:00
fourn Standardize and update code 2018-10-10 12:16:20 +02:00
ftp Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
holiday Standardize and update code 2018-10-11 09:22:03 +02:00
hrm Standardize code 2018-10-06 12:14:47 +02:00
imports
includes Merge pull request #9841 from laudeco/fix/9824_pdf_merge 2018-10-24 02:31:48 +02:00
install Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
langs Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr 2018-10-24 02:54:57 +02:00
livraison FIX missing print button for delivery form 2018-10-23 22:11:39 +02:00
loan Merge branch 'develop' into payloan 2018-10-16 19:43:34 +02:00
mailmanspip Update mailmanspip.class.php 2018-10-15 21:32:27 +02:00
margin Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 17:07:32 +02:00
modulebuilder Move declaration into common 2018-10-19 13:38:05 +02:00
multicurrency/class Specifics comments 2018-09-24 12:22:41 +02:00
opensurvey
paybox Merge pull request #9839 from oas-services/7.0 2018-10-24 03:27:12 +02:00
paypal
printing
product Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 03:35:44 +02:00
projet Fix deletion of project when there is events 2018-10-23 17:53:01 +02:00
public Merge pull request #9831 from frederic34/payment 2018-10-24 03:25:01 +02:00
resource Standardize and update code 2018-10-12 09:34:54 +02:00
societe Fix: do not loose country_code after update 2018-10-21 11:44:21 +02:00
stripe Revert "FIX and dolibarize" 2018-10-16 19:20:51 +02:00
supplier_proposal Standardize and update code 2018-10-12 12:20:05 +02:00
support Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
takepos Fix delete without any selected line 2018-10-18 16:31:37 +02:00
theme Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2018-10-24 03:39:33 +02:00
ticket Update ticketlogs.class.php 2018-10-19 12:51:14 +02:00
user Look and feel 2018-10-17 00:34:39 +02:00
variants New: works with variants: 2018-10-19 12:02:14 +02:00
webservices
website FIX delete of a file in file_manager return to same dir 2018-10-19 10:59:34 +02:00
.gitignore
cache.manifest
document.php
favicon.ico
filefunc.inc.php Prepare 7.0.5 2018-10-12 21:11:40 +02:00
index.php
main.inc.php
master.inc.php
robots.txt
viewimage.php