Laurent Destailleur
f8a5749fc4
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
ac67a5a2bb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-25 14:34:25 +01:00
Sylvain Legrand
cb86224613
new : allow to show all logos on a table
2022-02-25 13:17:05 +01:00
Laurent Destailleur
c097ee5331
FIX #yogosha9089
2022-02-25 01:49:38 +01:00
Laurent Destailleur
98da84f9b2
FIX #yogosha9086
2022-02-24 18:15:04 +01:00
Laurent Destailleur
118b211807
Fix error on null
2022-02-24 12:37:20 +01:00
Laurent Destailleur
2f0040e9c1
Fix phpunit
2022-02-23 19:24:17 +01:00
GregM
cf470c2306
Add auto tooltip
2022-02-23 16:01:07 +01:00
GregM
3edd478a46
Fix empty url : dont add token
2022-02-23 15:36:43 +01:00
Laurent Destailleur
64ce13e273
Clean setup page
2022-02-23 13:20:14 +01:00
lmarcouiller
57ed890b73
NEW : dol_uncompress new extensions
2022-02-23 12:28:37 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-22 22:27:32 +01:00
Laurent Destailleur
209ab708d4
FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd
2022-02-22 21:24:34 +01:00
Laurent Destailleur
8cc0f3bb58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-02-22 18:47:26 +01:00
Laurent Destailleur
8a99bc3b04
Try a more complete sanitization
2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c
FIX: invoice pdf: lines originating from deposits were not detailed anymore
2022-02-22 17:42:11 +01:00
Laurent Destailleur
f544219d92
FIX permission to download files of expense report with readall.
2022-02-22 16:44:17 +01:00
lmarcouiller
edbf1bb34b
update to fix PR
2022-02-22 16:35:10 +01:00
GregM
e107423c21
fix : change title if html not set
2022-02-22 12:25:30 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning
...
NEW : optional display warning icons on ticket list
2022-02-22 01:35:33 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields
...
New inventory extrafields
2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17
Fix #yogosha9033
2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62
Fix #yogosha8963
2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55
NEW on redirect of page in website module, GET parameters are kept.
2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa
Work on generic reporting tool.
2022-02-21 19:09:26 +01:00
lmarcouiller
192e62fa5c
Fix : fix bug class and sql regeneration in modulebuilder
2022-02-21 15:41:41 +01:00
atm-lena
8bbbc843eb
Ajout onglet paramètres "Inventaire extrafields"
2022-02-21 15:20:22 +01:00
Laurent Destailleur
00e6d2786d
Do not use dol_hash anymore for the name of cookies.
2022-02-21 12:21:43 +01:00
Thomas Negre
e8c48a06c0
Correct typos in ticket.lib
2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907
Clean code
2022-02-21 11:26:10 +01:00
Laurent Destailleur
3b6f7bff66
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136
FIX Debug v15
2022-02-18 16:24:11 +01:00
Laurent Destailleur
61e91656e0
FIX setup of member module
...
FIX generation of business cards
2022-02-18 14:14:34 +01:00
Laurent Destailleur
6b8312aab0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-17 20:51:25 +01:00
Laurent Destailleur
b013c9a15f
Fix duplicate div
2022-02-17 20:37:39 +01:00
Laurent Destailleur
3697cb9ca4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code
2022-02-17 04:15:03 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix
...
Fixes expensereport downloads
2022-02-16 20:37:32 +01:00
BB2A Anthony Berton
fd478ba3fa
add param for md theme
2022-02-16 15:13:50 +01:00
Laurent Destailleur
1b53ed09f9
Work on custom report feature
2022-02-15 11:03:48 +01:00
Vincent Dieltiens
af0000d568
Fixes expensereport downloads
2022-02-15 10:13:28 +01:00
Laurent Destailleur
5d90a00728
Debug v15
2022-02-14 12:27:35 +01:00
Alexandre SPANGARO
6734a3575e
Core
2022-02-14 04:52:39 +01:00
Laurent Destailleur
27b94ceea1
Debug v15
2022-02-13 19:26:16 +01:00
Laurent Destailleur
89ffe5baba
Clean code for param of dol_stringtotime()
2022-02-11 14:07:10 +01:00
Laurent Destailleur
32af067e1e
Code comment
2022-02-11 13:01:29 +01:00
Laurent Destailleur
b84fd3ec3d
Clean code
2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c
FIX events on several days may missing the last day in calendar view.
...
FIX the drag and drop was not available on some events
2022-02-11 11:27:50 +01:00
Laurent Destailleur
d69f9eca40
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
06fe8c391e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields
2022-02-10 10:13:24 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR
...
NEW Recurring vendor invoices
2022-02-10 10:09:47 +01:00
Laurent Destailleur
558db1b935
Fix #yogosha8845
2022-02-09 15:29:21 +01:00
Laurent Destailleur
47800aebfa
Fix phpunit and mode save after opening a ref
2022-02-09 15:21:25 +01:00
Laurent Destailleur
c496e6eb51
doc
2022-02-07 20:53:13 +01:00
Florian HENRY
30779be77e
fix: if capital is not numeric just display input value
2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b
fix: if capital is not numeric just display input value
2022-02-07 16:33:27 +01:00
Adrien Raze
ee52cac3ba
NEW : Template supplier invoices
2022-02-07 14:34:27 +01:00
Laurent Destailleur
9b1f04209d
NEW Change in theme colors does not need to use the refresh button
2022-02-06 22:11:44 +01:00
Laurent Destailleur
3fa3cd28cd
clean code
2022-02-06 15:21:49 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2
...
NEW - Border table
2022-02-06 14:59:31 +01:00
Laurent Destailleur
9c0fc59166
Fix #yogosha8791
2022-02-05 19:42:43 +01:00
habot-it
97850a6fbf
Add options in function pdf_pagefoot of pdf.lib.php
2022-02-05 12:22:18 +00:00
Laurent Destailleur
c53bac831d
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 20:33:32 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php
2022-02-04 19:05:22 +01:00
BB2A Anthony Berton
0e1e65e180
only one option
2022-02-04 17:29:13 +01:00
Laurent Destailleur
7cc06a0ef9
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-02-04 15:40:28 +01:00
BB2A Anthony Berton
b4fffc6a23
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias
2022-02-04 15:38:46 +01:00
Laurent Destailleur
5249840402
FIX #yogosha8628
2022-02-04 15:14:10 +01:00
Laurent Destailleur
a81b437d04
Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search
...
NEW Can use ! to make a search that exclude a string
2022-02-04 12:51:26 +01:00
Laurent Destailleur
a7021008ba
Update pdf.lib.php
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-04 12:27:13 +01:00
Laurent Destailleur
bfea5cd69d
Merge pull request #19966 from habot-it/develop
...
Fix "Warning: This option make TCPDF library being crazy sometime and…
2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925
Update pdf.lib.php
2022-02-04 12:14:11 +01:00
Laurent Destailleur
3db0a98594
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 18:26:15 +01:00
Laurent Destailleur
0259f094bd
Fix trans
2022-02-02 18:04:11 +01:00
Laurent Destailleur
ba77700619
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea
Fix css
2022-02-02 17:57:20 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10
fix sticler
2022-02-01 16:18:02 +01:00
Laurent Destailleur
89a06014da
Fix warnings
2022-02-01 15:55:04 +01:00
Quentin VIAL-GOUTEYRON
e17d3b029e
FIX delete criteria
2022-02-01 12:24:04 +01:00
Quentin VIAL-GOUTEYRON
e086d5a5f2
NEW Exclude filter
2022-02-01 12:21:06 +01:00
Laurent Destailleur
91be7b279e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a
FIX #yogosha8604
2022-01-30 17:24:10 +01:00
Laurent Destailleur
a9737a91e7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23
Fix #yogosha8590
2022-01-30 16:30:19 +01:00
habot-it
93ae62431c
Fix "Warning: This option make TCPDF library being crazy sometime and content on image disappeared!"
2022-01-30 13:09:42 +00:00
Laurent Destailleur
d9691e16d5
Merge pull request #18081 from lmag/fix_ticket_substitution
...
fix : #19428 ticket substitution
2022-01-28 20:01:10 +01:00
Laurent Destailleur
289ce87f6d
Fix fatal error
2022-01-28 19:06:41 +01:00
Laurent Destailleur
9dd44c6d5c
Merge pull request #19958 from SylvainLegrand/New_improve_the_reading_of_profIDs
...
New - Improve the reading of profIDs
2022-01-28 18:08:59 +01:00
Laurent Destailleur
adf8f3886b
Merge
2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop
...
NEW #17123 added ExtraFields for Stock Mouvement
2022-01-28 18:04:22 +01:00
Laurent Destailleur
2686541156
Fix late picto
2022-01-28 17:59:58 +01:00
Laurent Destailleur
d545ba5049
Merge pull request #19948 from OPEN-DSI/fix_vat_report_by_month_and_rate_with_vat_src_code
...
NEW VAT Report by month - Show detail by rate and also by code
2022-01-28 17:21:14 +01:00
Laurent Destailleur
a631c94193
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-28 15:58:15 +01:00
Salvatore Chiariello
e70604c485
NEW|New #17123 added ExtraFields for Stock Mouvement
2022-01-28 14:57:36 +01:00
Laurent Destailleur
bd2d7792f4
css
2022-01-28 13:52:42 +01:00
Sylvain Legrand
66b6b5e91a
stickler-ci
2022-01-28 11:31:17 +01:00
Sylvain Legrand
b65f849c5d
New - Improve the reading of profIDs
2022-01-28 11:22:12 +01:00
Alexandre SPANGARO
2d0427a5b1
Update tax.lib.php
2022-01-27 06:21:07 +01:00
Alexandre SPANGARO
1ed096316a
Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code
2022-01-27 06:11:20 +01:00
BB2A Anthony Berton
e8f27ca058
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias
2022-01-26 18:57:01 +01:00
BB2A Anthony Berton
fea897f323
Fix lang and erreur
2022-01-26 18:46:51 +01:00
BB2A Anthony Berton
b9cd22c60a
Add fonction invert and traduc
2022-01-26 18:36:04 +01:00
BB2A Anthony Berton
285e1d0f84
ok
2022-01-26 17:25:24 +01:00
BB2A Anthony Berton
d0942117df
1
2022-01-26 17:20:12 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action
2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688
ADD config text color
2022-01-26 15:06:51 +01:00
Laurent Destailleur
38408f916b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-01-26 13:51:25 +01:00
Laurent Destailleur
ae0f428acc
Merge pull request #19923 from bb2a/Add_param_color_button_action
...
NEW - Add param color button action
2022-01-26 13:48:23 +01:00
Laurent Destailleur
f94d84e395
Merge pull request #19655 from cfoellmann/wus/hotfix/fontawesome-PR
...
use any available fontawesome icon in picto
2022-01-26 13:44:38 +01:00
Laurent Destailleur
3b4c7ceb3b
Code comment
2022-01-26 13:00:48 +01:00
BB2A Anthony Berton
54b5fed67b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-25 16:45:30 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab
2022-01-25 15:58:54 +01:00
Laurent Destailleur
c3a58ae303
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:42 +01:00
kamel
7ca333f4d7
Fix the vat report by month and rate (with also the vat src code)
2022-01-24 17:04:46 +01:00
Laurent Destailleur
0e8b7ef656
Clean code
2022-01-24 16:38:25 +01:00
Laurent Destailleur
0e5907e220
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:35 +01:00
Laurent Destailleur
8ceec043e8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:10 +01:00
Laurent Destailleur
00eabded6d
Fix phpunit
2022-01-24 12:43:42 +01:00
BB2A Anthony Berton
0552381e39
1
2022-01-23 16:36:47 +01:00
Laurent Destailleur
5abe6c0eb5
Merge pull request #19878 from bb2a/patch-1
...
NEW - Add substitutions "user numbers"
2022-01-23 12:23:28 +01:00
Laurent Destailleur
3bea78726a
Merge pull request #19888 from bb2a/patch-2
...
Update formated substitution
2022-01-23 12:22:32 +01:00
Laurent Destailleur
a16293f9b7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-22 17:27:57 +01:00
Laurent Destailleur
2f1805beb8
Fix #yogosha8532
2022-01-22 17:14:45 +01:00
Laurent Destailleur
482efec536
Fix missing column
2022-01-21 15:40:37 +01:00
Laurent Destailleur
9276224422
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-20 21:49:33 +01:00
Laurent Destailleur
beee7fc5d3
Fix #yogosha8484
2022-01-20 20:03:58 +01:00
Laurent Destailleur
d9b0af616e
Fix the localtax were not saved on price when no code was set
2022-01-20 18:51:14 +01:00
Laurent Destailleur
b2f6de06d5
Fix the localtax were not saved on price when no code was set
2022-01-20 18:09:30 +01:00
Anthony Berton
687c8e2082
Update functions.lib.php
2022-01-20 13:49:23 +01:00
Anthony Berton
871e707185
Update functions.lib.php
2022-01-20 13:45:51 +01:00
Laurent Destailleur
ff1037634b
Clean OAuth feature
2022-01-19 18:23:31 +01:00
Laurent Destailleur
db903ad64d
Fix #yogosha8457
2022-01-19 16:40:48 +01:00
Laurent Destailleur
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +01:00
Anthony Berton
5f4c53f824
Update functions.lib.php
2022-01-19 11:37:38 +01:00
Anthony Berton
0a99e7c82a
Update functions.lib.php
2022-01-19 10:51:31 +01:00
Laurent Destailleur
2f7832ee44
css
2022-01-17 19:18:48 +01:00
Laurent Destailleur
22ab3c03a1
Fix another way to write the preg_replace_callback
2022-01-17 09:12:09 +01:00
Laurent Destailleur
cfc39ebf0a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-17 08:59:34 +01:00
Laurent Destailleur
3aedf6434b
css
2022-01-16 13:11:12 +01:00
Laurent Destailleur
2b19bcef54
Fix responsive
2022-01-15 13:08:15 +01:00
Laurent Destailleur
8cb5264928
Fix css
2022-01-15 12:56:19 +01:00
Laurent Destailleur
b3b1e82100
Change on column Assigned to on projet and task.
2022-01-15 12:30:41 +01:00
Laurent Destailleur
3d97888bc5
Comment
2022-01-14 17:46:06 +01:00
Laurent Destailleur
02fc420c2a
FIX #19817
2022-01-14 11:37:13 +01:00
Laurent Destailleur
91b2d59458
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-14 10:37:41 +01:00
Laurent Destailleur
52493b60fb
Fix #yogosha8316
2022-01-13 15:52:41 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Frédéric FRANCE
297d2ecfbd
fix warning
2022-01-12 16:09:31 +01:00
Laurent Destailleur
b824912473
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-11 13:28:07 +01:00
Laurent Destailleur
00108589fd
Fix creation of fields tms into sql scripts
2022-01-11 01:00:31 +01:00
Laurent Destailleur
d8a0dfad10
Merge pull request #19557 from yaslama/unaccent
...
Unaccent
2022-01-10 21:19:54 +01:00
Laurent Destailleur
865b05aad2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-10 19:29:37 +01:00
Laurent Destailleur
5d5a219b95
FIX #19770
2022-01-10 19:23:46 +01:00
Laurent Destailleur
12044fa67a
Debug v15
2022-01-10 03:24:01 +01:00
Laurent Destailleur
4ce77e62c6
Debug v15
2022-01-09 14:19:55 +01:00
Laurent Destailleur
6aeae8fe7f
Debug v15
2022-01-07 12:27:07 +01:00
Quentin VIAL-GOUTEYRON
f78a9ea6f5
missing column
2022-01-07 10:19:44 +01:00
Quentin VIAL-GOUTEYRON
137371cae5
Merge branch 'NEW_contact_project_tab' of github.com:atm-quentin/dolibarr into NEW_contact_project_tab
2022-01-07 10:18:57 +01:00
Quentin VIAL-GOUTEYRON
5fc0f18b0b
add column contact type
2022-01-07 10:17:00 +01:00
Laurent Destailleur
6cb0374784
Fix responsive
2022-01-06 18:02:44 +01:00
Laurent Destailleur
2aa3d60997
Debug v15
2022-01-05 14:04:02 +01:00
Laurent Destailleur
1d80b8394a
Debug v15
2022-01-04 12:56:08 +01:00
stickler-ci
f0677ed665
Fixing style errors.
2022-01-04 09:42:24 +00:00
Quentin VIAL-GOUTEYRON
b1f750ac2f
NEW: Project contact tab
2022-01-04 10:35:44 +01:00
Laurent Destailleur
adec35d4b1
Debug v15
2022-01-02 15:46:28 +01:00
Laurent Destailleur
bdb03c8bd0
Fix responsive
2022-01-02 13:51:30 +01:00
Laurent Destailleur
b41fdb6ec9
Fix tool for generic to sql filters. Must not be saved into api files.
2022-01-01 21:46:16 +01:00
Laurent Destailleur
ee5ea123ed
Revert "Update functions.lib.php"
...
This reverts commit 2676427ec4 .
2021-12-31 16:13:05 +01:00
Laurent Destailleur
706581a227
Merge pull request #19706 from atm-john/fix_scrutinizer_comments
...
Fix : scrutinizer comments
2021-12-30 12:42:08 +01:00
Anthony Berton
78861c1743
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2021-12-29 19:21:03 +01:00
dolibarr95
2676427ec4
Update functions.lib.php
...
#19709
2021-12-29 13:24:23 +01:00
John BOTELLA
5449d57d26
fix variable does not seem to be defined for all execution
2021-12-28 19:19:51 +01:00
Laurent Destailleur
7edba34107
Debug and secure the signature feature
2021-12-25 17:08:40 +01:00
Laurent Destailleur
3490dc3228
Update functions.lib.php
2021-12-21 16:31:28 +01:00
Laurent Destailleur
55562eb1d8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formadmin.class.php
2021-12-21 14:36:38 +01:00
Laurent Destailleur
084f298836
Fix regression. The entity for bank is in table itself not into a parent
2021-12-21 14:34:47 +01:00
Christian Foellmann
6bbbd99be9
use any available fontawesome icon in picto
2021-12-20 08:06:05 +01:00
Laurent Destailleur
5c4fad3cc0
phpcs
2021-12-19 00:37:43 +01:00
Laurent Destailleur
fbce09f21b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/compta/facture/card.php
htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/info.php
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/fourn/facture/list.php
htdocs/mrp/mo_movements.php
htdocs/product/stock/movement_card.php
htdocs/product/stock/movement_list.php
htdocs/product/stock/replenishorders.php
htdocs/reception/card.php
htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
baa9585f85
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/holiday/month_report.php
2021-12-19 00:01:11 +01:00
Laurent Destailleur
d46ef9c42a
css
2021-12-18 23:51:14 +01:00
Laurent Destailleur
7266c78162
Clean/Debug code for v15
2021-12-17 17:40:30 +01:00
Laurent Destailleur
654cd8bd1c
Fix for dol_string_onlythesehtmlattributes()
2021-12-17 12:01:25 +01:00
Laurent Destailleur
9d6ddced56
Merge pull request #19607 from fbosman/patch-1
...
Update functions.lib.php
2021-12-16 17:33:13 +01:00
Laurent Destailleur
930ac3e928
Merge pull request #19613 from hregis/fix_avoid_blank_page_with_error
...
FIX avoid blank page with error
2021-12-16 17:19:16 +01:00
Laurent Destailleur
36ba158a8b
Merge pull request #19637 from atm-john/12.0_fix_get_prev_progress
...
FIX : test of method exist on wrong object
2021-12-16 16:49:59 +01:00
John BOTELLA
d149596043
fix test of method exist on wrong object
2021-12-16 10:33:53 +01:00
Laurent Destailleur
53be92fac3
FIX #19626
2021-12-15 17:32:15 +01:00
Regis Houssin
3b65d46b53
FIX avoid blank page with error
2021-12-14 11:19:41 +01:00
Anthony Berton
9bc2a561bc
ok
2021-12-14 10:52:16 +01:00
Frans Bosman
cf05f38e54
Update functions.lib.php
...
Change exists to isset in price2num
2021-12-13 19:56:06 +01:00
jpb
ac8538a812
add info for acces right
2021-12-13 16:53:34 +01:00
Laurent Destailleur
2bc417fcf7
FIX parameter $action replaced with $mode. $action reserved for action
2021-12-11 13:22:43 +01:00
Laurent Destailleur
dce555f53f
Fix missing document tab on receptions
2021-12-10 18:57:25 +01:00
Laurent Destailleur
b2611e4cdb
CSS
2021-12-10 13:56:51 +01:00
Laurent Destailleur
9fbe0dee9b
Fix trans
2021-12-10 12:36:51 +01:00
Gauthier PC portable 024
b609c579b6
FIX : postgresql compatibility, "" as is not authorized
2021-12-10 11:40:25 +01:00
Laurent Destailleur
8cdc5726a0
Fix column length
2021-12-10 10:26:20 +01:00
Laurent Destailleur
0027335e3b
Fix regression
2021-12-10 03:25:07 +01:00
Laurent Destailleur
c4ef3ec116
Merge pull request #19578 from fr69400/patch4
...
FIX - Missing one html conversion
2021-12-09 17:31:03 +01:00
Laurent Destailleur
baabfd380f
Update pdf.lib.php
2021-12-09 17:25:06 +01:00
Laurent Destailleur
6b9636c3b8
FIX deletion of direct debit or credit transfer
2021-12-09 12:54:18 +01:00
fr69400
abd984bc14
Update pdf.lib.php
2021-12-09 09:39:22 +01:00
stickler-ci
f74077a2e7
Fixing style errors.
2021-12-09 08:35:12 +00:00
fr69400
d0413f423f
FIX - Missing one html conversion
2021-12-09 09:33:00 +01:00
Laurent Destailleur
f0cac384c5
Merge pull request #19553 from habot-it/patch-1
...
Add hookmanager in function pdf_pagefoot of pdf.lib.php
2021-12-08 19:18:09 +01:00
Laurent Destailleur
646ba34f89
Update functions.lib.php
2021-12-08 19:15:35 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
af6e21910d
FIX #19536
2021-12-08 16:47:46 +01:00
habot-it
6501bb7cbf
Update pdf.lib.php
2021-12-08 16:43:11 +01:00
Laurent Destailleur
8ff0d1f366
Update functions.lib.php
2021-12-08 15:49:52 +01:00
Laurent Destailleur
20f4b5389b
Fix the experimental feature to manage session in database
2021-12-07 17:39:46 +01:00
Yaacov Akiba Slama
04d4c06a43
Use intl extension when available
2021-12-06 15:34:20 +02:00
Yaacov Akiba Slama
8f91086e83
Add some missing characters
2021-12-06 15:33:51 +02:00
stickler-ci
39117e8089
Fixing style errors.
2021-12-06 11:06:50 +00:00
habot-it
9ee3903fc4
Update pdf.lib.php
2021-12-06 12:06:32 +01:00
habot-it
2ad9761040
Add hookmanager in function pdf_pagefoot of pdf.lib.php
...
Customize PDF footers with HTML.
(Only on the last page with free text)
2021-12-06 07:47:24 +01:00
Laurent Destailleur
259b7dfe5a
NEW: Add massaction to switch status on sale / on purchase of a product.
2021-12-06 02:48:34 +01:00
Laurent Destailleur
2b505ec9b8
Fix can read category if can run takepos.
2021-12-05 13:01:05 +01:00
Laurent Destailleur
87e221d6dd
Fix create new page
2021-12-04 00:24:59 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
...
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
07506b523f
Clean code
2021-11-30 14:09:46 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3
...
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
2021-11-30 14:04:10 +01:00
stickler-ci
c807286f0b
Fixing style errors.
2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e
Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3
2021-11-30 12:17:21 +01:00
fr69400
078a040078
Update pdf.lib.php
2021-11-30 12:13:21 +01:00
Laurent Destailleur
c6fb026b75
Merge pull request #19504 from fappels/14_fix_fatal_eval
...
FIX 14.0.4 fatal error on cron list.
2021-11-30 11:31:02 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
e3e4b154e7
Fix partnership
2021-11-29 01:04:32 +01:00
Laurent Destailleur
2d92130c1e
External backups can be downloaded from the "About info page".
2021-11-28 19:25:58 +01:00
Laurent Destailleur
ca11dcae22
Fix php compatibility
2021-11-28 15:41:19 +01:00
Laurent Destailleur
ce651fae58
Fix php compatibility
2021-11-28 15:35:03 +01:00
Laurent Destailleur
5d31bd441e
Fix php compatibility
2021-11-28 15:34:08 +01:00
stickler-ci
a933793b8a
Fixing style errors.
2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf
FIX PDF_NOLD_PRODUCT_LABEL
2021-11-28 14:40:15 +01:00
Laurent Destailleur
af1baf057b
FIX #yogosha7789
2021-11-28 12:01:42 +01:00
Francis Appels
5bb21a93a1
FIX fatal error on cron list.
2021-11-27 18:25:38 +01:00
Laurent Destailleur
bf1dfac629
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Laurent Destailleur
78f94b1c76
Fix css and label for recurring invoices
2021-11-25 14:17:20 +01:00
Laurent Destailleur
e07008f6e9
Fix tooltip
2021-11-25 09:40:54 +01:00
Laurent Destailleur
da897d9374
CSScss
2021-11-23 11:10:16 +01:00
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +01:00
Laurent Magnin
c8c6d5c1d2
Update functions.lib.php
2021-11-19 17:09:51 +01:00
Laurent Magnin
5f40c2e9dd
Update functions.lib.php
2021-11-19 17:08:07 +01:00
Laurent Magnin
00c7114c0b
Merge branch 'Dolibarr:develop' into fix_ticket_substitution
2021-11-19 16:52:57 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29
...
NEW Thirdparty - Add advanced right to add / edit payment information
2021-11-18 20:32:55 +01:00
Laurent Destailleur
e609622f2b
Fix test on verifCond for value 0
2021-11-18 13:17:48 +01:00
Laurent Destailleur
2d4f971508
Fix verifCond must return false if string is '0'
...
Hide a not used property.
2021-11-18 13:10:52 +01:00
Alexandre SPANGARO
2ebdc6a430
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-16 04:27:53 +01:00
Laurent Destailleur
75b6e241ce
Clean code
2021-11-15 14:06:50 +01:00
Laurent Destailleur
f2bfa8b2a1
Merge pull request #18940 from PyroShape/develop2
...
NEW : info of number of product still to dispatched in a supplier order
2021-11-15 13:58:43 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select
...
NEW add ldap password hash type select
2021-11-15 11:16:33 +01:00
Laurent Destailleur
ec7eebcf4a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-15 11:10:39 +01:00
Laurent Destailleur
16c28b505b
Add comment on a bugged option
2021-11-15 11:10:18 +01:00
Laurent Destailleur
50aee2377f
Merge pull request #19356 from frederic34/addtranslations
...
add load langs
2021-11-15 11:01:08 +01:00
Laurent Destailleur
5b5f41606a
NEW PDF generation support format PDF/A-1b and PDF/A-3b
2021-11-15 09:02:01 +01:00
Regis Houssin
9e5a20545d
FIX dolGetLdapPasswordHash use your own random salt
2021-11-12 13:23:11 +01:00
Regis Houssin
968ffbcef0
FIX add ldap hash algo
2021-11-12 13:06:41 +01:00
Regis Houssin
084a3f48c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00
Frédéric FRANCE
fd1585eda0
add load langs
2021-11-11 18:23:34 +01:00
Laurent Destailleur
06f378db18
FIX Bad use of dol_concatdesc()
2021-11-11 15:31:19 +01:00
Laurent Destailleur
66f1dd8545
Fix avoid too large PDF
2021-11-11 15:12:31 +01:00
Laurent Destailleur
28aa17e4fd
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 14:27:17 +01:00
Laurent Destailleur
0443302c3d
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 13:49:21 +01:00
Laurent Destailleur
e8e0768eec
Fix phpcs
2021-11-08 03:47:16 +01:00
Laurent Destailleur
28dcdb0708
Merge pull request #19283 from bb2a/NEW_SUBSTITUTION_ONLINE_SIGN_PROPAL
...
NEW - Substitution proposal online sign
2021-11-08 03:46:09 +01:00
Laurent Destailleur
43406e7d61
Merge pull request #19321 from nicolas-eoxia/new_redirect_after_login
...
NEW : redirect after connection in login page #19320
2021-11-08 03:27:48 +01:00
Laurent Destailleur
d026c721cf
Update security2.lib.php
2021-11-08 03:27:27 +01:00
Laurent Destailleur
eaf2c6e89c
Fix $action not defined
2021-11-07 17:49:31 +01:00
Laurent Destailleur
2e499c2d17
Fix unknown property
2021-11-07 17:46:08 +01:00
Laurent Destailleur
6829507372
Fix missing $db
2021-11-07 17:44:34 +01:00
Laurent Destailleur
552d32ccd6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-07 13:54:07 +01:00
Laurent Destailleur
3b7c385c6c
Fix syntax error
2021-11-07 13:53:30 +01:00
Laurent Destailleur
2234522519
Debug module parnership. Add the type of partnership.
2021-11-07 13:51:31 +01:00
Laurent Destailleur
713db0e613
Removed function pdf_getTotalQty (duplicate with pdf_getlineqty)
2021-11-07 12:26:44 +01:00
Laurent Destailleur
ccc1d4d1fa
Fix warning
2021-11-07 12:24:25 +01:00
Alexandre SPANGARO
1cd864e395
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-06 05:06:21 +01:00
Nicolas Domenech
61d97ccd22
NEW : redirect after connection in login page
2021-11-05 16:02:24 +01:00
Laurent Destailleur
897b00faf0
Clean code
2021-11-05 14:23:19 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner
...
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-05 13:28:39 +01:00
Ferran Marcet
3f426abc29
Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts
2021-11-04 10:56:55 +01:00
Florian HENRY
054d98b942
fix ref
2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-03 16:18:03 +01:00
Anthony Berton
5bb6185e64
add_substitution
2021-11-02 12:37:39 +01:00
Alexandre SPANGARO
dd7ee9e5f4
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-02 04:52:50 +01:00
Alexandre SPANGARO
f73f3cd55f
typo
2021-11-02 04:50:29 +01:00
Benjamin Chantalat
85776f7529
Avoid function calls in a FOR loop test part
2021-11-01 20:08:00 +01:00
stickler-ci
85372a7083
Fixing style errors.
2021-11-01 18:57:35 +00:00
Benjamin Chantalat
7b88f1da3f
Change to have number of item dispached on number of total item
2021-11-01 19:56:55 +01:00
Laurent Destailleur
3e1fa44657
Fix phpdoc
2021-11-01 03:23:38 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server
...
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Frédéric FRANCE
270ddfda1f
fix scrutinizer
2021-10-31 22:24:25 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8
2021-10-31 17:54:32 +01:00
Laurent Destailleur
efa8b7943e
Merge
2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-31 17:20:09 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete
...
FIX restrictedArea for payment delete
2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php
2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c
Merge pull request #19212 from fr69400/develop
...
[minor] Fix some warning
2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51
FIX #19210
2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
4f2cd2ba18
FIx #19227
2021-10-31 15:59:03 +01:00
Laurent Destailleur
be6b1e29ad
Add logs
2021-10-29 13:32:32 +02:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
stickler-ci
134e5cb5e6
Fixing style errors.
2021-10-28 13:52:29 +00:00
Regis Houssin
f497492e62
FIX compatibility with php8
2021-10-28 15:40:05 +02:00
Regis Houssin
ae6d16c830
FIX mhash function is deprecated since php 8.1.0
2021-10-28 13:36:53 +02:00
Laurent Destailleur
97d97af932
Clean: Remove fields for social networks (merged into "socialnetworks")
2021-10-27 16:39:34 +02:00
Florian HENRY
46119c99a2
fix: warning dol_print_date setTimeStamp when time empty
2021-10-27 09:23:54 +02:00
stickler-ci
6fd08bc5ef
Fixing style errors.
2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c
FIX restrictedArea for payment delete
2021-10-26 16:47:16 +02:00
fr69400
761ec7b790
Update functions.lib.php
2021-10-26 16:45:40 +02:00
fr69400
e4b3dda7f0
Update functions.lib.php
...
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
2021-10-26 15:27:12 +02:00
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Florian HENRY
52a4f4869d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-25 16:54:30 +02:00
Laurent Destailleur
02632e9e88
Fix need write permission on object to link/remove resource
2021-10-25 16:32:37 +02:00
Laurent Destailleur
98f4f0b1c9
Merge
2021-10-25 11:52:24 +02:00
Florian HENRY
b282673f61
fix php8 warning
2021-10-25 09:01:05 +02:00
Laurent Destailleur
b8250be237
css for toolitp
2021-10-24 16:35:42 +02:00
Laurent Destailleur
a26539c3e4
Merge pull request #19173 from frederic34/patch-1
...
Fix Undefined array key
2021-10-24 12:33:44 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list
2021-10-24 10:02:12 +02:00
Frédéric FRANCE
6d2cedb439
Fix Undefined array key
...
Fix Undefined array key 1 in htdocs/core/lib/project.lib.php on line 314
2021-10-24 09:33:54 +02:00
Frédéric FRANCE
635cb34606
fix warning
2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 21:06:37 +02:00
Lucas Marcouiller
b3e9aeef7a
Fix : PHP 8.0 warnings
2021-10-23 16:12:44 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings
2021-10-23 07:20:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings
2021-10-23 07:13:08 +02:00
Florian HENRY
bb4eb2feea
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-22 23:38:44 +02:00
Laurent Destailleur
81882f8243
Merge pull request #19065 from javieralapps4up/develop
...
Access forbidden when the password of other users is changed
2021-10-22 22:52:55 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning
...
fix multiple warnings
2021-10-22 22:47:28 +02:00
Frédéric FRANCE
fafabe3be2
fix multiple warnings
2021-10-22 22:22:55 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/compta/cashcontrol/cashcontrol_list.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Florian HENRY
87ac58efb6
fix php 8
2021-10-22 15:27:36 +02:00
Laurent Destailleur
e4a757ff9e
Merge pull request #19086 from FHenry/14_fix_various_warning
...
fix: fix various php warning
2021-10-22 11:39:48 +02:00
Florian HENRY
0c770b8810
fix various warning
2021-10-22 10:54:33 +02:00
Frédéric FRANCE
d1c9877c41
fix missing code comment
2021-10-22 07:02:44 +02:00
Laurent Destailleur
f7b12208d1
Merge pull request #18802 from javieralapps4up/14.0
...
Close : #18801 Jan-30 + 1m IS NOT Mar-2
2021-10-22 00:01:42 +02:00
Laurent Destailleur
232616fc77
Merge pull request #19052 from frederic34/patch-16
...
fix doxygen nested comment
2021-10-21 23:02:20 +02:00
Laurent Destailleur
c126c48a92
Merge pull request #19072 from atm-maxime/fix_expense_report_rules
...
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 23:02:05 +02:00
Maxime Kohlhaas
ae6cae0313
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 22:57:50 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
javieralapps4up
f50dfe8571
Update security.lib.php
2021-10-21 18:20:06 +02:00
javieralapps4up
5d854dcce1
FIX #19064
...
Access forbidden when the password of other users is changed
Steps to reproduce the behavior
User with lire and password (user) perms, but no creer.
When this user saves or cancels the edition of the password of another user, he is sent to the prohibited page
2021-10-21 18:17:43 +02:00
Florian HENRY
f66f5cbfb8
fix: scrutinizer
2021-10-21 17:10:39 +02:00
Vincent Dieltiens
3a48fe2d66
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 16:06:18 +02:00
Frédéric FRANCE
8778296784
fix doxygen nested comment
2021-10-21 12:29:27 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
4a5293fc9c
Rewrite getDictionaryValue (Use a cache file and consistent return code)
2021-10-20 14:41:40 +02:00
Alexandre SPANGARO
632751cebc
Use getDolGlobalInt()
2021-10-20 12:37:49 +02:00
javieralapps4up
2ca0a1facf
Update date.lib.php
2021-10-20 00:36:24 +02:00
Laurent Destailleur
421b692942
Clean last br for wysiwyg
2021-10-19 21:48:25 +02:00
Laurent Destailleur
12d211815b
Debug v15
2021-10-19 21:38:36 +02:00
Laurent Destailleur
bfdf88ca6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa
Debug v15
2021-10-19 16:47:43 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt
...
NEW Added linked files page and send mail possibility in payments
2021-10-19 12:25:37 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962
Debug feature for proposal signature
2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt
2021-10-18 19:53:36 +02:00
Laurent Destailleur
b0230ad42b
Look and feel v15
2021-10-18 16:45:14 +02:00
Alexandre SPANGARO
053740792f
Update accounting.lib.php
2021-10-18 10:19:50 +02:00
Polkiko
074b5589bd
NEW Added documents page and send mail possibility in payments
...
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
2021-10-18 01:15:12 +02:00
Laurent Destailleur
0727e182ac
Merge pull request #18997 from hregis/fix_add_zstd_compression
...
NEW add support for zstd compression
2021-10-17 13:49:06 +02:00
Laurent Destailleur
b66155de4b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
b30d7371a4
Fix allow ' - ' into file name
2021-10-17 12:21:22 +02:00
Regis Houssin
84e4bd8820
NEW add zstd compression
2021-10-17 11:59:25 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986
...
NEW: Add budget field into task #18986
2021-10-16 21:16:01 +02:00
Laurent Destailleur
830e067eff
Fix for tzuser
2021-10-16 21:03:47 +02:00
Laurent Destailleur
25967da832
Merge pull request #18970 from hregis/fix_avoid_warning_non_numeric
...
FIX avoid non-numeric warning
2021-10-16 19:22:16 +02:00
Laurent Destailleur
a28d01ca83
Use PDF/A format instead of PDF
2021-10-16 18:59:01 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Florian HENRY
ab9ba4e0a2
NEW: feature #18986
2021-10-15 10:53:17 +02:00
Florian HENRY
5f4410468d
add filed budget in task
2021-10-15 10:24:56 +02:00
lvessiller
5d22eeeff2
FIX user date timezone offset
2021-10-14 16:06:22 +02:00
Regis Houssin
f14de50bd7
FIX check if numeric value
2021-10-13 14:26:43 +02:00
Regis Houssin
ce37323f69
FIX avoid non-numeric warning
2021-10-13 14:14:30 +02:00
Laurent Destailleur
e6c451cdae
Fix responsive
2021-10-12 23:50:23 +02:00
Laurent Destailleur
f3ea05b701
Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture
...
NEW when multiple order linked to facture, show list into note.
2021-10-12 14:30:34 +02:00
Laurent Destailleur
2e32254574
Fix rul to shipment files
2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-11 20:18:46 +02:00
Laurent Destailleur
4e9c7c9efb
FIX Attachment of pdf into shipment when sending email
2021-10-11 20:04:45 +02:00
Laurent Destailleur
3a32787f15
Fix for backward compatibility
2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1
Fix for backward compatibility
2021-10-11 16:13:55 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code
...
New : integration gpec, source code
2021-10-11 15:39:54 +02:00
Laurent Destailleur
7180f5eeff
css
2021-10-10 21:25:46 +02:00
Benjamin Chantalat
65c0167d07
ADD : info of number of product still to dispatched in a supplier order
2021-10-10 20:50:51 +02:00
Laurent Destailleur
1b504b3e2c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-08 12:15:18 +02:00
Laurent Destailleur
806d832549
Fix canonical url for open graph
2021-10-08 12:00:13 +02:00
Laurent Destailleur
a057c7c2a7
Add og graph
2021-10-08 11:49:28 +02:00
Laurent Destailleur
da0a9e13f5
Fix twitter tag
2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac
Allow twitter cards per page.
2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6
Comment
2021-10-08 10:59:11 +02:00
Gauthier PC portable 024
de48c1bdde
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-07 11:23:37 +02:00
Laurent Destailleur
9cf46eaf25
Fix stats graphs
2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6
Fix missing invoice in stats when due date is unknown/null
2021-10-06 20:10:36 +02:00
Gauthier PC portable 024
231f809106
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-06 17:55:36 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21
...
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
3f26ab195b
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:41:03 +02:00
Alexandre SPANGARO
d10ec688c7
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802
Missing language key
2021-10-05 06:26:19 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23
...
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
2021-10-04 15:32:40 +02:00
Laurent Destailleur
66310b14d7
Better way to present open invoice graph
2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f
Better way to present open invoice graph
2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef
Clean css
2021-10-04 04:14:31 +02:00
Alexandre SPANGARO
42bb9ac6d2
Better URL
2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061
Change Url
2021-10-03 05:30:49 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:40:33 +02:00
Laurent Destailleur
673a2982a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
1595b38498
Fix param $morecss on img_mime
2021-09-30 00:28:47 +02:00
Laurent Destailleur
34dacca77c
Css
2021-09-29 16:31:40 +02:00
Laurent Destailleur
e15277bb6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-28 17:23:07 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021
...
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
2021-09-28 12:56:43 +02:00
Laurent Destailleur
8f4fb9fd3c
Update barcode.lib.php
2021-09-28 12:56:33 +02:00
Laurent Destailleur
0e3ec3ea2d
Trans
2021-09-28 11:56:43 +02:00
javieralapps4up
11723c2cd0
Update date.lib.php
...
Without words, sorry
2021-09-27 14:49:22 +02:00
javieralapps4up
c4f1eb0c46
Update date.lib.php
...
Fix my error
2021-09-27 14:32:03 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Gauthier PC portable 024
fde0f1ac25
NEW : HRM integration, source code
2021-09-27 11:20:38 +02:00
Laurent Destailleur
d5d4b8d8e0
Fix escape the undescore on search in website module
2021-09-26 14:21:23 +02:00
Philippe GRAND
67cc5155b1
fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62
2021-09-25 18:15:44 +02:00
Laurent Destailleur
70d255740b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66
Code comment
2021-09-24 02:31:15 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
stickler-ci
e5cff0ede1
Fixing style errors.
2021-09-22 16:07:36 +00:00
javieralapps4up
e74043d48e
Close : #18801 Jan-30 + 1m IS NOT Mar-2
...
Close : #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
2021-09-22 17:56:31 +02:00
Laurent Destailleur
6f9fc205ef
Merge pull request #18796 from altairis-noe/warehouse_project_elements
...
FIX: add warehouse in projects' overview count
2021-09-22 15:24:05 +02:00
Noé Cendrier
066013c31f
typo stickler
2021-09-22 15:15:39 +02:00
Noé Cendrier
c89468428e
add warehouse in projects elements count
2021-09-21 17:22:55 +02:00
ksar
f2b39b3eeb
FIX #18767 : Adherent delete
...
Adherent Delete was not working due to the fact that
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist
Also I used the double declaration of salaries.
2021-09-21 11:27:41 +02:00
Laurent Destailleur
deb1965cd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
0eff2fa15b
FIX default language defined for IN country
2021-09-20 13:20:54 +02:00
Laurent Destailleur
96436cac3d
FIX unprivileged user can attach agenda with leave.
2021-09-19 00:50:23 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
02bed7ce01
Fix sanitize
2021-09-17 10:45:59 +02:00
Laurent Destailleur
8909702619
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
Laurent Destailleur
6dbf316e66
Fix links
2021-09-14 17:56:06 +02:00
Laurent Destailleur
edb1f31a19
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2021-09-10 20:55:52 +02:00
Florian HENRY
257686c2fe
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 15:45:03 +02:00
Laurent Destailleur
11b6259130
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
Laurent Destailleur
6a296bf6c2
Debug setup
2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9
Clean setup and translation
2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8
2021-09-09 19:26:01 +02:00