Commit Graph

7743 Commits

Author SHA1 Message Date
Regis Houssin
82e19879d5 FIX php8.1 warning 2022-05-21 23:43:01 +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
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
420feba56f
Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +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
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +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
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
lvessiller
d624a1e25e FIX stickler-ci 2022-05-13 08:57:08 +02:00
lvessiller
94dcee622b FIX stickler 2022-05-12 17:58:31 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Anthony Berton
273f119631
Update pdf.php 2022-05-10 16:14:37 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +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
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
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +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
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +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
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
207373d37d FIX sending email on payment of registration of event 2022-05-03 20:07:21 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules
Trans debugbar
2022-05-03 12:08:24 +02:00
lmarcouiller
1dba611907 Merge branch 'develop#6' of github.com:Hystepik/dolibarr into develop#6 2022-05-02 15:42:43 +02:00
lmarcouiller
ce41d3ed09 remove target extrafields 2022-05-02 15:42:26 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
22a2aa55e2 Show tooltip on nb of translation files 2022-05-01 13:39:22 +02:00
Laurent Destailleur
48342cd3c5 Fix td balance 2022-05-01 12:49:53 +02:00
Laurent Destailleur
9af68679d1
Merge branch 'develop' into 16a20 2022-05-01 12:45:08 +02:00
Laurent Destailleur
fe2324ac7e
Merge pull request #20669 from ymollard/tickets-collector
FIX and NEW i18n for creating tickets via the mail collector
2022-05-01 12:36:16 +02:00
Laurent Destailleur
82b65f3517
Merge pull request #20707 from hregis/fix_wrong_data_root_with_multicompany
NEW Module website now supports the multicompany module
2022-05-01 12:33:07 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
477d681c49 Fix warnings 2022-04-30 17:47:45 +02:00
Yoan Mollard
bdfe7f12d9 Use the existing $form instead of a new $formcategory 2022-04-30 00:32:15 +02:00
Laurent Destailleur
8ad57b3d7a Fix td 2022-04-29 13:43:51 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00
lmarcouiller
8629651659 NEW : module webhook 2022-04-28 11:13:21 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install
Fix user photo when gravatar not reachable
2022-04-19 22:26:27 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
37ab728846 Allow users to switch on e-mail headers again in UI 2022-04-19 00:13:40 +02:00
Yoan Mollard
ad0199afd1 Rephrased ticket labels 2022-04-19 00:13:40 +02:00
Yoan Mollard
7f27b8c499 Use default e-mail sender/notif/body/signature for tickets if they exist
Otherwise, when params have not been configured, error message due to an
empty "from e-mail" is unclear
2022-04-19 00:13:40 +02:00
Alexandre SPANGARO
ffd9693b17 NEW Add an option to show quick add feature 2022-04-18 07:35:05 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +02:00
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +02:00
Laurent Destailleur
10367f2cb1
Merge pull request #20536 from atm-jpb/NEW_Add_class_name_on_expensereport_rule
add class name on tds  expensereport rule card
2022-04-07 14:22:46 +02:00
Laurent Destailleur
524b001f3b Add $dolibarr_main_restrict_os_commands in security center. 2022-04-06 21:14:35 +02:00
jpb
32f601a48b rename css class name 2022-04-06 09:15:53 +02:00
jpb
f4a780f3f6 add name on tr data 2022-04-04 16:28:42 +02:00
jpb
04140d8dc0 add class name on tds expensereport rule card 2022-04-04 15:45:16 +02:00
Thomas Negre
ac7f02e0d3 stickler corrections 2022-04-04 09:29:03 +02:00
Thomas Negre
4790006c3a workflow config: add button for WORKFLOW_TICKET_CREATE_INTERVENTION 2022-04-04 09:29:03 +02:00
Laurent Destailleur
564382ec6c Upgrade ACE Editor from 1.4.7 to 1.4.14 2022-04-03 12:56:07 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract
NEW: add a workflow to auto link contract on a ticket
2022-04-02 18:15:27 +02:00
Laurent Destailleur
7e34ce7245 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/main.inc.php
2022-04-02 15:39:15 +02:00
Laurent Destailleur
d4accb97c5 FIX #yogosha9754 2022-04-02 15:26:40 +02:00
Laurent Destailleur
89b0a7b2b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-01 14:34:15 +02:00
Laurent Destailleur
497117416b
Update mails_templates.php 2022-04-01 14:32:32 +02:00
Laurent Destailleur
02d1bd2868
Merge branch 'develop' into develop 2022-04-01 14:32:05 +02:00
Laurent Destailleur
7031995820
Merge pull request #20505 from atm-jpb/NEW_add_hook_in_expensereport_rule
add hook doactions on expensereport_rule
2022-04-01 13:26:03 +02:00
Laurent Destailleur
e10f9b4435 css 2022-03-31 17:07:13 +02:00
Laurent Destailleur
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +02:00
stickler-ci
63b8c126d0 Fixing style errors. 2022-03-31 14:52:41 +00:00
jpb
be82fd73ed remove var_dump 2022-03-31 16:47:06 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
1304ed5763
Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
Laurent Destailleur
f7f318feb2
Update notification.php 2022-03-30 12:38:34 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
6177e914e2
Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field
NEW Availibility dictionnary new column unit and number
2022-03-24 20:28:38 +01:00
Thomas Negre
2709e69a32 rename $form into $formcategory 2022-03-24 11:00:37 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
Laurent Destailleur
ee611e8517 Hide not important options 2022-03-23 16:56:07 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices
NEW option update prices on proposal cloning
2022-03-23 16:49:12 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Thomas Negre
c68e16c087 admin/ticket.php: correct parameters table 2022-03-17 16:05:35 +01:00
Thomas Negre
c745237ee9 Stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
5fba0dc237 ticket config : select product type matching tickets. 2022-03-17 16:05:35 +01:00
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/products.lang
2022-03-17 00:16:14 +01:00
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Laurent Destailleur
b0525c7a7f
Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin
add more specific context and doAction hook
2022-03-16 21:52:25 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-16 21:31:08 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-16 20:34:30 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
stickler-ci
43ab784be2 Fixing style errors. 2022-03-15 10:26:47 +00:00
atm-greg
0be989dceb add more specific context and doAction hook 2022-03-15 11:18:11 +01:00
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2022-03-11 17:04:23 +01:00
BB2A Anthony Berton
f2377627ec Add template custom module 2022-03-11 10:50:11 +01:00
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
2022-03-10 15:59:09 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:12:57 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:04:16 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
javieralapps4up
8ddd37a419
Enabled to add links to local object with local browser in email templates
It is forbidden by default
2022-03-09 13:16:09 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Thomas Negre
9ce51ba4b7 admin/facture: don't show the modify button if not in an HTML form 2022-03-09 09:25:52 +01:00
Thomas Negre
02693ba5ea Facture : add config option for INVOICE_CHECK_POSTERIOR_DATE 2022-03-09 09:25:52 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
lvessiller
bbe3cfffb1 FIX stickler-ci 2022-03-08 10:17:47 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
9dfb7b4328 Revert "CSS"
This reverts commit 7847e04925.
2022-03-07 19:46:24 +01:00
Laurent Destailleur
7847e04925 CSS 2022-03-07 19:45:00 +01:00
Laurent Destailleur
1d9a79e980 css 2022-03-07 19:42:57 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing
New - Ticket: notify contacts at closing
2022-03-07 16:23:27 +01:00
Laurent Destailleur
1ce8ecb43d Clean setup page 2022-03-07 16:21:37 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
8c61a29051 Show value of short_open_tags 2022-02-25 01:30:34 +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
27cc6078ed Clean code 2022-02-22 22:15:29 +01:00
Thomas Negre
5d10d6cb78 allow delays configuration from ticket module params 2022-02-21 11:57:59 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php 2022-02-20 10:39:59 +01:00
ptibogxiv
996dcdde82
FIX error with php8 2022-02-19 18:34:53 +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
d19aca7192 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:50:03 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read
ticket config: auto read ticket
2022-02-17 19:58:01 +01:00
Laurent Destailleur
39bb854ef8
Update ticket.php 2022-02-17 19:57:45 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore
Fix urlencode breaking links in Market Place page
2022-02-17 19:54:04 +01:00
Laurent Destailleur
c529af90c6 Fix trans 2022-02-17 12:06:48 +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
6593449806 Dictionary 2022-02-14 04:20:42 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
1097111706 Fix autofocus 2022-02-13 16:37:08 +01:00
Laurent Destailleur
cafdcb7206 Show translation value 2022-02-13 16:13:38 +01:00
Laurent Destailleur
b623b88674 css 2022-02-11 18:06:39 +01:00
Marc GUENNEUGUES
c552030b69 Fix urlencode breaking links in Market Place page 2022-02-11 15:18:38 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Thomas Negre
c5d1310373 handle workflow constants in appropriate category 2022-02-10 17:51:32 +01:00
Thomas Negre
39bd5dd6dc ticket config : add TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND option to config panel 2022-02-10 17:50:59 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
31ca78acda Sync transifex.
Fix install.
2022-02-07 14:25:20 +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
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance
NEW: leave requests: add field into type dictionary to block request if balance is negative
2022-02-04 20:23:04 +01:00
BB2A Anthony Berton
0e1e65e180 only one option 2022-02-04 17:29:13 +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
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Anthony Berton
a85f27248e
Update pdf.php 2022-02-04 09:28:01 +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
9db0b7d0ef Fix look and feel v15 2022-02-01 11:57:33 +01:00
Laurent Destailleur
38e39cfa96 CSS 2022-01-28 19:57:07 +01:00
Laurent Destailleur
288a6564dc CSS 2022-01-28 19:28:37 +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
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
416543a5f5 Standardize code to allow deletion of an odt template 2022-01-26 13:49:46 +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
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
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
2022-01-25 16:25:44 +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