Commit Graph

27156 Commits

Author SHA1 Message Date
Laurent Destailleur
091ca31b6c NEW Add method hintindex() in database handlers. 2022-04-06 17:32:56 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
Florian HENRY
7b36733690 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_bithday_date_displayed 2022-04-06 13:49:22 +02:00
Laurent Destailleur
a0cb04bafc Fix css 2022-04-06 11:21:46 +02:00
atm-greg
ff7e1643e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_optimize_PDF_generation 2022-04-06 09:08:25 +02:00
Laurent Destailleur
f9c9e518c3 Load tables for opensurvey only when module opensurvey is enabled 2022-04-05 19:14:00 +02:00
Laurent Destailleur
e1143eb468
Merge pull request #20081 from bb2a/border_theme-md
NEW - add param boder table for md theme
2022-04-05 18:02:51 +02:00
lvessiller
dd6706e521 NEW display errors in a message box after generating documents 2022-04-05 17:31:34 +02:00
Laurent Destailleur
d143b8bf6e Debug dol_uncompress and add phpunit tests 2022-04-05 17:19:12 +02:00
Laurent Destailleur
f17db2a919 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 15:33:29 +02:00
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
f0d163a4ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-05 15:28:54 +02:00
Laurent Destailleur
8e4c89673a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-04-05 15:28:43 +02:00
Laurent Destailleur
17c719e760 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-05 15:24:15 +02:00
Laurent Destailleur
000ab8ce5f
Merge pull request #20164 from Hystepik/develop#3
NEW dol_uncompress() supports extensions (.gz, .bz2, .zstd). Only .zip was supported before.
2022-04-05 15:21:09 +02:00
Laurent Destailleur
3385cb8071
Update files.lib.php 2022-04-05 15:19:55 +02:00
Laurent Destailleur
759f7e051e
Update files.lib.php 2022-04-05 15:18:52 +02:00
Laurent Destailleur
2e5d0ef92b
Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement
New employee management improvement #18434
2022-04-05 15:12:19 +02:00
atm-greg
aa42df9961 just for glory 2022-04-05 15:11:37 +02:00
atm-greg
59fec7d094 implement cache managed by current object 2022-04-05 15:10:31 +02:00
Laurent Destailleur
2303553fd1
Merge pull request #20392 from thomas-Ngr/develop_fix_ticket_workflow_create_ficheinter_from_public_interface
Fix: ticket/workflow: automatically create ficheinter
2022-04-05 15:08:10 +02:00
Laurent Destailleur
ed7fd09925 Fix regression 2022-04-05 14:36:09 +02:00
Laurent Destailleur
9bf156b981 Doc 2022-04-05 13:54:09 +02:00
Laurent Destailleur
3ab993127d NEW Accept 'auto' for ref of object on import of purchase order/proposal 2022-04-05 02:17:01 +02:00
Florian HENRY
1fec350ccc fix: Bad dirthday displayed date (d-1) in the Bithday Widget 2022-04-04 22:51:30 +02:00
atm-greg
ad145c94ca add comment 2022-04-04 17:23:34 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
atm-greg
2455d8fe52 avoid fetch_objectlinked for each page of the document 2022-04-04 14:31:48 +02:00
Laurent Destailleur
ea61e51730 Fix phpunit 2022-04-04 14:00:39 +02:00
Laurent Destailleur
af45691c9d Clean import profiles 2022-04-04 13:35:08 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-04 10:49:51 +02:00
Laurent Destailleur
2913759bb7 Fix syntax 2022-04-04 10:45:50 +02:00
atm-florian
563716b633 16.0 - Proposal for trigger prefix consistency: instead of adding missing prefix, check that trigger starts with declared prefix 2022-04-04 10:00:10 +02:00
Thomas Negre
2ec7818c75 When the ficheinter can't be created, display an error. 2022-04-04 09:29:03 +02:00
Thomas Negre
424125ca03 Workflow fichinter: use default fichinter pdf model 2022-04-04 09:29:03 +02:00
Thomas Negre
ea68ed9c07 move automatic intervention creation from ticket/card.php to triggers/workflow.php 2022-04-04 09:29:03 +02:00
Thomas Negre
0c0ff4dec9 add WORKFLOW_TICKET_CREATE_INTERVENTION to workflow constants 2022-04-04 09:29:03 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-03 17:27:15 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +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
f07e11179d
Merge pull request #20472 from hregis/fix_avoid_hooks_conflict
NEW add hooks contact tab badge and hooks parameter for avoid conflicts
2022-04-02 18:06:01 +02:00
Laurent Destailleur
c4c7b19fbe
Merge pull request #20514 from FHenry/new_hidden_option_in_contractPDF
NEW add hidden option on contract PDF line to hide qty and price
2022-04-02 16:29:37 +02:00
Laurent Destailleur
1c71a76d6e
Merge pull request #20518 from frederic34/patch-1
use calculated visibility of extrafields in list
2022-04-02 16:23:04 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
2022-04-02 10:31:58 +02:00
atm-florian
96c432566d NEW 16.0 - proposal for a prefix-based consistency mechanism for trigger names 2022-04-01 19:20:47 +02:00
kamel
11d4e85a39 FIX - Fiw default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions 2022-04-01 16:52:59 +02:00
Frédéric FRANCE
4669d58fcc
use calculated visibility of extrafields in list 2022-04-01 16:16:45 +02:00
Laurent Destailleur
0c27578e69
Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields
FIX: object cloning: set unique extrafield values to null to prevent duplicates
2022-04-01 14:49:25 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
ad8e0a3be5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:36 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +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
88e6c67c10 Look and feel v16 of media manager 2022-04-01 14:29:11 +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
de28cb5d78
Merge pull request #20501 from ralf1070/develop
Allow anonymous LDAP user lookups
2022-04-01 13:23:50 +02:00
Laurent Destailleur
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
Florian HENRY
cbf89df591 new: add hidden option on contract PDF line 2022-04-01 11:54:16 +02:00
Laurent Destailleur
9be7bae765 Fix menu entry invalid 2022-04-01 11:24:58 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
Florian Mortgat
5df5050418
Apply suggestions from code review
replace spaces with tabs
2022-04-01 09:14:04 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
5f7abc0f8c
Merge pull request #19703 from atm-maxime/fix_mysql8_createuser
Fix #19662 : mysql8 user creation in 2 steps
2022-03-31 16:06:53 +02:00
Laurent Destailleur
cd81312b6a
Update mysqli.class.php 2022-03-31 16:04:28 +02:00
Laurent Destailleur
df4e5fe84d Fix missing param 2022-03-31 13:28:19 +02:00
Ralf Müller
a2b60e52e9 core/login/ldap: allow anonymous user lookup 2022-03-31 09:36:58 +02:00
Laurent Destailleur
7422fd9b07 css on separators 2022-03-30 18:20:09 +02:00
Laurent Destailleur
199faaa6f6
Update modHRM.class.php 2022-03-30 15:19:57 +02:00
Laurent Destailleur
f7c5154cac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-30 13:04:50 +02:00
Laurent Destailleur
1304ed5763
Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
889c35e8df NEW Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 2022-03-30 12:02:20 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +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
8e7b145510
Update modFacture.class.php 2022-03-29 16:05:41 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
2022-03-29 15:02:29 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
038033f0ec
Merge pull request #20389 from atm-GregM/retoursGRH
NEW/fix GRH extrafields and more stuff
2022-03-29 14:19:24 +02:00
Laurent Destailleur
5108240ed5
Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility
FIX multicompany sharings compatibility
2022-03-29 13:56:43 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Regis Houssin
5b5f3a4aaf FIX avoid php warning "illegal string offset" 2022-03-27 11:11:16 +02:00
Regis Houssin
009ad3be0f FIX remove unused code 2022-03-26 13:10:23 +01:00
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Laurent Destailleur
c2a088c5ff Fix regression in phpunit 2022-03-26 12:34:52 +01:00
Laurent Destailleur
453c8981e8 CSS 2022-03-26 12:24:28 +01:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Laurent Destailleur
50847efdf8 Add the country into the popup with info on company. 2022-03-26 11:44:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Laurent Destailleur
396b532400 Can cumulate error message on different authentication modes 2022-03-26 09:40:22 +01:00
Laurent Destailleur
8e610ddce7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-25 15:10:50 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
8d2d0f1e84 Fix trans 2022-03-25 12:22:52 +01:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Regis Houssin
ffa79c59f9 FIX wrong alias of table if no parent and parentkey 2022-03-24 20:48:43 +01:00
Regis Houssin
391c02993d FIX better test for all usage 2022-03-24 20:26:47 +01:00
Marc de Lima Lucio
1c43617d93 FIX: contact card: single extrafield update failed 2022-03-24 17:34:50 +01:00
Regis Houssin
c38437f0de FIX wrong error message 2022-03-24 17:12:37 +01:00
Regis Houssin
6fdb140f04 FIX missing table alias 2022-03-24 16:54:02 +01:00
Regis Houssin
e8dae7a8db FIX Multiccompany sharings compatibility 2022-03-24 16:40:51 +01:00
Laurent Destailleur
a22d66b021 css 2022-03-24 13:31:03 +01:00
BB2A Anthony Berton
958b6abdaa pdf_path 2022-03-23 17:31:54 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
1f7e1c3c91
Merge pull request #20307 from bb2a/complete_label_tab_custom_module
NEW - Record count badge in custom modules tab
2022-03-23 16:40:19 +01:00
Laurent Destailleur
d82aae1871
Update functions.lib.php 2022-03-23 16:39:55 +01:00
Laurent Destailleur
eac3a6cf86
Update functions.lib.php 2022-03-23 16:38:57 +01:00
Laurent Destailleur
0cfd374314
Merge pull request #20393 from hregis/new_add_hook_in_contact_list
NEW add selectCompaniesForNewContactListWhere hook
2022-03-23 16:07:50 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name
FIX uniformize with element name "contact"
2022-03-23 16:04:53 +01:00
Laurent Destailleur
9d2f59a10d
Merge pull request #20397 from hregis/new_add_hook_in_box_customer_and_product
NEW add hooks in customers and products boxes
2022-03-23 16:04:23 +01:00
Laurent Destailleur
c9672e4605
Merge pull request #20442 from grandoc/new_branch_23_03_2022
fix : Nested ternary expressions (without parentheses) deprecated in …
2022-03-23 16:03:36 +01:00
Laurent Destailleur
0e63e09fbb
Merge pull request #20403 from Easya-Solutions/develop_remake_variants_permissions
NEW : Update variants to standard card and list (permissions)
2022-03-23 16:02:34 +01:00
Laurent Destailleur
1c7e2d3034
Merge pull request #20402 from Easya-Solutions/develop_remake_variants
NEW : Update variants to standard card and list
2022-03-23 16:02:08 +01:00
Laurent Destailleur
01396cc07a Code comment 2022-03-23 15:58:55 +01:00
Philippe GRAND
b59196d3f9 fix : Nested ternary expressions (without parentheses) deprecated in PHP 7.4. Targeting PHP 8.1.0. 2022-03-23 15:55:50 +01:00
Regis Houssin
fcb1bdaca1 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
new_add_hook_load_state_board
2022-03-23 15:53:09 +01:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
Laurent Destailleur
2b7797fa75 Clean code 2022-03-23 15:02:45 +01:00
Laurent Destailleur
279a8c9df5 Code comment 2022-03-23 14:39:10 +01:00
Laurent Destailleur
12db2a8f67 Doc 2022-03-23 13:02:49 +01:00
Laurent Destailleur
a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2022-03-22 16:58:57 +01:00
Laurent Destailleur
f662afa762 Fix sql syntax 2022-03-22 13:37:33 +01:00
Laurent Destailleur
8686e37fa9 Work on generic report. 2022-03-22 13:23:16 +01:00
Regis Houssin
5adcdd6b4e FIX use sanitize instead escape 2022-03-22 12:27:36 +01:00
Regis Houssin
ca3a4839e5 FIX try to fix CodingPhpTest::testPHP error 2022-03-22 12:06:37 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
Regis Houssin
4efe10a9a5 NEW add hook printFieldListWhere in "show_contacts" function 2022-03-22 10:46:26 +01:00
Regis Houssin
c23752b3d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_in_contact_list 2022-03-22 10:09:01 +01:00
Laurent Destailleur
2e27c40de4 Fix customreport with link to parents 2022-03-21 22:10:51 +01:00
Laurent Destailleur
bf7c707d05 Doc 2022-03-21 11:11:36 +01:00
Laurent Destailleur
cd37d4b403 Code comment 2022-03-21 00:14:42 +01:00
Laurent Destailleur
3293a6f8b8 Fix position of table on new page of PDF 2022-03-19 19:40:20 +01:00
Laurent Destailleur
d5dc29e794 Fix position of image on line 2022-03-19 19:26:58 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
cb93ab472d FIX ZATCA Encoding 2022-03-19 19:14:12 +01:00
Laurent Destailleur
79d34bd7d1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-19 18:21:08 +01:00
Laurent Destailleur
9878b04a98 Fix position of text in PDF 2022-03-19 18:20:24 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
1bb1475b54 Fix phpdoc 2022-03-19 15:03:32 +01:00
Laurent Destailleur
4c293aa49b Update doc 2022-03-19 13:06:30 +01:00
BB2A Anthony Berton
f0e3c33dc3 $labeltemp is alwase true 2022-03-18 16:55:53 +01:00
BB2A Anthony Berton
006dc787c1 method_exists skip fatal error 2022-03-18 16:34:44 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +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
Regis Houssin
f31bf8df48 FIX stickler problem ?? 2022-03-18 13:15:25 +01:00
Regis Houssin
27e893be1d FIX missing element name 2022-03-18 13:13:13 +01:00
Regis Houssin
1d8f170d32 NEW add hooks in customers and products boxes 2022-03-18 12:59:07 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Regis Houssin
a2f1f4331e NEW add selectCompaniesForNewContactListWhere hook 2022-03-18 11:11:25 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
3a82817ad9 avoid displaying warning messages on the public interface 2022-03-17 16:05:35 +01:00
Thomas Negre
c745237ee9 Stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
f92154d057 declare ticket-related constants in modTicket.class.php 2022-03-17 16:05:35 +01:00
Thomas Negre
2cf433019e FormCategory : create method to select the product category 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
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket.
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
2022-03-17 16:05:35 +01:00
GregM
ab87d772c7 update GRH extrafields and more stuff 2022-03-17 15:20:23 +01:00
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
Laurent Destailleur
7aeaaab7f0
Merge pull request #20365 from gdsoftdev/fix_invoicelineorders
Fix : keep row order into invoices created from massactions
2022-03-17 13:37:17 +01:00
Laurent Destailleur
7d60eefb9a
Merge pull request #20386 from hregis/new_add_hook_in_select_product
NEW add hooks select product list and select thirdparty list function
2022-03-17 13:26:01 +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
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Regis Houssin
a73b92c871 NEW add selectContactListWhere hook 2022-03-17 11:08:09 +01:00
Regis Houssin
dbd0dd7e97 NEW add selectThirdpartyListWhere hook 2022-03-17 10:54:09 +01:00
Regis Houssin
e8b5fa45f2 FIX missing global $hookmanager 2022-03-17 09:55:26 +01:00
Regis Houssin
b0fe8994e4 NEW add hook selectProductsListWhere in select_produits_list function 2022-03-17 09:32:45 +01:00
Laurent Destailleur
c6338e0de0
Merge pull request #20252 from wdammak/patch-47
Simplification of the code by separating the part given to menu proce…
2022-03-17 02:48:08 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +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
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2022-03-17 00:15:01 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
3346d64416
Merge pull request #20305 from fmarcet/14.0
Fix: Error whem generating supplier payment pdf
2022-03-16 22:46:53 +01:00
Laurent Destailleur
5b2e1fc374
Merge pull request #20306 from fmarcet/15.0
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
2022-03-16 22:41:54 +01:00
Laurent Destailleur
090b5c41bf
Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
2022-03-16 22:34:49 +01:00
Laurent Destailleur
3f7a807eba
Merge pull request #20383 from fappels/develop_remember_origin_for_butactionnew
New: Remember origin for newbutton inside create form.
2022-03-16 22:33:00 +01:00
Laurent Destailleur
55a421870c
Merge pull request #20333 from dolibit-ut/dolibit-ut-patch-menu_auguria_#5
Dolibit ut patch menu auguria #5
2022-03-16 22:09:58 +01:00
Francis Appels
e55a1f2783 Remember origin for newbutton inside create form. 2022-03-16 21:59:34 +01:00
Laurent Destailleur
ab2018e9b4
Merge pull request #20376 from oscim/patch-45
Update notify.class.php
2022-03-16 21:46:15 +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
922a0e58a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-16 21:22:45 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +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
Laurent Destailleur
abbc2ca909
Merge pull request #20377 from aspangaro/14p31
FIX Update icon of module reception
2022-03-16 20:13:55 +01:00
Laurent Destailleur
279b60dca6
Merge pull request #20378 from Hystepik/develop#4
Fix : website preview on closed status page
2022-03-16 20:13:30 +01:00
Laurent Destailleur
600657223b
Update functions.lib.php 2022-03-16 20:12:01 +01:00
Laurent Destailleur
14578820ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-16 20:10:52 +01:00