lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
657fc1b91c
dolibarr/htdocs
History
Laurent Destailleur 657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
..
accountancy Fixed: All sql requests are now logged 2014-12-04 01:29:01 +01:00
adherents Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
admin Admin config for ask for payment bank during order 2014-12-21 10:32:11 +01:00
asterisk Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
barcode Bad var 2014-12-04 01:36:53 +01:00
bookmarks Fix: Var not defined 2014-12-04 01:42:23 +01:00
cashdesk Fix: PHPCS 2014-12-05 20:34:36 +01:00
categories Fix: Param $action was not defined. 2014-11-15 19:04:21 +01:00
comm Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
commande Merge pull request #2186 from marcosgdf/bug-575 2014-12-26 04:02:01 +01:00
compta Merge pull request #2186 from marcosgdf/bug-575 2014-12-26 04:02:01 +01:00
conf Clean path dolibarr_main_url_root to avoid duplicate /. 2014-08-06 00:06:27 +02:00
contact Fixed: Translations 2014-12-07 18:24:45 +01:00
contrat Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
core Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
cron Update /cron/list.php 2014-11-23 17:43:24 +01:00
ecm Corrected key not translated 2014-12-25 22:20:09 +01:00
expedition Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
exports Fix: Missing field tobuy into service export. 2014-08-29 20:26:27 +02:00
externalsite #1704 Untranslatable token in externalsite module admin 2014-11-20 06:34:50 +01:00
fichinter Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
fourn Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
ftp Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
holiday Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
imports Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
includes Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
install Merge pull request #2193 from marcosgdf/bug-1761 2014-12-26 04:14:03 +01:00
langs Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
livraison Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
mailmanspip Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
margin Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
opensurvey Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
paybox Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
paypal Resized PayPal logo 2014-12-25 19:17:52 +01:00
printipp Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 2014-12-04 13:20:56 +01:00
product Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
projet Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
public Better comment 2014-11-23 13:19:28 +01:00
resource Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
societe Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
support Fixed: missing css 2014-12-08 02:51:26 +01:00
theme Maj icon 2014-12-22 03:12:01 +01:00
user Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
webservices Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
.gitignore Merge remote-tracking branch 'origin/3.6' into develop 2014-09-18 10:17:43 +02:00
cache.manifest Look: Refresh install style with more neutral colors. Select line style 2014-08-03 11:18:32 +02:00
disabled.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
document.php
favicon.ico
filefunc.inc.php Prepare 3.5.6 2014-12-04 15:09:47 +01:00
index.php Add : statistics on supplier orders and invoices on home page 2014-10-25 17:22:03 +02:00
main.inc.php Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
master.inc.php trigger on total 2014-08-12 11:40:24 +02:00
robots.txt
viewimage.php