Commit Graph

89993 Commits

Author SHA1 Message Date
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
b6e9ba8ed6
Merge pull request #14535 from aspangaro/13a6
Some fix on assets
2020-08-27 20:01:33 +02:00
Laurent Destailleur
af36f9c784
Merge pull request #14531 from andreubisquerra/master
NEW: Print payment method and change in TakePOS
2020-08-27 20:00:34 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php 2020-08-27 19:59:46 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
Laurent Destailleur
e95361fed4
Merge pull request #14536 from ptibogxiv/patch-347
Fix for better code
2020-08-27 19:57:34 +02:00
Laurent Destailleur
a3e94a670b
Merge pull request #14554 from bb2a/filter_warehous_order
Remove warehouse search
2020-08-27 19:56:55 +02:00
Laurent Destailleur
094b2e84a6
Merge pull request #14566 from TobiasSekan/FixEmptyRefInContractListToolTip
FIX - Empty references in contract service list tool tip
2020-08-27 19:54:37 +02:00
Laurent Destailleur
829ef1ae0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 19:52:21 +02:00
Laurent Destailleur
741489fdc0 FIX #14564 2020-08-27 19:52:05 +02:00
Laurent Destailleur
dda5775dd6
Merge pull request #14563 from atm-florianm/11.0_FIX_prelevement_top5_multicompany
FIX: missing entity check
2020-08-27 19:46:45 +02:00
Laurent Destailleur
84a096e234
Merge pull request #14555 from aspangaro/12.0p8
Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink
2020-08-27 19:45:55 +02:00
Laurent Destailleur
8a9244d1d6
Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions
NEW - Show references in contract form on interventions
2020-08-27 19:44:51 +02:00
Laurent Destailleur
6715eaee09
Update html.formcontract.class.php 2020-08-27 19:44:17 +02:00
Laurent Destailleur
57c8835fcc
Merge pull request #14565 from atm-john/develop_fix_14562
Fix #14562 Unable to create table `llx_product_attribute_combination_price_level` upon clean install
2020-08-27 19:42:50 +02:00
Laurent Destailleur
a80950dfa4 Fix regression 2020-08-27 19:41:32 +02:00
Laurent Destailleur
8b95aa63eb Trans 2020-08-27 18:59:36 +02:00
Laurent Destailleur
0309510ab8 Fix avoid duplicate event recorded from email collector 2020-08-27 18:50:08 +02:00
Laurent Destailleur
2abdfe08d7 FIX Email collector decode subject
FIX Cloning email collector clone also rules and operations
2020-08-27 18:27:05 +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
acb50950a4 Add a default message to "actioncomm_send" template 2020-08-27 11:31:48 +02:00
atm-lena
5856033892 Replace "agenda_send" and "event_push" to "actioncomm_send" 2020-08-27 11:15:08 +02:00
atm-lena
69459e3429 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-27 11:13:21 +02:00
Laurent Destailleur
180a49601b Use CSS to define size of logo on public pages. 2020-08-27 11:01:41 +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
stickler-ci
8ff24282d9 Fixing style errors. 2020-08-27 08:16:32 +00:00
Sekan, Tobias
c2590433fe Show ref in contract form on interventions 2020-08-27 10:11:18 +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
Sekan, Tobias
aa8ec1cd9c Fix empty ref in contract list tool tip 2020-08-27 09:32:00 +02:00
atm-lena
63f89950c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-08-27 09:19:44 +02:00
Laurent Destailleur
4127fded2a WIP 2020-08-27 03:14:55 +02:00
ATM john
236d2862af Fix install table 2020-08-26 21:56:50 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
Laurent Destailleur
243f59b9e9 FIX Missing transaction on PO actions 2020-08-26 17:09:45 +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
Florian Mortgat
9b3f13458f FIX: missing entity check 2020-08-26 16:02:31 +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
1267e914dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-26 15:16:53 +02:00
atm-lena
d4e6a9871c Update select_type_duration() function 2020-08-26 15:14:07 +02:00
atm-lena
2fb5824836 Calcul date of reminder for event create 2020-08-26 15:12:08 +02:00
Florian HENRY
08702a0d1a on going version 3 2020-08-26 14:16:49 +02:00
atm-lena
d3ac39589a WIP 2020-08-26 12:48:12 +02:00