Commit Graph

8366 Commits

Author SHA1 Message Date
Frédéric FRANCE
2863481629
Update list.php 2023-03-07 10:26:21 +01:00
Laurent Destailleur
363b165bc3 NEW Can show the sql request used on emailing selection 2023-03-06 23:13:33 +01:00
Laurent Destailleur
9e18a8b783 Clean code 2023-03-06 18:03:30 +01:00
Laurent Destailleur
25d09d7516 Tab events for proposals 2023-03-06 17:42:06 +01:00
Laurent Destailleur
56780311b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-04 15:26:46 +01:00
Laurent Destailleur
2b4f4e9e4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-04 15:25:58 +01:00
Frédéric FRANCE
f24a2608d2 add pictos 2023-03-03 14:04:16 +01:00
Laurent Destailleur
89810f97c1
Merge pull request #23941 from ATM-Consulting/FIX_propalestats_SQL_unknown_column_fk_soc
FIX: SQL error "unknown column p.fk_soc"
2023-03-03 13:41:32 +01:00
Laurent Destailleur
925cd10cee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-03 13:30:02 +01:00
Laurent Destailleur
51a890bf1a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:30:02 +01:00
Laurent Destailleur
59f2644d46 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:29:35 +01:00
Frédéric FRANCE
52856303d9 add pictos on forms 2023-03-03 12:06:27 +01:00
Nicolas
50d4f2d90f FIX select for task in event card 2023-03-03 12:00:24 +01:00
Frédéric FRANCE
f560d060d0 pictos 2023-03-03 11:18:42 +01:00
Frédéric FRANCE
ae83802f38 can set default values without overriding thirdparty defaults 2023-03-03 10:31:24 +01:00
GregM
87fa075ce0 Fix 16.0 propalestats 2023-03-03 10:20:45 +01:00
Laurent Destailleur
54bb784138 Debug v18 2023-03-02 19:40:28 +01:00
Laurent Destailleur
f277ed5f7a
Merge pull request #24066 from frederic34/reminder
doc
2023-03-02 16:55:28 +01:00
Laurent Destailleur
46945ec44c
Merge pull request #24073 from hregis/fix_multicompany_compatibility2
TODO remise_percent is a deprecated field for object parent
2023-03-02 16:31:51 +01:00
Frédéric FRANCE
e08ff855d2 Merge remote-tracking branch 'upstream/develop' into reminder 2023-03-02 14:13:24 +01:00
Frédéric FRANCE
45207822a1 restore tags 2023-03-02 14:13:17 +01:00
Laurent Destailleur
41d9463992
Merge pull request #24062 from BB2A/FIX---php8-warnning-localtaxes_type
FIX - php8 warnning localtaxes_type
2023-03-02 14:10:33 +01:00
stickler-ci
de86f0ecaa Fixing style errors. 2023-03-02 12:52:12 +00:00
Laurent Destailleur
9fd9b0cfa0
Merge branch 'develop' into fix_multicompany_compatibility2 2023-03-02 13:42:40 +01:00
Laurent Destailleur
7994825086
Update list.php 2023-03-02 13:39:08 +01:00
Laurent Destailleur
7f8b09f0b6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-02 10:48:36 +01:00
Laurent Destailleur
8612a88a2f Sync transifex
Debug v17
2023-03-02 10:38:45 +01:00
Laurent Destailleur
12bd795afc Work on Kanban view 2023-03-01 20:13:21 +01:00
Regis Houssin
4877c80c36 FIX missing "authorid" for getNomUrl link right access 2023-02-28 16:44:32 +01:00
Regis Houssin
d3c65e390b TODO remise_percent is a deprecated field for object parent 2023-02-28 15:47:33 +01:00
Laurent Destailleur
be49df370a css 2023-02-28 11:42:47 +01:00
Frédéric FRANCE
04ff41adc3 doc 2023-02-28 08:56:38 +01:00
Anthony Berton
eb16050918 FIX - php8 warnning localtaxes_type 2023-02-27 17:26:21 +01:00
Laurent Destailleur
06422a5d03 Fix message if no record found 2023-02-27 04:24:12 +01:00
Laurent Destailleur
b0b1e8d327 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-27 03:40:12 +01:00
Laurent Destailleur
8e086fda62
Merge pull request #24050 from grandoc/new_branch_25_02_2023
fix : Warning: Undefined array key tomail in /home/httpd/vhosts/aflac…
2023-02-26 20:35:51 +01:00
Laurent Destailleur
f23de55809 FIX #24041 2023-02-26 19:28:11 +01:00
Laurent Destailleur
32ba0acb32 Fix navigation 2023-02-26 12:03:55 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Philippe GRAND
05a32ab993 fix : Fatal error: Uncaught TypeError: Unsupported operand types: string / int in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/comm/propal/card.php on line 1420 2023-02-25 14:31:20 +01:00
Laurent Destailleur
1c9884e604 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 04:10:25 +01:00
Laurent Destailleur
7b7b8fda24 Fix sending emails with data:image inside 2023-02-25 04:05:18 +01:00
Laurent Destailleur
5981133a4e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 03:09:16 +01:00
Laurent Destailleur
6092932141 css 2023-02-25 02:55:28 +01:00
Laurent Destailleur
b04e7e38e6 Message 2023-02-25 02:53:34 +01:00
Laurent Destailleur
af71ad4993 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 02:45:43 +01:00
Laurent Destailleur
c90fa255fd css 2023-02-25 02:43:37 +01:00
Frédéric FRANCE
652a215a07 set errors from object 2023-02-24 16:57:39 +01:00
Frédéric FRANCE
2d454d6815 set errors from object 2023-02-24 16:50:41 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
4068b1db87 Fix link for read or unsubscribe must use a unique hash 2023-02-23 21:19:01 +01:00
Laurent Destailleur
4d44e68533 Fix substitution for emailing test 2023-02-23 20:40:46 +01:00
Laurent Destailleur
56afa676c0 Fix tags 2023-02-23 18:47:37 +01:00
atm-florian
b29ebef05f Propale stats: reworking of the fix to comply with travis rule for SQL string building 2023-02-23 18:03:00 +01:00
Laurent Destailleur
6afb899f05 Fix tags 2023-02-23 15:50:57 +01:00
Laurent Destailleur
dbf3df5210 Fix emailing in test mode use correct user or sender signature 2023-02-23 13:50:25 +01:00
Laurent Destailleur
ead1f15838 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-23 12:17:55 +01:00
Laurent Destailleur
d86ab00950 Look and feel v18 2023-02-23 12:08:43 +01:00
Laurent Destailleur
5e4cf97a16
Merge pull request #23758 from marcusdeangabriel/PROPALE_MODIFY_MARGIN_RATES
NEW Can modify margin rates in offers like VAT rates.
2023-02-22 17:29:20 +01:00
Laurent Destailleur
5713ca8a43 Regression 2023-02-22 16:01:48 +01:00
Gauthier PC portable 024
a03a708b84 FIX : llxHeader() must be after header location of MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE 2023-02-22 15:15:58 +01:00
Laurent Destailleur
d4402aa7f5 code easier to understand 2023-02-22 01:09:23 +01:00
Laurent Destailleur
643c05116f Debug v17 2023-02-21 13:37:27 +01:00
Laurent Destailleur
50baadbe0a Fix warning 2023-02-21 13:27:21 +01:00
Laurent Destailleur
80df9434db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-02-21 02:37:22 +01:00
Laurent Destailleur
9627bc14fa Debug v18 2023-02-20 19:32:15 +01:00
Laurent Destailleur
a8cd8853f4 Modulebuildarisation of the emailing list 2023-02-20 19:25:29 +01:00
Laurent Destailleur
4af4f89fa6 Fix syntax error 2023-02-20 18:27:54 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
a2d35f216d Debug v17 2023-02-20 16:07:28 +01:00
Laurent Destailleur
d89ccaeaad Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-19 18:18:38 +01:00
Laurent Destailleur
56add74e71 Debug v17 2023-02-19 13:58:57 +01:00
Laurent Destailleur
b5ec68a1c3 Fix look and feel v17 2023-02-19 13:05:35 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
53c8329b50 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 17:11:23 +01:00
Laurent Destailleur
1ac4e6f458 Fix phpunit 2023-02-17 16:52:00 +01:00
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
2023-02-17 00:10:00 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Laurent Destailleur
c498589bac
Merge pull request #23937 from bloxera/wikilink_DE_1
New: add links to wiki pages in German language
2023-02-16 21:23:15 +01:00
priojk
247ba8d0c3 New: added links to wiki pages in German language 2023-02-16 17:52:41 +01:00
marcusdeangabriel
f39d32255c
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-16 10:28:44 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Frédéric FRANCE
8e9db30707 add ajax tooltip on mailing 2023-02-15 08:52:15 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Laurent Destailleur
66369567b3
Merge pull request #23883 from frederic34/knowledgemgmt
add ajax tooltip on knowledge record
2023-02-13 18:21:09 +01:00
marcusdeangabriel
77087ed700
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-13 09:36:08 +01:00
Frédéric FRANCE
e1ca6ef019 clean code 2023-02-12 23:19:03 +01:00
Frédéric FRANCE
af1b9d3194
fix warnings 2023-02-12 20:48:19 +01:00
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
marcusdeangabriel
83b76ddfd9
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-07 08:23:48 +01:00
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Frédéric FRANCE
8a5e983d7e clean code 2023-02-06 22:21:54 +01:00
Guenter Lukas
3a8fbd3aa8 update 2023-02-06 10:32:54 +01:00
mgabriel
b8cd507287 As suggested by Dolibarr, removed PROPALE_MODIFY_MARGIN_RATES as not needed. 2023-02-06 10:06:23 +01:00
marcusdeangabriel
f974295a45
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 09:10:43 +01:00
Laurent Destailleur
e04a44e4ce
Merge pull request #23786 from glu000/16.0-issue-23785
Fix #23785 Box "Last changed vendors": External users can see all suppliers on htdocs/comm/index.php
2023-02-06 00:18:21 +01:00
Laurent Destailleur
b52203b4e0
Update peruser.php 2023-02-06 00:05:06 +01:00
Laurent Destailleur
a0f8a2454b
Update peruser.php 2023-02-06 00:04:19 +01:00
Frédéric FRANCE
b238830c82 keep original label 2023-02-05 23:19:56 +01:00
Frédéric FRANCE
19631fef74 fix tooltip 2023-02-05 20:41:29 +01:00
stickler-ci
d2a6d89fca Fixing style errors. 2023-02-05 10:48:29 +00:00
Guenter Lukas
edb81d1955 update 2023-02-05 11:43:09 +01:00
Guenter Lukas
31984b8f2e update 2023-02-05 09:33:54 +01:00
Günter Lukas
f5600fdffc
Update index.php 2023-02-05 08:38:46 +01:00
Günter Lukas
d8ff9468af
Update index.php 2023-02-05 08:35:45 +01:00
Günter Lukas
17397d635c
#23783 2023-02-05 08:24:09 +01:00
Frédéric FRANCE
473690f49b fix for double tooltip 2023-02-04 22:09:18 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Laurent Destailleur
1f195a3be5 Fix #yogosha14963 2023-02-04 14:04:25 +01:00
Frédéric FRANCE
dc33289a10 add ajax tooltip on actioncomm 2023-02-02 23:47:01 +01:00
Frédéric FRANCE
41dd574b16 clean js 2023-02-02 22:59:54 +01:00
mgabriel
99e5c89484 In CodingPhpTest::testPHP, found a GETPOST that uses 'none' as a parameter which is not allowe. 2023-02-02 10:20:02 +01:00
stickler-ci
35ce7352e8 Fixing style errors. 2023-02-02 08:09:57 +00:00
mgabriel
895957e89d Modify margin rates in offers like VAT rates. 2023-02-02 08:41:08 +01:00
Frédéric FRANCE
8d71b81013 ajax tooltip on propal 2023-02-01 20:58:40 +01:00
Laurent Destailleur
9fb08b5a0a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-31 21:28:59 +01:00
Laurent Destailleur
16ca0ab801 Debug v17 2023-01-31 05:02:26 +01:00
Laurent Destailleur
3692f9534e Fix properties 2023-01-30 12:06:13 +01:00
Laurent Destailleur
2493732edb Fix properties 2023-01-26 19:23:43 +01:00
Laurent Destailleur
072ee3f1ea Fix regression 2023-01-26 19:20:03 +01:00
Laurent Destailleur
f923b72c20
Merge pull request #23085 from jesserovira/develop
NEW Add date due and labels into customer comm card
2023-01-26 01:35:26 +01:00
Laurent Destailleur
eb8197a410
Merge pull request #23664 from dolibit-ut/patch-652
Update list.php
2023-01-26 00:38:07 +01:00
Laurent Destailleur
fc451d1fd7
Merge pull request #23665 from dolibit-ut/patch-653
Update list.php
2023-01-26 00:36:43 +01:00
stickler-ci
482c842895 Fixing style errors. 2023-01-23 20:15:00 +00:00
UT from dolibit
0c30837f15
Update list.php 2023-01-23 21:09:34 +01:00
UT from dolibit
cd13fcb0af
Update list.php 2023-01-23 21:04:31 +01:00
UT from dolibit
6cf41da774
Update list.php 2023-01-23 20:41:39 +01:00
Laurent Destailleur
dd4a9a94c7
Merge pull request #23633 from Hystepik/develop#1
Fix : php 8.1 warnings and dolibarr log
2023-01-23 02:24:01 +01:00
Randall Mora
343922210c
repair security issue
When reassing value to the $socid  in line 68 clean the filter set by $user->socid
2023-01-20 09:12:58 -06:00
hystepik
84436e1217 Fix : php 8.1 warnings and dolibarr log 2023-01-19 15:31:47 +01:00
Laurent Destailleur
35bc94095a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-19 13:50:59 +01:00
Laurent Destailleur
36fd6e6870 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-19 13:24:46 +01:00
Laurent Destailleur
28139689ff Debug v17 2023-01-19 03:51:49 +01:00
Laurent Destailleur
a6936a0b6a Debug v17 2023-01-19 03:49:16 +01:00
Laurent Destailleur
d3c4255e0e Fix bad test 2023-01-19 01:28:48 +01:00
Laurent Destailleur
df345945ad Fix regression 2023-01-19 01:28:04 +01:00
Laurent Destailleur
b2d9ade2d3 Fix bad test 2023-01-19 01:26:59 +01:00
Laurent Destailleur
e28fce6318 Debug 2023-01-19 01:16:39 +01:00
Laurent Destailleur
6d8851d1e4
Merge pull request #23468 from FHenry/16_fix_reminder_type_label
fix: reminder type label on Actioncomm Card
2023-01-18 23:41:18 +01:00
Laurent Destailleur
c9cdef40d0
Merge pull request #23615 from OPEN-DSI/develop_new_add_global_for_add_any_contact_on_events
NEW: Can add any contact on events if global MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is set at 1
2023-01-18 23:28:15 +01:00
Laurent Destailleur
0f475783de Enhance method getKanbanView 2023-01-18 22:27:52 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
cd5009d8a4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 21:21:49 +01:00