Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
109,389 Commits 36 Branches 189 Tags
19616982c7ac0c052d3f2edbd31f30cd5e6df96a
Commit Graph

27479 Commits

Author SHA1 Message Date
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Laurent Destailleur
b95440b83f Fix picto phone 2022-05-31 09:57:49 +02:00
Laurent Destailleur
0dda1d7e76 Merge pull request #20814 from atm-gauthier/NEW/develop_update_on_categorie_product_link_table 
New/develop update on categorie product link table
 2022-05-29 11:30:26 +02:00
Laurent Destailleur
dc3121dc42 Merge pull request #21043 from defrance/patch-194 
php V8 warning ($conf->global-b*)
 2022-05-29 10:52:50 +02:00
Laurent Destailleur
a56a6abb20 Merge pull request #21045 from defrance/patch-196 
fix php V8 warning
 2022-05-29 10:50:18 +02:00
Laurent Destailleur
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
61b69ca835 FIX repeating error "token expired" 2022-05-29 09:37:03 +02:00
Laurent Destailleur
23eb0b3264 Clean code 2022-05-28 21:07:52 +02:00
Laurent Destailleur
f6ad688ddd FIX module for emailing target selection must use a condition on module 2022-05-28 20:50:24 +02:00
Laurent Destailleur
a961bb5507 Debug v16 2022-05-28 11:31:41 +02:00
BENKE Charlene
4c96921a5f php 8 fix warning 2022-05-28 09:54:59 +02:00
BENKE Charlene
d36175c523 php V8 warning 2022-05-27 16:23:57 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
2b5e21379b Fix phpcs 2022-05-25 23:54:03 +02:00
Laurent Destailleur
343056dcbd Debug v16 2022-05-25 23:43:16 +02:00
Laurent Destailleur
271fb43bc6 FIX Import of fk_stcomm 2022-05-25 23:08:53 +02:00
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00
Laurent Destailleur
4cca69706a Merge pull request #20968 from Hystepik/develop#2 
New : function dol_move_dir in htdocs/core/lib/files.lib.php
 2022-05-25 19:06:57 +02:00
Laurent Destailleur
d0b6daaf4c Fix length of field 2022-05-25 16:50:09 +02:00
lmarcouiller
b1481d8495 Fix : socialnetworks import in db 2022-05-25 16:05:02 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-25 09:12:59 +02:00
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
Lucas Marcouiller
f43f2ab670 push phpunit to of the function 2022-05-22 15:44:57 +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