lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100fa1067e
dolibarr/htdocs
History
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
accountancy Change generic and setup image title 2015-04-18 23:13:48 +02:00
adherents Change generic and setup image title 2015-04-18 23:13:48 +02:00
admin Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02: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 Change generic and setup image title 2015-04-18 23:13:48 +02:00
cashdesk Change generic and setup image title 2015-04-18 23:13:48 +02:00
categories Change generic and setup image title 2015-04-18 23:13:48 +02:00
comm Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
commande First clean of code after devcamp 2015-04-21 15:49:58 +02:00
compta Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
conf Delete phpinfo.php 2015-04-01 18:57:54 +02:00
contact Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
contrat First clean of code after devcamp 2015-04-21 15:49:58 +02:00
core Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
cron Change generic and setup image title 2015-04-18 23:13:48 +02:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
don Change generic and setup image title 2015-04-18 23:13:48 +02:00
ecm QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
expedition Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
expensereport fix syntax errors 2015-04-18 18:07:41 +02:00
exports Merge remote-tracking branch 'origin/3.7' into develop 2015-04-13 13:08:46 +02:00
externalsite Change generic and setup image title 2015-04-18 23:13:48 +02:00
fichinter Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
fourn First clean of code after devcamp 2015-04-21 15:49:58 +02:00
ftp Change generic and setup image title 2015-04-18 23:13:48 +02:00
holiday QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
imports Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
includes Update PEAR Mail_MIME to 1.8.9 2015-04-18 04:27:15 +02:00
install Fix migration process 2015-04-22 00:17:03 +02:00
langs Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
livraison Copyright 2015-04-18 20:50:03 +02:00
loan Update loan card 2015-04-10 18:26:28 +02:00
mailmanspip Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
margin Change generic and setup image title 2015-04-18 23:13:48 +02:00
opensurvey fix syntax errors 2015-04-18 18:07:41 +02:00
paybox Change generic and setup image title 2015-04-18 23:13:48 +02:00
paypal Fix: PHPCS 2015-04-08 00:14:44 +02:00
printing Change generic and setup image title 2015-04-18 23:13:48 +02:00
product Update product.class.php 2015-04-22 10:39:32 +02:00
projet Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
public Fix warnings when submitting a vote for a survey 2015-04-12 11:42:49 +02:00
resource Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
societe Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
support Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
theme Fix minor look and security errors 2015-04-21 12:03:51 +02:00
user Change generic and setup image title 2015-04-18 23:13:48 +02:00
webservices Change generic and setup image title 2015-04-18 23:13:48 +02:00
.gitignore
cache.manifest Fixed: bad url 2015-01-22 23:49:32 +01:00
disabled.php
document.php
favicon.ico
filefunc.inc.php Fix minor look and security errors 2015-04-21 12:03:51 +02:00
index.php Add home picto for index page title 2015-04-19 00:41:29 +02:00
main.inc.php Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
master.inc.php trigger on total 2014-08-12 11:40:24 +02:00
robots.txt Add example of comment 2012-11-07 02:22:25 +01:00
viewimage.php