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

988 Commits

Author SHA1 Message Date
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray 
add thirdparty customer code to substitutionarray
 2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4
Update card.php 2022-01-11 13:31:16 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +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
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
ceaa2a9c5e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/ticket/class/actions_ticket.class.php
 2021-06-17 22:06:26 +02:00
Laurent Destailleur
5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php
 2021-06-17 21:35:31 +02:00
atm-lena
9769e33eab notigger parameter 2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71 Add Trigger "MAILING_DELETE" 2021-06-17 10:41:03 +02:00
Laurent Destailleur
c4e8866727 Clean code 2021-06-16 21:20:27 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3 
Fix of a bug on mass mailing
 2021-06-04 12:32:48 +02:00
lmarcouiller
c77dee0922 changes to fetch after send 2021-06-04 12:27:50 +02:00
Laurent Destailleur
e73dad30bb Warning 2021-06-04 11:53:12 +02:00
lmarcouiller
05a966b93e Fix of a bug on mass mailing 2021-05-28 10:29:46 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
a4f4cca895
Prefix length may have different length and be at a different place so i remove this tag. Must be replaced by a generic method to substring a substitution variable. 2021-05-17 08:36:49 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
Pierre Payet
4ce81ee535 set new outside the loop, add fetch result check 2021-05-11 20:30:57 +02:00
Pierre Payet
ff178667a3 add thirdparty customer code to substitutionarray 2021-05-11 12:33:35 +02:00
daraelmin
22d9c4c166
Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
daraelmin
7c27e9f931
too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
daraelmin
866857c111
Html link instead of url in substitutionarray 2021-05-04 21:57:59 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
daraelmin
034378a958
Add online substitution keys link in mailing 2021-05-04 00:58:29 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
Laurent Destailleur
4bc0c5b0b6 Fix cast 2021-04-16 20:43:04 +02:00
Laurent Destailleur
af9c2384ef Add warning 2021-04-16 19:14:01 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Laurent Destailleur
8fa943edc3 Fix select field in multiselect of languages 2021-04-12 14:26:09 +02:00
Laurent Destailleur
eb3438baa7 css 2021-04-12 13:02:34 +02:00
Laurent Destailleur
6fc19c626d Try fix for #17094 2021-04-04 17:05:01 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
a1366da130 FIX #yogosha5715 2021-03-23 03:45:17 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Frédéric FRANCE
e0b2e26da6
fix html 2021-02-07 19:05:10 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +01:00
Laurent Destailleur
ba3e902292 FIX #16080 2021-01-28 09:25:58 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Laurent Destailleur
e07486b626 Fix columns of download of list of targets of emailing 2020-12-29 02:20:10 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Frédéric FRANCE
12f4a74a74
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-27 14:04:04 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Frédéric FRANCE
cb77d9f175
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-09 08:55:46 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before 
and after filefunc.inc.php.
 2020-12-05 13:26:58 +01:00
Frédéric FRANCE
391e643eb7
doxygen 2020-11-27 20:33:40 +01:00
Frédéric FRANCE
ba352c2374
remove warnings 2020-11-27 20:20:04 +01:00
Frédéric FRANCE
fa6d02fb3f
doxygen 2020-11-27 00:25:45 +01:00
Frédéric FRANCE
bb09c84417
doxygen 2020-11-27 00:23:03 +01:00
Frédéric FRANCE
446997d0ba
doxygen 2020-11-27 00:15:07 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev 
Fix : correction de commentaires
 2020-10-15 20:15:12 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Givriz
c50e288a07 Correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
 2020-10-14 18:26:05 +02:00
Laurent Destailleur
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
c191dd1a34 Fix escaping 2020-09-19 23:27:11 +02:00
Laurent Destailleur
eb36c3f144 Fix must use GETPOST 2020-09-19 02:27:32 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
d700649fb9 The deprecated subsitution key __SIGNATURE__ has been removed. Replace 
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
 2020-09-06 19:25:25 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
ptibogxiv
e1db0ef855
Update index.php 2020-05-12 10:57:51 +02:00
Laurent Destailleur
44d36815bd Look and feel v12 2020-05-11 19:00:27 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2020-04-30 18:49:20 +02:00
gauthier
7f56c4a785 FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element" 2020-04-27 11:18:53 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00
Laurent Destailleur
63f0c07a07 Add warning 2020-04-08 18:32:13 +02:00
Laurent Destailleur
28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-03 18:07:24 +02:00
Laurent Destailleur
193a10bc39 FIX cloning of emailing when no content selected 2020-04-03 02:29:10 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
599bf89f60 Fix can edit emailing after sending has started 2020-03-20 20:46:21 +01:00
Laurent Destailleur
5d9e713a1c Fix better default sort order 2020-03-20 20:36:59 +01:00
Laurent Destailleur
68cadb58bb Fix better default sort order 2020-03-20 20:36:26 +01:00