Commit Graph

27452 Commits

Author SHA1 Message Date
Laurent Destailleur
0e3d7c4e2e
Merge pull request #19099 from johnvan7/develop
New: receipt beep alternative and current date/time
2022-05-24 22:13:59 +02:00
Laurent Destailleur
8385ca604f
Merge pull request #20098 from atm-lena/NEW_OF_Child
Create MO Child
2022-05-24 22:00:19 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
2cfb4c1fb9
Merge pull request #20990 from rycks/fix_modResource_depends_on_modResource
fix #20989 : modResource depends on modResource
2022-05-24 21:48:52 +02:00
Laurent Destailleur
fd19b2134d
Merge pull request #21009 from atm-jpb/FIX/leftmenu_holiday
FIX  : change same left menu name  on GRH top menu
2022-05-24 21:07:46 +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
Laurent Destailleur
ab40634dcb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-24 16:28:32 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +02:00
stickler-ci
f0fa315a7b Fixing style errors. 2022-05-24 13:24:31 +00:00
jpb
52b23c748c change same left menu name on GRH top menu 2022-05-24 15:13:22 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00
Laurent Destailleur
43be070300 PHP8.1 strftime("%Y%m%d%H%M") => dol_print_date(dol_now('gmt'),
"dayhourlogsmall", 'tzuser')
2022-05-24 11:55:21 +02:00
Laurent Destailleur
30e300fbc8 FIX Remove warning during dump 2022-05-24 11:52:55 +02:00
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
Eric Seigne
bbebb9ef5a fix #20989 : modResource depends on modResource 2022-05-23 08:29:04 +02:00
Laurent Destailleur
35edd3ac6e Fix bad test 2022-05-23 01:10:37 +02:00
Laurent Destailleur
36ccc52554 Doc 2022-05-23 00:19:15 +02:00
Laurent Destailleur
ac88e5f59e
Merge pull request #20980 from atm-maxime/fix_scrutinizer1
Fix scrutinizer and remove unused functions
2022-05-22 17:18:34 +02:00
Laurent Destailleur
7dab11f27d
Merge pull request #20984 from aspangaro/16a12_assets_code
Asset module - Fix advanced rights
2022-05-22 17:12:19 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
3d5b322d98 Debug v16 2022-05-22 16:27:42 +02:00
Laurent Destailleur
7b4dae8773 CSS 2022-05-22 16:16:17 +02:00
Laurent Destailleur
96867fac4f FIX ZATCA regression 2022-05-22 13:04:16 +02:00
Laurent Destailleur
d3f1332b24 FIX ZATCA regression 2022-05-22 13:02:51 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Laurent Destailleur
8e2b082a21 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-22 12:39:23 +02:00
Laurent Destailleur
f65f63b562 FIX Zatca QR code must use company name/vat 2022-05-22 12:38:52 +02:00
Alexandre SPANGARO
977907c07b Asset module - Fix advanced rights 2022-05-22 06:47:28 +02:00
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Maxime Kohlhaas
0559cc08ac Fix scrutinizer remove unused functions 2022-05-22 01:28:27 +02:00
Maxime Kohlhaas
266a4b2891 Fix scrutinizer 2022-05-22 00:36:53 +02:00
Maxime Kohlhaas
e5c38572d1 Fix no document available on job candidature 2022-05-22 00:23:16 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
e12daa74d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-21 23:06:04 +02:00
Laurent Destailleur
cde2af7614 Fix var missing 2022-05-21 23:05:51 +02:00
Laurent Destailleur
9fd6d4bb1e
Merge pull request #20874 from Hystepik/develop#3
New : import fields in societe class
2022-05-21 22:50:36 +02:00
Laurent Destailleur
0f268b682a
Merge pull request #20882 from FHenry/dev_new_add_ref_clinet_intervention
NEW: Add Customer Ref on Intervention
2022-05-21 22:36:17 +02:00
Maxime Kohlhaas
1dc1c2aa79 Fix parse error on formfile 2022-05-21 22:23:29 +02:00
Lucas Marcouiller
adfee839d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-21 19:19:02 +02:00
Nicolas SILOBRE
055d5508e4
Merge branch 'Dolibarr:develop' into develop 2022-05-21 19:15:39 +02:00
Laurent Destailleur
d99e2ea4eb
Merge pull request #20948 from inovea-conseil/FIX#20886
FIX#20886 : manage durations in list_print_total.tpl.php
2022-05-21 19:12:45 +02:00
Laurent Destailleur
8ede0f03f1
Merge pull request #20956 from hregis/fix_php8_compatibility
FIX php8 compatibility
2022-05-21 19:07:05 +02:00
Laurent Destailleur
3cce8babc3
Merge pull request #20959 from Hystepik/develop#5
Fix : php 8.0 warnings
2022-05-21 19:00:23 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
stickler-ci
aa313f23ad Fixing style errors. 2022-05-21 16:26:20 +00:00
Regis Houssin
019a68b3bb FIX clean code 2022-05-21 18:25:07 +02:00
Regis Houssin
cc7cc8bb5f FIX avoid stickler error : Line exceeds 500 characters 2022-05-21 18:18:31 +02:00
Nicolas SILOBRE
7cf97cfb93
FIX: warning Php 8 2022-05-21 18:15:44 +02:00