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

6610 Commits

Author SHA1 Message Date
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
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
5af1eff2d9 Fix phpcs 2020-09-03 10:46:46 +02:00
stickler-ci
8c514c8025 Fixing style errors. 2020-09-03 08:24:12 +00:00
Adrien Raze
c043501ee5 Retours PR standard 2020-09-03 10:19:57 +02:00
Adrien Raze
0898a1e28a Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign 2020-09-03 10:06:13 +02:00
Adrien Raze
675fe05808 Retours PR Standard 2020-09-03 09:51:49 +02:00
Laurent Destailleur
31548c6fbb Better error message 2020-09-02 21:42:29 +02:00
Laurent Destailleur
f642fc9ad9 Fix 2020-09-02 21:40:17 +02:00
Laurent Destailleur
ed743c9dbb Fix phpcs 
More secured sendEmailsReminder()
 2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-02 19:20:12 +02:00
Laurent Destailleur
80f824569a Use english 2020-09-02 19:15:03 +02:00
Laurent Destailleur
a58dcc3886 Doc 2020-09-02 19:10:07 +02:00
Laurent Destailleur
a984c8e969 Use english 2020-09-02 18:57:56 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder 
Event Reminder : Add "Default Mail Model" to select Mail Model
 2020-09-02 18:08:40 +02:00
Laurent Destailleur
d913736bd1
Update list.php 2020-09-02 17:59:21 +02:00
Laurent Destailleur
ee003ed499
Update list.php 2020-09-02 17:57:09 +02:00
Laurent Destailleur
2a4f0fc034 Fix backto link 2020-09-02 16:37:02 +02:00
stickler-ci
a713286579 Fixing style errors. 2020-09-02 13:58:04 +00:00
Adrien Raze
d6113acfc8 action presign/prevalidate + action sign/validate + Traductions 2020-09-02 15:20:10 +02:00
atm-lena
7b91c8efc8 Event Reminder : Add "Default Mail Model" to select Mail Model 2020-09-02 09:58:55 +02:00
Laurent Destailleur
e4557b3dd3 Responsive 2020-09-01 23:04:29 +02:00
Laurent Destailleur
619a9a3679 Look and feel v13 2020-09-01 22:53:49 +02:00
Laurent Destailleur
8e02d39cb3 Fix prefill of end date when event type is rendez-vous 2020-09-01 22:44:03 +02:00
Laurent Destailleur
f18a852510
Merge pull request #14599 from TobiasSekan/AllowClickOnAllNumOnCommerceOverview 
NEW Allow click on all header numbers on commerce area
 2020-09-01 15:38:42 +02:00
Laurent Destailleur
a424515835
Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2 
Agenda Remind (Part 2 & 3)
 2020-09-01 15:33:52 +02:00
Laurent Destailleur
a626b252bd
Optimize code 2020-09-01 15:33:02 +02:00
atm-lena
1b225706db FIX create remind : dateremind save 2020-09-01 14:48:03 +02:00
Sekan, Tobias
ba107361fd Allow click all num on comm. overview 2020-09-01 13:20:56 +02:00
stickler-ci
763515a4ca Fixing style errors. 2020-09-01 08:17:19 +00:00
atm-lena
86c6ef23e3 Errors management v2 2020-09-01 10:05:55 +02:00
atm-lena
b747f6285e Errors management 2020-09-01 10:01:59 +02:00
atm-lena
d2ed43d913 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-09-01 09:43:14 +02:00
atm-lena
13f91f1de8 FIX getEmailTemplat() in sendEmailsReminder() reminder function 2020-09-01 09:41:59 +02:00
Laurent Destailleur
b69a992324 Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS 2020-09-01 04:29:57 +02:00
Laurent Destailleur
e353d4a42d Add tooltip if label truncated 2020-09-01 03:59:57 +02:00
atm-lena
a8c9e76ef6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 16:57:49 +02:00
Laurent Destailleur
1a353a5742
Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal 
FIX Uniform availability delay description on commercial proposal (new and card)
 2020-08-31 16:25:42 +02:00
