Laurent Destailleur
95da79108f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-31 17:22:37 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
frederic34
6645b8a454
Cannot redeclare getmypid()
2014-07-31 10:21:47 +02:00
Laurent Destailleur
0f9aa69e4e
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 21:34:23 +02:00
Laurent Destailleur
b57371bfa1
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 20:21:01 +02:00
Laurent Destailleur
3011ecf6df
Fix: PHPCS
2014-07-28 19:55:12 +02:00
Laurent Destailleur
bf9313dd87
getBrowserInfo can return type of layout (classic/phone/tablet)
2014-07-27 20:56:26 +02:00
Laurent Destailleur
709bf20deb
Work on prootype for using datatable.
2014-07-27 20:31:11 +02:00
Laurent Destailleur
b964f9e9e3
New: Add info page about browser.
...
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
Marcos García de La Fuente
37c7d05a9e
Added missing return null for getStaticMember
2014-07-22 04:46:17 +02:00
Marcos García de La Fuente
31adeb7477
Deprecated getStaticMember
2014-07-22 04:12:45 +02:00
Marcos García de La Fuente
9b3e65d80f
Removed PHP 5.3 comparison in dol_nl2br function
2014-07-22 04:07:33 +02:00
Laurent Destailleur
bd095f597d
Fix: CheckStyle
2014-07-20 14:54:30 +02:00
Marcos García de La Fuente
55bfc98d48
Corrected dol_microtime_float refactor
2014-07-18 12:00:01 +02:00
Marcos García de La Fuente
214fe2d552
Optimized isValidEmail function and load json.lib.php always as it contains common Dolibarr functions
2014-07-18 11:18:25 +02:00
Marcos García de La Fuente
bcafa2c790
Corrected file_exists check and little refactor
2014-07-17 21:44:59 +02:00
Marcos García de La Fuente
8a17feb69b
Deprecated some functions and improved method documentation
2014-07-15 17:35:12 +02:00
Marcos García de La Fuente
ad4512cb24
Avoiding include in case of unexisting file
2014-07-15 17:18:41 +02:00
Marcos García
8eced58ba0
Removed @ operator from dol_include_once
...
Adding @ operator to include_once makes include errors untraceable, it shouldn't be there. Errors must be thrown so that we notice them. It is PHP configuration's choice to decide wether to log them or print them.
2014-07-14 19:16:28 +02:00
Laurent Destailleur
8e2999f73f
Fix: phpcs
2014-07-04 14:19:03 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Laurent Destailleur
bf96a78f63
Try a fix when timezone string is not standard
2014-07-04 13:07:53 +02:00
Juanjo Menent
24b2b83b85
use count() instead sizeof()
2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with company
2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
5c0813e865
Fix: EMail test feature to make a test without html must not include any
...
html.
2014-06-21 01:26:41 +02:00
Laurent Destailleur
e2afa6853b
Fix: Deletion of translation has disappeared.
2014-06-20 15:05:39 +02:00
Laurent Destailleur
3791175536
Fix: doxygen
2014-06-20 13:07:15 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
872e764c94
Fix: html detection was not working with hx tags.
2014-05-24 14:57:41 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Florian HENRY
2aa2f896c6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f
"or" into if instead of ||
2014-05-09 13:28:29 +02:00
Laurent Destailleur
7bfbc4cbf3
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
2014-05-07 19:30:19 +02:00
Laurent Destailleur
1bc3558307
Fix: Better html detection
2014-05-07 19:06:15 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
7bb23086b8
Fix: Strict mode
2014-05-01 17:06:14 +02:00
Laurent Destailleur
e5c5b15ecc
Qual: Start to clean module ECM (Code is to complex). Prepare for
...
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Raphaël Doursenaud
036cc7472f
Qual: Removed missing variable from function call
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
1c7011523d
Qual: Missing global declaration
2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
83dd3a532b
Qual: Better type check
2014-04-23 18:23:50 +02:00
Laurent Destailleur
1c21c00fb6
New: Can use "Space" as value for SeparatorThousand into language files
2014-04-06 21:18:21 +02:00
Laurent Destailleur
d595b96c8e
New: Paypal return for subscription show more information and direct
...
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
2014-04-06 14:22:08 +02:00
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
Laurent Destailleur
61f649e1ae
Fix: When select_date is called with '' as preselected date,
...
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
