Commit Graph

8366 Commits

Author SHA1 Message Date
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
kkhelifa
98356222c1 NEW: Can add any contact on events if global MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is set at 1 2023-01-18 10:36:52 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
03842ca251 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-14 00:40:53 +01:00
Laurent Destailleur
d1fb24bff7
Merge pull request #23438 from leninrivas/patch-10
NEW constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
2023-01-13 23:22:04 +01:00
Laurent Destailleur
669beb50d2 Better navigation bar for calendars 2023-01-13 19:28:29 +01:00
Laurent Destailleur
97061a9a92 NEW Use a cache file for external RSS in calendar 2023-01-13 17:17:23 +01:00
Laurent Destailleur
8eb89e0ad1 Remove merged feature with too many pb:
1=Not yet implemented everywhere.
2=Seems a duplicate info with the picto warning when late (so in past
not done)
3=Is also a duplicate with the existing css event-future, event-past,
event-current
4=It overwrites to choice done by the theme
5=Implementation is wrong, it must use css and not #background

Use CSS instead
2023-01-13 12:14:20 +01:00
Laurent Destailleur
a074c89960
Merge pull request #21506 from Easya-Solutions/new-event-list-with-color
NEW events list with color
2023-01-13 11:29:22 +01:00
Laurent Destailleur
5a4611732d
Merge pull request #23482 from lamrani002/kanbanpropal
NEW kanban mode for list of proposal commande
2023-01-11 20:26:05 +01:00
Laurent Destailleur
577ef4a8a1
Merge pull request #23501 from aspangaro/18a4
Use isModEnabled()
2023-01-11 10:29:37 +01:00
Alexandre SPANGARO
8f5edcab02 Use isModEnabled() 2023-01-11 06:11:41 +01:00
Laurent Destailleur
e50a56290c Fix warning 2023-01-10 23:49:31 +01:00
Laurent Destailleur
3769861a8a NEW VAT can be modified during add of line 2023-01-10 21:46:11 +01:00
Laurent Destailleur
ac5a07fee8 Debug v17 2023-01-10 17:27:19 +01:00
Lamrani Abdel
86ad9118f3 kanban mode for list of proposal commande 2023-01-10 11:14:14 +01:00
Florian HENRY
403f5a33ee Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16_fix_reminder_type_label 2023-01-09 16:15:39 +01:00
Florian HENRY
6c373c9381 fix: reminder type label 2023-01-09 15:50:55 +01:00
Laurent Destailleur
561ae3296d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-08 19:57:45 +01:00
ptibogxiv
ca9276b5eb
Fix php 8 error 2023-01-07 22:03:18 +01:00
Lenin Rivas
5be0bf1736
FIX line brak public note default 2023-01-06 13:17:19 -05:00
Lenin Rivas
cc6f42f926
Add new constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
Add constant default public note
2023-01-06 12:34:45 -05:00
Laurent Destailleur
ba08457171 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 16:55:41 +01:00
Laurent Destailleur
98b37d6648 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-06 16:53:03 +01:00
Laurent Destailleur
2755e3dad7 Fix typo 2023-01-06 15:53:25 +01:00
mgabriel
a7de5e4c72 Added &$arrayfields to $parameters so that hooks can manipulate list columns. 2023-01-05 11:59:43 +01:00
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
85d91c82e8 Fix warning 2023-01-03 17:38:05 +01:00
Laurent Destailleur
67144020c6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-02 20:24:13 +01:00
stickler-ci
59ed7b9f96 Fixing style errors. 2023-01-02 11:52:34 +00:00
Amael
658753d242
Merge branch '17.0' into Amael-PE-FIX-23334 2023-01-02 12:47:45 +01:00
Laurent Destailleur
cbda0e6197 Fix warnings 2022-12-31 15:17:37 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
3ca8e8c493 Fix warning 2022-12-31 13:47:09 +01:00
Laurent Destailleur
15c05d9b7d Fix warnings 2022-12-31 12:39:42 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Laurent Destailleur
cdb9aa5ba0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 13:29:06 +01:00
Laurent Destailleur
54936c916c Fix MO hang when no thirdparties are set 2022-12-30 13:27:12 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
Laurent Destailleur
8d64f8617c Clean code 2022-12-30 01:52:41 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
3f4b0549cb Fix qodana 2022-12-28 13:15:55 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Laurent Destailleur
dbc5f5742f Clean code 2022-12-28 12:05:30 +01:00
Laurent Destailleur
120dd6319f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-28 02:44:28 +01:00
Laurent Destailleur
a9d480896d Debug v17 2022-12-28 02:06:51 +01:00
Laurent Destailleur
e41ca9af5d Debug v17 2022-12-28 01:54:54 +01:00
Laurent Destailleur
4c743c76bc
Merge pull request #22867 from Easya-Solutions/new-mailing-triggers
NEW triggers on mailing
2022-12-27 00:31:57 +01:00
stickler-ci
50e2545bea Fixing style errors. 2022-12-25 23:41:03 +00:00
Amael
58d3cdb13c
FIX #23334 Implement a price equivalent in propal
Implement a price equivalent when dealing with minimum prices and foreign currencies. 
Added in comm/propal/card.php as it was done in command/card.php for add and update.
2022-12-26 00:31:38 +01:00
Frédéric FRANCE
a08d84b995 fix code 2022-12-23 14:11:13 +01:00
Laurent Destailleur
8f02fb2ab8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 20:34:22 +01:00
Laurent Destailleur
68ebd850f4 Debug v17 2022-12-22 16:21:25 +01:00
Josep Lluís
ca95d26f17
NEW option filter in proposals
NEW option filter for NoSalesRepresentativeAffected in proposals list
2022-12-21 14:21:16 +01:00
hystepik
27cb4b4d86 Fix: php 8.1 warnings 2022-12-15 14:46:29 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Laurent Destailleur
6d5aa62400 Fix delay between emails 2022-12-13 15:25:52 +01:00
Laurent Destailleur
bcd8c4ca87 Debug v17 2022-12-13 14:32:43 +01:00
Laurent Destailleur
279e161b95
Merge pull request #23152 from atm-lena/develop_fixsearchlistaliasname
FIX Search Alias / Company
2022-12-10 16:33:58 +01:00
Laurent Destailleur
5b31882ce3
Merge pull request #23167 from Hystepik/develop#2
Fix : php 8.1 warnings
2022-12-10 16:15:40 +01:00
Laurent Destailleur
a07193ef4b Fix php8 2022-12-09 15:57:18 +01:00
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
stickler-ci
0db8a0b831 Fixing style errors. 2022-12-08 09:34:48 +00:00
atm-lena
fbf7f8b8bc FIX Propal List : alias name / Company display 2022-12-08 08:47:33 +01:00
atm-lena
9fef8b7dc2 FIX Search List Alias Name 2022-12-07 10:11:57 +01:00
Laurent Destailleur
291cb1908d
Merge pull request #23081 from FHenry/dev_PropalResetIPSignOnBAckToDraft
fix: propal when back to draft delete ip and name of web sign
2022-12-06 21:06:22 +01:00
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Jesse Rovira
f98381de8a Showing label for Due date into last customer invoice at comm card 2022-12-02 13:36:17 -03:00
Laurent Destailleur
48f7d20e83 Fix warning 2022-12-02 16:34:56 +01:00
Jesse Rovira
8426e955c8 Showing Due date into last customer invoice at comm card 2022-12-02 12:34:13 -03:00
Florian HENRY
ab8a61aeaa fix: propal when back to draft delete ip and name of web sign 2022-12-02 11:59:47 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +01:00
Laurent Destailleur
261320e551 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-29 14:45:35 +01:00
Laurent Destailleur
b15fda8d9a Debug edit actioncomm 2022-11-29 14:38:25 +01:00
Laurent Destailleur
2d59619df5 More complete fix for #22957 #23034 2022-11-29 13:04:13 +01:00
Laurent Destailleur
414df160a9 css 2022-11-29 01:57:44 +01:00
Laurent Destailleur
839df739a4 Debug v17 2022-11-29 01:24:04 +01:00
Laurent Destailleur
bb46cdb0af Fix regression sql error 2022-11-27 21:10:37 +01:00
hystepik
c1b355fcac Fix : php 8.1 warnings 2022-11-27 00:44:05 +01:00
Maxime Kohlhaas
eb7222227d Fix : use count() in lists - part 3 2022-11-26 01:53:18 +01:00
Maxime Kohlhaas
8c597543e1 Fix : use count() in lists - part 1 2022-11-26 00:54:49 +01:00
Laurent Destailleur
0ccca81f12 Debug v17 - Finish move of type of event into actioncomm 2022-11-25 12:11:51 +01:00
fboitel
00f5a2ddc8
Merge branch 'Dolibarr:develop' into FIX-SECURITY-Fail2ban-public-pages 2022-11-24 19:10:35 +01:00
VESSILLER
fcc7965a78 FIX resolve conflicts 2022-11-24 15:04:12 +01:00
Laurent Destailleur
40bc26a666 NEW Ad the target to select attendees of event for emailings 2022-11-23 21:29:15 +01:00
Laurent Destailleur
03e8e49465 Fix responsive 2022-11-23 20:31:26 +01:00
Faustin
08010fae5c Limit booth suggest on public page by ip adress 2022-11-23 19:51:17 +01:00
Laurent Destailleur
3a59344c2f Fix responsive 2022-11-23 11:57:53 +01:00
Laurent Destailleur
2d27acbe8d
Merge pull request #22895 from cfoellmann/PR/fix-load-lang
FIX load correct language file
2022-11-22 21:52:16 +01:00
Laurent Destailleur
ba1f82b354 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:32 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
Laurent Destailleur
af413cb09f Fix #yogosha13195 2022-11-21 15:12:46 +01:00
Laurent Destailleur
322124690c Fix sql syntax error 2022-11-21 14:47:31 +01:00
Faustin
eddb215173 checkbox colum on left for action list 2022-11-20 00:10:04 +01:00
Christian Foellmann
f5618755dd load correct language file 2022-11-18 10:04:02 +01:00
Laurent Destailleur
e775707c23 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-18 01:08:56 +01:00
Laurent Destailleur
2f0d9e18bd Fix missing default bank account on form 2022-11-17 23:29:42 +01:00
Laurent Destailleur
b8e5b10cac Default field 2022-11-17 02:29:30 +01:00
Laurent Destailleur
c11d69dd21 Fix typo in tooltip 2022-11-17 02:26:02 +01:00
Laurent Destailleur
6684b3c96b Fix balance of columns 2022-11-17 02:13:01 +01:00
Laurent Destailleur
f145db3222 Fix useless left join 2022-11-17 01:15:18 +01:00
Laurent Destailleur
db454a6374 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-16 20:35:53 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
Laurent Destailleur
5b49021bb4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-16 20:20:34 +01:00
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
VESSILLER
90191d6ce8 FIX stickler-ci 2022-11-16 12:23:17 +01:00
VESSILLER
3b3ebfa1c2 NEW triggers on mailing 2022-11-16 11:45:42 +01:00
Laurent Destailleur
2dc6fe9785
Merge pull request #22865 from FliyFly/bugErrorCode
Fix(Scrutinizer) add public
2022-11-16 11:22:19 +01:00
VESSILLER
10154cc357 FIX remove not initialized variable 2022-11-16 11:05:39 +01:00
VESSILLER
6e33d1e2b1 FIX merge errors on mailing card 2022-11-16 10:48:25 +01:00
FLIO
73db58a700 Fix(Scrutinizer) add public 2022-11-15 17:10:04 +01:00
Laurent Destailleur
7238575a6d Clean code and add context information for onlineSign 2022-11-14 22:40:42 +01:00
Laurent Destailleur
e6d9b02fe0 NEW Page for mass stock transfer can be used with no source stock 2022-11-12 02:16:50 +01:00
Laurent Destailleur
886fa7a812 Fix phpcs 2022-11-11 14:57:02 +01:00
Laurent Destailleur
08985fbe62
Merge pull request #22792 from noec764/14_FIX_Add_Missing_LibStatut_Hooks
FIX: Add Missing "LibStatut" hooks in propal, commande, facture
2022-11-09 15:39:43 +01:00
lmarcouiller
a215717991 Fix : php 8.1 warnings in ticket 2022-11-08 16:27:04 +01:00
stickler-ci
89876d8d52 Fixing style errors. 2022-11-08 15:24:05 +00:00
Noé Courtier
73b857c1b3 FIX: Add Missing "LibStatut" hook in propal, commande, facture 2022-11-08 16:21:32 +01:00
Laurent Destailleur
f371bf96db Debug v17 2022-11-08 03:01:32 +01:00
kkhelifa
a355f4fc8b NEW: Add new hooks for actioncomm 2022-11-04 17:46:32 +01:00
Laurent Destailleur
1984feeae1
Merge pull request #22681 from bb2a/FIX---/td-in-if-to-MAIN_CHECKBOX_LEFT_COLUMN
FIX - </td> in if to MAIN_CHECKBOX_LEFT_COLUMN
2022-11-02 00:38:28 +01:00
Laurent Destailleur
7c6c3d6987 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-02 00:24:17 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
2022-11-02 00:15:21 +01:00
Laurent Destailleur
8e9be8f40f
Update card.php 2022-11-01 23:33:08 +01:00
Laurent Destailleur
37e52ca8f1
Merge pull request #22697 from hector-07/develop
NEW: Add agenda hooks
2022-11-01 23:28:49 +01:00
Laurent Destailleur
4f38cfc435
Merge pull request #22714 from frederic34/strftimedeprecated
strftime is deprecated in php 8.1
2022-11-01 20:04:05 +01:00
Laurent Destailleur
c07ce8ae95
Merge pull request #22716 from hregis/new_add_constant_to_bypass_valideted_status
FIX use existing PROPAL_SKIP_ACCEPT_REFUSE for massaction
2022-11-01 20:00:42 +01:00
Laurent Destailleur
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Regis Houssin
b7293632cf FIX use existing PROPAL_SKIP_ACCEPT_REFUSE instead 2022-10-31 14:58:38 +01:00
Laurent Destailleur
1e76422a50 NEW Show picto and color into combo for selection of tags 2022-10-31 13:00:41 +01:00
Regis Houssin
88152eccda NEW add constant PROPAL_BYPASS_VALIDATED_STATUS 2022-10-31 12:30:01 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
hector
95b3913910 Add hooks 2022-10-28 13:52:22 +02:00
Thomas Negre
02942e844e Fix propal page reload : use thirdparty values 2022-10-27 15:26:40 +02:00
Anthony Berton
04cba0307d Propal list and third 2022-10-26 19:15:55 +02:00
Laurent Destailleur
b15f0093cc
Merge branch 'develop' into fix_missing_hook_parameters 2022-10-25 17:19:38 +02:00
Laurent Destailleur
81813225aa Look and feel v17 2022-10-24 01:25:50 +02:00
Laurent Destailleur
780c6e3ce1 FIX Debug add event on a ticket 2022-10-23 21:45:21 +02:00
Laurent Destailleur
5b22eeab31 Fix support of inline src data 2022-10-23 20:45:27 +02:00
Laurent Destailleur
c9573510de css 2022-10-22 15:23:07 +02:00
Laurent Destailleur
3cd16d80f4 NEW Can edit label of an emailing even once sent 2022-10-22 14:43:22 +02:00
Laurent Destailleur
003df66f6a Clean code 2022-10-22 02:32:43 +02:00
Laurent Destailleur
f87ec74b9f Replace LEFT JOIN with EXISTS 2022-10-22 00:22:54 +02:00
Laurent Destailleur
d9c2528b62 Clean code 2022-10-21 23:49:45 +02:00
Laurent Destailleur
9a5a3a3517 Fix link to create event from user card 2022-10-21 16:21:09 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Regis Houssin
9145388301 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_missing_hook_parameters 2022-10-21 11:09:45 +02:00
Laurent Destailleur
56892e32e8 FIX #yogosha13195 2022-10-20 16:45:08 +02:00
Laurent Destailleur
fee00a3655 Look and feel 2022-10-19 00:29:23 +02:00
Regis Houssin
8856c5c3d6 FIX merge error 2022-10-18 10:52:14 +02:00
Regis Houssin
0e63591604 FIX avoid warning (php8) missing hook parameters 2022-10-18 10:45:48 +02:00
Laurent Destailleur
e3ad177abc
Merge pull request #22603 from hregis/fix_use_propal_instead_propale
FIX use propal instead propale
2022-10-17 23:48:13 +02:00
lvessiller
2d181f01be NEW rename MAIN_LIST_ALLOW_NOTES by MAIN_LIST_HIDE_NOTES 2022-10-17 11:37:09 +02:00
Laurent Destailleur
2484fefa4d Fix deprecated 2022-10-16 21:01:05 +02:00
Laurent Destailleur
b8479e9144 NEW Can set a commercial discount by entereing amount including VAT 2022-10-16 20:25:23 +02:00
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +02:00
Laurent Destailleur
388f55f056 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:31 +02:00
Laurent Destailleur
6ae8af440f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:04 +02:00
Laurent Destailleur
ccaa23121e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-15 13:57:23 +02:00
Laurent Destailleur
042db61523 Merge 2022-10-15 13:52:57 +02:00
Richard Franks
d3b0c190d5 Sorted Proposal not saving ref_ext 2022-10-14 09:44:49 +01:00
atm-lena
5dde5e1a20 Input "Private Mssage" 2022-10-14 09:54:47 +02:00
atm-lena
1cec84c21a FIX : private message ticket become public if edit action 2022-10-13 12:18:25 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Laurent Destailleur
9660e9f0e0 Fix warning 2022-10-10 23:08:25 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
63109d2844
Merge pull request #22182 from frederic34/pr/dolibit-ut/22136
sample deprecated function
2022-10-06 12:20:15 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6
Use isModEnabled
2022-10-04 18:01:59 +02:00
lvessiller
f43056a76f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-event-list-with-color 2022-10-03 14:33:32 +02:00
lvessiller
f18c846212 FIX user owner cache in event list 2022-10-03 14:33:08 +02:00
Florian HENRY
83fa90eef7 travais 2022-10-03 13:41:07 +02:00
Florian HENRY
7ac0168397 travais 2022-10-03 13:40:33 +02:00
Florian HENRY
3777b7dffe fix: [AdvTargetEmailling] bad table from select and use of dict for prospect status 2022-10-03 13:38:15 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
lvessiller
c268cf379c FIX full day event compare start date in future 2022-09-30 14:00:06 +02:00
Laurent Destailleur
98ed321514
Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
lmarcouiller
91d0eefd92 Fix : php 8.1 warnings 2022-09-27 11:22:20 +02:00
Alexandre SPANGARO
a415fcfe4c Use isModEnabled 2022-09-25 23:06:42 +02:00
Alexandre SPANGARO
8c14377ecc Use isModEnabled 2022-09-25 22:52:16 +02:00
Alexandre SPANGARO
ef94f2af70 Use isModEnabled 2022-09-25 22:45:10 +02:00
Alexandre SPANGARO
9772bbeff3 Use isModEnabled 2022-09-25 21:58:40 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references
Add an option to manage input size for customer / supplier references
2022-09-25 18:48:55 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
Alexandre SPANGARO
fc9e6c541e Use isModEnabled 2022-09-25 06:30:33 +02:00
Alexandre SPANGARO
aec9a7a60d Use isModEnabled 2022-09-25 06:30:09 +02:00
Alexandre SPANGARO
bcd5043eb2 Use isModEnabled 2022-09-25 06:13:14 +02:00
Alexandre SPANGARO
49f1afccca Use isModEnabled 2022-09-25 06:09:29 +02:00
Alexandre SPANGARO
58ac8d196c Use isModEnabled 2022-09-25 06:01:40 +02:00
priojk
33291b7cc7 FIX #21799 inactive companies cannot be selected 2022-09-24 17:19:52 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +02:00
Philippe GRAND
04f84ffd44 update code toward php8 compliance 2022-09-24 14:36:58 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Laurent Destailleur
2fbfbdf7dd
Merge pull request #22351 from bb2a/FIX---php-V8-propal-index-last-draft
FIX - php V8 propal index last draft
2022-09-23 17:43:05 +02:00
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
Anthony Berton
fdef117f63 FIX - php V8 propal index last draft 2022-09-21 18:11:00 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
f08f00bda0
Merge pull request #22179 from grandoc/new_branch_10_09_2022
update code toward php8 compliance
2022-09-13 02:03:30 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
8ac625f03b FIX reading of trackid in emailcollector (when on recipient suffix) 2022-09-12 10:26:20 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Laurent Destailleur
439bef8e0e NEW Add substitution key __SENDEREMAIL_SIGNATURE__ 2022-09-10 15:55:36 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Philippe GRAND
c8a70ba221 update code toward php8 compliance 2022-09-10 11:14:25 +02:00
Philippe GRAND
3f2faf4667 update code toward php8 compliance 2022-09-10 11:02:48 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
84ba9850e1
Merge pull request #22154 from dolibit-ut/patch-544
Update card.php
2022-09-09 16:23:00 +02:00
Alexandre SPANGARO
6b4bd6c09e FIX #21859 - Don't show html balise on list for private/public note 2022-09-09 15:56:17 +02:00
Laurent Destailleur
768e679599
Merge pull request #22167 from dolibit-ut/patch-551
Update pertype.php
2022-09-09 15:51:41 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
UT from dolibit
348682c386
Update pertype.php 2022-09-09 09:43:50 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
UT from dolibit
e6b5ef99a9
Update card.php 2022-09-08 19:47:17 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
Frédéric France
07e761d115 Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-07 20:37:29 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
31fcfc5aa5 Fix conflict in workflow due to new feature 2022-09-07 17:15:34 +02:00
Laurent Destailleur
46925dc9c4 CSS 2022-09-07 17:02:08 +02:00
Laurent Destailleur
99ce5837c8
Merge pull request #18316 from altairisfr/PROPAL_SKIP_ACCEPT_REFUSE
NEW : skip accept/refuse process for proposals
2022-09-07 16:32:06 +02:00
Laurent Destailleur
f1d19ae3de
Merge pull request #21839 from bb2a/date16
FIX - Edit propal date
2022-09-07 16:27:53 +02:00
Laurent Destailleur
9835469a02
Update propal.class.php 2022-09-07 16:27:31 +02:00
Frédéric France
fbbdcd1d4c fix php8 warnings 2022-09-07 10:28:23 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
cfd3eeb245 NEW All ajax pages have now a top_httphead() 2022-09-03 20:08:13 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
f9a404795f Update code 2022-09-03 11:09:05 +02:00
Philippe GRAND
e10ce6a6a0 Update code 2022-09-03 11:07:45 +02:00
Philippe GRAND
a8465d16fa Update code 2022-09-03 11:05:03 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
bc76c9357e update code 2022-09-01 09:39:16 +02:00
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
628ed54955 update code 2022-08-31 22:02:34 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Philippe GRAND
50e96a6356 update code 2022-08-31 21:55:01 +02:00
Philippe GRAND
8d73d2ecd5 update code 2022-08-31 21:54:11 +02:00
Philippe GRAND
97013cc956 update code 2022-08-31 21:53:29 +02:00
Philippe GRAND
50728f4b22 update code 2022-08-31 21:52:34 +02:00
Philippe GRAND
fa34b7ac20 update code 2022-08-31 21:52:00 +02:00
Philippe GRAND
1acc9bb99c update code 2022-08-31 21:51:32 +02:00
Philippe GRAND
37a2cc3052 update code 2022-08-31 21:50:58 +02:00
Philippe GRAND
990ff193aa update code 2022-08-31 21:50:12 +02:00
Philippe GRAND
1f3c390907 update code 2022-08-31 21:49:38 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
Philippe GRAND
da5fb70473 update code 2022-08-31 21:49:06 +02:00
Philippe GRAND
1ab949b3c4 update code 2022-08-31 21:48:32 +02:00
Philippe GRAND
6e6b0d16cc update code 2022-08-31 21:48:00 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Philippe GRAND
6844d603ff update code 2022-08-29 09:23:15 +02:00
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022
FIX php8 compatibility
2022-08-29 01:09:49 +02:00
ptibogxiv
5d5ea3efd8 FIx clean code signature proposal 2022-08-29 00:33:00 +02:00
ptibogxiv
0e2ade76ad
FIx clean code signature proposal 2022-08-28 23:36:18 +02:00
Philippe GRAND
5f1d6b406f FIX php8 compatibility 2022-08-28 13:47:36 +02:00
Philippe GRAND
3d64296992 FIX php8 compatibility 2022-08-28 13:43:50 +02:00
Philippe GRAND
5c6f9281c9 FIX php8 compatibility 2022-08-28 13:43:12 +02:00
Philippe GRAND
3bb1a2387b FIX php8 compatibility 2022-08-28 13:42:27 +02:00
Laurent Destailleur
09ad9e6e92 css 2022-08-27 22:14:56 +02:00
Laurent Destailleur
bfb01ae928 Clean code 2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e NEW Can enter the unit price including the vat 2022-08-26 17:39:41 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/user/bank.php
2022-08-25 14:29:09 +02:00
Laurent Destailleur
72a0725fec Fix phpcs 2022-08-25 13:52:30 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Anthony Berton
5a4d5d7f97 set_echeance no in set_date 2022-08-23 08:56:00 +02:00
Anthony Berton
8328923e09 update date 2022-08-22 17:18:31 +02:00
Christian Humpel
0bf814d558 Fix #21816: correct Agenda filter (if no filter is selected) 2022-08-20 18:00:43 +02:00
stickler-ci
c4e88b739f Fixing style errors. 2022-08-19 13:46:44 +00:00
atm-greg
ccbae64324 fix put line errase desc and label of line 2022-08-19 15:36:57 +02:00
Laurent Destailleur
d7209f1818 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-14 21:42:45 +02:00