Commit Graph

28370 Commits

Author SHA1 Message Date
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 john
d50e0457f3 add todo comment 2022-03-30 12:33:17 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +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
ATM john
16968b08f9 Add GETPOSTISARRAY 2022-03-30 11:49:48 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
ATM john
75d7c439dd Merge branch '14.0_fix_regression_selct_extrafield_search' of github.com:atm-john/dolibarr into new_fix_regression_select_extrafield_search 2022-03-30 11:09:29 +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
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
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
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
2022-03-16 20:10:35 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
Laurent Destailleur
0102832679 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 16:01:55 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
lmarcouiller
133721904d add pre-commit changes 2022-03-16 15:57:04 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
8a2d3c0029 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-16 15:41:02 +01:00
Laurent Destailleur
d2005a3bb9 Fix regression on extrafields not visible 2022-03-16 15:40:17 +01:00
oscim
41fa1f968b
Update notify.class.php
add in var $parameters transmited in hook 
outputlangs and labeltouse for customise by hook
2022-03-16 12:30:30 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
ATM john
53f4fd2af8 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_regression_selct_extrafield_search 2022-03-16 10:44:15 +01:00
Laurent Destailleur
2205469fab
Merge pull request #20343 from ptibogxiv/patch-7
Fix for multicompany on online sign url
2022-03-15 19:32:56 +01:00
Laurent Destailleur
6ec272ef36
Merge pull request #20347 from hregis/fix_avoid_php_warning
FIX avoid php warning
2022-03-15 19:27:33 +01:00
Laurent Destailleur
d2d86ce53b
Merge pull request #20353 from Hystepik/develop_v13#1
Fix #20351 : top navbar no longer hiden in extarnal site
2022-03-15 19:23:24 +01:00
Laurent Destailleur
0899caf74d
Update lib_head.js.php 2022-03-15 19:23:17 +01:00
Laurent Destailleur
97fc58c799
Merge pull request #20354 from fappels/14_fix_set_move_stock_on_close_wehen_batch
FIX: Stock move on shipment close and reception close disabled for lot/serial type
2022-03-15 19:21:37 +01:00
ATM john
5e644ed0a4 Fix search degradation 2022-03-15 18:24: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
Jé GDSOFT
ffa6cb0610 fix : keep lines order when creating invoices from orders 2022-03-15 15:47:36 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
Hystepik
bbed6b8198
Merge branch 'develop' into develop#2 2022-03-15 10:36:42 +01:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
Francis Appels
207aba2e98 FIX: Stock move on shipment close and reception close also moves lot/serial type. 2022-03-14 17:59:18 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
lmarcouiller
22706b70e9 fix syntax error 2022-03-14 16:21:12 +01:00
Laurent Destailleur
f789fc24f7 Fix filter 2022-03-14 16:20:57 +01:00
lmarcouiller
1a20afe29b Fix #20351 : top navbar no longer hiden in extarnal site 2022-03-14 16:11:34 +01:00
lmarcouiller
8d11813ea5 fix security problems and add zstd support 2022-03-14 11:45:23 +01:00
Regis Houssin
44b6f8a48d FIX avoid php warning 2022-03-14 09:20:10 +01:00
Laurent Destailleur
22fb2845ae Fix position of tabs 2022-03-13 18:40:43 +01:00
Laurent Destailleur
2367f0d030 Fix missing badge 2022-03-13 18:39:45 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
ptibogxiv
b1197d4f4e
Fix for multicompany on online sign url 2022-03-13 15:31:37 +01:00
BB2A Anthony Berton
316380afd2 1 2022-03-12 23:41:16 +01:00
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +01:00
UT from dolibit
993cb70a6f
Update init_menu_auguria.sql 2022-03-12 12:38:58 +01:00
UT from dolibit
4134bf5890
Update init_menu_auguria.sql 2022-03-12 12:31:52 +01:00
UT from dolibit
4438ef74f1
Update init_menu_auguria.sql 2022-03-12 12:29:10 +01:00
UT from dolibit
7ff53ddb74
Update init_menu_auguria.sql 2022-03-12 12:25:49 +01:00
UT from dolibit
bc60a1c819
Update init_menu_auguria.sql 2022-03-12 12:19:13 +01:00
UT from dolibit
bb82e6328d
Update init_menu_auguria.sql 2022-03-12 12:08:53 +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
Laurent Destailleur
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
Laurent Destailleur
d71f117e81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-11 15:33:56 +01:00
Laurent Destailleur
11d18fae4a Clean code 2022-03-11 13:36:58 +01:00
BB2A Anthony Berton
80a2499844 Clean 2022-03-11 11:25:49 +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
Gauthier PC portable 024
9e2c8ffe37 FIX : test for stickler feedback 2022-03-10 11:10:38 +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
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
BB2A Anthony Berton
1a5beb0664 Fix style 2022-03-09 19:55:55 +01:00
BB2A Anthony Berton
e1e573c532 Add Hook 2022-03-09 19:55:40 +01:00
BB2A Anthony Berton
032b8692b1 Add hook 2022-03-09 19:42:17 +01:00
BB2A Anthony Berton
3a5a74478f Add auther notif 2022-03-09 18:05:07 +01:00
Gauthier PC portable 024
f2aaa27d7b 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-09 17:41:48 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Thomas Negre
7f527b85b0 use double quotes to compose SQL requests 2022-03-09 09:34:50 +01:00
Thomas Negre
93765add38 Travis fix, hopefully. 2022-03-09 09:25:52 +01:00
Thomas Negre
288663be36 Facture mass validation: sort by date to avoid conflicts 2022-03-09 09:25:52 +01:00
Thomas Negre
6e08115aa2 introduce constant INVOICE_CHECK_POSTERIOR_DATE in Facture module 2022-03-09 09:25:52 +01:00
Laurent Destailleur
c7bb6c3c4c FIX Upload in the filemanager use the Dolibarr methods 2022-03-08 20:46:56 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
BB2A Anthony Berton
cef9cf8670 int 2022-03-08 18:34:56 +01:00
BB2A Anthony Berton
eae3fe78f1 init 2022-03-08 18:06:26 +01:00
Ferran Marcet
a14bf4b621 Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work 2022-03-08 18:02:55 +01:00
Ferran Marcet
8e944b8b6d Fix: Error whem generating supplier payment pdf 2022-03-08 17:34:51 +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
161edea6f3 FIX: deposit payment terms: adapt to v16 2022-03-08 15:22:19 +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
Laurent Destailleur
66f21fc1d0 Fix phpunit 2022-03-07 20:46:09 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
d6852c31b8 Clean code 2022-03-07 19:31:06 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
492c198e46 Make conditions of some corn tasks dynamic. 2022-03-07 18:01:07 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump
NEW -  Add util function send backup by mail
2022-03-07 17:37:44 +01:00
Laurent Destailleur
29e278ed36
Update modCron.class.php 2022-03-07 17:33:50 +01:00
Laurent Destailleur
32711e5f1f
Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction
FIX: function dolGetButtonAction change title if html not set
2022-03-07 17:14:33 +01:00
Laurent Destailleur
5bde2b3489 Merge 2022-03-07 16:42:47 +01:00
Laurent Destailleur
c4036345b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 16:42:28 +01:00
Laurent Destailleur
b1de986fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 16:41:44 +01:00
Laurent Destailleur
dd9f10b1b6
Merge pull request #20186 from atm-kevin/FIX_Add_Id_In_Formproject
FIX : Add ID into formproject method
2022-03-07 16:34:04 +01:00
Laurent Destailleur
1ecdc7bc20 css 2022-03-07 16:30:39 +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
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 15:24:08 +01:00
Laurent Destailleur
7d374dc4f6
Merge pull request #20264 from fmarcet/15.0
Fix: #20161 Can't import thirds. Column Skype doesn't exist
2022-03-07 14:21:42 +01:00
Laurent Destailleur
403db246bb
Merge pull request #20280 from Achicken7301/develop
Add unit price for {DOL_PRINT_OBJECT_LINES}
2022-03-07 13:44:03 +01:00
Laurent Destailleur
edaf740e78
Update dolreceiptprinter.class.php 2022-03-07 13:43:16 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES}
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
2022-03-05 07:02:36 +07:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
wdammak
cf43024d5d
Update eldy.lib.php 2022-03-03 11:29:47 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations.
Fix reponsive
2022-03-03 09:41:15 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +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
wdammak
dd9a350136
Simplification of the code by separating the part given to menu processing
The goal:
- A simplification of the code for easier maintenance is targeted
- Separation of data to left menu display processing
- Plan in the future to put the left menu data directly in the folders of the modules concerned and which will be loaded automatically by eldy.lib.php or eldy_menus.php (for example add a folder "menus/leftmenu.php" in the module "bank" => "bank/menus/leftmenu.php")... This greatly cleans up the code and makes the modules easier to maintain while also avoiding the massive use of hooks for external modules.
- A reuse of the left menus in other corners of the ERP just by calling the function of the desired menu.
- The code is much lighter! is more readable with easier display order modification!
2022-03-02 22:41:00 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
kevin
ad5a18996d Replace id by class 2022-03-02 21:00:07 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
7c253c7e28 Clean code 2022-03-01 19:05:00 +01:00
Laurent Destailleur
762de973eb Fix sql injection 2022-03-01 18:43:16 +01:00
Laurent Destailleur
e5fd841fe3 Make verifCond more robust against RCE 2022-03-01 18:21:30 +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
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +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
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
Marc de Lima Lucio
e3aae6d2e1 FIX: object cloning: set unique extrafield values to null to prevent duplicates 2022-03-01 10:50:22 +01:00
Laurent Destailleur
8c94c2f98c Fix collapse icon 2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php 2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php 2022-02-28 21:53:05 +01:00
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss
Allow to add more CSS and more params on html fields
2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php 2022-02-28 21:45:04 +01:00
Laurent Destailleur
253622acf6
Merge pull request #20206 from fappels/15_fix_product_photo_on_cornas_model
FIX: Show product photo on Supplier order Cornas model.
2022-02-28 21:03:20 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code
FIX remove duplicated code
2022-02-28 20:58:24 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Thomas Negre
b9e0fc7b02 stickler corrections 2022-02-28 19:02:07 +01:00
stickler-ci
c2047f1f5d Fixing style errors. 2022-02-28 17:46:20 +00:00
atm-greg
bc8ea7571b perms can be an expression and must be evaluated 2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a fiw visibility can be an expression and can return 0 2022-02-28 18:37:47 +01:00
Thomas Negre
dcc41d0ab7 Ticket triggers: allow to automatically send messages on TICKET_CLOSE event 2022-02-28 17:10:45 +01:00
Thomas Negre
5b1b862687 reformat trigger/interface_50_modTicket_TicketEmail.class.php to create methods for email composition and sending 2022-02-28 17:10:45 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00
steve
91ee90ebeb fix: read employee and write employee 2022-02-28 16:48:08 +01:00
steve
08fa2dfadd wip: add read employee and write employee 2022-02-28 15:58:23 +01:00
Regis Houssin
e63e53e081 FIX remove duplicated code 2022-02-28 14:10:35 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Francis Appels
3e41c9cb97 FIX: Show product photo on Supplier order Cornas model. 2022-02-26 11:13:02 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3 Fix CSS
Conflicts:
	htdocs/projet/list.php
