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

421 Commits

Author SHA1 Message Date
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
Philippe GRAND
7deccb3215 Standardize and update code 2018-09-15 11:06:35 +02:00
Philippe GRAND
3da762a59d Standardize and update code 2018-09-13 15:06:06 +02:00
Philippe GRAND
be3468241f Standardize and update code 2018-09-13 10:55:05 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Regis Houssin
912c05774b FIX remove deprecated triggers USER_LOG* 2018-09-03 09:30:36 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Laurent Destailleur
3e0b2d0281 Fix phpcs 2018-08-29 21:51:49 +02:00
Laurent Destailleur
f146572b81 ident 2018-08-29 21:18:47 +02:00
ptibogxiv
eaa49e773d fix deletion of stripe customer 2018-08-29 21:13:45 +02:00
ptibogxiv
4de8b8bfd9
fix deletion of stripe customer 2018-08-29 17:25:37 +02:00
ptibogxiv
523b03e132
Fix for new stripe API 2018-08-23 
Fix break with change API
 2018-08-28 13:32:38 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
5f4d54ede5
correct space 2018-08-07 17:17:58 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Philippe GRAND
7d5464cfbc Clean and update code 2018-07-25 15:25:23 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
d6a84b0685 FIX Sync third party change to Stripe only if we change Stripe data 2018-06-11 11:47:10 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
Laurent Destailleur
1645c14e25 Fix deletion of stripe card 2018-05-17 13:51:17 +02:00
Laurent Destailleur
363eaf0d72 FIX Parameters to triggers must be set into $this->context array. 2018-05-05 13:44:49 +02:00
Laurent Destailleur
24518803fc Clean code 2018-05-02 19:15:16 +02:00
Laurent Destailleur
d0fafc812e Fix include of strip class only when required 2018-05-02 19:04:59 +02:00
Laurent Destailleur
0358e0f29f Debug ticketsup 2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Regis Houssin
97bf6fff7f Fix: missing User object with API REST 2018-04-10 08:07:23 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Regis Houssin
6e616e1198 Fix: better performance for openldap 2018-03-28 10:06:00 +02:00
Laurent Destailleur
4c9ccb163c Remove deprecated way of working. Use context array instead. 2018-03-27 17:58:24 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
a5dd98701e Too verbose log 2018-03-25 13:40:22 +02:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
florian HENRY
d3ae285c0c finish work 2018-03-21 22:58:17 +01:00
Laurent Destailleur
1a70e7a7c4 Triggers for Strips payment modes 2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +01:00
Laurent Destailleur
b232681318 NEW Add a button to create Stripe customer from the Payment mode tab 2018-03-14 16:53:16 +01:00
Laurent Destailleur
9c92e09295 Fix syntax 2018-03-13 14:48:01 +01:00
Laurent Destailleur
59b7187501
Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php 2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:14:33 +01:00
ptibogxiv
3dd90a1f1a
FIX name of file 2018-03-13 13:21:36 +01:00
ptibogxiv
3aa0bdfe5c
ADD trigger when modify, delete thirdparty 
More fix todo with new class of stripe.class.php
 2018-03-13 12:17:57 +01:00
Laurent Destailleur
591b0993af Fix PHPUnit for Ticket 2018-03-12 12:54:48 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
jfefe
3b814ebba2 Try to fix phpunit test (br tag isuue) 2018-03-11 16:54:39 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Laurent Destailleur
8014f7d822 Fix blockedlog module must store ref of invoice once validated 2018-01-12 19:09:43 +01:00
Laurent Destailleur
332ee53c22 Fix module blockedlog for donation 2018-01-05 12:43:53 +01:00
Laurent Destailleur
dbf7603118 Debug blockedlog for loi finance 2016 2018-01-05 04:31:48 +01:00
Laurent Destailleur
d895e1be9f NEW Show list of tracked events into the module config page. 2017-12-16 22:26:25 +01:00
Laurent Destailleur
9cdf322bfb Fix scrutinizer bugs 2017-12-15 22:14:28 +01:00
Laurent Destailleur
5af153550d Debug blockedlog: 
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
 2017-12-15 16:56:08 +01:00
