lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
110,189 Commits 43 Branches 150 Tags 886 MiB
d2e7ff3bfb
Commit Graph

27733 Commits

Author SHA1 Message Date
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Laurent Destailleur
32d54ee44d Fix permission 2022-06-10 09:43:19 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Frédéric France
3fe46c8028 use isModEnabled function 2022-06-09 22:10:51 +02:00
Frédéric France
588046d825 use isModEnabled function 2022-06-09 21:33:39 +02:00
Sylvain Legrand
216cb6b6ea Merge branch '14.0' into Fix_Supplier_deposit_can_not_be_used_to_pay_supplier_invoice 2022-06-09 20:14:11 +02:00
BB2A Anthony Berton
293141e578 checkbox PHP error 2022-06-09 15:52:47 +02:00
stickler-ci
de88a39bb6 Fixing style errors. 2022-06-09 13:25:44 +00:00
BENKE Charlene
39d29d4cf3
Update card_presend.tpl.php 2022-06-09 15:20:00 +02:00
BENKE Charlene
d335bb22a2
Update html.formmail.class.php 2022-06-09 15:13:29 +02:00
BENKE Charlene
429f9c027e
php V8 warning 
and little optimising code
 2022-06-09 15:04:33 +02:00
Laurent Destailleur
648f4b1d8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 12:51:02 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Abdelaziz MISBAH
14e7c5454e FIX #21141 Update condition to check for attached file to E-mail Template 
Update condition to check for attached file to E-ail Template, initial Commit doesn't check for  if null (may generate fatal error depending on context), now we check if is an object, before checking if we join files.
 2022-06-09 11:47:34 +01:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
7a7d296533 Fix fatal error on canvas 2022-06-09 10:49:24 +02:00
Laurent Destailleur
2b9dbe4c98 Doc 2022-06-09 03:21:31 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
604855bbc1 Debug v16 2022-06-09 02:05:20 +02:00
Sylvain Legrand
ab3f19dd59 Fix error when supplier deposit are used to pay supplier invoice 2022-06-08 22:07:48 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
8dc908a16a
Merge pull request #21147 from bb2a/FIX---php-V8-warning-actions-addupdatedelete 
FIX - php V8 warning actions addupdatedelete
 2022-06-08 15:04:42 +02:00
Laurent Destailleur
8688ba23b4
Merge pull request #21145 from bb2a/FIX---php-V8-warning-class-html-form 
FIX - php V8 warning class html form
 2022-06-08 15:02:58 +02:00
Laurent Destailleur
499d1d2994
Merge pull request #21149 from bb2a/FIX---php-V8-lib-pdf 
FIX - php V8 lib pdf
 2022-06-08 15:01:54 +02:00
Laurent Destailleur
6ce1451214
Merge pull request #21154 from defrance/patch-202 
php V8 warning
 2022-06-08 14:57:26 +02:00
lmarcouiller
c257f32559 add of names in update 2022-06-08 13:35:32 +02:00
BENKE Charlene
5aef26d8cc
Update project.lib.php 2022-06-08 13:11:28 +02:00
lmarcouiller
c368ff69df New : add of socialmedias in contact update 2022-06-08 12:36:55 +02:00
BENKE Charlene
dc2979ad4d
php V8 warning 2022-06-08 09:02:24 +02:00
Laurent Destailleur
7ee4cccc84 FIX ODT tags for subobjects {object_subobject_yyy} was not working. 2022-06-07 19:59:33 +02:00
Laurent Destailleur
8303347ab8 FIX label and get_substitutionarray_each_var_object on ODT generation 2022-06-07 19:27:43 +02:00
BB2A Anthony Berton
054eefb1f7 FIX - php V8 lib pdf 2022-06-07 18:49:29 +02:00
BB2A Anthony Berton
75e05ac412 FIX - php V8 warning actions addupdatedelete 2022-06-07 18:25:24 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Laurent Destailleur
0033a1a02a CSS 2022-06-07 17:54:51 +02:00
BB2A Anthony Berton
03f8d49c94 FIX - php V8 warning class html form 2022-06-07 17:25:33 +02:00
Laurent Destailleur
a9440c934d FIX #yogosha10825 2022-06-07 16:05:01 +02:00
Abdelaziz MISBAH
a29aa48100 Send Notification Without File when E-mail Template does'nt attach file 
When we create an Email Template that does'nt require main file to be attached, we still send notification with an attached file, eg: when we send a notification when validating proposal it send proposal with attached file with mention NOT VALIDATED.
I added OR condition on checking pdf_path.
 2022-06-07 13:13:08 +01:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3
Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias 
NEW - Add option pdf global thirdparty alias
 2022-06-07 10:43:18 +02:00
