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

2568 Commits

Author SHA1 Message Date
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
Laurent Destailleur
48f7d20e83 Fix warning 2022-12-02 16:34:56 +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
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
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
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
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
f145db3222 Fix useless left join 2022-11-17 01:15:18 +01:00
lmarcouiller
a215717991 Fix : php 8.1 warnings in ticket 2022-11-08 16:27:04 +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
hector
95b3913910 Add hooks 2022-10-28 13:52:22 +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
003df66f6a Clean code 2022-10-22 02:32:43 +02:00
Laurent Destailleur
9a5a3a3517 Fix link to create event from user card 2022-10-21 16:21:09 +02:00
Laurent Destailleur
56892e32e8 FIX #yogosha13195 2022-10-20 16:45:08 +02:00
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +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
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
9660e9f0e0 Fix warning 2022-10-10 23:08:25 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +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
lvessiller
c268cf379c FIX full day event compare start date in future 2022-09-30 14:00:06 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +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
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +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
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
UT from dolibit
e6b5ef99a9
Update card.php 2022-09-08 19:47:17 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
cfd3eeb245 NEW All ajax pages have now a top_httphead() 2022-09-03 20:08:13 +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
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
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
990ff193aa update code 2022-08-31 21:50:12 +02:00
Philippe GRAND
1f3c390907 update code 2022-08-31 21:49:38 +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
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
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
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
72a0725fec Fix phpcs 2022-08-25 13:52:30 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Christian Humpel
0bf814d558 Fix #21816: correct Agenda filter (if no filter is selected) 2022-08-20 18:00:43 +02:00
lvessiller
74a2b58e85 FIX resolve conflicts 2022-08-12 14:55:06 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
4fb3a2e296 Fix scrutinizer 2022-08-11 00:52:08 +02:00
lvessiller
a3b240bd3b FIX resolve conflicts 2022-08-05 11:23:02 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Anthony Berton
9c0cf32ef7 FIX - php V8 user right actioncomm class 2022-07-28 11:56:07 +02:00
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
 2022-07-28 02:36:57 +02:00
Yoan Mollard
244f3913b0 Qualify cactionevents for eventorganization 2022-07-27 21:35:52 +02:00
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents 
NEW : Recurrent events on agenda v1
 2022-07-27 11:01:26 +02:00
lvessiller
62b70b37d3 NEW set today start time at begining 2022-07-27 08:32:46 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
lvessiller
4d59fd2679 FIX reset today event time 2022-07-26 16:36:28 +02:00
Florian HENRY
266b0213a5 fix: filter Status Not applicable into is not correctly manage on Agenda list 2022-07-25 13:18:03 +02:00
lvessiller
993812dc70 FIX stickler-ci 2022-07-21 11:22:53 +02:00
lvessiller
161958d346 NEW color for start date and owner 2022-07-21 10:56:03 +02:00
Faustin
1f9afaadb1 Removing daily event for the moment 2022-07-20 13:08:28 +02:00
Faustin
87b80912df merge 2022-07-19 20:42:53 +02:00
Laurent Destailleur
75b8246578
Merge branch 'develop' into NEW-recursive-envents 2022-07-19 19:40:48 +02:00
comaiteseb
888328b03b
FIX issue Dolibarr#21495 for v15 
FIX #21495

Error when calculate the date when AGENDA_EXPORT_FIX_TZ is set.
The resulting date is 1969-12-31
 2022-07-19 15:31:29 +02:00
lvessiller
cda6e9184d NEW color in action list and translated 2022-07-13 16:52:57 +02:00
lvessiller
1414f72794 NEW color in action list 2022-07-13 16:37:50 +02:00
lvessiller
6aade2e506 NEW hook formConfirm on action comm card 2022-07-13 11:19:07 +02:00
comaiteseb
f2a294965a Update actioncomm.class.php 
FIX issue #21495
 2022-07-12 18:44:21 +02:00
