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
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
fmarcet
ab57c236be
New: Can have half day holiday
...
New: Add Spanish holidays
Fix: Holiday log shows nothing
2014-07-10 12:06:09 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
aspangaro
9eaeaae2fb
Merge branch 'Upstream/develop'
2014-07-05 08:48:51 +02:00
aspangaro
be78e96313
Bug fix & add tab info
2014-07-05 08:47:01 +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
aspangaro
a2ac578712
Merge branch 'Upstream/develop'
2014-07-04 06:21:00 +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
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +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
31c27b8f7c
New: More option to define default filter setting of agenda views.
2014-06-29 23:35:00 +02:00
aspangaro
46320071a0
Merge branch 'Upstream/develop'
2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d
Update
2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94
Fix: typo
2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
a8e4391887
Prepare calendars to be able to show calendars with selection on several
...
users.
2014-06-28 18:04:32 +02:00
Maxime Kohlhaas
d61e5bae93
Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related
2014-06-28 17:01:52 +02:00
Laurent Destailleur
e5a06635dc
Fix css for agenda box
...
Make different view of agenda into different tabs.
2014-06-27 20:50:46 +02:00
Laurent Destailleur
2deadea40a
New: Filter on event status
2014-06-26 20:24:00 +02:00
Laurent Destailleur
0778d38b2c
Fix: Deprecated and no more used fields should not appear to user.
2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472
Fix: Deprecated and no more used fields should not appear to user.
2014-06-21 18:03:01 +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
a2724822d7
Fix: Add hidden option to partially fix a bug. A more complete fix
...
should be done later.
2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
e2afa6853b
Fix: Deletion of translation has disappeared.
2014-06-20 15:05:39 +02:00
Laurent Destailleur
6740e0321a
Merge pull request #1670 from FHenry/3.5
...
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
2014-06-20 13:16:11 +02:00
Laurent Destailleur
3791175536
Fix: doxygen
2014-06-20 13:07:15 +02:00
Laurent Destailleur
221d7b56aa
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
2014-06-20 12:41:23 +02:00
Florian HENRY
0f77fbaea2
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
...
card
2014-06-17 11:18:30 +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
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Florian HENRY
f796a6408e
Do not display dictionnay for non activated module
2014-06-12 15:28:11 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Laurent Destailleur
9ba4b53a88
Merge pull request #1645 from FHenry/3.5
...
Start fix [ bug #1437 ] Securitu Issue
2014-06-09 15:10:55 +02:00
Florian HENRY
77a9d4eb71
Start fix [ bug #1437 ] Securitu Issue
...
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple
I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Laurent Destailleur
768163c6fc
Fix: Easy fix to solve pb with pagebreak when adding image
2014-06-06 12:57:12 +02:00