Laurent Destailleur
07f4ebf8b8
Merge pull request #21125 from bb2a/FIX---php-V8-warning-class-extrafields 
FIX - php V8 warning class extrafields
 2022-06-07 09:58:50 +02:00
Laurent Destailleur
33d9c164c2
Update extrafields.class.php 2022-06-07 09:57:15 +02:00
Laurent Destailleur
2b8de78572
Merge pull request #21126 from bb2a/FIX---php-V8-warning-class-commonobject-extrafields 
FIX - php V8 warning class commonobject extrafields
 2022-06-07 09:53:52 +02:00
Laurent Destailleur
cfcd46ecaa
Merge pull request #21124 from bb2a/FIX---php-V8-warning-lib-usergroups-topmenu-select 
FIX - php V8 warning lib signature
 2022-06-07 09:53:18 +02:00
Laurent Destailleur
fc0f624445 Debug v16 2022-06-04 02:08:08 +02:00
Laurent Destailleur
0f7b84cfae Fix phpcs 2022-06-03 18:20:02 +02:00
BB2A Anthony Berton
d8e6ce1ae8 FIX - php V8 warning class commonobject extrafields 2022-06-03 16:06:25 +02:00
BB2A Anthony Berton
fc26196a7f FIX - php V8 warning class extrafields 2022-06-03 15:35:20 +02:00
BB2A Anthony Berton
59cd2fea98 FIX - php V8 warning lib usergroups topmenu select 2022-06-03 15:20:17 +02:00
Laurent Destailleur
87230795cc Fix warning 2022-06-03 14:23:37 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
3d80cb9b66 Debug emailcollector 2022-06-03 12:29:47 +02:00
Laurent Destailleur
afd9787e99 Help debug cron 2022-06-03 11:52:39 +02:00
Laurent Destailleur
b69cdb266a
Merge pull request #21120 from SylvainLegrand/fix_change_payment_term_error 
Fix error on change payment term
 2022-06-03 11:13:38 +02:00
Laurent Destailleur
b2e6f9fc68
Update commonobject.class.php 2022-06-03 11:12:55 +02:00
Laurent Destailleur
41ce28996c PHP 8.1 #21121 2022-06-03 11:10:08 +02:00
Sylvain Legrand
2fe29627e6 Fix error on change payment term 2022-06-03 08:59:19 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template 
Conflicts:
	htdocs/core/class/commonobjectline.class.php
 2022-06-02 20:18:11 +02:00