Laurent Destailleur
5ac0cfb39d
Merge pull request #21496 from comaiteseb/develop 
Update actioncomm.class.php
 2022-07-12 18:42:28 +02:00
Laurent Destailleur
eeb967b540 Fix missing link to invoice 2022-07-12 11:59:33 +02:00
comaiteseb
4b5b0bd163
Update actioncomm.class.php 
FIX issue #21495
 2022-07-11 21:25:49 +02:00
Laurent Destailleur
1cbeaf6ac0 Fix php8 2022-07-11 20:05:49 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Faustin
572f1f0fee NEW : Recurrent events on agenda v2 2022-07-07 00:07:15 +02:00
Faustin
259224c3be NEW : Recurrent events on agenda v1 2022-07-02 18:48:35 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Supermanu
f39c8e46d8 Fix timezone issue in event list 2022-06-15 10:26:44 +02:00
Laurent Destailleur
2de5a9f31b
Merge pull request #21253 from badre-agtaib/scru2 
fix bug: The property thirdparty_id does not exist on ActionComm
 2022-06-14 19:29:32 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
bagtaib
8c8ae82700 removed deprecated code 2022-06-13 17:22:00 +02:00
Laurent Destailleur
a48b032dd8
Merge pull request #21200 from leninrivas/patch-5 
Save usermodid to updatePercent
 2022-06-12 19:09:45 +02:00
Lenin Rivas
503a5cdc82
Add user who modified the percent 2022-06-12 06:33:42 -05:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Lenin Rivas
b57a9d5896
Save usermodid to updatePercent 2022-06-10 05:58:01 -05:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Florian HENRY
70892c18c5 fix: filter status do not work on peruser action comm 2022-06-07 18:14:15 +02:00
Florian HENRY
0146be0d15 fix: filter status do not work on peruser action comm 2022-06-07 18:13:21 +02:00
stickler-ci
e48ce5b159 Fixing style errors. 2022-06-02 19:34:39 +00:00
Florian HENRY
b482a78d31 better fix 2022-06-02 21:29:27 +02:00
Florian HENRY
7f38d55648 better fix 2022-06-02 21:28:17 +02:00
stickler-ci
19dc0f124c Fixing style errors. 2022-06-02 13:37:55 +00:00
Florian HENRY
d5c4cac64b Merge branch '15_fix_actioncomm_code_not_updated' of github.com:FHenry/dolibarr into 15_fix_actioncomm_code_not_updated 2022-06-02 15:32:37 +02:00
Florian HENRY
43207429ae fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:32:16 +02:00
stickler-ci
d73982d1eb Fixing style errors. 2022-06-02 13:26:06 +00:00
Florian HENRY
f6e53b40da fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:20:00 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
65913cdd15 Fix list of event empty. 2022-06-01 13:11:36 +02:00
BENKE Charlene
35a1f9ac4b
php V8 warning 2022-05-27 16:30:26 +02:00
Laurent Destailleur
00e65eb106 Fix bad management when inserting contacts of actioncomm 2022-05-23 00:49:59 +02:00
Laurent Destailleur
3d5b322d98 Debug v16 2022-05-22 16:27:42 +02:00
Laurent Destailleur
7b4dae8773 CSS 2022-05-22 16:16:17 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
0d7386ab89 Fix select projet on event creation 2022-05-21 01:23:39 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
a92974c818 Fix typo 2022-05-16 14:08:16 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
8023e1b0cd Debug v16 2022-04-30 20:41:18 +02:00
Laurent Destailleur
2e1dfc9a43 Fix method "file" for external URLs is forbidden. 2022-04-30 20:06:08 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
631d2da6b3 Fix php8 2022-04-09 03:26:38 +02:00
Marc de Lima Lucio
6e0888ca0e FIX: action comm list: holiday last day not included + handle duration with halfdays 2022-04-07 17:17:20 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
0ed7c643f8 Close #20547 2022-04-07 13:28:24 +02:00