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
111,473 Commits 36 Branches 190 Tags
29e64bee8b13c384ce77dbcc1bf3929ba0884c20
Commit Graph

1079 Commits

Author SHA1 Message Date
Maxime Kohlhaas
3a2cfe1fab NEW : add employment anniversary in birthday box 2022-08-01 10:42:30 +02:00
Laurent Destailleur
a4b7f38346 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_actions.php
	htdocs/core/boxes/box_contracts.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_services_expired.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
 2022-07-29 11:22:01 +02:00
Laurent Destailleur
f66dfb1c08 phpv8 2022-07-29 11:08:04 +02:00
Anthony Berton
c1b98e8e73 FIX - php V8 user right box 2022-07-28 12:09:22 +02:00
Laurent Destailleur
1f87f515ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:55 +02:00
Laurent Destailleur
4f9211d3e5 Fix link 2022-07-11 19:24:55 +02:00
lmarcouiller
ce2bf519d5 Close #19587 : box_action order by to datep 2022-07-11 11:22:19 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Laurent Destailleur
b8e5f3c4f2 Look and feel v16 2022-06-28 11:33:19 +02:00
Alexandre SPANGARO
4768502773 Merge remote-tracking branch 'upstream/develop' into 16b2 2022-06-19 06:35:49 +02:00
Laurent Destailleur
34d3d2695e Merge pull request #21250 from Quatadah/dolicloud-qnasdami-scrutinizer-005 
BUG FIX : increasing the scope of the variable
 2022-06-14 19:01:47 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
NASDAMI Quatadah
fe4dac5ecb increasing the scope of the variable 2022-06-13 16:10:45 +02:00
Alexandre SPANGARO
909bb1469d Fix PHP 8.1.7 2022-06-13 03:42:12 +02:00
ptibogxiv
562e9998fd Fix php 8 compatibility 2022-06-12 13:22:55 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Maxime Kohlhaas
4c10ef8f4c Fix labels in tickets widgets 2022-05-21 15:36:04 +02:00
ptibogxiv
3a4657e5ec Fix box activity for php 8 
annee doesn't exist so makes php error
 2022-05-20 11:18:30 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
c5a4877eb8 php8 2022-05-11 10:28:12 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
a57312d09c Look and feel v16 2022-05-06 14:13:04 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
Laurent Destailleur
a0cb04bafc Fix css 2022-04-06 11:21:46 +02:00
Florian HENRY
1fec350ccc fix: Bad dirthday displayed date (d-1) in the Bithday Widget 2022-04-04 22:51:30 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Florian Mortgat
5df5050418 Apply suggestions from code review 
replace spaces with tabs
 2022-04-01 09:14:04 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Laurent Destailleur
bc9ec3e2b9 Merge pull request #20395 from hregis/fix_uniformize_with_element_name 
FIX uniformize with element name "contact"
 2022-03-23 16:04:53 +01:00
Regis Houssin
f31bf8df48 FIX stickler problem ?? 2022-03-18 13:15:25 +01:00
Regis Houssin
27e893be1d FIX missing element name 2022-03-18 13:13:13 +01:00
Regis Houssin
1d8f170d32 NEW add hooks in customers and products boxes 2022-03-18 12:59:07 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
f4f03d03f2 Fix link 2022-02-18 15:23:13 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00