lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,043 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-3
Commit Graph

539 Commits

Author SHA1 Message Date
Laurent Destailleur
96ad9d27fa
Merge pull request #15174 from frederic34/patch-8 
clean code interface_99_modZapier_ZapierTriggers.class.php
 2020-10-27 01:25:43 +01:00
Frédéric FRANCE
0bdd6abca9
Update interface_99_modZapier_ZapierTriggers.class.php 2020-10-26 20:14:45 +01:00
Frédéric FRANCE
557a0caa91
Update interface_20_all_Logevents.class.php 2020-10-26 20:10:19 +01:00
Frédéric FRANCE
360ea91be5
clean triggers 2020-10-26 18:46:03 +01:00
Frédéric FRANCE
66fbddb892
clean triggers 2020-10-26 18:35:27 +01:00
Frédéric FRANCE
3e686e167c
clean triggers 2020-10-26 18:31:45 +01:00
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Laurent Destailleur
dfb5c78a68 FIX bad concat when generating desription of event on email sent 2020-10-17 11:51:17 +02:00
Laurent Destailleur
f063a144c1 NEW Can add event to log into blockedlog module with a constant. 2020-09-29 21:51:39 +02:00
Laurent Destailleur
fa86b62198 Fix escaping 2020-09-20 01:53:24 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
lvessiller
4f68c694b8 NEW fetch object useless on create ticket trigger 2020-09-04 14:25:13 +02:00
lvessiller
85575fd604 NEW translate classification labels in ticket 2020-09-04 12:18:32 +02:00
lvessiller
22d4382b83 NEW add extra fields labels and values in mail on create ticket 2020-09-04 09:38:33 +02:00
lvessiller
a4f1ddaad0 NEW send context and remove new lines on create ticket 2020-09-03 17:22:27 +02:00
Laurent Destailleur
6f1a51139c Fix load lang 2020-08-25 12:48:56 +02:00
Laurent Destailleur
7c39543c72 Support trigger in module recruitment 
Enhance generic code of automatic recording events
 2020-08-25 12:47:38 +02:00
Laurent Destailleur
f9eccce26c Fix phpcs 2020-08-24 20:43:38 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
84d3d633e5 Fix typo 2020-06-22 11:34:54 +02:00
Laurent Destailleur
194a094d23 Fix deletion of a thirdparty must not delete the stripe account. 2020-06-22 11:32:58 +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
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
dfd1711f53
Update interface_80_modStripe_Stripe.class.php 2020-04-20 14:35:11 +02:00
Frédéric FRANCE
ca3402c4cf
Update interface_80_modStripe_Stripe.class.php 2020-04-19 21:33:31 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group 
New : refactor UserGroup module with new common way
 2020-04-18 16:26:58 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
e26124bf84 Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to 
understand
 2020-04-15 12:57:33 +02:00
Maxime Kohlhaas
7fea2bc557 Update changelog + trigger name change for class UserGroup 2020-04-15 08:44:29 +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
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
84606f29c0 Trans 2020-03-09 09:14:25 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
25fa83bd06 Fix phpcs 2020-02-17 12:40:26 +01:00
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-02-17 12:25:51 +01:00
Laurent Destailleur
b9a7401f1d Doc 2020-01-07 16:29:37 +01:00
Laurent Destailleur
3d98863092 Fix bad position of lang loading 2020-01-01 13:51:14 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Francis Appels
9efcdc78f9 Cleanup interface_90_modSociete_ContactRoles 2019-11-12 21:56:05 +01:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +02:00
Frédéric FRANCE
33c35780e0
wip 2019-10-20 11:17:54 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Laurent Destailleur
3a15485e99
Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e
Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:23:30 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Frédéric FRANCE
b74a93e194
zapier trigger 2019-09-30 22:03:42 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Frédéric FRANCE
08f056a0f4
Delete interface_50_modIFTTT_IFTTT.class.php 
IFTTT has been removed
 2019-09-14 09:09:41 +02:00
