Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

1015 Commits

Author SHA1 Message Date
Laurent Destailleur
af99cab839 CSS 2021-07-13 13:46:20 +02:00
Laurent Destailleur
752b55ac98 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 14:04:07 +02:00
Laurent Destailleur
16ee47b12c Fix warning. 
Reduce memory need for getmin/max on large graphs.
 2021-07-08 11:13:15 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
555f1c719b Debug v14 2021-07-06 04:29:25 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
ab4dbcf5ae Update box_mos.php 2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2 Update box_boms.php 2021-06-29 15:41:21 +02:00
Maxime Kohlhaas
8332385bd5 Fix links in box last BOM 2021-06-27 08:42:08 +02:00
Maxime Kohlhaas
d86caa39e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_mo_stuff 2021-06-27 08:34:11 +02:00
Laurent Destailleur
c7b03da7e6 Fix bad object used 2021-06-25 23:43:22 +02:00
Laurent Destailleur
2f6a91f506 Look and feel v14 2021-06-22 15:25:49 +02:00
Laurent Destailleur
d6e9947cd4 CSS 2021-06-22 12:30:50 +02:00
Maxime Kohlhaas
2d9d46b9b5 Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_mo_stuff 2021-06-20 21:08:28 +02:00
Laurent Destailleur
5ad999e46d css 2021-06-20 16:39:30 +02:00
Laurent Destailleur
68b8a6a916 css 2021-06-20 16:35:49 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
242f8b2544 Debug v14 2021-06-07 01:23:34 +02:00
Maxime Kohlhaas
a63d3364b4 Fix links in box last MO 2021-06-06 22:51:27 +02:00
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