Commit Graph

97174 Commits

Author SHA1 Message Date
IC-Ilies
1b6e0a9fc0 FIX#20886 : manage durations in list_print_total.tpl.php 2022-05-21 16:25:47 +02:00
Nicolas SILOBRE
2b6154050c
Fix : php warning 8 / backup 2022-05-21 16:16:59 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Sylvain Legrand
a65c4c2e05
field ref_customer in llx_expedition is not varchar(255) #20629 2022-05-21 16:05:58 +02:00
Maxime Kohlhaas
9b2a543170 Fix phpcs too long line 2022-05-21 15:49:27 +02:00
Laurent Destailleur
6bc7cbd106
Merge pull request #20938 from atm-john/new_formsetup_as_default
NEW form setup and backport as default setup builder
2022-05-21 15:44:08 +02:00
Maxime Kohlhaas
4932f86a2d Fix default value for boolean extrafield 2022-05-21 15:41:34 +02:00
Maxime Kohlhaas
4c10ef8f4c Fix labels in tickets widgets 2022-05-21 15:36:04 +02:00
Laurent Destailleur
2c2544d471 Fix scrutinizer 2022-05-21 15:31:08 +02:00
Nicolas
11da45646e FIX signature online with proposal with n page. 2022-05-21 15:30:52 +02:00
John BOTELLA
9ba1020298 Fix version detect 2022-05-21 15:03:10 +02:00
Laurent Destailleur
b14c04a8f0 Fix regression 2022-05-21 15:02:14 +02:00
Laurent Destailleur
f3ca26576d Fix regression 2022-05-21 14:17:49 +02:00
Laurent Destailleur
e341ca0fdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-21 11:00:13 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention 2022-05-21 10:48:09 +02:00
Laurent Destailleur
71c71d11c4
Merge pull request #20931 from homer8173/patch-36
Update categorie.class.php
2022-05-21 10:47:09 +02:00
Laurent Destailleur
4a2a6fd747 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-21 10:40:00 +02:00
Laurent Destailleur
0cb9fe25a8
Merge pull request #20922 from homer8173/patch-31
Fix scrutinizer
2022-05-21 10:39:06 +02:00
Laurent Destailleur
e36c6f2268
Merge pull request #20923 from homer8173/patch-32
FIX scrutinizer
2022-05-21 10:38:41 +02:00
Laurent Destailleur
7c9d360019
Merge pull request #20937 from atm-maxime/fix_date_creation_visible
Fix : date_creation must have visible=-2
2022-05-21 10:34:01 +02:00
Laurent Destailleur
21c3f27e72
Merge pull request #20941 from inovea-conseil/FIX#20448
FIX#20448 missing preg_replace for vat rate when adding a free line
2022-05-21 10:33:41 +02:00
Laurent Destailleur
653e59ffeb
Merge pull request #20939 from atm-maxime/fix_select_project_on_event
Fix select projet on event creation
2022-05-21 10:28:35 +02:00
Laurent Destailleur
54e572b94f Fix 2022-05-21 10:25:20 +02:00
IC-Ilies
c12ae28ad7 FIX#20448 missing preg_replace for vat rate when adding a free line 2022-05-21 09:31:33 +02:00
Laurent Destailleur
a55fe58d4c
Merge pull request #20921 from homer8173/patch-30
FIX scrutinizer
2022-05-21 01:40:37 +02:00
John BOTELLA
cf321dd8e5 change comment 2022-05-21 01:26:02 +02:00
Maxime Kohlhaas
0d7386ab89 Fix select projet on event creation 2022-05-21 01:23:39 +02:00
Laurent Destailleur
980c9874ab
Merge pull request #20895 from ATM-Consulting/FIX_15.0_unable_to_add_several_cron_jobs_with_same_method_and_different_parameters
FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
2022-05-21 01:17:28 +02:00
Laurent Destailleur
6aa4ce2acb
Merge pull request #20896 from marc-dll/13.0_FIX_new_membership_select_width
FIX: new member subscription: bank account and payment mode might be hidden
2022-05-21 00:48:58 +02:00
Laurent Destailleur
ef32179ba7
Merge pull request #20935 from atm-maxime/fix_fields_check_enabled
Fix : fields must check module enabled
2022-05-21 00:48:22 +02:00
Laurent Destailleur
4378ec2e2b
Merge pull request #20879 from altairisfr/takepos_hide_stock
NEW: TAKEPOS - add constant to hide stock on cart lines
2022-05-21 00:47:41 +02:00
Laurent Destailleur
d84bdf3dc2
Merge pull request #20897 from Hystepik/develop#5
Fix : contact backtopage on confirm_delete
2022-05-21 00:46:37 +02:00
Laurent Destailleur
9a0e5c0591
Merge pull request #20898 from frederic34/patch-1
Update card.php
2022-05-21 00:45:36 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary
New/sortorder on holiday type dictionnary
2022-05-21 00:43:52 +02:00
Laurent Destailleur
1196d6f48c
Merge pull request #20907 from atm-quentin/NEW_hook_format_address
FIX : hook for dol_format_address
2022-05-21 00:42:11 +02:00
Laurent Destailleur
3080aafa2a
Merge pull request #20914 from grandoc/new_branch_20_05_2022_02
The property supplier_invoice_id does not seem to exist on Asset
2022-05-21 00:40:55 +02:00
Laurent Destailleur
a24fad1a44
Merge pull request #20925 from homer8173/patch-34
Update files.lib.php
2022-05-21 00:39:10 +02:00
John BOTELLA
e48bf14dae Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_formsetup_as_default 2022-05-21 00:38:53 +02:00
Laurent Destailleur
cd4a449580
Merge pull request #20924 from homer8173/patch-33
FIX scrutinizer
2022-05-21 00:36:48 +02:00
John BOTELLA
f8dcc1daaf Add form setup and backport as default setup builder 2022-05-21 00:36:13 +02:00
Laurent Destailleur
305798906b
Merge pull request #20928 from Hystepik/develop#7
Fix : bug import societe with null status
2022-05-21 00:33:31 +02:00
John BOTELLA
72bfedaba1 Add form setup and backport as default setup builder 2022-05-21 00:33:28 +02:00
Laurent Destailleur
fffd655442
Merge pull request #20933 from atm-maxime/fix_recruitment_missing_const
Fix missing const in recruitment module
2022-05-21 00:24:01 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
106fe22234 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-20 23:35:41 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Maxime Kohlhaas
8231a9ea0f Fix wrong right test to show button 2022-05-20 23:29:35 +02:00
Laurent Destailleur
98d22ed31b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-20 23:29:32 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-20 23:28:01 +02:00
Laurent Destailleur
b184a1512f
Merge pull request #20909 from daraelmin/patch-2
FIX regression PR #20713
2022-05-20 23:24:34 +02:00
Maxime Kohlhaas
bba6a917cb Fix missing const in recruitment module 2022-05-20 23:21:08 +02:00
Laurent Destailleur
29092c2eca
Merge pull request #20929 from atm-john/16.0_fix_form_setup
FIX : fatal error and missing param
2022-05-20 23:10:42 +02:00
Laurent Destailleur
9661342422 Disabled for beta 16. Will be analyzed later. 2022-05-20 23:00:25 +02:00
Laurent Destailleur
3794c8193d
Merge pull request #20573 from wdammak/patch-48
Avoid duplicate 3rd partires
2022-05-20 22:51:43 +02:00
Laurent Destailleur
58a77ae890
Merge pull request #20134 from Hystepik/develop#2
Fix : fix bug in modulebuilder and fix php8.0 warnings in modulebuilder
2022-05-20 22:50:35 +02:00
Norbert Penel
5591ee7e6f
Update categorie.class.php 2022-05-20 22:36:48 +02:00
John BOTELLA
c3e3eab594 Fix missing hooks and fatal error 2022-05-20 22:34:44 +02:00
Laurent Destailleur
748587abd4
Merge pull request #20919 from ynnoig/bugfix/issue_19468
FIX #19468
2022-05-20 22:32:32 +02:00
Laurent Destailleur
d7f93826dd
Merge pull request #20916 from hregis/fix_scrutinizer
Fix scrutinizer
2022-05-20 22:29:51 +02:00
Laurent Destailleur
fcd70fa852
Merge pull request #20917 from inovea-conseil/FIX#20828
FIX #20828
2022-05-20 22:27:37 +02:00
Laurent Destailleur
462a3b17c2 Fix regression 2022-05-20 22:24:06 +02:00
John BOTELLA
b081649907 Fix fatal error and missing param 2022-05-20 22:05:13 +02:00
Lucas Marcouiller
98af6f8606 Fix : import on societe with null status 2022-05-20 22:01:39 +02:00
Laurent Destailleur
fb74bbc204
Merge pull request #20920 from homer8173/develop
propagate tva  rate from supplier FIX #20803
2022-05-20 21:42:17 +02:00
Laurent Destailleur
786816dd44
Merge pull request #20881 from FHenry/15_fix_template_modbuilder
fix: module builder template bad error message affactation
2022-05-20 21:40:35 +02:00
Laurent Destailleur
d0030cd4f5
Merge pull request #20884 from Easya-Solutions/14.0-fix-pdf-squille-qyt-received-label-from-status
FIX qty received label in Squille PDF model
2022-05-20 21:40:16 +02:00
Laurent Destailleur
432c07ec31
Merge pull request #20892 from atm-greg/Fix_15.0_Fatal_on_holiday_approve_massaction
add missing CMailFile class requirement
2022-05-20 21:35:33 +02:00
Laurent Destailleur
beb710957c
Merge pull request #20901 from atm-GregM/DolGetButtonAction_Projet
FIX : replacing to dolGetButtonAction on Projet card
2022-05-20 21:33:42 +02:00
Laurent Destailleur
dc54ae6879
Merge pull request #20908 from ptibogxiv/patch-8
Fix box activity for php 8
2022-05-20 21:31:41 +02:00
Norbert Penel
9bb0f639f6
Update files.lib.php 2022-05-20 21:31:14 +02:00
Laurent Destailleur
2ea5fa3a68
Merge pull request #20885 from atm-lena/15.0_fetchpropal_fetchsignaturedate
Add date signature in propal fetch
2022-05-20 21:15:05 +02:00
Lucas Marcouiller
c887f48dee fix in social import 2022-05-20 21:12:55 +02:00
Laurent Destailleur
4162a02cc1 Fix deprecated remise must be remove from insert 2022-05-20 20:10:45 +02:00
Laurent Destailleur
168d1d4334
Merge pull request #20890 from Hystepik/develop#1
Fix : php 8.0 warnings
2022-05-20 19:41:20 +02:00
Laurent Destailleur
b44676aa1a
Merge pull request #20887 from grandoc/new_branch_18_05_2022
fix deprecated for fk_statut
2022-05-20 19:40:22 +02:00
stickler-ci
20b74cebc0 Fixing style errors. 2022-05-20 17:32:58 +00:00
Norbert Penel
b21facc3db
FIX scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/categories/class/api_categories.class.php?orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:32:27 +02:00
Norbert Penel
2a22a530e9
FIX scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/asset/model/depreciation_options.php?orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:27:15 +02:00
stickler-ci
5c01db353a Fixing style errors. 2022-05-20 17:26:17 +00:00
Norbert Penel
877b487298
Fix scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/asset/card.php?selectedLabels%5B0%5D=9&orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:25:46 +02:00
stickler-ci
3780718bcf Fixing style errors. 2022-05-20 17:23:54 +00:00
Norbert Penel
0533fd4762
scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/adherents/type_translation.php?orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:21:47 +02:00
stickler-ci
18890e2cbb Fixing style errors. 2022-05-20 17:11:36 +00:00
Norbert Penel
a3fc71981f
send tva rate 2022-05-20 19:09:46 +02:00
Norbert Penel
6e9c1764ad
propage tva rate on tva field 2022-05-20 19:08:26 +02:00
John BOTELLA
1452e74431 Fix sanitize 2022-05-20 19:01:25 +02:00
Giovanni Piemontese
945144d5a3 Fixed pagination on public ticket list page - ISSUE 19468 2022-05-20 18:46:02 +02:00
IC-Ilies
c08c86a9d8 FIX #20828 2022-05-20 17:52:53 +02:00
Regis Houssin
a302ffa5fb FIX wrong var name 2022-05-20 17:51:16 +02:00
Regis Houssin
334baeffaa FIX syntax error 2022-05-20 17:37:36 +02:00
Regis Houssin
56d6dd0603 FIX scrutinizer 2022-05-20 17:34:37 +02:00
Philippe Grand
1cefe479e7
Update adherent_type.class.php 2022-05-20 17:20:41 +02:00
Nicolas
9a1aa0d5ea FIX Warning on attribut 2022-05-20 17:14:30 +02:00
stickler-ci
80e0e5b987 Fixing style errors. 2022-05-20 15:03:36 +00:00
Philippe GRAND
58a2e9c389 fix : The property supplier_invoice_id does not seem to exist on Asset 2022-05-20 16:55:50 +02:00
Philippe GRAND
61d9e48821 fix : The property other does not seem to exist on AdherentType. 2022-05-20 15:48:25 +02:00
stickler-ci
18e9a332b4 Fixing style errors. 2022-05-20 12:58:46 +00:00
priojk
03d60ec05e NEW #20905 add hooks for accountancy export 2022-05-20 14:54:26 +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
Florian HENRY
8af848c539 add Ref client in PDF and send to propal on create 2022-05-20 10:40:59 +02:00
Florian HENRY
93831663d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-20 10:31:29 +02:00
Quentin VIAL-GOUTEYRON
a2fe72225f NEW : hook for dol_format_address 2022-05-20 10:06:28 +02:00
daraelmin
3d734e8d34
FIX regression PR #20713
Please do not revert with PR #20900
2022-05-20 09:22:16 +02:00
Laurent Destailleur
fe0bbbb626 Better compatibility 2022-05-19 21:32:43 +02:00
Laurent Destailleur
9e2e3393c6 Work on popup create pages 2022-05-19 21:32:17 +02:00
Laurent Destailleur
ae34fd1498 Log 2022-05-19 20:23:42 +02:00
Laurent Destailleur
2d16af1d31 Debug import wizard 2022-05-19 20:18:18 +02:00
GregM
0defbe8205 replacing to dolGetButtonAction on Projet card 2022-05-19 17:55:13 +02:00
stickler-ci
8b5c4b02c1 Fixing style errors. 2022-05-19 12:17:45 +00:00
Gauthier PC portable 024
8438c7cd6c FIX : sortorder 2022-05-19 14:09:50 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
672a646fa9 Fix scrutinizer 2022-05-19 12:59:29 +02:00
Frédéric FRANCE
243dfacb15
Update card.php 2022-05-19 12:46:15 +02:00
Frédéric FRANCE
ad3276b579
Update card.php 2022-05-19 12:42:15 +02:00
Frédéric FRANCE
2114e51b0e
Update card.php 2022-05-19 12:34:54 +02:00
Laurent Destailleur
5dfd5ed444 css 2022-05-19 12:34:15 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Frédéric FRANCE
e44e9d812a
Update card.php 2022-05-19 12:28:50 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
d0db89faf9 debug 2022-05-19 12:02:04 +02:00
Laurent Destailleur
e5cda0b80e Debug v16 2022-05-19 11:55:14 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
lmarcouiller
4b58425181 Fix : contact backtopage on confirm_delete 2022-05-19 10:54:35 +02:00
Marc de Lima Lucio
25196fa709 FIX: new member subscription: bank account and payment mode might be hidden 2022-05-19 10:20:31 +02:00
atm-florian
0bf588962b FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters 2022-05-19 09:45:37 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Laurent Destailleur
53aca952db phpcs 2022-05-18 23:55:59 +02:00
Laurent Destailleur
38aced687b Fix scrutinizer 2022-05-18 23:52:43 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
6d848edba7 Fix scrutinizer 2022-05-18 23:28:53 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
Laurent Destailleur
c1e864f4e2 Clean code 2022-05-18 23:15:11 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
900be0a899 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-18 23:03:31 +02:00
Laurent Destailleur
b5ff847572 Prepare 15.0.3 2022-05-18 22:48:44 +02:00
Florian HENRY
a70274dc47 Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15_fix_template_modbuilder 2022-05-18 22:25:38 +02:00
Florian HENRY
4420e73431 fix quote in insert sql 2022-05-18 22:24:30 +02:00
Florian HENRY
566806bbea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-18 22:23:18 +02:00
Laurent Destailleur
0d20a3b606 Prepare code for dic management 2022-05-18 21:54:38 +02:00
Laurent Destailleur
ddf9c06e2c Debug v16 2022-05-18 17:06:42 +02:00
Laurent Destailleur
d22ba9aa66 css 2022-05-18 17:02:50 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
atm-greg
c2ee562c89 add missing CMailFile class requirement 2022-05-18 14:47:12 +02:00
Laurent Destailleur
3afeb16227 Debug v16 2022-05-18 13:37:49 +02:00
Laurent Destailleur
8c14f42d60 phpcs 2022-05-18 13:09:17 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Philippe GRAND
e0c3fa79cb fix : method was undefined and attached files was nok 2022-05-18 11:39:47 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
48cb30bd9b Fix scrutinizer 2022-05-18 11:34:54 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Philippe GRAND
8c62363ad1 fix deprecated for fk_statut 2022-05-18 11:14:20 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
lmarcouiller
7e4070faa5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-18 10:31:56 +02:00
Laurent Destailleur
1a0e416c1a WIP 2022-05-18 00:51:20 +02:00
Laurent Destailleur
7de1fe8646 Look and feel v16 2022-05-18 00:17:46 +02:00
Laurent Destailleur
2e15a14c14 css 2022-05-18 00:10:44 +02:00
Laurent Destailleur
68b25b35b4 Look and feel v16 2022-05-17 23:53:36 +02:00
Laurent Destailleur
8d84ccfe01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/theme/eldy/global.inc.php
2022-05-17 23:30:48 +02:00
Laurent Destailleur
a483af70df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433 Debug v16 2022-05-17 23:23:50 +02:00
Laurent Destailleur
0fa6329947 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-17 23:22:28 +02:00
Florian HENRY
416d404b27 Merge branch 'dev_new_add_ref_clinet_intervention' of github.com:FHenry/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-17 22:51:25 +02:00
Florian HENRY
2f959306f7 fix travis 2022-05-17 22:50:42 +02:00
Florian HENRY
ecd0d2a7e2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-17 22:49:26 +02:00
Laurent Destailleur
180d94b43c More log 2022-05-17 20:31:50 +02:00
Laurent Destailleur
2a34d6354f Fix scrutinizer 2022-05-17 20:08:59 +02:00
Laurent Destailleur
9c00e087fe css 2022-05-17 17:47:35 +02:00
Laurent Destailleur
5ccf4145e3 Clean import process 2022-05-17 17:25:09 +02:00
atm-lena
f18dc89bdf Add ddate signature in fetch propal 2022-05-17 16:26:43 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
50b4eaf82f Clean code 2022-05-17 15:29:05 +02:00
Laurent Destailleur
5f0a34166d NEW Add a protection into PHPunit to avoid to forget a var_dump 2022-05-17 15:10:20 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
480b48e5e1 Fix var_dump 2022-05-17 14:36:56 +02:00
stickler-ci
8950ae160b Fixing style errors. 2022-05-17 11:00:13 +00:00
Florian HENRY
ada81750c1 NEW: Add Customer Ref on Intervention 2022-05-17 12:53:50 +02:00
Florian HENRY
61f7c4395b fix: module builder template bad error message affactation 2022-05-17 11:55:57 +02:00
lmarcouiller
23da46938a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-17 10:15:35 +02:00
Christophe Battarel
179716ac00 add constant to hide stock on cart 2022-05-17 09:17:36 +02:00
Laurent Destailleur
a2e814b079 Fix permissions 2022-05-17 07:30:02 +02:00
Laurent Destailleur
ddd0848acc Look and feel v16 2022-05-17 01:21:33 +02:00
Laurent Destailleur
b51465434c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-17 00:53:16 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
Laurent Destailleur
f173ce4aaf
Merge pull request #20684 from thomas-Ngr/develop_fix_ticket_extrafields_are_not_kept
fix: Ticket extrafields were not kept during triggers on TICKET_CREAT…
2022-05-16 21:13:25 +02:00
Laurent Destailleur
51dc95fbda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-16 21:06:19 +02:00
Laurent Destailleur
1900bfe68b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-16 21:06:03 +02:00
Laurent Destailleur
fe7483ccce
Merge pull request #20864 from thomas-Ngr/develop_fix_allow_modify_validated_draft_invoice
allow to modify invoices that have been validated in the past
2022-05-16 21:02:53 +02:00
Laurent Destailleur
d13cb10c8b
Update facture.class.php 2022-05-16 21:02:09 +02:00
Laurent Destailleur
7890d6f7f6
Update card.php 2022-05-16 21:01:48 +02:00
Laurent Destailleur
249543e368
Merge pull request #20869 from FHenry/dev_new_export_file_withdt
new: add hidden option to add export file with date time
2022-05-16 20:58:45 +02:00
Laurent Destailleur
29aaa3f6f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-16 20:45:06 +02:00
Laurent Destailleur
dd02c0607a Removed unexpected plugins 2022-05-16 20:44:58 +02:00
Laurent Destailleur
402398912b
Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface
NEW create third-party with contact if not found on pulic ticket
2022-05-16 20:44:40 +02:00
Laurent Destailleur
049799c2e6 Update to ckeditor 4.18 2022-05-16 20:28:00 +02:00
Laurent Destailleur
c020325587 Debug v16 2022-05-16 19:54:49 +02:00
Laurent Destailleur
71c0f08b6c Debug v16 2022-05-16 19:47:06 +02:00
Laurent Destailleur
b87b997c7d Debug v16 2022-05-16 19:19:52 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
5d148a8a99 Fix alignement 2022-05-16 16:53:19 +02:00
Laurent Destailleur
937d0418b4 Fix tz 2022-05-16 16:08:54 +02:00
Laurent Destailleur
80bce5a893 Look and feel v16 2022-05-16 16:06:00 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/line.php
2022-05-16 16:03:07 +02:00
Laurent Destailleur
c8d6dceb53
Merge pull request #20873 from Hystepik/develop#1
Fix : import with selectbox
2022-05-16 15:36:16 +02:00
Laurent Destailleur
61153f04c8
Merge branch 'develop' into dev_event_factrec 2022-05-16 15:34:39 +02:00
Laurent Destailleur
783337604d Fix regression in address formating 2022-05-16 15:28:36 +02:00
Laurent Destailleur
7c44436485 Fix phpunit 2022-05-16 15:04:57 +02:00
Laurent Destailleur
8410ba709a Fix field 2022-05-16 15:02:24 +02:00
Laurent Destailleur
b75c0d805b Add more field 2022-05-16 15:01:33 +02:00
Laurent Destailleur
7926945477 FIX update of recruitment should not fill email_msgid in actioncomm 2022-05-16 14:49:06 +02:00
Laurent Destailleur
a92974c818 Fix typo 2022-05-16 14:08:16 +02:00
Laurent Destailleur
84fccb0988 Debug v16 2022-05-16 13:57:11 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Frédéric FRANCE
e6c103733e
dlc dluo are inverted 2022-05-16 11:06:21 +02:00
Laurent Destailleur
ac60aa4711 NEW Add filter "opportunity status" on statistics of projects. 2022-05-16 10:45:42 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
1ba8bc9147 css 2022-05-14 07:51:48 +02:00
lmarcouiller
1e406276c5 New : import fields in societe class 2022-05-13 15:04:30 +02:00
lmarcouiller
a77c2c2260 Fix : import with selectbox 2022-05-13 11:51:58 +02:00
Thomas Negre
82017d7a39 allow to modify invoices that have been validated in the past 2022-05-13 11:43:56 +02:00
Florian HENRY
8ebeb0bf8a add c_action_trigger for auto batch invoice création 2022-05-13 11:29:48 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
Florian HENRY
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
lvessiller
89e5d3e1c2 FIX merge from develop 2022-05-13 10:02:35 +02:00
Florian HENRY
9b0c7d0904 new: add hidden option to add export file with date time 2022-05-13 09:58:00 +02:00
Laurent Destailleur
6106d54632 css 2022-05-13 09:54:10 +02:00
lvessiller
d5356076fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-ticket-public-interface 2022-05-13 09:32:37 +02:00
lvessiller
d624a1e25e FIX stickler-ci 2022-05-13 08:57:08 +02:00
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
lvessiller
94dcee622b FIX stickler 2022-05-12 17:58:31 +02:00
lvessiller
0a5b2097e7 FIX resolve conflicts 2022-05-12 17:07:23 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
a787fc178b Fix language 2022-05-12 15:27:41 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
Laurent Destailleur
85cddf638f Fix can fix a corrupted lost bank account on bank account lines 2022-05-12 11:06:22 +02:00
Laurent Destailleur
1768c3d926 Code more robust when fk_account has been corrupted 2022-05-12 10:48:34 +02:00
Laurent Destailleur
c46303c0e6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:47:31 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
fc33aa854e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:18 +02:00
Laurent Destailleur
88a9b8c201 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:08 +02:00
Laurent Destailleur
de19783f19 Fix log 2022-05-12 10:36:18 +02:00
Laurent Destailleur
4e87e47451 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-12 10:35:00 +02:00
Laurent Destailleur
62005e1502 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:19:54 +02:00
Laurent Destailleur
43e7da685b NEW Add more fields to detect duplicate for import of thirdparties 2022-05-12 02:19:31 +02:00
Laurent Destailleur
3be2993dc2
Merge pull request #20818 from Hystepik/develop#3
NEW : Import with select boxes V2
2022-05-12 02:04:52 +02:00
Laurent Destailleur
6fc131b483 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:03:17 +02:00
Laurent Destailleur
0bd5fe32bd
Merge pull request #20827 from Hystepik/develop#1
Fix : adherent module agenda create backtopage
2022-05-12 02:02:51 +02:00
Laurent Destailleur
9ec23c7073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:02:36 +02:00
Laurent Destailleur
a261b05866
Merge pull request #20825 from Easya-Solutions/fix-incoterms-dictionary-table-name
FIX dictionary table name in incoterms for Debug v16
2022-05-12 02:02:20 +02:00
Laurent Destailleur
f22661efd7
Merge pull request #20823 from Easya-Solutions/fix-ticket-dictionnry-table-name
FIX dictionary table name in ticket for Debug v16
2022-05-12 02:02:10 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
Laurent Destailleur
1c2e29fac8
Merge pull request #20830 from atm-quentin/FIX_missing_hook_for_row_ordering
Fix missing hook for row ordering
2022-05-12 01:56:55 +02:00
Laurent Destailleur
bffcb42ef9
Merge pull request #20831 from atm-gauthier/NEW/can_update_rank_on_api_put_function
NEW Can update rank of invoice, proposal and order lines with API update
2022-05-12 01:56:21 +02:00
Laurent Destailleur
f8654072da
Merge pull request #20832 from atm-lena/develop_NEW_ForceToWarehouse_moproduction
New "force to"  for mo consumption
2022-05-12 01:54:49 +02:00
Laurent Destailleur
c08595866f
Merge branch 'develop' into burundi_support_for_dolibarr_13 2022-05-12 01:51:17 +02:00
Laurent Destailleur
5c620c0071
Merge pull request #20829 from Hystepik/develop#5
fix php 8.0 warnings
2022-05-12 01:48:37 +02:00
Laurent Destailleur
162bb2c9df
Merge pull request #20833 from atm-john/15.0_fix_formsetup
Fix missing array managements for form setup class
2022-05-12 01:45:21 +02:00
Laurent Destailleur
91110b938e Fix bad db var 2022-05-12 01:38:46 +02:00
Laurent Destailleur
23b1658081 Fix null object 2022-05-12 01:37:20 +02:00
Laurent Destailleur
bf8ba511cb Fix missing index.php file on "regenerate all files" button for alt lang 2022-05-12 01:28:20 +02:00
John BOTELLA
dcd5cfe190 Fix missing array managements 2022-05-11 18:05:06 +02:00
stickler-ci
2d1615de27 Fixing style errors. 2022-05-11 15:22:16 +00:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
bc6cd8cc1c NEW : update rank line is possible on API for customer invoices 2022-05-11 15:34:16 +02:00
Quentin VIAL-GOUTEYRON
5d50a0e9d1 move row object 2022-05-11 15:19:50 +02:00
Quentin VIAL-GOUTEYRON
270ce3d169 FIX missing hook for row ordering 2022-05-11 15:07:39 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Gauthier PC portable 024
da2a8a59f3 Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function 2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279 NEW : update rank line is possible on API for orders propal and supplier invoice 2022-05-11 14:26:21 +02:00
atm-lena
1555a6540b Translation 2022-05-11 12:40:51 +02:00
atm-lena
e716c9abd6 Force to warehouse for consume produt in mo 2022-05-11 12:38:24 +02:00
lmarcouiller
fc9c2295c0 Fix : adherent module agenda create backtopage 2022-05-11 11:38:44 +02:00
Thomas Negre
bdb7ba5eaa fix extrafields not being kept on ticket creation 2022-05-11 11:37:02 +02:00
Laurent Destailleur
a526021459 Better size 2022-05-11 11:30:20 +02:00
lvessiller
aed0296ae2 FIX dictionary table name in incoterms for Debug v16 2022-05-11 11:08:53 +02:00
lvessiller
cdf9b89c0a FIX dictionary table for Debug v16 2022-05-11 10:51:43 +02:00
Laurent Destailleur
c5a4877eb8 php8 2022-05-11 10:28:12 +02:00
Laurent Destailleur
da5cf74a08 Fix total 2022-05-11 10:17:56 +02:00
Laurent Destailleur
e7ab9a3545 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-11 10:06:01 +02:00
Laurent Destailleur
9e2665fc66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-11 10:05:35 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
ea0d6b1867 css 2022-05-11 10:00:37 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Eric Seigne
6d4455ec17 burundi profId mapping 2022-05-10 23:48:07 +02:00
Eric Seigne
b8e73b4b72 burundi companies type 2022-05-10 23:47:49 +02:00
Eric Seigne
7aad16bc80 burundi currencie 2022-05-10 23:47:36 +02:00
Eric Seigne
99225dab9f burundi departements (Communes) 2022-05-10 23:47:22 +02:00
Eric Seigne
4d759c23b3 burundi : regions (provinces) 2022-05-10 23:47:04 +02:00
Laurent Destailleur
fef6b159bd
Merge pull request #20798 from atm-kevin/FIX_Trigger_SetProject
FIX : Trigger on commonObject setProject
2022-05-10 19:30:14 +02:00
Laurent Destailleur
c4f4754b5b Add option EMAIL_ALTERNATIVE_HOST_SIGNATURE 2022-05-10 19:23:30 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/errors.lang
2022-05-10 17:16:11 +02:00
Laurent Destailleur
af4e9b7510 Debug v16 2022-05-10 17:05:39 +02:00
Laurent Destailleur
1f59e329cd Work on public form for partnership 2022-05-10 16:50:33 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Laurent Destailleur
8fe5dea6e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:04:38 +02:00
Laurent Destailleur
c9a0dd327f Fix default value 2022-05-10 16:04:20 +02:00
Laurent Destailleur
fea6771a7a Module Partnership is stable 2022-05-10 15:57:52 +02:00
lmarcouiller
7e439a8248 add of selectimportfieldsource in lang 2022-05-10 15:50:01 +02:00
kevin
a10e8c3696 Remove method Ticket::setProject because method already defined into parent CommonObject 2022-05-10 15:44:41 +02:00
kevin
f28dd2827b Update Ticket::setProject method signature 2022-05-10 15:41:38 +02:00
kevin
76b0deefb3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_Trigger_SetProject 2022-05-10 15:41:06 +02:00
Laurent Destailleur
8ef75ecc7c Better fix fox #20807 2022-05-10 15:27:43 +02:00
Laurent Destailleur
a788597723
Merge pull request #20813 from Easya-Solutions/new-ticket-send-message-uncheck-private-message
NEW uncheck send message when private message is checked
2022-05-10 14:49:15 +02:00
Laurent Destailleur
fff9a692b4
Merge pull request #20816 from hregis/fix_missing_loading_global_conf
FIX missing loading of global conf (avoid warning)
2022-05-10 14:47:56 +02:00
Laurent Destailleur
02bad082d6
Merge pull request #19383 from atm-gauthier/NEW/accountancy_massaction_preselect_account_customer_and_supplier_list
NEW : accountancy massaction preselect account (customer and supplier list)
2022-05-10 14:45:35 +02:00
Laurent Destailleur
628554caf4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-10 14:38:52 +02:00
Laurent Destailleur
91d539bbef Clean code of not used method 2022-05-10 14:38:40 +02:00
Regis Houssin
8692038be2 FIX missing loading of global conf 2022-05-10 14:06:27 +02:00
Regis Houssin
6f8eef9550 FIX missing executeHooks 2022-05-10 12:56:22 +02:00
stickler-ci
98f5edbfba Fixing style errors. 2022-05-10 10:47:18 +00:00
Gauthier PC portable 024
74ba2d551a Merge branch 'NEW/update_on_categorie_product_link_table' of github.com:atm-gauthier/dolibarr into NEW/develop_update_on_categorie_product_link_table 2022-05-10 12:36:49 +02:00
Gauthier PC portable 024
08a3ef5bbf NEW : method avoid being blocked when entry already exists for import in llx_categorie_product (use update keys) 2022-05-10 12:25:38 +02:00
lmarcouiller
ed13280ea1 fix bug in select boxes 2022-05-10 12:15:52 +02:00
lvessiller
419fd94025 NEW uncheck send message when private message is checked 2022-05-10 12:08:23 +02:00
Laurent Destailleur
1e8547dd44
Merge pull request #20650 from bb2a/Move-checkbox-column-as-first-column-on-Thirdparty-list
NEW - Move checkbox column as first column on Thirdparty list
2022-05-10 12:00:13 +02:00
Laurent Destailleur
218749ead4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-10 11:52:22 +02:00
Laurent Destailleur
3271522971
Merge pull request #20790 from altairis-melina/empty_search
NEW : TakePos - Empty search results when emptying search term
2022-05-10 11:42:00 +02:00
Laurent Destailleur
bfa19bc065
Merge pull request #20797 from altairis-melina/hookaddline
add hook for takepos addline
2022-05-10 11:41:22 +02:00
Laurent Destailleur
e3ff7b43ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-10 11:39:55 +02:00
Laurent Destailleur
f9f8896921 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-10 11:39:14 +02:00
Laurent Destailleur
fc718e68ee css 2022-05-10 11:38:56 +02:00
Laurent Destailleur
1b82340e1b
Merge pull request #20785 from aspangaro/16a29-Fixcustomerdeposit
FIX Accountancy - Add an option to disable use of sub-account on deposit line
2022-05-10 11:37:24 +02:00
Laurent Destailleur
54e149b959
Merge pull request #20810 from FHenry/15.0_fix_filename_lenght
fix: limit filename lenght to show glasses into document boxes
2022-05-10 11:32:08 +02:00
Laurent Destailleur
44e7496ef3
Merge pull request #20811 from ibuiv/allow-retrocession2
add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDE…
2022-05-10 11:11:13 +02:00
Laurent Destailleur
7c0c56bf7b css 2022-05-10 11:07:29 +02:00
Laurent Destailleur
c2143e01ee Merge branch 'fixes/formconfirm-pass-action' of
https://github.com/vold-lu/dolibarr into
vold-lu-fixes/formconfirm-pass-action

