lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,168 Commits 43 Branches 150 Tags 886 MiB
1b3db2ca41
Commit Graph

2235 Commits

Author SHA1 Message Date
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
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
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
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
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided 
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
 2015-08-03 10:30:10 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
a16d6b037c Fix: bad link to task 2015-07-28 12:06:57 +02:00
Florian HENRY
517e9094da FIX : Avoid warning strict mode when hosting server do not have 
php5_curl installed
 2015-07-27 22:34:30 +02:00
Laurent Destailleur
d128cf69d9 Doxygen doc 2015-07-27 17:09:16 +02:00
Laurent Destailleur
814cec880a Fix filter can be empty 2015-07-21 13:38:24 +02:00
Gauthier
f18c983ba5 NEW : print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1) 
Conflicts:
	htdocs/core/lib/company.lib.php
 2015-07-21 11:06:00 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00