atm-lena
f8c79db4a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 14:14:27 +02:00
Sekan, Tobias
070a09d5cc Uniform availability desc. on propal 2020-08-31 13:41:22 +02:00
Laurent Destailleur
e030b2089a Look and feel v13 2020-08-30 13:14:28 +02:00
Laurent Destailleur
8adf1852b1 Clean code 2020-08-30 03:00:35 +02:00
Laurent Destailleur
6293f76692 Debug 2020-08-29 06:17:26 +02:00
Laurent Destailleur
bca9a84710 Enhance autofill of end date when creating an event 2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
82f93fed92 css 2020-08-29 03:52:27 +02:00
Laurent Destailleur
983a3c59c8 css 2020-08-29 01:11:08 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
atm-lena
6562334f7b FIX sendEmailsReminder() function 2020-08-28 09:37:18 +02:00
Laurent Destailleur
4624cf98ee
Merge pull request #14545 from cfoellmann/defaults-payment-selections 
FIX allow use of default settings for payment term and condition on proposal creation
 2020-08-27 21:04:10 +02:00
Laurent Destailleur
f997d11761
Update card.php 2020-08-27 21:02:01 +02:00
Laurent Destailleur
7730569dff
Update card.php 2020-08-27 21:00:01 +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
Laurent Destailleur
0309510ab8 Fix avoid duplicate event recorded from email collector 2020-08-27 18:50:08 +02:00
atm-lena
c0f254d10c Translation + decode 2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c Function sendEmailsReminder() 2020-08-27 15:49:56 +02:00
atm-lena
f57325237a WIP : sendEmailsReminder() 2020-08-27 12:30:59 +02:00
atm-lena
5856033892 Replace "agenda_send" and "event_push" to "actioncomm_send" 2020-08-27 11:15:08 +02:00
stickler-ci
b0fe7bc2e0 Fixing style errors. 2020-08-27 08:47:57 +00:00
atm-lena
4ef2644300 Use date.lib.php functions 2020-08-27 10:29:23 +02:00
atm-lena
9d1fc28eba Fix type reminder "push" to "browser" 2020-08-27 09:35:02 +02:00
atm-lena
bbc554070c Fix 2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58 Error management 2020-08-26 17:02:34 +02:00
atm-lena
cc29654f47 WIP : rename fk_project to fk_actioncomm + add line to sql file to install 2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7 Add fk_email_template 2020-08-26 16:06:20 +02:00
atm-lena
cf9337b644 Add fk_project to actioncommreminder object 2020-08-26 15:58:14 +02:00
atm-lena
c10556473f Clean 2020-08-26 15:35:12 +02:00
atm-lena
552e655668 Add field "entity" in actioncommrminder object and table 2020-08-26 15:22:32 +02:00
atm-lena
2fb5824836 Calcul date of reminder for event create 2020-08-26 15:12:08 +02:00
atm-lena
d3ac39589a WIP 2020-08-26 12:48:12 +02:00
atm-lena
42f492877e WIP 2020-08-26 11:36:32 +02:00
atm-lena
3046556d7b Add checkbox "AddReminder" 2020-08-26 11:19:14 +02:00
atm-lena
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
atm-lena
94b2f3c5e1 Add $conf conditions 2020-08-25 12:57:36 +02:00
atm-lena
25840c2b3d Create Event - Add fields 2020-08-25 12:40:29 +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
stickler-ci
a60968e95b Fixing style errors. 2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34 allow default settings for "cond_reglement_id" and "mode_reglement_id" 
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
 2020-08-24 16:08:44 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar 2020-08-23 18:21:18 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents 
NEW Show place from events on import calender
 2020-08-23 18:11:02 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
Laurent Destailleur
6ad18ceef0 Remove useless code 2020-08-21 19:48:31 +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
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Sekan, Tobias
546571a6f8 Show place from events on import calender 2020-08-20 08:20:00 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
Laurent Destailleur
4afdfdda53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
 2020-08-02 22:42:17 +02:00
Laurent Destailleur
66d4b7372e FIX Look and feel v12 
Conflicts:
	htdocs/comm/card.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2020-08-02 22:38:20 +02:00