lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
111,448 Commits 43 Branches 150 Tags 886 MiB
724490b94d
Commit Graph

567 Commits

Author SHA1 Message Date
Laurent Destailleur
07fc85c222 Fix minor 2020-09-04 12:25:16 +02:00
Laurent Destailleur
1408c862f6 css 2020-09-03 21:23:58 +02:00
Laurent Destailleur
aafe323405 css 2020-09-03 19:11:56 +02:00
kev-73
38ed033b8a
New: add week number for month view in agenda 
Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.
 2020-09-03 14:03:40 +02:00
Laurent Destailleur
82f93fed92 css 2020-08-29 03:52:27 +02:00
Laurent Destailleur
9f8d1f0e63
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents 
NEW Show user on external calender events (when found)
 2020-08-27 20:10:13 +02:00
Sekan, Tobias
a7895f3496 Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents 2020-08-25 12:20:10 +02:00
Sekan, Tobias
4c851884e5 Address feedback 2020-08-25 12:16:44 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar 2020-08-23 18:21:18 +02:00
stickler-ci
183013e9ed Fixing style errors. 2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe Parse priority and transparency from external calender events 2020-08-21 13:57:03 +02:00
stickler-ci
61cce2e700 Fixing style errors. 2020-08-21 06:46:00 +00:00
Sekan, Tobias
22ff5a320f fix not working external calender on/off 2020-08-21 08:40:23 +02:00
Sekan, Tobias
bb1452917b fix wrong event percentage 2020-08-21 08:33:19 +02:00
Sekan, Tobias
ba98db934d Show user on external calender events 2020-08-21 08:18:26 +02:00
Sekan, Tobias
546571a6f8 Show place from events on import calender 2020-08-20 08:20:00 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc CSS 2020-07-09 11:55:16 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e94ef09977 css 2020-06-10 22:24:15 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
94e02269ee Fix: missing fk_project 2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba FIX Missing ref into popup 2020-05-30 23:52:47 +02:00
Laurent Destailleur
02bf646abe FIX Missing ref into popup 2020-05-30 23:51:02 +02:00
Supermanu
721b99bb2f Add calendar selection for agenda view 2020-05-28 11:24:37 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule 2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
f06f15de2e
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda 
New: Show holidays in the agenda view (month, week, day)
 2020-01-22 14:13:55 +01:00
Laurent Destailleur
d87419f3db FIX #11957 2020-01-22 13:34:07 +01:00
stickler-ci
eca59220d8 Fixing style errors. 2020-01-16 09:44:49 +00:00
Tobias Sekan
bbd7900fc7
Show holidays in agenda 2020-01-16 10:34:45 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Frédéric FRANCE
5c59ddb357
add hook like for per day/week/month 2019-12-10 21:11:52 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
cb1e5954f6 Fix regression 2019-11-08 13:10:41 +01:00
Laurent Destailleur
cb3fd5728b Fix color for not busy events 2019-11-08 13:04:49 +01:00
Tobias Sekan
6fdbe8923f
Fix mixed order of events with same time 2019-11-06 10:33:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
c215d534fc Fix phpcs 2019-10-31 21:16:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Tobias Sekan
bfe7ad211f
Fix non-numeric error in sort event function 
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
 2019-10-28 09:53:27 +01:00
Frédéric FRANCE
1a10b30a76
clean indent in comm directory 2019-10-26 14:28:40 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
4a305ec95c
Add hook beforeAgenda in comm/action/index.php 2019-09-30 15:59:05 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
4d0ef33471 FIX #11857 2019-09-15 15:43:03 +02:00
Abbes Bahfir
dccc8b0be3 Fix:Same action in both cases 2019-04-24 08:48:36 +01:00
Laurent Destailleur
5c53044863
Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events 
FIX: actioncomm: sort events by date after external calendars and hook
 2019-04-16 23:28:30 +02:00
Laurent Destailleur
c0defe3965
Update index.php 2019-04-16 23:27:45 +02:00
Marc de Lima Lucio
1669d497b4 FIX: actioncomm: sort events by date after external calendars and hook 2019-04-16 17:36:27 +02:00
Laurent Destailleur
6daa262779 Files for variables of themes were renamed from graph-color.php into 
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
 2019-03-11 20:32:25 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
