Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
64bd4ef784 Fix component to select ticket groups 2021-07-10 20:09:51 +02:00
Laurent Destailleur
339fa6fbe3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-10 09:44:22 +02:00
Laurent Destailleur
f65aa6024f Add replace into forbidden sql in read-only mode 2021-07-10 09:42:20 +02:00
Laurent Destailleur
3fadd5cda5 NEW Add $dolibarr_main_db_readonly in conf.php for readonly access. 2021-07-09 19:37:12 +02:00
Laurent Destailleur
9e9af8548d Responsive 2021-07-09 18:47:34 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
kamel
073ace3a9e FIX get categories linked to another object type 2021-07-09 16:23:46 +02:00
kamel
ec6fadf196 Fix hook constructCategory when several new categories is added by several modules 2021-07-09 15:29:39 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
2bef8a27c8 Trans 2021-07-09 12:34:51 +02:00
Laurent Destailleur
823d360202 Fix reposition 2021-07-09 12:15:43 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option
New :  Add js confirm modal option to BTN created with dolGetButtonAction
2021-07-09 10:09:08 +02:00
Florian Mortgat
924cff44f3 FIX PR feedback: in addFileIntoDatabaseIndex, return error if $object is set with an ID but without a table_element 2021-07-09 09:16:27 +02:00
Florian Mortgat
407f314498 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 2021-07-09 09:11:11 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
05953d61e4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 23:45:50 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Laurent Destailleur
5b6358d938 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:43:19 +02:00
Laurent Destailleur
fb9d16a84a
Merge pull request #18109 from altairisfr/lot_sn_masks
FIX : don't display custom masks if they are not used
2021-07-08 23:42:48 +02:00
Laurent Destailleur
2314c5dda2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:41:16 +02:00
Laurent Destailleur
14f52f2871
Merge pull request #18118 from aspangaro/12p16
FIX Problem of z-index with popup and top menu
2021-07-08 23:40:18 +02:00
Laurent Destailleur
76037db0ef
Merge pull request #18117 from aspangaro/13p11
FIX Accountancy - if we define a date start, automatic binding try to continue to solve old binding
2021-07-08 23:37:38 +02:00
Laurent Destailleur
cc1f15354a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:26:43 +02:00
Laurent Destailleur
aa9d98a336 Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:19:43 +02:00
ATM john
c2ce8e3c9d Fix comment 2021-07-08 22:29:41 +02:00
Laurent Destailleur
7d6b70f679 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:26:58 +02:00
Laurent Destailleur
4e69afb253
Merge pull request #18119 from aspangaro/14p4
Update product/card.php
2021-07-08 22:26:18 +02:00
Alexandre SPANGARO
f4005cd7a7 Update product/card.php 2021-07-08 22:24:20 +02:00
Laurent Destailleur
9512865896 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:18:11 +02:00
Laurent Destailleur
a916f668f9 Fix param of include js 2021-07-08 22:16:47 +02:00
Alexandre SPANGARO
be62c2f7f4 FIX Problem of z-index with popup and top menu 2021-07-08 22:11:41 +02:00
Laurent Destailleur
ed60ea7b1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:01:36 +02:00
Laurent Destailleur
8f534b2c20 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:01:25 +02:00
Laurent Destailleur
6539961d58 Update card.php 2021-07-08 21:59:20 +02:00
Laurent Destailleur
5c8ac0cb9d Update card.php 2021-07-08 21:59:12 +02:00
Alexandre SPANGARO
d6be380816 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:58:54 +02:00
Laurent Destailleur
512f58a34a
Merge pull request #18116 from aspangaro/14p3
FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY
2021-07-08 21:57:19 +02:00
Laurent Destailleur
e5bc32bb7c
Update card.php 2021-07-08 21:55:35 +02:00
Laurent Destailleur
76d02ecd77
Update card.php 2021-07-08 21:53:24 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Alexandre SPANGARO
c8162e6785 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:35:25 +02:00
Laurent Destailleur
12b1f5b23b Fix sql 2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
Laurent Destailleur
ddc37ef38c Fix missing lang param 2021-07-08 20:58:19 +02:00
Laurent Destailleur
ec4533142a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 18:16:02 +02:00
Laurent Destailleur
1209253d57 Sanitize data 2021-07-08 18:12:15 +02:00
Francis Appels
d2403d38b5 Merge remote-tracking branch 'Dolibarr/14.0' into 14 2021-07-08 17:49:47 +02:00