Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,306 Commits 36 Branches 190 Tags
f95bd2f4396f9f159c1e872b96a16f7a84ebd92c
Commit Graph

470 Commits

Author SHA1 Message Date
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
piernov
1cbe0e3f2d Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Laurent Destailleur
a81e4d4daa Fix bad picto 2021-02-16 13:21:18 +01:00
Laurent Destailleur
3399ab2c5d Fix phpcs 2021-01-07 10:20:41 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
atm-lena
6f15683709 FIX create ticket : thirdparty/contact notification #15629 2021-01-06 10:42:48 +01:00
Laurent Destailleur
cc44ce7ddd Fix warning 2020-12-07 15:35:38 +01:00
Laurent Destailleur
ca2ce88bd2 Fix warning 2020-12-07 13:29:56 +01:00
Laurent Destailleur
6023f2e16f Fix php8 2020-12-05 14:57:41 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
0b6123328d Removed rule with +99% of false positives 2020-11-12 13:12:38 +01:00
Laurent Destailleur
84cc0ef19b Add a protection to avoid infinite loop when we will trigger ACTION_ 2020-11-12 12:55:09 +01:00
Laurent Destailleur
5d5bbb2b5e Fix warning 2020-11-09 09:55:32 +01:00
Laurent Destailleur
fc49583efe Removed warning 2020-11-09 09:18:06 +01:00
Laurent Destailleur
8802bd4a91 Fix warning 2020-11-08 18:56:02 +01:00
Laurent Destailleur
26b8e8d2bf More logs 2020-11-08 18:52:26 +01:00
Laurent Destailleur
daa4d33d5b Fix trackid 2020-11-08 14:41:26 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
1c1a9a5463 Fix log 2020-11-08 12:57:56 +01:00
Laurent Destailleur
549b2eb99c Add log for a test 2020-11-08 12:56:53 +01:00
Laurent Destailleur
eba73101b9 Merge pull request #15210 from frederic34/zapieruser 
work on zapier
 2020-11-06 18:49:23 +01:00
Laurent Destailleur
c097e140cc Fix php8 2020-11-06 15:41:34 +01:00
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01: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
24ace56110 zapier on ticket create 2020-10-30 21:03:00 +01:00
Frédéric FRANCE
5afab4ba90 zapier on ticket create 2020-10-30 20:57:43 +01:00
Frédéric FRANCE
41e8f0085c zapier on ticket create 2020-10-30 20:37:23 +01:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Frédéric FRANCE
5d0ac98c34 work on zapier 2020-10-29 00:34:41 +01:00
Laurent Destailleur
e10033143a Fix bad var 2020-10-27 18:40:44 +01:00
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