florian HENRY
ee931d0f25 fix travis 2019-09-09 14:53:23 +02:00
florian HENRY
42b3640a5a fix travis 2019-09-09 14:12:28 +02:00
Frédéric FRANCE
61d432865b
wip 2019-09-07 14:33:36 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
florian HENRY
d50114df64 mostlyDone 2019-09-06 09:20:18 +02:00
florian HENRY
73c5b9617f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf add trigger files 2019-09-03 17:04:42 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
Laurent Destailleur
59fe34752c Fix error reporting of LDAP errors 2019-09-02 16:02:48 +02:00
Laurent Destailleur
6cf3fd79bb Fix error reporting of LDAP errors 2019-09-02 15:50:48 +02:00
Laurent Destailleur
48db5c2a44 Replace deprecated actioncomm->note into actioncomm->note_private 2019-08-31 02:46:39 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-10 01:43:52 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Laurent Destailleur
754ed1b93b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-07-30 22:03:02 +02:00
Laurent Destailleur
fe8ced58c8
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-07-30 21:19:33 +02:00
Florian Mortgat
858e8a826f FIX: use rounding to compare the amounts 2019-07-29 09:47:28 +02:00
Laurent Destailleur
75aa11e526 Code comment 2019-07-04 02:02:44 +02:00
Laurent Destailleur
2f7e9aa363 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
 2019-06-25 13:24:45 +02:00
Laurent Destailleur
d85ec982e5 Fix do not output log in arhived log for draft documents 2019-06-24 23:39:44 +02:00
Laurent Destailleur
51506724ef FIX Do no record log in archived log for draft documents. 2019-06-24 23:36:52 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
 2019-04-23 12:32:08 +02:00
florian HENRY
2b6cdd2e33 Fix workfolow module launch trigger on order close 2019-04-18 10:01:05 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Laurent Destailleur
488004026f Fix syntax error 2019-02-28 11:28:10 +01:00
Laurent Destailleur
c444521abc IFTTT 2019-02-28 11:00:40 +01:00
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
Frédéric FRANCE
ba4ca5d7c2
add visibility 2019-02-28 00:15:32 +01:00
Frédéric FRANCE
8b9bf64643
Update interface_50_modMailmanspip_Mailmanspipsynchro.class.php 2019-02-14 20:44:07 +01:00
Laurent Destailleur
e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php
 2019-02-14 15:33:17 +01:00
Timoté Fallais
9a28c12781 reform MEMBER_VALIDATE and MEMBER_MODIFY code correctly 2019-02-13 14:57:37 +01:00
Timoté Fallais
a115b1da7f Fix MailmanSpip bad adherent type after update 2019-02-13 14:45:51 +01:00
Timoté Fallais
6c08cc6b6a MailmanSpip & Adherent : add and remove mailman list 2019-02-12 17:45:26 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
gauthier
412940b5ca FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:19:13 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2018-12-22 18:59:49 +01:00
Regis Houssin
09ce84ca93 FIX avoid Class 'AdherentType' not found 2018-12-21 16:38:02 +01:00
Laurent Destailleur
220e72449b Code comment 2018-12-18 13:30:42 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
6b5c0d1ea1 Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00
Laurent Destailleur
3f912ebfff FIX restore security event login/logout 2018-12-10 11:19:52 +01:00
Laurent Destailleur
be7e424862 FIX thirdparty not set on some events 2018-12-09 00:16:59 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
25f66bd024 Code comment 2018-12-08 14:44:52 +01:00
Laurent Destailleur
5f93315097 Clean code 2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64 FIX Link between action and project must use field not the link table 2018-11-19 14:38:30 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
90d3b80efb NEW Add email in event histor for reminder email of expired subsription 2018-11-03 22:53:55 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
f332dc1cef
Merge branch 'develop' into patch-40 2018-10-12 19:15:43 +02:00
atm-quentin
4b23b46e48 NEW workflow set reception billed on validate supplier bill 2018-10-11 14:49:19 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +02:00
Laurent Destailleur
76f5d53840 Fix deletion of credit card when no Oauth set 2018-10-02 22:34:41 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018 2018-09-27 09:42:58 +02:00
Philippe GRAND
89b942ac9a Standardize and update code 2018-09-20 11:34:18 +02:00
Philippe GRAND
5910e1ddf8 Standardize and update code 2018-09-15 11:15:59 +02:00