dolibarr/htdocs/core
Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
..
ajax Fix: String translated twice 2014-02-05 20:57:43 +01:00
boxes Update box_ficheinter.php 2014-03-26 10:57:07 +01:00
class Merge remote-tracking branch 'origin/3.5' into develop 2014-03-31 00:44:45 +02:00
db Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
filemanagerdol Removed deprecated code 2014-02-25 04:29:34 +01:00
js Fix: Image always fit into window when using cropping feature even if 2014-03-18 23:24:00 +01:00
lib Merge remote-tracking branch 'origin/3.5' into develop 2014-03-31 00:44:45 +02:00
login Add multicompany->enabled test 2013-12-16 09:45:38 +01:00
menus Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00
modules Merge remote-tracking branch 'origin/3.5' into develop 2014-03-31 00:44:45 +02:00
tpl Merge remote-tracking branch 'origin/3.5' into develop 2014-03-19 22:29:18 +01:00
triggers Fix: Add actions events not implemented 2014-03-17 17:05:55 +01:00
actions_extrafields.inc.php Fix: sql error with postgres when creating extrafield with an upper cas 2014-02-25 15:48:13 +01:00
actions_sendmails.inc.php Fix: Sending email from thirdparty must add event into agenda if option 2013-09-25 21:36:40 +02:00
actions_setnotes.inc.php Qual: Mutualize code for actions of editing notes 2014-01-11 13:33:30 +01:00
antispamimage.php
datepicker.php
doxygen.php
get_menudiv.php Fix: Var not initialized 2013-06-01 23:46:36 +02:00
index.php
photos_resize.php Fix: Image always fit into window when using cropping feature even if 2014-03-18 23:24:00 +01:00
search_page.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
tools.php Fix: Permissions on files 2013-08-06 00:36:21 +02:00