Laurent Destailleur
69a7b01f20 Fix ODT tags in BOM template 2022-06-02 20:15:49 +02:00
Laurent Destailleur
a579859ab5
Merge pull request #21044 from defrance/patch-195 
php V8 warning ($conf->c part 1
 2022-06-02 15:44:04 +02:00
Laurent Destailleur
00c22eff6b
Merge pull request #21106 from frederic34/patch-1 
New isModEnabled function
 2022-06-02 14:45:56 +02:00
Laurent Destailleur
701d4a1f47
Merge pull request #21107 from Hystepik/develop#1 
fix: php8.0 warnings
 2022-06-02 14:44:57 +02:00
Laurent Destailleur
1fc29d6d40 Missing token 2022-06-02 14:26:57 +02:00
lmarcouiller
0bad3664fb fix: php8.0 warnings 2022-06-02 11:14:35 +02:00
Frédéric FRANCE
5b316487b4
Update eldy.lib.php 2022-06-02 10:29:34 +02:00
Frédéric FRANCE
96bf5a9c8a
New isModEnabled function 2022-06-02 10:21:05 +02:00
Laurent Destailleur
43dedcb2b1 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-01 22:29:29 +02:00
Laurent Destailleur
1a51a7d525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:14:02 +02:00
Laurent Destailleur
d3fed26d78 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-06-01 22:13:42 +02:00
Laurent Destailleur
ff450e57fd
Merge branch 'develop' into patch-198 2022-06-01 22:05:03 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
731702c7eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:01:47 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
cbd12288d3
Merge pull request #21067 from bb2a/php-V8-warning-class-commonobject 
php V8 warning class commonobject
 2022-06-01 21:28:22 +02:00
Laurent Destailleur
d2a8dd6925
Merge pull request #21065 from bb2a/FIX-PHP8-files-lib 
php V8 warning files lib
 2022-06-01 20:58:44 +02:00
Laurent Destailleur
f89892f7e4
Merge pull request #21069 from bb2a/php-V8-warning-class-html-form 
php V8 warning class html form
 2022-06-01 20:58:22 +02:00
Laurent Destailleur
e641bef40a
Merge pull request #21080 from bb2a/FIX---php-V8-warning-lib-usergroups-topmenu 
FIX - php V8 warning lib usergroups topmenu select
 2022-06-01 19:56:51 +02:00
Laurent Destailleur
c88ee425ad
Merge pull request #21087 from Hystepik/develop#3 
New : update in import for socialnetworks
 2022-06-01 19:40:54 +02:00
Laurent Destailleur
3dcd9fcfe9
Merge pull request #21086 from Hystepik/develop#2 
Fix: import update on xlsx
 2022-06-01 19:40:08 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Gauthier PC portable 024
2a3f0affaf FIX : try for travis 2022-06-01 14:13:24 +02:00
lmarcouiller
69e8c1abe4 New : update in import for socialnetworks 2022-06-01 11:44:07 +02:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
BENKE Charlene
0126f043c9
fixed 2022-06-01 10:53:52 +02:00
BB2A Anthony Berton
976f6d42b8 php V8 warning 2022-06-01 09:15:21 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
5ada47195a FIX Link to social network 2022-05-31 15:48:50 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
Laurent Destailleur
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00
BB2A Anthony Berton
d917ac46e7 php V8 warning class html form 2022-05-31 14:14:22 +02:00
BB2A Anthony Berton
d7eebeb913 php V8 warning class commonobject 2022-05-31 11:41:38 +02:00
BB2A Anthony Berton
e303f27a19 FIX PHP8 2022-05-31 11:36:23 +02:00
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
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +02:00
BENKE Charlene
d74fc672e7
Update files.lib.php 2022-05-30 10:23:00 +02:00
BENKE Charlene
785d0e03b7
php V8 warning 2022-05-30 08:43:41 +02:00
BENKE Charlene
008800cf52
correct it 2022-05-30 07:46:21 +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
f5da6ebfe2
Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields 
FIX: Show sellist type of extrafield when none category selected
 2022-05-29 11:24:35 +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
8963a41085
php V8 warning 
and don instead donation
 2022-05-27 16:47:23 +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
kamel
f1914ff66f FIX: Show sellist type of extrafield when none category selected 2022-05-25 18:02:18 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
1dd2ce0399
Merge pull request #21024 from atm-john/15.0_fix_btn_confirm_url 
Fix btn confirm url
 2022-05-25 16:56:54 +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
John BOTELLA
e07827a0be Fix btn confirm url 2022-05-25 10:03:08 +02:00
John BOTELLA
9d31d6448c Fix btn confirm url 2022-05-25 09:59:45 +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