2
0
forked from Wavyzz/dolibarr
Commit Graph

27056 Commits

Author SHA1 Message Date
Laurent Destailleur
0c27578e69 Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields
FIX: object cloning: set unique extrafield values to null to prevent duplicates
2022-04-01 14:49:25 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
ad8e0a3be5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:36 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +02:00
Laurent Destailleur
89b0a7b2b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-01 14:34:15 +02:00
Laurent Destailleur
88e6c67c10 Look and feel v16 of media manager 2022-04-01 14:29:11 +02:00
Laurent Destailleur
7031995820 Merge pull request #20505 from atm-jpb/NEW_add_hook_in_expensereport_rule
add hook doactions on expensereport_rule
2022-04-01 13:26:03 +02:00
Laurent Destailleur
de28cb5d78 Merge pull request #20501 from ralf1070/develop
Allow anonymous LDAP user lookups
2022-04-01 13:23:50 +02:00
Laurent Destailleur
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
Florian HENRY
cbf89df591 new: add hidden option on contract PDF line 2022-04-01 11:54:16 +02:00
Laurent Destailleur
9be7bae765 Fix menu entry invalid 2022-04-01 11:24:58 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
Florian Mortgat
5df5050418 Apply suggestions from code review
replace spaces with tabs
2022-04-01 09:14:04 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
5f7abc0f8c Merge pull request #19703 from atm-maxime/fix_mysql8_createuser
Fix #19662 : mysql8 user creation in 2 steps
2022-03-31 16:06:53 +02:00
Laurent Destailleur
cd81312b6a Update mysqli.class.php 2022-03-31 16:04:28 +02:00
Laurent Destailleur
df4e5fe84d Fix missing param 2022-03-31 13:28:19 +02:00
Ralf Müller
a2b60e52e9 core/login/ldap: allow anonymous user lookup 2022-03-31 09:36:58 +02:00
Laurent Destailleur
7422fd9b07 css on separators 2022-03-30 18:20:09 +02:00
Laurent Destailleur
199faaa6f6 Update modHRM.class.php 2022-03-30 15:19:57 +02:00
Laurent Destailleur
f7c5154cac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-30 13:04:50 +02:00
Laurent Destailleur
1304ed5763 Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
atm-steve
4fa656be96 Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
889c35e8df NEW Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 2022-03-30 12:02:20 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
636188f28a Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
8e7b145510 Update modFacture.class.php 2022-03-29 16:05:41 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
2022-03-29 15:02:29 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
038033f0ec Merge pull request #20389 from atm-GregM/retoursGRH
NEW/fix GRH extrafields and more stuff
2022-03-29 14:19:24 +02:00
Laurent Destailleur
5108240ed5 Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility
FIX multicompany sharings compatibility
2022-03-29 13:56:43 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Regis Houssin
5b5f3a4aaf FIX avoid php warning "illegal string offset" 2022-03-27 11:11:16 +02:00
Regis Houssin
009ad3be0f FIX remove unused code 2022-03-26 13:10:23 +01:00
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Laurent Destailleur
c2a088c5ff Fix regression in phpunit 2022-03-26 12:34:52 +01:00
Laurent Destailleur
453c8981e8 CSS 2022-03-26 12:24:28 +01:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Laurent Destailleur
50847efdf8 Add the country into the popup with info on company. 2022-03-26 11:44:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Laurent Destailleur
396b532400 Can cumulate error message on different authentication modes 2022-03-26 09:40:22 +01:00
Laurent Destailleur
8e610ddce7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-25 15:10:50 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00