2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500 Fix CSS 2022-02-25 21:45:29 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +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
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
stickler-ci
722b1de2b7 Fixing style errors. 2022-02-25 15:10:10 +00:00
Jé GDSOFT
073431543d accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 16:07:44 +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
Jé GDSOFT
1040555baf accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 11:26:56 +01:00
Sylvain Legrand
e8ef2a8d8c new : allow to show all logos on a table 2022-02-25 09:33:08 +01:00
kevin
aabfdfa212 Format code 2022-02-25 09:20:36 +01:00
kevin
d2cbead203 Add an ID into formproject method to be able to target 2022-02-25 09:17:18 +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
ba3856f9e9 Fix regression 2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield
FIX Reduce flash effect on edit inline feature.
2022-02-24 12:54:33 +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
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +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
atm-lena
e5ba5b208e Correct Stickler 2022-02-22 11:36:41 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
Laurent Destailleur
aa8932a3a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc Add preg_quote 2022-02-22 10:51:51 +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
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +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
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +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
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency
fix rounding for price and display currency
2022-02-18 20:19:02 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +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
f4f03d03f2 Fix link 2022-02-18 15:23:13 +01:00
Laurent Destailleur
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +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
694ea8830b Fix missing name and type into template 2022-02-18 13:46:12 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
stickler-ci
b5afa27774 Fixing style errors. 2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84 fix rounding for price and display currency 2022-02-18 10:50:00 +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
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
c20d824999 Tables of module ticket are create only when module is enabled. 2022-02-17 19:30:18 +01:00
Laurent Destailleur
cbf15af853
Merge pull request #20095 from Hystepik/develop#3
Fix : fix php 8.0 warnings
2022-02-17 19:12:39 +01:00
Laurent Destailleur
85327f28b0
Update login.tpl.php 2022-02-17 19:12:24 +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
lmarcouiller
aea9c2e427 Fix : fix php 8.0 warnings 2022-02-17 10:22:58 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:13:49 +01:00
Laurent Destailleur
131ae92cc6 FIX #20063 2022-02-16 21:05:23 +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
60ada5fe72 Can filter on status purchase on list of products 2022-02-16 14:06:16 +01:00
Vincent Dieltiens
392f468a13 allow to add more CSS and more params on html fields 2022-02-16 10:01:55 +01:00
Alexandre SPANGARO
948f20c2b6 Add a graphical option to define duration per year for depreciation 2022-02-16 05:18:29 +01:00
Laurent Destailleur
453871bf38 css 2022-02-15 23:01:14 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Laurent Destailleur
50853205bb Support placeholder on multiselect components 2022-02-15 16:43:47 +01:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
atm-lena
1931ad3bab Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 12:43:42 +01:00
atm-lena
0f4b1e1d7a WIP 2022-02-15 11:46:30 +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
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00
Laurent Destailleur
f2d5e43381 Fix showempty for select_salesrepresentatives 2022-02-14 12:25:48 +01:00
stickler-ci
526157dfcb Fixing style errors. 2022-02-14 03:56:45 +00: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
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
8000adb694 Fix test 2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT 2022-02-11 18:19:50 +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
52bacbd914 Tables for emailing and asset modules are loaded on module activation 2022-02-10 19:21:15 +01:00
Thomas Negre
4c5ddcf030 ticket config: add constant TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND to admin panel 2022-02-10 17:57:28 +01:00
Laurent Destailleur
e0377d788c Send position x,y of cursor into an ACE editors on POST form 2022-02-10 14:34:04 +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
e901949531 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 10:23:52 +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
e210952f74
Update extrafields.class.php 2022-02-10 10:11:46 +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
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) (#20032)
* FIX not active value are not hidden (missing filter of field)

* FIX wrong category table and wrong object id
2022-02-10 09:19:14 +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
6e6c57d0e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 13:22:53 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Adrien Raze
194959c61c FIX : Fixing PR returns 2022-02-09 10:03:30 +01:00
Christian Foellmann
e0a3820b9c fix double VAT line in commande PDF template 2022-02-09 08:01:24 +01:00
stickler-ci
b80e9a9bdc Fixing style errors. 2022-02-08 15:37:23 +00:00
atm-lena
27cbd16bb9 Clean code 2022-02-08 16:01:18 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
Florian HENRY
316cb9e4e3 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_sql_extrafields 2022-02-08 08:46:21 +01:00
Florian HENRY
3f2c04a53c fix sql error return 2022-02-08 08:46:15 +01:00
Laurent Destailleur
bfa9986736
Merge pull request #20013 from thomas-Ngr/develop_db_ticket_last_message_date
New : ticket add last_msg_sent field
2022-02-07 20:54:26 +01:00
Laurent Destailleur
c496e6eb51 doc 2022-02-07 20:53:13 +01:00
Thomas Negre
b6b5eb633b only update last_msg_date if a message is really sent. 2022-02-07 17:38:32 +01:00
Florian HENRY
e672b6f6e0 fix: in some case index do not exists and return an error 2022-02-07 16:41:45 +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
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
Thomas Negre
26648e4f12 ticket : update date_last_msg_sent on message sending from backend or public interface 2022-02-07 15:19:13 +01:00
Laurent Destailleur
53bac7ae0f Fix menu 2022-02-07 15:16:11 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
856b83a202 CSS 2022-02-07 09:26:03 +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
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
habot-it
97850a6fbf Add options in function pdf_pagefoot of pdf.lib.php 2022-02-05 12:22:18 +00: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
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
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
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +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
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
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
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Gauthier PC portable 024
1910423684 FIX : conf name is MAIN_ADD_LINE_AT_POSITION 2022-01-11 09:54:27 +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
Gauthier PC portable 024
04cc0a0480 NEW : Add column "Total HT" to products array on document creation card 2022-01-10 17:02:15 +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
Laurent Destailleur
132d393d23 Code comment 2022-01-06 16:06:17 +01:00
Laurent Destailleur
aee61cb470
Update ldap.class.php 2022-01-06 16:02:47 +01:00
Laurent Destailleur
718771fcf5
Merge pull request #19743 from andreubisquerra/develop
Add dol_value_currentdate tag to TakePOS printer template
2022-01-06 10:41:45 +01:00
Laurent Destailleur
d9715729c8 Fix var 2022-01-05 22:44:12 +01:00
Laurent Destailleur
1f36a31fe9 Fix css 2022-01-05 16:21:44 +01:00
Quentin VIAL-GOUTEYRON
446ba2a416 FIX stickler 2022-01-05 15:33:05 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Laurent Destailleur
2aa3d60997 Debug v15 2022-01-05 14:04:02 +01:00
Laurent Destailleur
3581dda876 Fix trans 2022-01-05 09:43:51 +01:00
andreubisquerra
0c86ca6081
Add dol_value_currentdate tag to TakePOS template 2022-01-04 22:14:02 +01:00
Laurent Destailleur
0189d92139 Some country need qr code for legal issues. Add a hook to allow this. 2022-01-04 20:44:17 +01:00
Laurent Destailleur
0046cbbece Fix phpunit 2022-01-04 15:13:04 +01:00
Laurent Destailleur
f0660b3c99 Fix db transaction 2022-01-04 13:27:26 +01:00
Laurent Destailleur
b19a148f4c Fix ip used to sing not saved 2022-01-04 13:25: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
John BOTELLA
70a1975ad2
Merge branch 'develop' into new_convert_setup_to_new_setup 2022-01-03 21:53:45 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Vincent de Grandpré
6a52b967f4 Permettre de sortir de la fonction de connexion après authentification. 2022-01-02 16:37:07 -05:00
Laurent Destailleur
0d8cf96f8f FIX croping function 2022-01-02 20:54:35 +01:00
Laurent Destailleur
0c82577fc5 Look and feel v15 2022-01-02 19:04:12 +01:00
Laurent Destailleur
507f91acf8 Fix tooltip 2022-01-02 18:36:18 +01:00
Laurent Destailleur
084a404870 Debug v15 2022-01-02 18:33:57 +01:00
Laurent Destailleur
3d8de7790c Fix restore color if we cancel color selection 2022-01-02 16:34:46 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +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
bjoern86
cab4b762d3
Adds possibility to add senders name to $formmail->fromname
If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
2022-01-01 20:24:30 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
ee5ea123ed Revert "Update functions.lib.php"
This reverts commit 2676427ec4.
2021-12-31 16:13:05 +01:00
Laurent Destailleur
7e11677117 Fix: Add token to the url logout 2021-12-31 14:33:12 +01:00
Laurent Destailleur
9c50cfeb62 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modBom.class.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
ebb7aa7494
Merge pull request #19693 from grandoc/new_branch_27_12_2021
fix : units were not displayed
2021-12-30 13:19:25 +01:00
Laurent Destailleur
cd8613e9db
Merge pull request #19704 from atm-john/fix_validate_methode_call
Fix wrong method call
2021-12-30 12:46:12 +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
Laurent Destailleur
c288b0d02a
Merge pull request #19711 from dolibarr95/patch-58
Update functions.lib.php
2021-12-30 12:40:52 +01:00
Laurent Destailleur
2435ef4f66
Merge pull request #19712 from atm-maxime/fix_boxes_css_amount
Fix missing amount css class on boxes
2021-12-30 12:39:34 +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
Maxime Kohlhaas
873adb3cb1 Fix : add missing resource stats on stat box 2021-12-29 13:57:22 +01:00
Maxime Kohlhaas
ac7fb65d04 Fix missing amount css class on boxes 2021-12-29 13:43:18 +01:00
dolibarr95
2676427ec4
Update functions.lib.php
#19709
2021-12-29 13:24:23 +01:00
John BOTELLA
0f587a37e2 fix missing var definition 2021-12-28 19:36:44 +01:00
John BOTELLA
5449d57d26 fix variable does not seem to be defined for all execution 2021-12-28 19:19:51 +01:00
John BOTELLA
e20d669e34 Fix : prevent fatal error 2021-12-28 19:08:47 +01:00
John BOTELLA
9af621c6f8 Fix scrutinizerh 2021-12-28 18:43:04 +01:00
John BOTELLA
019b10c9eb Fix wrong method call 2021-12-28 18:27:29 +01:00
Maxime Kohlhaas
706ee8ce62 Fix #19662 : mysql8 user creation in 2 steps 2021-12-28 16:26:21 +01:00
John BOTELLA
e9e100410a Fix empty value 2021-12-28 14:51:19 +01:00
John BOTELLA
817a9594ae Convert setup of situation invoice to new setup system + fix size 2021-12-28 14:32:57 +01:00
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Philippe GRAND
f8884d2c86 fix : units were not displayed 2021-12-27 15:00:05 +01:00
Laurent Destailleur
27134a1f91 Fix position of menu 2021-12-26 15:44:04 +01:00
Laurent Destailleur
2e2e1b90e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-26 15:41:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
Laurent Destailleur
3490dc3228
Update functions.lib.php 2021-12-21 16:31:28 +01:00
Laurent Destailleur
d3b429bef6
Merge pull request #19663 from frederic34/patch-1
add url in receipt printer options
2021-12-21 15:52:25 +01:00
Laurent Destailleur
e2ee74f8e0 Clean code 2021-12-21 15:46:42 +01:00
Laurent Destailleur
bb436e556d Fix warnings 2021-12-21 15:23:56 +01:00
Laurent Destailleur
e3bb837313 Fix doxygen 2021-12-21 14:58:34 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +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
Laurent Destailleur
bb6bf2f743 Fix replacement of ICS on sepa mandate 2021-12-21 11:45:42 +01:00
Laurent Destailleur
8e4077eedf Fix ics on sepa mandate template 2021-12-21 11:25:19 +01:00
Frédéric FRANCE
214feeb1f3
Update dolreceiptprinter.class.php 2021-12-21 10:05:06 +01:00
Laurent Destailleur
af8d022b92 Fix link of module bookmarks 2021-12-21 02:49:10 +01:00
Frédéric FRANCE
520c296626
add url in receipt printer options 2021-12-20 16:04:32 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc Merge branch '13.0up' into 13.0 2021-12-20 12:32:43 +01:00
Christian Foellmann
03d4317302 add hook 'menuDropdownQuickaddItems' to manipulate dropdown menu 2021-12-20 10:20:14 +01:00
Christian Foellmann
6bbbd99be9 use any available fontawesome icon in picto 2021-12-20 08:06:05 +01:00
Laurent Destailleur
13b17fa0da FIX #19564 2021-12-19 20:28:27 +01:00
Laurent Destailleur
626cd24305 Clean code for #19639 2021-12-19 17:05:57 +01:00
Laurent Destailleur
ee3246bf65 Trans 2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
015bc9ebca Fix mode 2021-12-19 03:45:36 +01:00
Laurent Destailleur
771805cd83 More complete error management. 2021-12-19 03:36:25 +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
lvessiller
68174cf440 FIX check stickler 2021-12-17 12:41:44 +01:00
lvessiller
5a2a6a07ea NEW add entity filter in exports 2021-12-17 12:38:13 +01:00
Laurent Destailleur
654cd8bd1c Fix for dol_string_onlythesehtmlattributes() 2021-12-17 12:01:25 +01:00
Laurent Destailleur
eb3eef9a61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-17 09:54:19 +01:00
Laurent Destailleur
3895438b85 Fix responsive 2021-12-16 23:53:05 +01:00
Laurent Destailleur
fd404c0438 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-16 19:01:28 +01:00
Laurent Destailleur
517355972a Fix duplicate table for online signature 2021-12-16 19:01:11 +01:00
Laurent Destailleur
fdf7749a54
Merge pull request #19508 from atm-john/fix_missing_formsetup_elements
Fix missing formsetup elements
2021-12-16 18:42:55 +01:00
Laurent Destailleur
2e68505fd1
Merge pull request #19594 from fr69400/develop
FIX - unasigned variable $action given to hook printOriginObjectLine
2021-12-16 17:59:27 +01:00
Laurent Destailleur
9b9cb6842e
Merge pull request #19599 from Je2fb/develop
Fix #19418
2021-12-16 17:38:38 +01:00
Laurent Destailleur
e4dede7aba
Merge pull request #19605 from atm-jpb/14_fix_bank_restrictedArea
Fix : add  info for acces right  on compta/ bank / info
2021-12-16 17:35:31 +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
726fa41650
Merge pull request #19616 from atm-gauthier/fix_param_used_by_reference
FIX : marginInfos array should be used by reference to allow to updat…
2021-12-16 17:31:00 +01:00
Laurent Destailleur
c5bdb7b4d8
Revert "Update card_presend.tpl.php" 2021-12-16 17:29:04 +01:00
Laurent Destailleur
0e593d9e8b
Merge branch 'develop' into patch-2 2021-12-16 17:28:07 +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
b604199d0e
Merge pull request #19635 from AlainRnet/patch-9
Update notes.tpl.php
2021-12-16 17:01:44 +01:00
Laurent Destailleur
bef1afc7b8 Clean code 2021-12-16 17:01:15 +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
Laurent Destailleur
8c73ef4bbf Fix menu perm 2021-12-16 16:30:42 +01:00
Laurent Destailleur
84400cf1d3 Fix backto page 2021-12-16 13:35:17 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
John BOTELLA
d149596043 fix test of method exist on wrong object 2021-12-16 10:33:53 +01:00
Alain Rihs
32ef42d163
Update notes.tpl.php
See https://github.com/Dolibarr/dolibarr/issues/19580

The options of the advanced editor were not taken into account when editing public and private notes. I propose this code to fix this bug.
2021-12-16 10:22:43 +01:00
Laurent Destailleur
53be92fac3 FIX #19626 2021-12-15 17:32:15 +01:00
Laurent Destailleur
f9e4266007 FIX debug inventory feature (missing link to mvt, bad label of mvt) 2021-12-14 19:37:44 +01:00
Gauthier PC portable 024
b971efb062 FIX : marginInfos array should be used by reference to allow to update it with a hook without draw again margin table 2021-12-14 12:25:43 +01:00
stickler-ci
66c486c878 Fixing style errors. 2021-12-14 11:12:54 +00:00
John BOTELLA
1d8cf297de
Update html.formsetup.class.php 2021-12-14 12:10:09 +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
8c844c96df
Update card_presend.tpl.php
Add hidden feature ORDER_SUPPLIER_EMAIL_SENDER as sender address for purchase order emails
2021-12-13 20:33:42 +01:00
Frans Bosman
cf05f38e54
Update functions.lib.php
Change exists to isset in price2num
2021-12-13 19:56:06 +01:00
fr69400
2419784bdb Update commonobject.class.php 2021-12-13 16:54:42 +01:00
jpb
ac8538a812 add info for acces right 2021-12-13 16:53:34 +01:00
Je2fb
df9b337a57
Fix #19418 2021-12-13 09:44:00 +01:00
Laurent Destailleur
49853adf82 Fix pb with cache 2021-12-13 09:35:27 +01:00
Laurent Destailleur
388500794b Fix for ckeditor 2021-12-13 01:19:48 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
Laurent Destailleur
0a976ad1be Fix bad permission test on bookmark page 2021-12-12 01:56:31 +01:00
Laurent Destailleur
689f5dd1fe Fix use of reposition when nojs for confirmation popup 2021-12-11 18:13:03 +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
5bca7cf5f1 css 2021-12-10 15:57:10 +01:00
Laurent Destailleur
f3da457b2b Clean comment 2021-12-10 14:26:28 +01:00
fr69400
611bae4c3a FIX - unasigned variable $action given to hook printOriginObjectSubLine 2021-12-10 14:20:04 +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
20a3fab437 Fix pb when several output hooks 2021-12-09 20:58:23 +01:00
Laurent Destailleur
c37377626e Revert change 2021-12-09 19:43:23 +01:00
Laurent Destailleur
9624b9aa59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 18:03:38 +01:00
Laurent Destailleur
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/repair.php
2021-12-09 18:03:27 +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
30107837a5
Merge pull request #19588 from Hystepik/develop#2
Fix php 8.0 warnings of modulebuilder
2021-12-09 17:19:42 +01:00
lmarcouiller
8b2002fbfb Fix php 8.0 warnings of modulebuilder 2021-12-09 15:17:18 +01:00
Laurent Destailleur
6b9636c3b8 FIX deletion of direct debit or credit transfer 2021-12-09 12:54:18 +01:00
Laurent Destailleur
b5d1ea4629 FIX select too large into addrights (pb of missing parenthesis) 2021-12-09 11:07:38 +01:00
Regis Houssin
1098426005 FIX wrong syntax of sql request 2021-12-09 10:31:02 +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
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4
Fix : php 8.0 warnings
2021-12-08 18:44:16 +01:00
Laurent Destailleur
8f7b222764 Fix phpcs 2021-12-08 18:37:07 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +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
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +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
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop
FIX When you pay an invoice, you can send the payment multiple times.
2021-12-08 16:31:40 +01:00
Laurent Destailleur
8ff0d1f366
Update functions.lib.php 2021-12-08 15:49:52 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
2021-12-08 15:43:01 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2
Fix inventory scanning function
2021-12-08 15:30:55 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5
Fix php8.0 warnings
2021-12-08 14:36:42 +01:00
Laurent Destailleur
20f4b5389b Fix the experimental feature to manage session in database 2021-12-07 17:39:46 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Vincent Dieltiens
9ef2735520 Adds import for customer invoices and invoices lines 2021-12-07 09:33:18 +01:00
Laurent Destailleur
5efa31204b FIX ECM module was mixing contributions and vat and not showing salaries 2021-12-07 02:00:34 +01:00
Francis Appels
fe40668f43 Parameter 4 extrafieldsobjectkey seems to be required now. 2021-12-06 20:32:44 +01:00
Francis Appels
f1524372ad Fix extrafield showOutputField old syntax always hidden. 2021-12-06 16:34:50 +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
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +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
ATM john
5dc620b728 Merge branch 'fix_missing_formsetup_elements' of github.com:atm-john/dolibarr into fix_missing_formsetup_elements 2021-12-04 14:00:12 +01:00
ATM john
f640a9fbad Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements 2021-12-04 13:59:27 +01:00
Laurent Destailleur
87e221d6dd Fix create new page 2021-12-04 00:24:59 +01:00
javieralapps4up
b024bf20ed
Update html.form.class.php
When you pay an invoice, you can send the payment multiple times.
2021-12-03 13:57:34 +01:00
lmarcouiller
83ea868c9a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-12-03 10:19:28 +01:00
Laurent Destailleur
c171ba3a45 Fix regression in cron jobs 2021-12-02 16:07:33 +01:00
lmarcouiller
b732d80ca5 Fix php 8.0 warnings 2021-12-02 15:56:34 +01:00
Laurent Destailleur
a3493d0132 Clean code 2021-12-02 11:33:51 +01:00
Laurent Destailleur
ca6f222662 Fix notification (pb static var unknown) 2021-12-02 11:19:44 +01:00
Laurent Destailleur
10e126eb69 Clean code on pdf templates 2021-12-02 10:43:44 +01:00
John BOTELLA
c0d00a859f use dol_escape_htmltag 2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +01:00
Laurent Destailleur
259418d1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82 Clean code for browser notifications 2021-12-01 12:00:19 +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
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +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
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +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
Ferran Marcet
ac975ecc61 Undo changes 2021-11-30 13:30:17 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary
NEW : for developpers allow translation label in select_dictionnary
2021-11-30 12:38:18 +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
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
fr69400
078a040078 Update pdf.lib.php 2021-11-30 12:13:21 +01:00
Laurent Destailleur
cf4beafb68
Merge pull request #19484 from aspangaro/12p23
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-11-30 11:39:44 +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
Laurent Destailleur
ecdae02062
Merge pull request #19510 from frederic34/contractdirectprint
add direct print for contracts
2021-11-30 11:20:51 +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
John BOTELLA
5bdaab8dcb Fix duplicated code 2021-11-29 14:30:04 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
e3e4b154e7 Fix partnership 2021-11-29 01:04:32 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
Frédéric FRANCE
5473dbd3f0
add direct print for contracts 2021-11-28 20:55:17 +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
c41578a3c3 Fix php compatibility 2021-11-28 15:43:22 +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
ATM john
e97e0e4f17 Fix remove not used propertie 2021-11-28 12:18:09 +01:00
ATM john
29437a22b9 Fix comment and remove not use global 2021-11-28 12:15:31 +01:00
ATM john
a75ae6a8cf Fix missing formsetup elements 2021-11-28 12:11:03 +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
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
6e273e47e5 css 2021-11-27 12:35:30 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
f5343c55c3 FIX: holiday mass deletion: correct return of record deleted 2021-11-26 18:23:31 +01:00
Marc de Lima Lucio
1361abffe5 FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card 2021-11-26 18:22:31 +01:00
Ferran Marcet
5265cd8084 Fix: correctly display the products of a warehouse in the pdf 2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f dejar igual que 13 2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11 Merge branch '13.0up' into 13.0
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
2021-11-26 12:29: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
Alexandre SPANGARO
9d2fb782fa FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12 2021-11-25 15:41:28 +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
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Frédéric FRANCE
3301790647
clean code 2021-11-23 23:56:52 +01:00
Frédéric FRANCE
21a3a6cc7a
clean code 2021-11-23 23:55:01 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module 2021-11-23 23:27:07 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental 2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
0dcbd458b8 FIX default_vat_code was not returned in some Ajax services of products 2021-11-23 13:08:00 +01:00
Laurent Destailleur
ee14aa2597 Fix: Do not loose data on error when editing a line 2021-11-23 12:11:27 +01:00
Laurent Destailleur
da897d9374 CSScss 2021-11-23 11:10:16 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop 2021-11-23 08:48:52 +01:00
Laurent Destailleur
949bc9f9bd Make setup page of widget easier 2021-11-22 18:15:54 +01:00
stickler-ci
9975587cd5 Fixing style errors. 2021-11-22 15:26:46 +00:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
63cd06394f Debug permission on supplier order.
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
2021-11-20 15:41:31 +01:00
Laurent Destailleur
001507f54e Fix css on disabled menu 2021-11-20 14:24:51 +01:00
Laurent Destailleur
59de140366 css 2021-11-19 23:39:25 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00
Laurent Destailleur
071042b449 Code comment 2021-11-19 22:28:35 +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
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Florian HENRY
c90082925c fix 2021-11-19 14:30:33 +01:00
Florian HENRY
9685081967 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_enhance_trad_select_dictionnary 2021-11-19 14:27:46 +01:00
Florian HENRY
be44e5b0ca NEW: for developper select_dictionnry can now deal with label translated 2021-11-19 14:27:29 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
Laurent Destailleur
cdc160b9a9 FIX column alignement on valid confirm page of shipment 2021-11-19 11:12:53 +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
8b1c45d0fe
Merge pull request #19413 from FHenry/dev_add_hook_marginDisplay
new: add hook for displayMarginInfos
2021-11-18 20:05:32 +01:00
Laurent Destailleur
e81c118a27 FIX Use the SQL standard for the if confition 2021-11-18 19:38:56 +01:00
Laurent Destailleur
d24120d6f9 Clean code 2021-11-18 19:27:40 +01:00
Laurent Destailleur
0649dc598d Clean code 2021-11-18 19:25:07 +01:00
Laurent Destailleur
8477c0a3f1
Merge pull request #17998 from OPEN-DSI/fix_00008
FIX: Reload values of the specified entity when change entity in the execution of cron jobs
2021-11-18 18:41:06 +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
Laurent Destailleur
e652b93878 Autoswitch on inventory tab on validation of inventory
Fix disabled button when some data are available.
2021-11-18 12:58:31 +01:00
Florian HENRY
0f402897a4 add add_replace 2021-11-18 10:55:05 +01:00
Florian HENRY
d48df1d2c3 new: add hook for displayMarginInfos 2021-11-18 10:50:03 +01:00
Laurent Destailleur
649bf38c05 Responsive 2021-11-17 11:14:12 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Alexandre SPANGARO
1107c6a208 Modify name of advance right 2021-11-16 04:32:09 +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
5af241371a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-11-15 12:32:09 +01:00
Laurent Destailleur
7b9c492798 Manage formSetup 2021-11-15 12:12:36 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class
NEW : setup form class to help setup page creation
2021-11-15 12:12:25 +01:00
Laurent Destailleur
b87f3208ef
Merge pull request #19275 from frederic34/patch-5
fix error
2021-11-15 11:36:47 +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
a5d49a7850
Merge pull request #19363 from yaslama/develop
Import bank accounts improvements
2021-11-15 10:56:37 +01:00
lmarcouiller
238996b351 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-11-15 10:13:27 +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
Laurent Destailleur
a368200036 Add MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT and MAIN_MEMORY_LIMIT_DUMP 2021-11-13 01:45:38 +01:00
Regis Houssin
415ee6669a FIX missing php8 warning 2021-11-12 17:23:17 +01:00
Regis Houssin
e839d9da02 FIX syntax error 2021-11-12 16:56:26 +01:00
Regis Houssin
317060d915 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select 2021-11-12 16:53:39 +01:00
Regis Houssin
c5d70477c3 FIX compatibility with php8 2021-11-12 16:53:00 +01:00
Laurent Destailleur
715a65eab2 Clean code for md theme 2021-11-12 13:33:59 +01:00
Regis Houssin
9e5a20545d FIX dolGetLdapPasswordHash use your own random salt 2021-11-12 13:23:11 +01:00
Regis Houssin
1169ae551f FIX remove debug 2021-11-12 13:12:49 +01:00
Regis Houssin
968ffbcef0 FIX add ldap hash algo 2021-11-12 13:06:41 +01:00
Yaacov Akiba Slama
de435576a9 Allow WithdrawMode to be imported 2021-11-12 12:46:37 +02:00
Yaacov Akiba Slama
5c8d91ba6c BankAccountNumber is not required.
The IBAN can contain all the needed information. So there is no reason for
the account number to be required
2021-11-12 12:46:18 +02: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
67d6ada23c
Merge branch 'Dolibarr:develop' into patch-5 2021-11-11 20:12:56 +01:00
Frédéric FRANCE
cde4e48849
Merge branch 'Dolibarr:develop' into addtranslations 2021-11-11 20:12:20 +01:00
Frédéric FRANCE
fd1585eda0
add load langs 2021-11-11 18:23:34 +01:00
Laurent Destailleur
aab9c2e6ca Fix #yogosha7605 2021-11-11 18:20:31 +01:00
Frédéric FRANCE
c245e4b388
Merge remote-tracking branch 'upstream/develop' into patch-5 2021-11-11 17:18:50 +01:00
Laurent Destailleur
0021381201 Fix #yogosha7605 2021-11-11 17:08:35 +01:00
Frédéric FRANCE
38d3b9ca71
fix regex 2021-11-11 16:54:20 +01:00
Laurent Destailleur
06f378db18 FIX Bad use of dol_concatdesc() 2021-11-11 15:31:19 +01:00
Laurent Destailleur
c5f3f42867 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 15:13:39 +01:00
Laurent Destailleur
66f1dd8545 Fix avoid too large PDF 2021-11-11 15:12:31 +01:00
Laurent Destailleur
e46e622049
Merge pull request #19349 from BitKFu/total_discount
Added -Propal- as a missing class name to the commondocgenerator.class.php
2021-11-11 15:03:02 +01:00
Laurent Destailleur
c6ecf87a8a
Update commondocgenerator.class.php 2021-11-11 15:02:51 +01:00
Laurent Destailleur
da2f3e7b40 Code comment 2021-11-11 14:55:59 +01:00
Laurent Destailleur
0665dac594
Merge pull request #19348 from ptibogxiv/patch-449
FIX bug if multicompany disabled
2021-11-11 14:38:28 +01:00
Laurent Destailleur
9cb094b466 Fix error method not defined 2021-11-11 14:37:25 +01:00
Laurent Destailleur
a3d2dcb97f
Merge pull request #19351 from cfoellmann/PR/block-massaction-delete
block deletion of items not free to delete (is_deletable)
2021-11-11 14:33:23 +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
bbd97c6e16 Code comment 2021-11-11 13:36:04 +01:00
Christian Foellmann
6a216e520f block deletion of items not free to delete (is_deletable) 2021-11-11 11:06:05 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
stickler-ci
7c5810dee6 Fixing style errors. 2021-11-10 14:19:14 +00:00
Gerhard Stephan
285bd67d90 Added -Propal- as a missing class name to the commondocgenerator.class.php 2021-11-10 15:16:36 +01:00
ptibogxiv
0afaf080ee
FIX bug if multicompany disabled
avoid bad constantes
2021-11-10 14:53:17 +01:00
Giovanni Vella
78df3f54c4
Merge branch 'Dolibarr:develop' into develop 2021-11-10 13:55:18 +01:00
Laurent Destailleur
13e8e3d33c Look and feel v15 2021-11-08 19:15:02 +01:00
Laurent Destailleur
8636527125 Clean code 2021-11-08 17:53:18 +01:00
Laurent Destailleur
f4b2a6ec92 Fix negative colors for bars 2021-11-08 14:51:14 +01:00
Laurent Destailleur
c464a1cfd2 Fix colors 2021-11-08 14:37:21 +01:00
Gerhard Stephan
b34fb95f4f Load product data optional fields to the line -> enables to use "line_options_{extrafield}" 2021-11-08 10:59:04 +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
a94b2b4f7e Clean code 2021-11-08 03:22:49 +01:00
Laurent Destailleur
be1ca6ebab Clean code 2021-11-08 03:21:15 +01:00
Giovanni Vella
e36d2b5398
Merge branch 'Dolibarr:develop' into develop 2021-11-07 21:53:52 +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
66f85d674d Fix warning scrutinizer 2021-11-07 17:43:17 +01:00
Laurent Destailleur
1934a37676 Escape to avoid false positive, even if it should be useless. 2021-11-07 17:35:43 +01:00
Laurent Destailleur
969fe16442 Debug mass actions of partnership module 2021-11-07 16:51:18 +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
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:04:17 +01:00
Laurent Destailleur
edbcf78495 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05 Better log 2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO 2021-11-06 19:11:47 +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
e8a550cb21
Merge pull request #19273 from frederic34/patch-1
fix warning (bad const)
2021-11-05 14:02:41 +01:00
Laurent Destailleur
b9d5f77937
Merge pull request #19276 from frederic34/patch-7
fix warnings
2021-11-05 14:01:14 +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
Laurent Destailleur
01b1ce5fb5
Merge pull request #19313 from cfoellmann/PR/fix-holiday-docpreview
fix DocumentPreview on holiday documents
2021-11-05 13:03:22 +01:00
Laurent Destailleur
19b9412c13 FIX #19305 2021-11-05 12:49:33 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php 2021-11-05 12:42:42 +01:00
Christian Foellmann
58ae45a88b fix DocumentPreview on holiday documents 2021-11-04 13:58:38 +01:00
ATM john
dd8d4e9e98 Fix missing return status 2021-11-04 12:10:19 +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
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +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
daraelmin
d334fe1292
Fix Bad count of subscription by year
If
2021-11-03 13:12:33 +01:00
John BOTELLA
12b046cb68 Fix class name 2021-11-02 14:11:36 +01:00
John BOTELLA
bbe71c9c32 Rename var 2021-11-02 14:07:36 +01:00
John BOTELLA
b98efd7e44 Add rank item management and add Hook 2021-11-02 13:55:12 +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
155eae1772 Add advanced right to add / update thirdparty payment information 2021-11-02 04:52:16 +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
Frédéric FRANCE
d7c0d87aeb
Update mod_facture_fournisseur_tulip.php 2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d
Update actions_addupdatedelete.inc.php 2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6
fix typo 2021-11-01 13:32:19 +01:00
Regis Houssin
c5e6893289 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_add_ldap_hash_type_select

Conflicts:
	htdocs/core/class/ldap.class.php
2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a Works on ldap password hash type 2021-11-01 11:13:44 +01:00
John BOTELLA
ea641b707d Factoring 2021-11-01 10:32:37 +01:00
John BOTELLA
4c016cc3be integrate fix from V14 2021-11-01 10:11:43 +01:00
John BOTELLA
c28e9f5f7c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-11-01 10:08:37 +01:00
Frédéric FRANCE
b992deb084
fix warnings 2021-11-01 09:44:43 +01:00
Frédéric FRANCE
39777d4cc5
fix error 2021-11-01 09:37:07 +01:00
Frédéric FRANCE
cb8e1ce8f0
fix warning 2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657 Fix phpdoc 2021-11-01 03:23:38 +01:00
Laurent Destailleur
6acc8a6582 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/ldap.class.php
2021-11-01 03:17:51 +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
Laurent Destailleur
1b336456ce Code comment 2021-11-01 02:44:14 +01:00
Laurent Destailleur
d4348b8e53
Merge pull request #19264 from frederic34/patch-1
fix warning
2021-11-01 02:35:48 +01:00
Laurent Destailleur
6480425130
Merge pull request #19269 from frederic34/patch-8
fix unknown function
2021-11-01 02:31:59 +01:00
Frédéric FRANCE
75eff571d9
fix unknown function 2021-10-31 22:27:39 +01:00
Frédéric FRANCE
270ddfda1f
fix scrutinizer 2021-10-31 22:24:25 +01:00
Frédéric FRANCE
7d60cddaac
fix warning
same test at line 65
2021-10-31 19:36:31 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a
Merge pull request #19187 from frederic34/patch-8
fix warning
2021-10-31 17:51:16 +01:00
Laurent Destailleur
ae103f20ca
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
Fix introduced scrutinizer
2021-10-31 17:37:31 +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
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +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
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning
fix: warning dol_print_date setTimeStamp when time empty
2021-10-31 16:49:13 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
f989b145af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18 FIx #19227 2021-10-31 15:59:03 +01:00
Laurent Destailleur
82e7c4b237
Merge pull request #19244 from hregis/fix_missing_access_right
FIX missing service access right
2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
2021-10-31 14:33:44 +01:00
Laurent Destailleur
27d9ee9fc0
Merge pull request #19240 from frederic34/patch-15
fix warnings
2021-10-31 13:56:54 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0
Fix: Import don't work if extrafield is separator
2021-10-31 13:54:31 +01:00
Laurent Destailleur
ed9f0c4ad9 Fix labels 2021-10-31 13:42:08 +01:00
John BOTELLA
ca766c2e71 Factoring 2021-10-31 09:29:20 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
3242400855 Clean module HRM 2021-10-31 06:26:41 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
John BOTELLA
cdf1538ffa fix save using template 2021-10-30 16:36:51 +02:00
John BOTELLA
41beffccde Merge branch 'new_setup_form_help_class' of github.com:atm-john/dolibarr into new_setup_form_help_class 2021-10-30 12:55:26 +02:00
John BOTELLA
3a86221290 add more customisation 2021-10-30 12:54:13 +02:00
Giovanni Vella
badf52b295
Merge branch 'Dolibarr:develop' into develop 2021-10-29 15:35:56 +02:00
Laurent Destailleur
be6b1e29ad Add logs 2021-10-29 13:32:32 +02:00
Ferran Marcet
9f23528ccd Fix: Import don't work if extrafield is separator 2021-10-29 12:39:22 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Regis Houssin
8df90a1f54 FIX missing service access right 2021-10-29 08:28:41 +02:00
Frédéric FRANCE
787cef4440
fix warnings 2021-10-28 20:34:05 +02:00
Marc de Lima Lucio
15455ed470 FIX: deposit payment terms: correctly store default deposit percent value if not defined 2021-10-28 16:54:47 +02:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
stickler-ci
134e5cb5e6 Fixing style errors. 2021-10-28 13:52:29 +00:00
Regis Houssin
390d5eccaf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server 2021-10-28 15:47:31 +02:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +02:00
Laurent Destailleur
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Regis Houssin
ae6d16c830 FIX mhash function is deprecated since php 8.1.0 2021-10-28 13:36:53 +02:00
Regis Houssin
72484961ab FIX show connected server if we have a primary and secondary ldap server 2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +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
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +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
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +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
cfd88cb6e5 fix scrutinizer error 2021-10-25 21:50:27 +02:00
Laurent Destailleur
f64cd9d859 Fix bookmarks page 2021-10-25 21:28:52 +02:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02: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
7533d4495d Fix bug huntr.dev 2021-10-25 15:39:02 +02:00
Laurent Destailleur
d916fe121a css 2021-10-25 13:57:02 +02:00
Laurent Destailleur
15c80327b1 data-key for extrafielsds has prefix of element 2021-10-25 13:29:08 +02:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Laurent Destailleur
940c69b46d Clean code 2021-10-25 12:09:17 +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
Frédéric FRANCE
03a8c5f0cb
Update commonfields_edit.tpl.php 2021-10-24 19:21:58 +02:00
Frédéric FRANCE
72a665b901
fix warning 2021-10-24 19:19:32 +02:00
Laurent Destailleur
b8250be237 css for toolitp 2021-10-24 16:35:42 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list 2021-10-24 14:34:47 +02:00
Laurent Destailleur
55d30884b8 Remove strange code 2021-10-24 13:15:01 +02:00
Laurent Destailleur
d3f630e4b5 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7 Code comment 2021-10-24 13:02:45 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification
[NEW]  Add option for notification in message form
2021-10-24 13:00:39 +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
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist
fix warnings in ticket list
2021-10-24 12:31:57 +02:00
Giovanni Vella
a855ef1329 current date default format string
Added a default format for date/time tag DOL_PRINT_CURR_DATE
2021-10-24 12:07:23 +02:00
Giovanni Vella
037c36abf0
Merge branch 'Dolibarr:develop' into develop 2021-10-24 11:54:48 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +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
stickler-ci
61576dad53 Fixing style errors. 2021-10-24 00:17:18 +00:00
John BOTELLA
fdcb9674d8 Remove prints 2021-10-24 02:09:49 +02:00
John BOTELLA
aaa7fd5b3a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-10-24 01:38:42 +02:00
John BOTELLA
d3d3a87ce9 Add new class to help setup generation 2021-10-24 01:38:13 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
2021-10-24 00:02:15 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
5078e3d863
Merge pull request #19161 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2021-10-23 22:38:15 +02:00
Laurent Destailleur
06c1d79c05
Update html.form.class.php 2021-10-23 22:36:55 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00: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
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Lucas Marcouiller
385d2c8d72 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2021-10-23 16:13:42 +02:00
Lucas Marcouiller
b3e9aeef7a Fix : PHP 8.0 warnings 2021-10-23 16:12:44 +02:00
Lucas Marcouiller
bc4373a5de Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-10-23 11:47:06 +02:00
Lucas Marcouiller
6ccd8ce83a Fix : PHP errors 8.0 2021-10-23 11:45:06 +02:00
Laurent Destailleur
f5aebbf6b8
Merge pull request #19127 from frederic34/usermyactions
fix warnings
2021-10-23 11:38:18 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes
fix warnings
2021-10-23 11:38:03 +02:00
Laurent Destailleur
a9bba23ef5
Merge pull request #19138 from Hystepik/scrutinizerfix
Fix : scrutinizer errors
2021-10-23 11:23:13 +02:00
Laurent Destailleur
7b496add01
Merge pull request #19137 from Hystepik/develop#3
Fix: PHP 8.0 Warnings
2021-10-23 11:22:04 +02:00
Laurent Destailleur
98f1637e0f
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories
Fix link object to categories
2021-10-23 11:21:41 +02:00
Lucas Marcouiller
d1ec71197a Fix : scrutinizer errors 2021-10-23 11:10:58 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Giovanni Vella
d624928a5d
Merge branch 'Dolibarr:develop' into develop 2021-10-23 10:56:54 +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
Frédéric FRANCE
2d92e6006c
fix warnings 2021-10-23 07:04:13 +02:00
John BOTELLA
55cdb8ac6f Fix numeric value 2021-10-23 01:00:24 +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
Theo
a36c966f15 add: quick link categories to adherent 2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +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
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines
FIX Content line substitution in email
2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a
Merge pull request #19094 from Hystepik/scrutinizerfix
Fix: scrutinizer errors + boxes activation
2021-10-22 15:37:17 +02:00
Florian HENRY
87ac58efb6 fix php 8 2021-10-22 15:27:36 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00
Florian HENRY
b94d74f194 fix php8 warning 2021-10-22 14:58:09 +02:00
Giovanni Vella
c77d1206d3 NEW: receipt beep alternative and current date/time
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Laurent Destailleur
a55497561f
Merge pull request #19096 from Hystepik/develop#4
Fix : french labels of box_graph_new_vs_close
2021-10-22 14:31:39 +02:00
Laurent Destailleur
c1b2778ffc
Merge pull request #19093 from Hystepik/develop#3
Fix : Error on fetchAll on line
2021-10-22 14:23:05 +02:00
Lucas Marcouiller
1ecd0a2be7 Fix : french labels of box_graph_new_vs_close 2021-10-22 14:17:47 +02:00
Florian HENRY
3f211417c2 review 2021-10-22 12:19:16 +02:00
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Laurent Destailleur
42dceeafd4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 11:58:17 +02:00
Laurent Destailleur
f354427b3c Fix warning 2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc Fix : Error on fetchAll on line 2021-10-22 11:55:21 +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
Florian HENRY
64bb2e6ece fix various warning 2021-10-22 10:49:47 +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
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Laurent Destailleur
18e421448c
Merge pull request #19041 from frederic34/patch-5
doxygen
2021-10-21 23:34:42 +02:00
Laurent Destailleur
556a6eaaf3
Merge pull request #19040 from frederic34/patch-4
doxygen
2021-10-21 23:22:06 +02:00
Laurent Destailleur
0b5d63aabe
Merge pull request #19043 from frederic34/patch-7
doxygen
2021-10-21 23:21:55 +02:00
Laurent Destailleur
9a989ca308
Merge pull request #19044 from frederic34/patch-8
doxygen
2021-10-21 23:20:32 +02:00
Laurent Destailleur
16d2a9c1bd
Merge pull request #19046 from frederic34/patch-10
doxygen
2021-10-21 23:20:17 +02:00
Laurent Destailleur
988f208dff
Merge pull request #19042 from frederic34/patch-6
doxygen
2021-10-21 23:20:03 +02:00
Laurent Destailleur
82be96e254
Merge pull request #19039 from frederic34/patch-2
doxygen
2021-10-21 23:07:13 +02:00
Laurent Destailleur
7ea993e448
Merge pull request #19045 from frederic34/patch-9
doxygen
2021-10-21 23:03:55 +02:00
Laurent Destailleur
ffd954b454
Merge pull request #19053 from frederic34/patch-17
fix doxygen nested comment
2021-10-21 23:02:54 +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
Laurent Destailleur
88f870c6e3
Merge pull request #19060 from vincentjdc/original-file-hook-checkSecureAccess
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 22:39:29 +02:00
Laurent Destailleur
da4ecb46b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-21 22:32:10 +02:00
Laurent Destailleur
db6c793044 Text in english 2021-10-21 22:31:51 +02:00
Florian HENRY
96722d55ef fix scrutinzer 2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa Clean 2021-10-21 18:54:07 +02:00
atm-lena
03765528e1 Contract line : update boolean 2021-10-21 18:42:06 +02:00
javieralapps4up
f50dfe8571
Update security.lib.php 2021-10-21 18:20:06 +02:00