Laurent Destailleur
82ad81fc03
Fix picto
2015-09-07 20:56:28 +02:00
Laurent Destailleur
9667b6a7c6
Solve conflict of var name
2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc
Fix memcached effect was lost because init was done each time.
2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c
Fix memcached effect was lost because init was done each time.
2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
71b98ffc0e
Qual: remove debug output
2015-09-07 17:15:41 +02:00
Raphaël Doursenaud
0a9f4a41f3
Qual: Removed dead code
2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
97f91d0ef9
Fix #3440 Only search core modules in main path
...
Removed duplicated code and used common dolGetModulesDirs() function
2015-09-05 12:37:43 +02:00
Laurent Destailleur
c03d508bd3
Merge pull request #3467 from guerrierk/develop
...
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
2a8ebcefcc
Merge pull request #3412 from gschratzer/develop
...
NEW update actions_sendmails.inc.php files.inc.php
2015-09-04 23:38:01 +02:00
GUERRIER Kevin
692fdbaec4
Adding Document tab into Bank Account
2015-09-04 21:29:16 +02:00
Raphaël Doursenaud
1ffb28a460
Fixed mobile detect classname without autoloader
2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
0eb0f52b6d
Install mobiledetect from composer
2015-09-04 19:06:01 +02:00
Laurent Destailleur
dcaef54f9b
Fix can't disable a module that were removed.
2015-09-04 16:47:43 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
0955432de3
Merge branch '3.7' into bug-iban-whitespaces-37
...
# Conflicts:
# ChangeLog
2015-09-03 12:02:23 +02:00
Laurent Destailleur
ce2e5e7862
Little debug of accounting module
2015-09-03 11:54:03 +02:00
Laurent Destailleur
7a78c9d704
Fix doxygen
2015-09-01 14:31:32 +02:00
Marcos García de La Fuente
9ec349f410
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
...
Close #3432
2015-09-01 10:56:55 +02:00
BENKE Charlie
5ee00cf97b
change made
2015-08-31 05:09:21 +02:00
Laurent Destailleur
1e3bc9f822
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Marcos García
3482031b8a
Removed second odd test
2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383
Removed odd test
2015-08-29 21:41:15 +02:00
Laurent Destailleur
c8f12dc5f2
Fix PUT method for already formated strings
2015-08-29 15:12:31 +02:00
philippe grand
6952084be3
it's a mess
2015-08-27 17:23:23 +02:00
philippe grand
db7defb7c3
Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
...
This reverts commit 2527ae263b .
2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
2015-08-27 14:28:12 +02:00
Niklas Spanring
53a02e5863
Fix: travis-ci error files.lib.php
...
error line="215" message="There must be no blank lines after the function comment"
error line="217" message="Arguments with default values must be at the end of the argument list"
error line="248" message="The use of function sizeof() is forbidden; use count() instead"
error line="303" message="The use of function sizeof() is forbidden; use count() instead"
error line="447" message="The use of function sizeof() is forbidden; use count() instead"
error line="456" message="The use of function sizeof() is forbidden; use count() instead"
error line="465" message="The use of function sizeof() is forbidden; use count() instead"
error line="474" message="The use of function sizeof() is forbidden; use count() instead"
error line="483" message="The use of function sizeof() is forbidden; use count() instead"
error line="494" message="The use of function sizeof() is forbidden; use count() instead"
error line="510" message="There must be no blank lines after the function comment"
2015-08-26 15:12:17 +02:00
Laurent Destailleur
3fc63eba0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-26 11:25:05 +02:00
Laurent Destailleur
3db021addf
Fix Use correct boolean type.
...
Complete doxygen
2015-08-26 11:24:31 +02:00
gschratzer
16268e9f0a
New: function calculate_byte
2015-08-25 17:05:08 +02:00
aspangaro
a6701aeb69
New: CkEditor add possibility to choose skin
2015-08-23 15:39:55 +02:00
Laurent Destailleur
1b409538a8
Fix #3400
...
Conflicts:
htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Laurent Destailleur
e24fd6fa37
Merge remote-tracking branch 'origin/develop' into 3.8
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
philippe grand
3743c7460d
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
...
now linked objects return by fetchLinkedObject are associative array
with ID as key.
2015-08-19 16:36:44 +02:00
philippe grand
61f6da0210
the form should be outside table to avoid errors
2015-08-15 16:07:59 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
BENKE Charlie
daa68efdd3
Update functions.lib.php
...
better context change
2015-08-14 23:23:44 +02:00
BENKE Charlie
a3db26adfd
Update functions.lib.php
...
change context init method
2015-08-14 19:13:13 +02:00
Laurent Destailleur
5ed3d80103
Merge pull request #3385 from marcosgdf/bug-3321
...
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
2015-08-14 18:10:28 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Laurent Destailleur
84d4cbdbcc
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc
Remove dead code
2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284
Fix better translation
2015-08-14 13:04:35 +02:00
Marcos García de La Fuente
b3a7b44046
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
...
Close #3321
2015-08-14 12:29:32 +02:00
Laurent Destailleur
811169b2ae
Fix: do not show desc if empty
2015-08-13 01:26:25 +02:00
Laurent Destailleur
25e729cf4d
Revert "Fix #3322 Use title for alt if no alt is provided"
...
This reverts commit 2cf9d9f583 .
2015-08-12 23:18:07 +02:00
Juanjo Menent
993037ec9e
Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab
...
NEW : print event type on third party card tab agenda list (only if A…
2015-08-12 18:25:20 +02:00