Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,552 Commits 35 Branches 179 Tags 1.7 GiB
d9907fe074
Commit Graph

1567 Commits

Author SHA1 Message Date
Laurent Destailleur
d4501a6f67 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
e47e3b9797 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-08 18:09:55 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
9b65bb2085
Update list.php 2021-12-08 15:29:16 +01:00
atm-gregr
01893caa61 bad default value 2021-12-08 14:40:46 +01:00
atm-gregr
386771cffc fix display contat line on list 2021-12-08 14:21:42 +01:00
Marc de Lima Lucio
6af2626f08 FIX: contact card: bad colspan value for separator extrafield in creation/modification form 2021-12-06 16:55:51 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
36eb79c14d Fix filter on "Refuse emailing" 2021-11-28 16:49:13 +01:00
Florian HENRY
47da6793c5 FIX: contact not listed if module mainling not active and contact has no email 2021-11-16 13:31:51 +01:00
Laurent Destailleur
4e844b4687 Fix phpcs 2021-10-26 20:45:00 +02:00
Laurent Destailleur
7cd09eb649 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 16:34:25 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Maxime Kohlhaas
983e28691b Use a subselect instead of a join 2021-10-24 00:02:55 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
9ba7f019ea Fix css 2021-09-21 16:53:29 +02:00
Laurent Destailleur
a57e8a14b8 Fix look and feel v14 2021-09-06 12:56:33 +02:00
Laurent Destailleur
38bd5e0902 Fix trans 2021-09-06 12:51:40 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
df498def86 Fix css 2021-07-03 18:38:43 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/class/contact.class.php
 2021-06-29 15:52:39 +02:00
Laurent Destailleur
e2c4a14939 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:47:58 +02:00
lvessiller
fa28a02d74 FIX update contact birthday alert 2021-06-28 11:03:22 +02:00
Laurent Destailleur
8372a79c1d Clean code 2021-06-19 14:22:41 +02:00
Laurent Destailleur
0fd200083f
Merge pull request #17970 from a-schild/develop 
Allow to update ref_ext via webservices
 2021-06-19 14:20:28 +02:00
stickler-ci
d4fa284f67 Fixing style errors. 2021-06-17 16:18:55 +00:00
a-schild
597e8ef671 Allow to update ref_ext via webservices 
See issue #17967
 2021-06-17 18:17:08 +02:00
Laurent Destailleur
5b8c93b090 FIX #17967 2021-06-17 18:01:31 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
 2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347 
Update agenda.php
 2021-06-14 14:27:56 +02:00
Laurent Destailleur
f988f4c352 Fix contact 2021-06-14 14:15:32 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
UT from dolibit
2143395d70
Update agenda.php 2021-06-14 11:02:43 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
9952fdb6d3 FIX #17648 #17712 2021-05-26 17:45:45 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00