Commit Graph

102177 Commits

Author SHA1 Message Date
Laurent Destailleur
76779aa9e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-09 10:00:59 +01:00
Laurent Destailleur
92a0c9e4fb Fix sql error in repair.php 2021-12-09 10:00:42 +01:00
Laurent Destailleur
1697cdf4b9
Merge pull request #19526 from hregis/fix_missing_default_value
FIX missing default value for more comprehensive
2021-12-08 21:26:56 +01:00
Laurent Destailleur
9d11d265ec Fix phpcs 2021-12-08 18:37:52 +01:00
Laurent Destailleur
8f7b222764 Fix phpcs 2021-12-08 18:37:07 +01:00
Laurent Destailleur
d4501a6f67 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-08 18:21:56 +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
e47e3b9797 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-08 18:09:55 +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
e6a82ed9a5
Merge pull request #19539 from hregis/fix_compatibility_with_multicompany
FIX compatibility with multicompany
2021-12-08 16:28:33 +01:00
Laurent Destailleur
57ebcf94c0
Merge pull request #19554 from atm-quentin/FIX_setoptionalfrompost
FIX set optional from post, we cant untick boolean field on product card
2021-12-08 16:27:41 +01:00
Laurent Destailleur
e887e44c25
Merge pull request #19528 from atm-greg/FIX_Uniformize_printFieldListHaving_hook
add printFieldListHaving hook
2021-12-08 16:10:36 +01:00
Laurent Destailleur
deb0a468da
Merge pull request #19561 from marc-dll/14.0_FIX_contact_extrafields_separator
FIX: contact card: bad colspan value for separator extrafield in creation/modification form
2021-12-08 15:36:39 +01:00
Laurent Destailleur
df11210243
Merge pull request #19575 from atm-gregr/FIX_V13_No_Display_Contact_On_List_If_No_Mail_Adress
Fix v13 no display contact on list if no mail adress
2021-12-08 15:29:29 +01:00
Laurent Destailleur
9b65bb2085
Update list.php 2021-12-08 15:29:16 +01:00
atm-gregr
01893caa61 bad default value 2021-12-08 14:40:46 +01:00
atm-gregr
386771cffc fix display contat line on list 2021-12-08 14:21:42 +01:00
Marc de Lima Lucio
6af2626f08 FIX: contact card: bad colspan value for separator extrafield in creation/modification form 2021-12-06 16:55:51 +01:00
Laurent Destailleur
39c7d55c1d Fix php syntax 2021-12-06 12:17:07 +01:00
Laurent Destailleur
8b914172df Fix rename and protect a test page 2021-12-06 12:16:12 +01:00
Laurent Destailleur
1977cac44a Fix error message 2021-12-06 12:12:04 +01:00
Laurent Destailleur
dd60720299 Add tool to help debug 2021-12-06 12:07:13 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
49e3344a58 Fix link 2021-12-05 15:11:10 +01:00
Laurent Destailleur
305d8af76a Fix use a standard link insted of js to open a window. 2021-12-05 14:58:07 +01:00
Laurent Destailleur
2b505ec9b8 Fix can read category if can run takepos. 2021-12-05 13:01:05 +01:00
Laurent Destailleur
7e835ec915 Fix css 2021-12-02 19:06:44 +01:00
Laurent Destailleur
075faded47 FIX list of categories in stats of supplier invoices
Conflicts:
	htdocs/compta/facture/stats/index.php
2021-12-02 18:48:15 +01:00
Regis Houssin
202b123aaa FIX compatibility with multicompany 2021-12-02 15:10:29 +01:00
Laurent Destailleur
bacf569e0b Fix phpcs 2021-12-01 17:33:26 +01:00
Regis Houssin
efda10333c FIX missing default value for more comprehensive 2021-12-01 10:40:10 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +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
d84d09556c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-11-30 15:55:57 +01:00
Laurent Destailleur
feabb34a42 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-30 15:54:46 +01:00
Laurent Destailleur
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +01:00
Laurent Destailleur
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-11-30 14:23:37 +01:00
Laurent Destailleur
0b4409a087
Merge pull request #19442 from andreubisquerra/14.0
TakePOS Direct Payment (Cash) Button doesn't work
2021-11-30 12:25:21 +01:00
Laurent Destailleur
cf165835bf
Merge pull request #19462 from KlaasOl/patch-5
Update main.lang
2021-11-30 12:00:35 +01:00
Laurent Destailleur
06cda2ce35
Merge pull request #19453 from aspangaro/14p27
FIX Accountancy - SQL error on subledger account search in journal
2021-11-30 11:59:07 +01:00
Laurent Destailleur
f9b347c61c
Merge pull request #19481 from ksar-ksar/patch-11
FIX #19476
2021-11-30 11:56:12 +01:00
Laurent Destailleur
2b1fab2181 Clean code 2021-11-30 11:50:27 +01:00
Laurent Destailleur
db4871846e
Merge pull request #19463 from code-chicken/patch-13
Better wording
2021-11-30 11:46:51 +01:00
Laurent Destailleur
ce8312c744
Merge pull request #19464 from atm-quentin/FIX_11_TAB_INVOICE
FIX : Urgent onglet contact inaccessible depuis une facture
2021-11-30 11:45:56 +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
adda1995a2
Merge pull request #19487 from moreauftheobald/14.0_fix_stock_mouv_list
card Modif
2021-11-30 11:37:53 +01:00
Laurent Destailleur
9a72f147d1
Merge pull request #19500 from marc-dll/12.0_FIX_holiday_massdelete
FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card
2021-11-30 11:31:59 +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
4fd6f9955a
Merge pull request #19503 from KlaasOl/patch-6
Update main.lang
2021-11-30 11:21:49 +01:00