Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

945 Commits

Author SHA1 Message Date
Laurent Destailleur
ea21e1dbfb Fix color selection for ticket graph 2021-05-30 20:19:02 +02:00
Laurent Destailleur
673eb73d0a Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
97154f8267 Fix timezone into widgets 2021-05-25 00:29:32 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Maxime Kohlhaas
d4aa0ae422 Update box_dolibarr_state_board.php 
Global stats box is always enabled
 2021-05-16 18:26:26 +02:00
Laurent Destailleur
56b0b5a1f1 Merge pull request #17575 from frederic34/patch-12 
fix php8 warning
 2021-05-11 18:00:29 +02:00
Frédéric FRANCE
eccfa40396 fix php8 warning 
remove variables not used
 2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910 fix php8 warning 2021-05-11 08:26:03 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
daraelmin
50a5dd7ff3 Use adh const 2021-04-27 23:28:49 +02:00
daraelmin
e7f1170736 Use adherent status const 2021-04-27 23:22:29 +02:00
Adrien Raze
e8c2085abd FIX : Change parameters MF to MS for price2num() function 2021-04-27 09:24:22 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Adrien Raze
c5775cc902 FIX : Add parameter to function price2num() 2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9 FIX : Add function price2num for rounding values in productAlertStock box 2021-04-23 11:11:47 +02:00
Laurent Destailleur
70abc04bf5 Merge pull request #17103 from Givriz/dev 
Fix compatibility phpv8
 2021-04-16 20:51:00 +02:00
Laurent Destailleur
7e4f7f7200 Nicer page of widget setup 2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9 Nicer page of widget setup 2021-04-15 13:22:03 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Givriz
7a54e5d346 Using empty instead of isset 
I used empty instead of isset, and I fixed some problems of my previous pull request
 2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
2a1a22763d Work on split module fournisseur 2021-04-12 06:51:00 +02:00
Laurent Destailleur
1e1b963ca7 Restriction on name of files 2021-04-07 19:38:54 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Givriz
5ed01f6733 Fix errors phpv8 2021-04-03 17:09:14 +02:00
Laurent Destailleur
cadef101db Fix var name 2021-04-02 21:40:33 +02:00
Laurent Destailleur
32287d8734 Merge pull request #17036 from dolibit-ut/patch-196 
Update box_supplier_orders_awaiting_reception.php
 2021-03-30 19:18:20 +02:00
UT from dolibit
479421d923 Update box_supplier_orders_awaiting_reception.php 
https://
 2021-03-30 18:30:07 +02:00
UT from dolibit
0203eab0b0 Update box_accountancy_suspense_account.php 
https://
 2021-03-30 18:28:07 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
a4987c6e4f Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
a23a2a0119 Merge pull request #16988 from daraelmin/daraelmin-patch-excluded 
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
 2021-03-29 17:39:58 +02:00
daraelmin
8a43d65476 Copyright box_members_by_type.php 2021-03-29 07:49:15 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
stickler-ci
6a9d6a8634 Fixing style errors. 2021-03-27 12:44:34 +00:00
daraelmin
bad5aa6468 fix excluded member color in graph 2021-03-27 13:39:15 +01:00
daraelmin
c8a455edf4 add excluded memer on graph 2021-03-27 13:14:59 +01:00
Laurent Destailleur
01c1101b29 Look and feel v14 2021-03-26 18:16:12 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
4ac5d32c48 Fix picto 2021-03-21 22:27:12 +01:00
Laurent Destailleur
9d1dcccb86 Fix css 2021-03-21 22:15:37 +01:00
Laurent Destailleur
e334e83a64 Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Regis Houssin
573ca669da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8 2021-03-20 12:11:12 +01:00
Laurent Destailleur
ee84bef3b2 Merge pull request #16828 from frederic34/membersboxfix 
fix new boxes add
 2021-03-20 11:52:19 +01:00
Laurent Destailleur
810b15f73a Merge pull request #16875 from frederic34/patch-25 
fix doxygen
 2021-03-20 11:14:57 +01:00
Frédéric FRANCE
65c3dced1c fix doxygen 2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947 fix doxygen 2021-03-20 10:32:18 +01:00
Laurent Destailleur
b5264e978b Merge pull request #16776 from frederic34/boxticket 
fix php8 warnings
 2021-03-20 10:14:34 +01:00