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
6562b24e41
NEW Some core tables are created only at module activation
2022-02-06 13:31:44 +01:00
Laurent Destailleur
2991f992dc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-06 13:28:30 +01:00
Laurent Destailleur
cd491280cf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460
Fix remove dead code
2022-02-06 13:06:12 +01:00
Laurent Destailleur
f2120a6463
Merge pull request #19994 from defrance/patch-177
...
fix : duration in hour and min (not in second)
2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac
Update list_print_total.tpl.php
2022-02-06 12:35:33 +01:00
Laurent Destailleur
9c0fc59166
Fix #yogosha8791
2022-02-05 19:42:43 +01:00
BENKE Charlene
9977761846
print the good format of totalisation
2022-02-05 12:12:37 +01:00
ATM john
ba46d04d6e
Fix logic for form setup
2022-02-04 21:51:33 +01: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
Laurent Destailleur
ba795310b5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590
Fix phpcs
2022-02-04 20:30:45 +01:00
Laurent Destailleur
c9a685e09d
Better error message
2022-02-04 19:21:47 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php
2022-02-04 19:05:22 +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
Laurent Destailleur
5249840402
FIX #yogosha8628
2022-02-04 15:14:10 +01:00
Laurent Destailleur
85e198283b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087
FIX #19939
2022-02-04 13:18:07 +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
4324558d67
FIX backup fails
2022-02-04 12:34:42 +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
5294a9ae2f
Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function
...
Works on replace MAIN_DB_PREFIX by $db->prefix()
2022-02-04 11:09:51 +01:00
Laurent Destailleur
3a9564ed88
Merge pull request #19976 from bb2a/patch-1
...
FIX - Trigger in setPaymentMethods for order
2022-02-04 09:23:11 +01:00
Laurent Destailleur
a5bdd62268
Merge pull request #19981 from aspangaro/14p30
...
FIX Accountancy - Wrong name rule on FEC import
2022-02-04 09:12:11 +01:00
Alexandre SPANGARO
6d350f9a75
FIX Accountancy - Wrong name rule on import
2022-02-03 05:53:05 +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
ef62cd0b18
css
2022-02-02 18:24:30 +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
Anthony Berton
da91c5f5ef
Update commonobject.class.php
2022-02-02 12:38:22 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10
fix sticler
2022-02-01 16:18:02 +01:00
Laurent Destailleur
35ac8923dd
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 16:14:12 +01:00
Laurent Destailleur
1ca1f111b3
Fix warnings
2022-02-01 16:12:51 +01:00
Laurent Destailleur
89a06014da
Fix warnings
2022-02-01 15:55:04 +01:00
Laurent Destailleur
44bc197d03
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 13:25:45 +01:00
Laurent Destailleur
6ddc4ba3a0
Fix bad value for total VAT on PDF
2022-02-01 13:23:52 +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
d167e022eb
Debug v15
2022-01-31 12:08:51 +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
Regis Houssin
b2384b624a
FIX regression
2022-01-30 11:40:12 +01:00
Regis Houssin
5f376685c3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function
2022-01-30 11:28:29 +01:00
Laurent Destailleur
7f13561158
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 02:06:08 +01:00
Laurent Destailleur
9e86e5ce93
Fix creation of page
2022-01-30 01:46:14 +01:00
Laurent Destailleur
5942bc57e6
Add DDOS protection
2022-01-30 01:03:07 +01:00
Laurent Destailleur
2fea78c90a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
728df13238
Optimize files loaded on login and passwordforgotten page
2022-01-29 16:22:55 +01:00
Laurent Destailleur
d75dd51bb7
Clean code to debug fulldayevent
2022-01-29 00:39:20 +01: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
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop
...
NEW : Sub-bom
2022-01-28 19:01:30 +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
c01e942a1c
Merge pull request #19960 from fappels/15_reception_missing_translation_key
...
Fix missing reception module description translation key.
2022-01-28 17:08:17 +01:00
Francis Appels
8d75f575e5
Fix missing reception module description translation key.
2022-01-28 16:35:14 +01:00
Laurent Destailleur
7c9b97d035
css
2022-01-28 16:29:27 +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
Laurent Destailleur
ef70777cf1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/reception/card.php
2022-01-28 15:57:09 +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
Laurent Destailleur
da744f5cb9
Fix link
2022-01-28 13:44:15 +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
Laurent Destailleur
34f3ec8a39
Try a fix with php that return a fatal error on some mysql
2022-01-28 11:11:36 +01:00
Regis Houssin
8196134345
FIX not use $this in static function
2022-01-27 14:17:14 +01:00
Regis Houssin
b07fff5754
FIX Travis avoid error "you should use $this->db-> inside a class file"
2022-01-27 13:06:43 +01:00
Regis Houssin
a1dc6e7e9b
FIX travis error - use double quote instead simple quote
2022-01-27 12:52:13 +01:00
Regis Houssin
b6f9500d46
FIX uniformize code and remove unused global
2022-01-27 12:00:55 +01:00
Regis Houssin
153cd38c78
FIX uniformize and fix code
2022-01-27 10:57:20 +01:00
Regis Houssin
d78bcaa419
FIX avoid stickler Line exceeds 500 characters
2022-01-27 10:26:39 +01:00
Regis Houssin
399fffa81e
FIX convert core class
2022-01-27 10:19:35 +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
Laurent Destailleur
32b2b6e788
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:57:00 +01:00
Laurent Destailleur
932096f332
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:56:50 +01:00
Laurent Destailleur
538c5f14d3
Fix phpcs
2022-01-26 19:56:02 +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
Laurent Destailleur
33d67e74c2
Merge pull request #19934 from bb2a/Add_param_color_button_action
...
NEW - ADD config text color of button action
2022-01-26 16:46:12 +01:00
Adrien Raze
e52fb89182
FIX : Fixing stickler returns
2022-01-26 16:36:58 +01:00
Adrien Raze
d38ff3ad9b
FIX : Fixing stickler returns
2022-01-26 15:53:30 +01:00
Laurent Destailleur
512df3c580
Try to address a better solution for #19776
2022-01-26 15:12:42 +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
0d66646052
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 14:08:20 +01:00
Laurent Destailleur
7ce6f13933
Fix php8
2022-01-26 14:07:13 +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
416543a5f5
Standardize code to allow deletion of an odt template
2022-01-26 13:49:46 +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
BB2A Anthony Berton
656dc02e7d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-26 13:03:01 +01:00
Laurent Destailleur
3b4c7ceb3b
Code comment
2022-01-26 13:00:48 +01:00
Laurent Destailleur
60fff852ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-01-26 12:53:06 +01:00
Laurent Destailleur
30fba23326
Merge pull request #19931 from Easya-Solutions/new-stock-add-limit-stock-csv
...
NEW stock limit in stock export CSV
2022-01-26 11:36:53 +01:00
Laurent Destailleur
7b990a1a7f
Fix phpcs
2022-01-26 11:30:19 +01:00
pandreani
95df5bebe6
NEW stock limit in stock export CSV
2022-01-26 10:35:08 +01:00
Anthony Berton
4f54149555
Update commonobject.class.php
2022-01-25 22:28:47 +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
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list
...
NEW : Contact filter project list
2022-01-25 16:06:31 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab
2022-01-25 15:58:54 +01:00
Laurent Destailleur
13f66df975
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:57 +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
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup
...
NEW : convert situation setup to new setup system
2022-01-25 15:17:14 +01:00
Laurent Destailleur
bb49dd195e
Merge pull request #19722 from bjoern86/patch-2
...
Adds possibility to add senders name to $formmail->fromname
2022-01-25 14:58:27 +01:00
Laurent Destailleur
b7b88865e6
Update card_presend.tpl.php
2022-01-25 14:58:00 +01:00
Laurent Destailleur
54e5b5d369
Fix reponsive
2022-01-25 13:40:22 +01:00
Adrien Raze
a5903abb5b
FIX : Change display of the bom's select
2022-01-25 11:28:36 +01:00
Adrien Raze
4edbd5c4e3
NEW : Creation of the function select_bom() used to display bom select list
2022-01-25 10:31:45 +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
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test
...
FIX : lang load in validate class and fix test for numeric values
2022-01-23 18:24:11 +01:00
BB2A Anthony Berton
0552381e39
1
2022-01-23 16:36:47 +01:00
Laurent Destailleur
0ee0bfed85
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/fourn/commande/card.php
test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
ba404493a2
Merge pull request #19865 from hregis/fix_avoid_warning
...
FIX avoid warning
2022-01-23 12:33:52 +01:00
Laurent Destailleur
9dd3d970bf
Update commonobject.class.php
2022-01-23 12:31:30 +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
9424cebf0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:19 +01:00
Laurent Destailleur
9049134556
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:11 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth
...
FIX : 15.0 add minwidth to selectArray mail model
2022-01-23 11:58:09 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix
...
NEW add modifications for new function "$db->prefix()"
2022-01-23 11:57:42 +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
e0956c1765
Fix missing token, missing reposition, missing modulepart
2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:09:14 +01:00
Laurent Destailleur
caf7e7d7d5
FIX action must be protected with a permission check
2022-01-22 15:07:53 +01:00
Laurent Destailleur
1790ba2820
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:06:05 +01:00
Laurent Destailleur
4750f6bbc6
FIX action must be protected with a permission check
2022-01-22 15:05:41 +01:00
Laurent Destailleur
6baa0939ce
NEW Can add a tooltip after the combo list of doc templates
2022-01-22 14:03:39 +01:00
Laurent Destailleur
284fcf3ad5
FIX Company logo not found in some cases on some templates
2022-01-22 13:19:29 +01:00
Laurent Destailleur
38fcfd38f8
Fix trans
2022-01-21 19:16:29 +01:00
Regis Houssin
a3a856d0be
NEW add modifications for new function "$db->prefix()"
2022-01-21 16:57:57 +01:00
Laurent Destailleur
482efec536
Fix missing column
2022-01-21 15:40:37 +01:00
Laurent Destailleur
1dcfb88ad4
Debug v15
2022-01-21 13:44:40 +01:00
stickler-ci
3e84a99965
Fixing style errors.
2022-01-21 08:58:06 +00:00
jpb
15c39db35c
add minwidth to selectArray
2022-01-21 09:55:14 +01:00
jpb
015cd543d6
add minwidth to selectArray
2022-01-21 09:52:52 +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
050b531403
Fix troubles in select_language when selected is array
2022-01-20 19:01:04 +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
8c3b28b0d0
Introduce method for future
2022-01-20 18:50:18 +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
Laurent Destailleur
de30b68f9e
Code comment
2022-01-20 17:10: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
a5de93cf44
Validate the oauthstateanticsrf value.
2022-01-19 23:03:24 +01:00
Laurent Destailleur
3ae63cb111
Clean code
2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25
Decode extra params of id_token
2022-01-19 22:26:31 +01:00
Laurent Destailleur
d38784f45a
WIP Login with Google
2022-01-19 20:33:20 +01:00
Laurent Destailleur
ff1037634b
Clean OAuth feature
2022-01-19 18:23:31 +01:00
Laurent Destailleur
4f533c3f9d
Merge
2022-01-19 16:54:00 +01:00
Laurent Destailleur
d06f570c23
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 16:50:11 +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
63d6ef1ba0
Merge pull request #19647 from OPEN-DSI/new-exports-entity-filters
...
NEW add entity filter in exports
2022-01-19 02:26:18 +01:00
Laurent Destailleur
c2c74f4849
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 02:02:52 +01:00
Laurent Destailleur
c469634101
Fix hook for emailcollector
2022-01-19 02:01:52 +01:00
Laurent Destailleur
3757d7e952
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2022-01-18 16:11:48 +01:00
Laurent Destailleur
200f796232
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-18 16:08:54 +01:00
Laurent Destailleur
09eb051bcc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 12:25:20 +01:00
Laurent Destailleur
874bbca881
Doc
2022-01-18 12:24:19 +01:00
Laurent Destailleur
f91504b9c1
Add property
2022-01-18 12:16:13 +01:00
Regis Houssin
08009bcec5
FIX avoid warning
2022-01-18 10:06:11 +01:00
Laurent Destailleur
70e4705149
Clean code
2022-01-17 22:52:56 +01:00
Laurent Destailleur
642f77e8f5
FIX Widget of stock alert does not report on purchase products.
2022-01-17 22:07:18 +01:00
Laurent Destailleur
2f7832ee44
css
2022-01-17 19:18:48 +01:00
Laurent Destailleur
812f12ccc4
Fix tz message
2022-01-17 19:09:18 +01:00
Laurent Destailleur
a072c8911a
Fix tz of message on popup
2022-01-17 19:07:02 +01:00
Laurent Destailleur
9d067d74ab
Fix responsive
2022-01-17 17:51:03 +01:00
Laurent Destailleur
2462700975
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 13:57:59 +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
5fd2d00936
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 08:57:48 +01:00
Laurent Destailleur
24de82859e
Debug v15
2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50
Debug template of warehouse
2022-01-16 19:21:59 +01:00
Laurent Destailleur
3aedf6434b
css
2022-01-16 13:11:12 +01:00
Laurent Destailleur
5070a40fa4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/list.php
2022-01-15 20:28:04 +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
fe79218571
Change on column Assigned to on projet and task.
2022-01-15 12:26:08 +01:00
Laurent Destailleur
ecde594a15
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/card.php
2022-01-14 20:28:44 +01:00
Laurent Destailleur
3d97888bc5
Comment
2022-01-14 17:46:06 +01:00
Laurent Destailleur
744296a43a
FIX Permission on holiday and expensereport.
2022-01-14 13:52:08 +01:00
ATM john
a394713f1b
Fix doc comment
2022-01-14 11:51:07 +01:00
ATM john
8ace96f495
Fix validate class lang load and test for numeric values
2022-01-14 11:46:31 +01:00
Laurent Destailleur
02fc420c2a
FIX #19817
2022-01-14 11:37:13 +01:00
Laurent Destailleur
1ae01ba2fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-14 10:38:38 +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
stickler-ci
2b64f69def
Fixing style errors.
2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43
Update extrafields.class.php
2022-01-14 10:10:10 +01:00
Laurent Destailleur
7d5c36ad02
Merge pull request #19823 from harrywinner/15.0
...
FIX Solving non-blocking bug in user login
2022-01-14 10:03:10 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm
...
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
dolibarr95
e53d9d4320
Update extrafields.class.php
...
fix #19739
2022-01-14 08:52:04 +01:00
Laurent Destailleur
52493b60fb
Fix #yogosha8316
2022-01-13 15:52:41 +01:00
Gauthier PC portable 024
55389036d9
FIX : perms
2022-01-13 12:02:05 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Harry Winner KF
67ab70f37d
FIX Solving non-blocking bug in user login
...
When using the function check_user_password_dolibarr to authenticate a user, a call is made to the function dol_verifyHash which requires a pre-calculated hash. This hash is not available with programmatically-created never-used accounts. Hence, in suce cases we have the following warning:
Notice: Trying to access array offset on value of type null in .../htdocs/core/lib/security.lib.php on line 156
This fix solves that bug by avoiding that unnecessary call
2022-01-12 15:05:11 -05:00
Frédéric FRANCE
297d2ecfbd
fix warning
2022-01-12 16:09:31 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
...
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +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
da83d101db
Merge pull request #19778 from atm-john/fix_stuff_on_setup_class
...
FIX : Setup helper class
2022-01-10 18:32:12 +01:00
Laurent Destailleur
cfec02aaae
Debug v15
2022-01-10 14:27:43 +01:00
Laurent Destailleur
c81f46842b
Fix too many load of objects
2022-01-10 13:36:28 +01:00
Laurent Destailleur
12044fa67a
Debug v15
2022-01-10 03:24:01 +01:00
Laurent Destailleur
4af80507cb
Fix #yogosha8282
2022-01-09 20:25:10 +01:00
Laurent Destailleur
4ce77e62c6
Debug v15
2022-01-09 14:19:55 +01:00
ATM john
29e5fb0250
Merge branch 'fix_stuff_on_setup_class' into new_convert_setup_to_new_setup
2022-01-09 10:27:34 +01:00
ATM john
bb1ec5940d
Fix setup class
2022-01-09 10:24:28 +01:00
Laurent Destailleur
c3a42162d9
FIX The vat code was not correctly managed on PDF templates
2022-01-08 14:43:24 +01:00
Laurent Destailleur
3a6b5199ec
Debug module intracomm
2022-01-08 01:19:04 +01:00
Laurent Destailleur
60b2479389
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/core/class/utils.class.php
htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
ff31d660c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-01-07 15:50:40 +01:00
Laurent Destailleur
451fa396aa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2022-01-07 15:49:09 +01:00
Laurent Destailleur
265aeb76e6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e
FIX avoid infinite loop on dump with popen
2022-01-07 15:35:33 +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
144a56d073
Clean code
2022-01-06 18:12:02 +01:00
Laurent Destailleur
6cb0374784
Fix responsive
2022-01-06 18:02:44 +01:00
Laurent Destailleur
26e8496c46
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
