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 |
|
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 |
|
Laurent Destailleur
|
87f71e7681
|
FIX Look and feel v12
|
2020-08-02 22:36:14 +02:00 |
|
kkhelifa-opendsi
|
fe0f77b967
|
Merge branch 'develop' into stcommcontact
|
2020-07-31 16:41:17 +02:00 |
|
Tim Otte
|
85c5f423b1
|
Added fetch_thirdparty (without the site crashes)
|
2020-07-29 12:55:58 +02:00 |
|
Tim Otte
|
c5816478d9
|
Added fetch_thirdparty (without the site crashes)
|
2020-07-28 11:14:55 +02:00 |
|
Laurent Destailleur
|
dd86c21382
|
FIX dolGetElementUrl and agenda page for external modules
|
2020-07-25 03:01:04 +02:00 |
|
Laurent Destailleur
|
46fccf8eb1
|
FIX dolGetElementUrl and agenda page for external modules
|
2020-07-24 11:53:44 +02:00 |
|
Laurent Destailleur
|
42234ba506
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/price.lib.php
|
2020-07-24 00:07:57 +02:00 |
|
Abdessalam@MEGALOGI
|
1e6273b92d
|
Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
|
2020-07-18 23:11:17 +02:00 |
|
Laurent Destailleur
|
8b5f4fe9a6
|
Fix massaction delete on events
|
2020-07-11 12:21:53 +02:00 |
|
Laurent Destailleur
|
b6452dbbc0
|
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
|
2020-07-10 02:51:25 +02:00 |
|
Laurent Destailleur
|
46119dc786
|
Fix per user
|
2020-07-09 12:49:48 +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
|
1dfd2d565b
|
FIX Reposition and nav
|
2020-07-08 18:18:47 +02:00 |
|
Laurent Destailleur
|
96d935832c
|
FIX Reposition and nav
|
2020-07-08 18:18:08 +02:00 |
|
Laurent Destailleur
|
5ea47f3ade
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
|
2020-07-08 18:11:58 +02:00 |
|
Laurent Destailleur
|
96729769f7
|
Standardize Agenda view
|
2020-07-08 18:06:14 +02:00 |
|
Tim Otte
|
a73f77cfef
|
Fixed same error like before
|
2020-07-07 12:43:15 +02:00 |
|
Laurent Destailleur
|
4fd970af28
|
Fix phpcs
|
2020-07-07 01:29:31 +02:00 |
|
Laurent Destailleur
|
14c98f277b
|
NEW Can change VAT rate of all lines of a draft object in one step.
|
2020-07-06 22:48:22 +02:00 |
|
Laurent Destailleur
|
f72a836231
|
Fix look and feel v12
|
2020-07-06 16:59:25 +02:00 |
|
Laurent Destailleur
|
4dcc073b3a
|
Fix param GETPOST
|
2020-07-06 16:54:30 +02:00 |
|
Laurent Destailleur
|
3939a640e9
|
Fix note in creation
|
2020-07-06 16:52:28 +02:00 |
|
Laurent Destailleur
|
83eaddb17b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
|
2020-07-04 13:13:17 +02:00 |
|
Tim Otte
|
bce0a93227
|
Hotfix for an error in v12
|
2020-07-03 00:33:54 +02:00 |
|
Laurent Destailleur
|
0ea55209ae
|
Merge pull request #14165 from ptibogxiv/patch-345
FIX non numeric value on comm/card.php
|
2020-07-03 00:24:32 +02:00 |
|
Regis Houssin
|
a5431a40da
|
FIX missing possibility to change entity when propal cloning
|
2020-07-02 10:16:20 +02:00 |
|
ptibogxiv
|
cc132775f3
|
FIX non numeric value on comm/car.php
|
2020-07-01 16:18:19 +02:00 |
|
Tim Otte
|
94a1d71fba
|
Hotfix for an error in v12
|
2020-06-30 15:20:30 +02:00 |
|
Laurent Destailleur
|
0aa08edb38
|
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
NEW can edit and set sales representatives directly on thirdparty card
|
2020-06-28 21:08:24 +02:00 |
|
Laurent Destailleur
|
90d4458aab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2020-06-27 00:38:51 +02:00 |
|
Laurent Destailleur
|
29ba9c82c3
|
Fix #14120
|
2020-06-26 17:17:13 +02:00 |
|
lvessiller
|
ad36447295
|
NEW can edit and set sales representatives directly on thirdparty card
|
2020-06-26 12:20:53 +02:00 |
|
Laurent Destailleur
|
333d4873c3
|
Properties ->contactid has been renamed into ->contact_id
|
2020-06-25 12:17:47 +02:00 |
|
Laurent Destailleur
|
18c23680f7
|
Fix bad object
|
2020-06-25 12:17:06 +02:00 |
|
Laurent Destailleur
|
ee5156034d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-24 20:03:40 +02:00 |
|
Laurent Destailleur
|
de62037ba5
|
Fix signed only in margin calculation of project
|
2020-06-24 12:58:10 +02:00 |
|
Laurent Destailleur
|
6d25b8630b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
|
2020-06-23 11:38:20 +02:00 |
|
Laurent Destailleur
|
4d2cbf7006
|
Fix alert picto of expired services not visible
Fix CSS
|
2020-06-23 11:27:40 +02:00 |
|
Laurent Destailleur
|
501fd2f7a3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/admin/receipt.php
|
2020-06-21 20:48:41 +02:00 |
|