florian HENRY
7a182c7880 fix #10069 2018-11-30 23:25:44 +01:00
Frédéric FRANCE
8f17ae8df5
GETPOSTISSET has only one parameter 2018-11-19 20:28:55 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
b615d03b0b
Update index.php 2018-10-09 12:17:51 +02:00
Laurent Destailleur
a546ef7f2d FIX default day 2018-09-19 20:01:25 +02:00
Laurent Destailleur
92aa6929de Fix go back on agenda view on correct page 2018-09-19 17:03:13 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
John BOTELLA
1daba56bbc Fix count(): Parameter must be an array or an object that implements Countable 2018-07-09 10:05:53 +02:00
Laurent Destailleur
7a8fac4198 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2018-06-04 15:14:26 +02:00
Laurent Destailleur
de2ffa1122 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/listactions.php
 2018-06-04 14:09:17 +02:00
florian HENRY
b996237142 fix: when agenda is filterd with "todo" event, do not display "not 
applicable" event
 2018-05-30 13:37:17 +02:00
Frédéric FRANCE
f24a6ed4d6
loadlangs 2018-05-26 19:03:41 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec WIP to show event per hours 2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
f3fd5f4cfa FIX Label of event show twice 2018-03-07 11:03:35 +01:00
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
4cff4c6935 Simplify and standardize code for agenda pages 2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
0e2f64af72 CSS 2017-11-14 12:18:02 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Laurent Destailleur
a329f7dc75 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
 2017-11-05 18:50:14 +01:00
Laurent Destailleur
63a363080e
Update index.php 2017-11-02 15:48:56 +01:00
Laurent Destailleur
323a0d7d0d
Update index.php 2017-11-02 15:48:24 +01:00
gauthier
b7cf434ebd FIX : Filter type on actioncomm with multiselect doesn't work 2017-11-02 14:58:33 +01:00
Laurent Destailleur
4220d02dd4 Debug module blocked log 2017-10-31 23:57:37 +01:00
Laurent Destailleur
4b4dcf2e01 Fix overload with a protection for rare case with very high nb of event 2017-07-12 23:05:26 +02:00
Laurent Destailleur
10cb7b2524 Fix remove warnings 2017-07-09 20:31:27 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
807c77f754 Fix inconsistent options 2017-05-19 18:03:49 +02:00
KHELIFA
169859b708 Module Agenda: Add option - Show linked object into agenda view 2017-05-17 17:00:45 +02:00
Laurent Destailleur
d7e10085b8 Clean code. Using 2 different key for a param is not more allowed. 2017-05-05 18:42:11 +02:00
Laurent Destailleur
e221c48997 Css 2017-04-01 00:59:21 +02:00
Laurent Destailleur
7254b54a04 Work on 6.0 look and feel 2017-04-01 00:49:06 +02:00
Laurent Destailleur
7056edf509 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-31 18:32:36 +02:00
Laurent Destailleur
6e0918dded Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-31 18:31:54 +02:00
Laurent Destailleur
911d5832c6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-03-31 18:29:15 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
hugome
38ccf7ffdd Fix : Agenda getCalendarEvents hook 
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
 2017-03-13 11:35:49 +01:00
Laurent Destailleur
618c27d63c Optimize space 2017-03-10 16:26:43 +01:00
De Coninck Laurent
979a5e70bf allow the drag and drop of an event only for allowed users 
The drag and drop of the event didn't take into account the user rights.
 2017-02-16 07:51:46 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
BENKE Charlie
223eed0cba Update index.php 2016-08-25 12:24:38 +02:00
Laurent Destailleur
645412517d css enhancement 2016-06-06 22:07:35 +02:00
Laurent Destailleur
0e06f116a2 Fix truncation of event conente in agenda view 2016-06-06 15:13:55 +02:00
Laurent Destailleur
9b6e5196ea Debug module resource. Filter on agenda. 2016-06-06 13:05:36 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
00a658143d NEW List of user in agenda view per user show photo thumb 2016-04-23 16:51:22 +02:00
Laurent Destailleur
0d7f67ade5 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-10 23:59:15 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Laurent Destailleur
acf3f23de8 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 14:15:44 +01:00
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +01:00
Laurent Destailleur
7fd2cbea49 Merge pull request #4257 from defrance/patch-91 
add icalname on default event
 2016-01-12 23:41:57 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
BENKE Charlie
efb1e91a23 Update index.php 
i have add an icalcolor test for icalevent too and made some reindentation
 2015-12-19 10:29:56 +01:00
BENKE Charlie
dc0af179e9 add icalname on default event 
allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)
 2015-12-18 01:41:30 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
Alexis Algoud
68cbd4699b NEW multi event type for filter and get form in order to allow bookmark 2015-11-09 17:18:23 +01:00
Laurent Destailleur
17a5b0a0f4 Fix css 2015-10-02 11:58:19 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
dd88a799fb FIX Event from ical stream should not be movable into calendar view 2015-09-26 13:54:50 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00