Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

783 Commits

Author SHA1 Message Date
daraelmin
f83cf3a17b Update copyright 2021-03-29 03:29:21 +02:00
daraelmin
28ff0f2bc3 Copyright adherent_type.class.php 2021-03-28 22:50:27 +02:00
daraelmin
39933f97be Copyright adherent.class.php 2021-03-28 22:46:19 +02:00
daraelmin
bad5aa6468 fix excluded member color in graph 2021-03-27 13:39:15 +01:00
Laurent Destailleur
86c7ab922a Fix #yogosha5728 2021-03-24 18:57:23 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
daraelmin
e910810037 activate exlcude button 2021-03-21 14:38:15 +01:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
stickler-ci
ba29f327a9 Fixing style errors. 2021-03-19 11:41:27 +00:00
ptibogxiv
a9398e5630 FIx get optionnal in membertype with API 2021-03-19 12:39:38 +01:00
daraelmin
82509e2102 merged conflict with develop 2021-03-15 13:12:13 +01:00
daraelmin
639e234d4b Use dol_now instead of time() 2021-03-14 16:44:34 +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
daraelmin
ed3b0032bb Syntax error 2021-03-13 22:46:51 +01:00
daraelmin
47f7ee09cf img_picto for excluded should be status8 2021-03-13 21:10:47 +01:00
daraelmin
d979440ca6 Call exclude() when updating status to -2 2021-03-13 19:21:44 +01:00
daraelmin
39fba3c4a9 Update comment to mention exclude() fonction 2021-03-13 19:17:28 +01:00
daraelmin
5f0249894d Add property mail_exclusion 
Unused for the moment
 2021-03-13 19:11:21 +01:00
daraelmin
8f73334a79 Add excluded status in adherent class 2021-03-13 18:24:17 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Frédéric FRANCE
f394e55ade deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Laurent Destailleur
b88ee6eff4 Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Frédéric FRANCE
94e859bf6a doxygen 2020-12-30 21:41:44 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Frédéric FRANCE
914d2ae7f7 Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +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
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Frédéric FRANCE
9a2f945807 Merge remote-tracking branch 'upstream/develop' into patch-13 2020-11-27 11:15:10 +01:00
Laurent Destailleur
7bf12c8720 Fix name into popup of member in list of subscriptions 2020-11-27 01:22:13 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Frédéric FRANCE
0735993839 set ref at create 2020-11-11 12:17:23 +01:00
Frédéric FRANCE
c7557fdb8a specimen 2020-11-11 11:12:19 +01:00
Frédéric FRANCE
4d48eb96ed Update adherent.class.php 2020-11-11 07:16:07 +01:00
Frédéric FRANCE
016c9915ef Update 12.0.0-13.0.0.sql 
add ref in class

add ref in getNomUrl

add ref on card
 2020-11-10 23:03:03 +01:00
Frédéric FRANCE
2f7b445c9e doxygen 2020-11-10 21:57:49 +01:00
Laurent Destailleur
26b8e8d2bf More logs 2020-11-08 18:52:26 +01:00
Frédéric FRANCE
6e7448a1d0 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
42a3a20dfc Fix phpcs 2020-11-02 16:37:50 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
0e7b1ff1c7 doxygen 2020-11-01 15:39:01 +01:00
Frédéric FRANCE
e52b79d586 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Laurent Destailleur
47a4d2c9f6 Merge pull request #15244 from frederic34/patch-8 
doxygen
 2020-11-01 13:52:15 +01:00
Frédéric FRANCE
26406b0f9f Update adherent.class.php 2020-11-01 08:56:56 +01:00