Laurent Destailleur
a234482d08
FIX #3694
2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976
FIX #3694
2015-12-31 14:55:10 +01:00
Raphaël Doursenaud
973e42d10f
FIX #4097 Public holiday calculation
...
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
Laurent Destailleur
c06c2d0464
FIX #3841 creation of a task completed has not status set to finished by
...
default
2015-11-02 14:21:45 +01:00
Laurent Destailleur
87fad70f4a
Revert "FIX no need to remove file into mail form"
2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
...
FIX no need to remove file into mail form
2015-10-11 20:42:42 +02:00
Marcos García de La Fuente
4e9a378f0d
Merge branch '3.6' into bug-1776
2015-10-11 12:37:41 +02:00
Laurent Destailleur
34adc60d26
Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company
...
FIX error in SQL due to a previous fix
2015-10-01 10:35:07 +02:00
Alexis ALGOUD
453ed8a05e
FIX error in SQL due to a previous fix
2015-09-28 15:36:27 +02:00
Alexis Algoud
2d35124c71
FIX no need to remove file into mail form, the temp dir will be deleted after any sending
2015-09-23 11:11:19 +02:00
Marcos García de La Fuente
3818bff86a
Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address
2015-09-16 12:49:05 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Laurent Destailleur
14a8a2269b
FIX End log must use same level then start log.
2015-06-14 16:59:35 +02:00
Marcos García de La Fuente
87a00d6924
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-12 15:02:05 +02:00
Alexis Algoud
bc672c2c23
FIX event for restricted user was restricted if company null
2015-05-21 11:49:10 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Marcos García de La Fuente
41c55d1913
Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value
2015-03-04 11:55:17 +01:00
Marcos García de La Fuente
7876238823
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
...
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Laurent Destailleur
72da9b52af
Merge pull request #2380 from marcosgdf/bug-1825
...
Better fix for bug 1825
2015-02-24 17:07:17 +01:00
Laurent Destailleur
e1e31de229
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-02-20 20:15:04 +01:00
Marcos García de La Fuente
3a917a0d1f
Merge branch '3.6' into bug-1825
2015-02-20 10:19:08 +01:00
Marcos García de La Fuente
fd18aa8717
Better fix for Bug #1825
2015-02-20 10:17:02 +01:00
Laurent Destailleur
639aaebacb
Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825
Conflicts:
ChangeLog
2015-02-19 09:47:22 +01:00
Laurent Destailleur
ec56667f5e
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
...
country set
2015-02-19 09:44:22 +01:00
Laurent Destailleur
d1a4b6c2c5
phpcs
2015-02-19 00:04:35 +01:00
Marcos García de La Fuente
3efb737cbf
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016
Fix: [ bug #1846 ] Browser IE11 not detected
2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
0a81fe667f
Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
2015-02-16 10:44:10 +01:00
Marcos García de La Fuente
58a61e1294
Changed int typecast to float
2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
2015-02-10 00:20:47 +01:00
Laurent Destailleur
e8b2b22c32
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1827
Conflicts:
ChangeLog
2015-02-07 23:56:38 +01:00
Marcos García de La Fuente
b8b9df7b95
Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
2015-02-06 12:36:09 +01:00
Raphaël Doursenaud
fb865e8184
FIXED Removed deprecated forcing SSLv3 for CURL
...
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0
add left joins on llx_c_actiocomm
2015-01-20 17:26:32 +01:00
Marcos García de La Fuente
46fe2c67e0
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
2014-12-22 22:32:05 +01:00
Francis Appels
18406fc550
Fix: Show sender Country on PDF docs
...
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Florian HENRY
c0a3606a59
Fix problem on task creation with chrome for french browser.
2014-11-12 22:53:23 +01:00
Laurent Destailleur
31c38cedbc
Fix: checkstyle
2014-11-05 16:26:11 +01:00
Laurent Destailleur
420de76b4b
Merge pull request #1993 from aspangaro/3.6-patch
...
GPLv3
2014-11-04 17:40:38 +01:00
Laurent Destailleur
627f5694f0
Fix: Infinite loop
2014-11-02 21:19:00 +01:00
aspangaro
57f49ec5d4
GPLv3
2014-10-30 20:41:08 +01:00
Laurent Destailleur
a94f7dc3ad
Revert "Add function dolEscapeXML"
...
This reverts commit 756b1d31ad .
2014-10-16 01:21:33 +02:00
Laurent Destailleur
756b1d31ad
Add function dolEscapeXML
2014-10-16 01:01:30 +02:00
Laurent Destailleur
5c07df812d
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5
Fix: Pb in management of "or" ("|") for permission check.
2014-10-12 15:22:07 +02:00
Laurent Destailleur
c5d8012eb1
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/lib/date.lib.php
2014-10-12 02:13:38 +02:00
Laurent Destailleur
742d0e37ee
Fix: Bad month return by function
2014-10-05 12:54:51 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00