Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
109,389 Commits 36 Branches 189 Tags
19616982c7ac0c052d3f2edbd31f30cd5e6df96a
Commit Graph

582 Commits

Author SHA1 Message Date
Laurent Destailleur
00e65eb106 Fix bad management when inserting contacts of actioncomm 2022-05-23 00:49:59 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
a92974c818 Fix typo 2022-05-16 14:08:16 +02:00
Laurent Destailleur
631d2da6b3 Fix php8 2022-04-09 03:26:38 +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
Frédéric FRANCE
b277ab9ee3 Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Frédéric FRANCE
eb77f10d7b Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Laurent Destailleur
1087ddb22f Clean code 2022-01-18 14:00:38 +01:00
Laurent Destailleur
ebc3ef2f37 Removed no more used property 2022-01-18 13:52:09 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +01:00
Frédéric FRANCE
661e404a14 fix tests 2021-11-24 22:56:32 +01:00
Frédéric FRANCE
ebc54f82e6 move actioncomm 2021-11-24 18:16:48 +01:00
Frédéric FRANCE
2d92e6006c fix warnings 2021-10-23 07:04:13 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
64c4e25c02 Fix warning 2021-08-28 05:40:07 +02:00
Laurent Destailleur
1b859fe723 Fix warning 2021-08-28 05:24:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Francis Appels
68482c637b Update actioncomm.class 
Property contactid should be contact_id
 2021-08-06 18:45:25 +02:00
Laurent Destailleur
062c39c40d Fix html entities when we should not 2021-07-21 01:40:45 +02:00
Laurent Destailleur
312968eeac Clean code 2021-06-22 11:38:02 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Dorian Vabre
fe6b25ede6 fix on $value 2021-05-26 09:48:13 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
e31d8f89f5 wip filter 2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00