lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

6697 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +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
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
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +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
stickler-ci
19eef8aa93 Fixing style errors. 2020-07-06 01:26:46 +00:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +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
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +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
stickler-ci
029f5570e5 Fixing style errors. 2020-05-28 12:55:29 +00:00
Supermanu
0baea21947 NEW Add mass deletion for events 
Only users with the right `allactions->delete` will be able to mass delete.
 2020-05-28 14:45:54 +02:00
Supermanu
721b99bb2f Add calendar selection for agenda view 2020-05-28 11:24:37 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +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
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent 
NEW mass-actions for the event list view
 2020-05-23 14:26:51 +02:00
Laurent Destailleur
7397806ae7
Update actioncomm.class.php 2020-05-23 14:26:28 +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
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
stickler-ci
f0bb7d233f Fixing style errors. 2020-05-19 06:29:23 +00:00
Tobias Sekan
7fd6151c43
Add massactions for event list 2020-05-19 08:18:38 +02:00
Tobias Sekan
223224d12c
Add function to update the event percent + const 2020-05-19 08:07:21 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:50:36 +02:00
Maxime Kohlhaas
cf96383bf9 Fix : entity was missing in actioncomm fetch 2020-05-18 10:44:55 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0 
fix template email on propal list
 2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0 
FIX: Do not show stats panel if the user does not have permissions
 2020-05-14 16:09:37 +02:00
ptibogxiv
e1db0ef855
Update index.php 2020-05-12 10:57:51 +02:00
Juanjo Menent
66beb7c14f FIX: Do not show stats panel if the user does not have permissions 2020-05-12 10:17:47 +02:00
florian HENRY
d9e26b8569 fix template email on prpal list 2020-05-12 08:38:03 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Laurent Destailleur
44d36815bd Look and feel v12 2020-05-11 19:00:27 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype 
Add possibility to filter stats by ThirdParty type and categorie
 2020-05-01 22:05:06 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2020-04-30 18:49:20 +02:00
DEMAREST Maxime (Indelog)
790cffb7ae Correct select label for categories in stats pages 2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
1bd9372022 Forgot comments to document news params for the modified methods 2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0 Add possibility to filter stats by ThirdParty type and categorie 2020-04-29 09:17:44 +02:00
kamel
4dd42496fa Correction pour validation Stickler CI / stickler-ci 2020-04-27 17:48:05 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
gauthier
7f56c4a785 FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element" 2020-04-27 11:18:53 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note 
actioncomm note deprecated
 2020-04-23 18:52:56 +02:00
Marc Guenneugues
94be1870ec Clean line extrafields when deleting proposal 2020-04-23 18:02:53 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Frédéric FRANCE
177008ab65
actioncomm note deprecated 2020-04-23 00:45:33 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated 2020-04-23 00:38:42 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
d847f67e45 Look and feel v12 2020-04-20 03:10:26 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive 
Restore some files modified by error.
 2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
Laurent Destailleur
47ff3f866a css 2020-04-18 12:54:28 +02:00
Laurent Destailleur
7c6c600225 CSS 2020-04-18 11:38:24 +02:00
Laurent Destailleur
07ce3fc34d Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-04-18 11:08:21 +02:00
Laurent Destailleur
23876684cb Responsive 2020-04-18 11:06:28 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00