# Conflicts:
#	htdocs/core/class/html.form.class.php
2022-05-10 11:07:16 +02:00
Laurent Destailleur
2e6f4862f9 Fix creation of thirdparty when module supplier not enabled
NEw can use the clicktoclipboard feature when clicking on value
2022-05-10 10:57:51 +02:00
Aloïs Micard
80ed7af114 formConfirm: pass action even when not confirming 2022-05-10 10:18:53 +02:00
Laurent Destailleur
cffec01451 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
2022-05-09 22:04:36 +02:00
Laurent Destailleur
ef18456724 Fix regression in dol_eval 2022-05-09 21:56:21 +02:00
amarchal
d21f5eca83 add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN 2022-05-09 20:13:06 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
32a1c20154 Fix phpcs 2022-05-09 17:33:45 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-09 16:53:53 +02:00
Laurent Destailleur
0cac14c82f Fix trans 2022-05-09 16:51:31 +02:00
Laurent Destailleur
b3bfe22f58 FIX Error management 2022-05-09 16:45:57 +02:00
Laurent Destailleur
370f090403 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-09 16:43:05 +02:00
Laurent Destailleur
43e1486dbb FIX No empty line inserted into accounting_bookkeeping 2022-05-09 16:42:08 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
86a8ae8c3d NEW Suggest a way to run upgrade per entities. 2022-05-09 15:24:46 +02:00
Florian HENRY
333b22b961 fix: limit filename lenght to show glasses 2022-05-09 14:32:47 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
Laurent Destailleur
c3c24fe342 NEW The 'reposition' class works on ajax constantonoff that redirects 2022-05-09 11:52:19 +02:00
Laurent Destailleur
9ae3f442e7 Fix css 2022-05-09 11:28:00 +02:00
Laurent Destailleur
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +02:00
stickler-ci
017eb99e86 Fixing style errors. 2022-05-09 07:53:37 +00:00
Pierre Ardoin
ec00c6fef2
line deleted when updated after rapproched
Fix an issue that deletes line when we update data after its rappro.
2022-05-09 09:49:07 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
522c092aeb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-09 09:26:10 +02:00
melina
0ac89a5eae test reshook 2022-05-09 08:23:26 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
stickler-ci
a12c0f6dbf Fixing style errors. 2022-05-08 18:33:23 +00:00
Laurent Destailleur
c718b86f9b
Update index.php 2022-05-08 20:28:37 +02:00
Laurent Destailleur
4779b8d3e1
Merge branch 'develop' into categorydescription 2022-05-08 20:26:48 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project
NEW: Separate read-only and adding time on projects
2022-05-08 19:50:46 +02:00
Laurent Destailleur
90c95bc638
Merge pull request #20610 from hregis/fix_missng_signature_library
FIX missing signature library when ODT model is used
2022-05-08 19:36:06 +02:00
Laurent Destailleur
c24c2015af
Merge pull request #20762 from fappels/develop_chkbxlst_entity_filter
NEW: Can use current entity filter on 'chkbxlst'
2022-05-08 19:16:20 +02:00
Laurent Destailleur
07e252e8e4
Merge pull request #20781 from hregis/fix_missing_country_filter
FIX missing country filter in contract list
2022-05-08 19:15:46 +02:00
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product
NEW : Add massaction "Edit Extrafield" for Product
2022-05-08 19:15:25 +02:00
Laurent Destailleur
16fac44e9f
Update products.lang 2022-05-08 19:14:32 +02:00
Laurent Destailleur
b04ef20708
Merge pull request #20782 from atm-adrien/FIX_move_inventory_column-develop
Fix move inventory column develop
2022-05-08 19:13:26 +02:00
Laurent Destailleur
b4e1bac32d
Merge pull request #20783 from fappels/14_fix_error_handling
Fix errors.lang merge conflict and fix reception error handling
2022-05-08 19:12:11 +02:00
Laurent Destailleur
a65e9f33db
Merge pull request #20793 from atm-gauthier/fix_salaries_payments_and_stats
FIX : in salary stats and payment list, we must check right perms as well as salary list
2022-05-08 19:11:54 +02:00
Laurent Destailleur
649e6eb3ac
Merge pull request #20787 from dolibit-ut/patch-399
Update index.php
2022-05-08 19:10:09 +02:00
Laurent Destailleur
56c943d4a7
Merge pull request #20794 from altairis-melina/invoicehooks
NEW: TakePos - add hooks for cart display
2022-05-08 19:08:30 +02:00
Laurent Destailleur
b416c49348
Merge pull request #20796 from altairis-melina/transradio
FIX: size and translations of radio buttons
2022-05-08 19:07:11 +02:00
Laurent Destailleur
cfe347de17
Merge pull request #20799 from FHenry/15.0_fix_invoice_stat
fix: invoice stat
2022-05-08 19:03:55 +02:00
Laurent Destailleur
9f0ddd3712
Merge pull request #20800 from ATM-Consulting/FIX_pricejs
FIX: make pricejs behave more like PHP's price() in Dolibarr
2022-05-08 19:03:38 +02:00
Laurent Destailleur
000c6f69bd
Merge pull request #20801 from aspangaro/16a31
Look & feel v16
2022-05-08 18:56:23 +02:00
Laurent Destailleur
bbba8abebc
Merge pull request #20805 from aspangaro/16a32
FIX Accountancy - Product Account - SQL Error with only_full_group_by option enabled
2022-05-08 18:55:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Alexandre SPANGARO
710f189b98 FIX SQL Error with full_group_by option enabled 2022-05-08 06:34:47 +02:00
Laurent Destailleur
3256ac2f2a css 2022-05-07 19:47:51 +02:00
Alexandre SPANGARO
6ee15794e6 Merge remote-tracking branch 'upstream/develop' into 16a29-Fixcustomerdeposit 2022-05-07 07:59:23 +02:00
Alexandre SPANGARO
39716dce28 Look & feel v16 2022-05-07 06:43:23 +02:00
Laurent Destailleur
6b9ed5aa32 Better message in installation process 2022-05-06 20:03:59 +02:00
atm-florian
60b7904340 typo in doc string 2022-05-06 18:50:02 +02:00
atm-florian
200faac99e Simplify behaviour of 'mode' parameter, systematically use Intl if available 2022-05-06 18:38:10 +02:00
atm-florian
afcfcc7dd2 FIX: make pricejs behave more like PHP's price() in Dolibarr (taking locale settings into account) 2022-05-06 18:30:19 +02:00
Florian HENRY
318e403013 fix: invoice stat 2022-05-06 16:15:52 +02:00
kevin
19cedae1c1 Add trigger on commonObject setProject 2022-05-06 16:14:38 +02:00
melina
7747489259 add hook for takepos addline 2022-05-06 15:49:44 +02:00
lmarcouiller
81e2383515 import with selectbox 2022-05-06 15:38:47 +02:00
Laurent Destailleur
a57312d09c Look and feel v16 2022-05-06 14:13:04 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated)
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
melina
7af2d3a54d fix radio buttons size 2022-05-06 12:04:57 +02:00
melina
a65cb2baff translate radio buttons label 2022-05-06 12:04:12 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
melina
5a76385d91 add hook for cart display 2022-05-06 11:34:05 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
e79ab6e991 Prepare the v16 freeze 2022-05-06 11:09:09 +02:00
melina
bfab24f848 merge develop 2022-05-06 10:32:12 +02:00
UT from dolibit
0483e89c82
Update index.php 2022-05-06 08:19:47 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Laurent Destailleur
9dbeccb8d8 Doc 2022-05-06 05:02:29 +02:00
Laurent Destailleur
1942e35459 Fix phpunit 2022-05-06 02:34:23 +02:00
Laurent Destailleur
f9942dfeaa Debug v16 2022-05-05 23:02:23 +02:00
Laurent Destailleur
fea8b263f9 NEW Add a tab with list of application on the jobposition file. 2022-05-05 21:56:59 +02:00
Laurent Destailleur
e0a690bead Clean code 2022-05-05 19:51:19 +02:00
Laurent Destailleur
62dd7244a3 css 2022-05-05 18:29:36 +02:00
Laurent Destailleur
2810623e6e css 2022-05-05 17:47:52 +02:00
stickler-ci
fb97f7db29 Fixing style errors. 2022-05-05 14:59:49 +00:00
Alexandre SPANGARO
7bb5ac4095 FIX Accountancy - Add an option to disable use of sub-account on deposit line 2022-05-05 16:48:01 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
93cd0174cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-05 13:16:03 +02:00
Laurent Destailleur
6c624a9a45 Fix name of sql file 2022-05-05 12:26:15 +02:00
Francis Appels
10e13286d3 Add missing reception back to draft error handling 2022-05-05 11:08:17 +02:00
Francis Appels
29d1424413 fix merge conflict
Add missing error translation key
2022-05-05 11:07:39 +02:00
stickler-ci
23ae3af247 Fixing style errors. 2022-05-05 07:38:40 +00:00
Adrien Raze
3681cd7747 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_move_inventory_column-develop 2022-05-05 09:24:51 +02:00
Regis Houssin
0882c7f5af FIX missing country filter in contract list 2022-05-05 08:43:22 +02:00
Laurent Destailleur
2c8830a798
Merge pull request #20655 from bb2a/Move-checkbox-column-as-first-column-on-modulebuilder
Move checkbox column as first column on modulebuilder
2022-05-04 20:40:29 +02:00
Laurent Destailleur
46254143ef
Merge pull request #20775 from grandoc/new_branch_04_05_2022
fix : do not display html tags into list
2022-05-04 20:40:04 +02:00
Laurent Destailleur
03ffbabb4a
Merge pull request #20778 from FHenry/dev_new_total_list_computed_fields
NEW: extrafields computed numeric and totalizable are correctly calculated in total table row
2022-05-04 20:39:24 +02:00
Laurent Destailleur
82ab41a7f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-04 20:37:13 +02:00
Laurent Destailleur
05e22fb8bc css 2022-05-04 20:36:59 +02:00
GregM
ac1fcf290e update 2022-05-04 17:24:37 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script
fix: CREATE TABLE llx_element_tag without migration script
2022-05-04 17:15:53 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
Laurent Destailleur
55e60bf628
Merge pull request #20768 from atm-john/15.0_fix_fatal_error_on_task_list
FIX : fatal error for $db  usage in tpl
2022-05-04 16:46:22 +02:00
Laurent Destailleur
5a12fbb808
Merge pull request #20777 from Hystepik/develop#1
Fix : extrafields attrname regex
2022-05-04 16:45:33 +02:00
Laurent Destailleur
763c86144e Fix add invoice to email 2022-05-04 15:51:24 +02:00
Laurent Destailleur
8f7e162406 Fix css 2022-05-04 15:27:23 +02:00
Laurent Destailleur
3574864062 Add email_company 2022-05-04 15:07:50 +02:00
Laurent Destailleur
82f7f30f0a Clean code 2022-05-04 14:58:50 +02:00
Florian HENRY
089289d13b NEW: extrafields computed numeric and totalizable are correctly calculated in total table row 2022-05-04 14:55:03 +02:00
lmarcouiller
0fd2e91ccc Fix : extrafields attrname regex 2022-05-04 14:37:54 +02:00
Philippe GRAND
2467dd0615 fix : do not display html tags into list 2022-05-04 09:18:46 +02:00
Anthony Berton
ff696acab8
Update myobject_list.php 2022-05-04 08:43:14 +02:00
Laurent Destailleur
6813bfb1e8 Trans 2022-05-04 02:23:24 +02:00
Laurent Destailleur
1957ebcc35 Fix restore warning 2022-05-04 02:13:29 +02:00
Laurent Destailleur
d76e7224d9 NEW Can set the max number of attendees for an organized event 2022-05-04 01:53:45 +02:00
Laurent Destailleur
f1e429d333 CSS 2022-05-04 01:29:19 +02:00