lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,076 Commits 43 Branches 150 Tags 886 MiB
5217ae28f8
Commit Graph

95076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5217ae28f8 Fix load of margin infos 2023-02-13 21:35:48 +01:00
Laurent Destailleur
a06a5d0f65 Fix lang file not loaded 2023-01-13 11:09:06 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
5ad7894849 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:43 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
f782ac6654 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:03:47 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
Laurent Destailleur
f2eb3c1a55
Merge pull request #22919 from atm-maxime/11.0 
Fix API right check
 2022-11-22 21:40:12 +01:00
Laurent Destailleur
41a970c90f
Merge pull request #22922 from ATM-Nicolas/fix_sql_request_parenthesis 
FIX sql request parenthesis
 2022-11-22 21:39:11 +01:00
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +01:00
Maxime Kohlhaas
7be0e0da1c Fix API right check 2022-11-22 13:46:42 +01:00
Laurent Destailleur
f4b1d31013 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-15 19:36:37 +01:00
Laurent Destailleur
bb01ad7d9a
Merge pull request #22850 from daraelmin/patch-4 
FIx #18304 No adh create if error on public form
 2022-11-15 13:12:02 +01:00
stickler-ci
c81c91755d Fixing style errors. 2022-11-15 10:55:09 +00:00
daraelmin
cd2b9538c1
FIx #18304 No adh create if error on public form 
FIX #18304 - Member subscription confirmation email sent even if mandatory fields are missing
 2022-11-15 11:51:20 +01:00
Laurent Destailleur
d021c0b2a1
Merge pull request #22665 from atm-maxime/fix_dict_error_data_toolong 
Fix : dict data too long error
 2022-10-24 16:38:10 +02:00
Maxime Kohlhaas
92ad656bf0 Fix : dict data too long error 2022-10-23 12:06:13 +02:00
Laurent Destailleur
da3ae71a47 Try to fix rounding error 2022-10-18 13:32:18 +02:00
Laurent Destailleur
7df36e4a1f Try fix phpunit 2022-10-18 00:53:13 +02:00
Laurent Destailleur
374e56d938 FIX #22538 2022-10-13 00:50:55 +02:00
Laurent Destailleur
6b0de43f8f
Merge pull request #21529 from noec764/13.0_Fix_MissingTabHelp 
Fix: 'tabhelp' must be present in every module
 2022-07-19 18:54:21 +02:00
Noé Courtier
276168ef6f Fix: tabhelp must be present in every module 2022-07-19 17:14:57 +02:00
Laurent Destailleur
d0a2017639
Merge pull request #21491 from atm-lena/13.0_FIX_DisplayLineExtrafieldsEmpty_PDF 
No display extrafield line on PDF if empty
 2022-07-12 19:05:58 +02:00
stickler-ci
3434460cc3 Fixing style errors. 2022-07-11 09:55:39 +00:00
atm-lena
851416a61e No display extrafield line on PDF if empty 2022-07-11 11:48:37 +02:00
Laurent Destailleur
fcbe09b790
Merge pull request #21480 from atm-jpb/13.0_fix_massaction_create_invoice_on_multiorders 
FIX : rank duplicate on mass action invoice from multiple orders
 2022-07-10 18:43:36 +02:00
Laurent Destailleur
c16cd502d0
Update actions_massactions.inc.php 2022-07-10 18:43:25 +02:00
jpb
226488b7ed rank change. if we only have one order we leave the origin rank otherwhise we pass -1 2022-07-08 12:32:17 +02:00
Laurent Destailleur
1820276ac7
Merge pull request #21462 from atm-jpb/fix_export_resource_type 
fix export resource type filter
 2022-07-07 20:56:34 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +02:00
Laurent Destailleur
fb1a548a1e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-27 12:05:44 +02:00
Laurent Destailleur
eeaa4f8205 Revert "doc" 
This reverts commit 380cae761a.
 2022-06-25 04:06:55 +02:00
Laurent Destailleur
380cae761a doc 2022-06-25 04:06:18 +02:00
Laurent Destailleur
2d9a9ddd22
Merge pull request #21235 from Silocan/payment-duplicate-bank-transaction 
fix: remove duplication bank transaction
 2022-06-13 12:42:42 +02:00
Nicolas F
5decd00149
fix: remove duplication bank transaction 
do not duplicate previous bank transaction when value is 0
 2022-06-13 10:40:41 +00:00
Laurent Destailleur
10aa1a66bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
c300437e2a
Merge pull request #21084 from Silocan/13.0 
fix for issue #16985 on v13
 2022-06-01 19:55:08 +02:00
Nicolas
4696cd33d5 fix for issue #16985 2022-06-01 10:42:29 +02:00
Laurent Destailleur
192510316b
Merge pull request #21013 from atm-greg/FIX_12.0_get_batch_only_for_same_fk_product 
fix sql to avoid getting product_stock of another product with same batch
 2022-05-24 21:23:02 +02:00
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php 2022-05-24 21:22:14 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
85e2fe40b1
Merge pull request #20983 from atm-maxime/fix_delete_paiement 
Fix delete customer payment
 2022-05-22 17:13:01 +02:00
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Laurent Destailleur
6aa4ce2acb
Merge pull request #20896 from marc-dll/13.0_FIX_new_membership_select_width 
FIX: new member subscription: bank account and payment mode might be hidden
 2022-05-21 00:48:58 +02:00
Laurent Destailleur
e2c411b224
Merge pull request #20934 from atm-maxime/fix_er_right_to_pay 
Fix wrong right test to show button
 2022-05-21 00:23:51 +02:00
Maxime Kohlhaas
8231a9ea0f Fix wrong right test to show button 2022-05-20 23:29:35 +02:00
Marc de Lima Lucio
25196fa709 FIX: new member subscription: bank account and payment mode might be hidden 2022-05-19 10:20:31 +02:00
Laurent Destailleur
36fdee3337 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-05-03 11:54:57 +02:00
Laurent Destailleur
a254412c61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
 2022-05-03 11:54:28 +02:00