lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
116,997 Commits 43 Branches 150 Tags 886 MiB
fa856424a4
Commit Graph

8075 Commits

Author SHA1 Message Date
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
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
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