dolibarr/htdocs
aspangaro 11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
..
accountancy Merge remote-tracking branch 'origin/3.7' into develop 2015-02-26 13:36:07 +01:00
adherents Reduce a lot of duplicate code. Move all tables of extrafields setup 2015-02-28 20:14:26 +01:00
admin Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-05 20:24:53 +01:00
asterisk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
barcode Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 2015-02-18 22:54:02 +01:00
bookmarks Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
cashdesk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
categories Reduce a lot of duplicate code. Move all tables of extrafields setup 2015-02-28 20:14:26 +01:00
comm Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:46:48 +01:00
commande Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 2015-03-04 23:03:29 +01:00
compta Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-05 20:24:53 +01:00
conf Fixed example 2015-02-21 10:00:31 +01:00
contact Merge remote-tracking branch 'origin/3.7' into develop 2015-02-28 03:11:15 +01:00
contrat Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:38:16 +01:00
core Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-05 20:24:53 +01:00
cron Merge remote-tracking branch 'origin/3.7' into develop 2015-02-26 13:36:07 +01:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
ecm Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
expedition Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 2015-03-04 23:03:29 +01:00
expensereport Key language 2015-02-28 08:50:47 +01:00
exports Finished new module to manage expense reports ! 2015-02-22 13:16:49 +01:00
externalsite Fix: syntax error 2014-12-04 01:23:39 +01:00
fichinter Reduce a lot of duplicate code. Move all tables of extrafields setup 2015-02-28 20:14:26 +01:00
fourn Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:38:16 +01:00
ftp
holiday FIXED: Update licence to GPLv3 2015-02-23 22:04:01 +01:00
imports Merge remote-tracking branch 'origin/3.7' into develop 2015-02-24 15:42:28 +01:00
includes Fix bad merge 2015-03-05 10:57:17 +01:00
install Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-05 20:24:53 +01:00
langs Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-05 20:24:53 +01:00
livraison [CORE] intégration de incoterm sur les différentes class (#incoterm). 2015-02-23 09:16:14 +01:00
mailmanspip Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
margin Merge remote-tracking branch 'origin/3.7' into develop 2015-02-23 14:59:24 +01:00
opensurvey Fix bad position of html tags 2015-03-01 13:54:24 +01:00
paybox
paypal Merge remote-tracking branch 'origin/3.7' into develop 2014-12-26 04:57:55 +01:00
printing Fix doxygen 2015-02-11 15:05:52 +01:00
product NEW: Add module "Supplier commercial proposals" to requests 2015-03-04 17:54:43 +01:00
projet NEW: Show difference between timespent by everybody and time spent by 2015-03-05 13:48:57 +01:00
public Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
resource Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
societe Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:38:16 +01:00
support Fixed: missing css 2014-12-08 02:51:26 +01:00
theme NEW: Add module "Supplier commercial proposals" to requests 2015-03-04 17:54:43 +01:00
user Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:38:16 +01:00
webservices Closed #2414 2015-03-04 20:34:41 +01:00
.gitignore Better doc to install external modules. 2015-01-09 13:00:10 +01:00
cache.manifest Fixed: bad url 2015-01-22 23:49:32 +01:00
disabled.php
document.php
favicon.ico
filefunc.inc.php NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
index.php Merge remote-tracking branch 'origin/3.7' into develop 2015-02-23 14:59:24 +01:00
main.inc.php Add navigation into the new timesheet week page. 2015-03-05 11:13:44 +01:00
master.inc.php
robots.txt
viewimage.php