Laurent Destailleur
c1791b87b4 Fix status tracked 2017-12-04 18:04:52 +01:00
Laurent Destailleur
db4a96c96b Add payment delete into blockedlog 2017-12-04 17:55:22 +01:00
Laurent Destailleur
0e4f82439b Add event BILL_DELETE into blockedlog module 2017-12-03 21:47:37 +01:00
Laurent Destailleur
6796c08cb8 Debug/rewrite Blockedlog 2017-11-30 14:21:55 +01:00
Laurent Destailleur
39fdd1b37d Use correct link to changelog 2017-11-30 11:16:28 +01:00
Laurent Destailleur
31e152274c NEW Add 2 new automatic classification in workflow module 2017-11-14 01:00:57 +01:00
Laurent Destailleur
55386a3ae2 Work on website module 2017-11-03 13:52:03 +01:00
Laurent Destailleur
4220d02dd4 Debug module blocked log 2017-10-31 23:57:37 +01:00
Laurent Destailleur
e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php
 2017-10-27 02:12:35 +02:00
florian HENRY
f4a95f89ac Ok, now suppliers payment are correctly logged 2017-10-26 12:26:25 +02:00
florian HENRY
a7655b69e8 agin fix blockedlog on supplier incvoive payument 2017-10-26 12:13:47 +02:00
Laurent Destailleur
7b661685cc Debug modBlockedLog module 2017-10-24 15:22:46 +02:00
Laurent Destailleur
d40dda83cf Add API "close" for proposals 
Standardize code
 2017-10-18 11:10:08 +02:00
Regis Houssin
4a30448ff4 Fix: use fullname instead id is more explicit 2017-10-09 11:34:28 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
KHELIFA
88ab3a9cab Add a new notification for the event that has successfully closed a proposal. 2017-10-06 16:15:40 +02:00
Regis Houssin
723bc4d436 NEW add ldap_rename for avoid password if ldap key changed 2017-10-04 11:22:41 +02:00
Regis Houssin
59bf61f9b3 NEW add possibility to disabled the LDAP trigger 2017-10-04 09:22:18 +02:00
Laurent Destailleur
aeeda250c7 Merge pull request #7443 from salnaSrc/myFixes 
Add hidden option WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS
 2017-09-25 17:28:28 +02:00
Regis Houssin
01f9d59e75 Fix: use another method 2017-09-21 12:16:01 +02:00
Pilon David
78b45bd972 Update interface_20_modWorkflow_WorkflowManager.class.php 2017-09-20 09:41:32 +02:00
Regis Houssin
f550e27579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-18 12:15:01 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Regis Houssin
4ab1f68102 Fix: check connectivity for avoid ldap errors 2017-09-16 17:12:51 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
c44a5ede43 FIX Several problem with the last event box on project/tasks 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7 FIX Several problem with the last event box on project/tasks 2017-09-13 15:12:54 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
743de4e586 FIX Option to classify proposal/order in workflow module must not set 
source object to billed if amount differs.
 2017-07-13 12:42:32 +02:00
Laurent Destailleur
2141cfb282 Fix code of triggers (disabled if module not enabled) 2017-07-13 11:25:25 +02:00
Laurent Destailleur
9127892c71 Fix several minor bugs 2017-07-13 02:33:48 +02:00
Laurent Destailleur
1c8daf9700 Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +02:00
alexis Algoud
ef0907d89e NEW log download or preview event on a validate bill 2017-06-13 15:55:22 +02:00
alexis Algoud
f780af305a NEW blocklog other things 
fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
 2017-06-13 10:04:05 +02:00
Alexis Algoud
4fd24f6d8c fix travis 2017-06-10 09:58:07 +02:00
Alexis Algoud
3d5899edf3 final blockedlog init 2017-06-10 09:25:32 +02:00
alexis Algoud
9b3b2e600f init blockedlog trigger and hash store 2017-06-08 17:52:02 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working. 
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
 2017-05-13 21:10:56 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Laurent Destailleur
c673d283e0 Fix script to send emailings 2017-05-02 18:21:50 +02:00
Laurent Destailleur
31d99bbfe6 Complete event tracked automatically 2017-05-02 12:17:25 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2017-03-30 12:02:27 +02:00
Laurent Destailleur
f01815519a Fix trigger of automatic events 2017-03-30 11:25:28 +02:00
Laurent Destailleur
1d6e760fc8 FIX Notification sending was broken. 2017-03-29 11:44:14 +02:00
Alexandre SPANGARO
6ce8aa7d6f Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-03-07 22:08:23 +01:00
florian HENRY
227daee2de Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_NEW_copyeventfiles

Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-03-02 14:29:22 +01:00
Laurent Destailleur
59d2943d8d Fix context must be provided to triggers using ->context no a dedicated 
property.
 2017-02-28 12:07:05 +01:00