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

95051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
cc1a3080d0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-05-03 11:53:23 +02:00
Laurent Destailleur
b5f887b3e4 Fix DEBUGBAR_USE_LOG_FILE 2022-05-03 11:52:32 +02:00
Laurent Destailleur
7616a55de5
Merge pull request #20726 from vold-lu/fixes/lines-array-error-reporting 
FIX: ModuileBuilder - Fix getLinesArray() error reporting
 2022-04-29 16:35:16 +02:00
Laurent Destailleur
47661d8d38
Merge pull request #20735 from atm-john/13.0_fix_missing_budget_export 
Fix :  missing project budget field in Dolibarr V13 export wizard
 2022-04-29 16:06:30 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
Aloïs Micard
fb7f0545e4 Fix error reporting in getLinesArray() 2022-04-27 17:56:31 +02:00
Laurent Destailleur
6bbf4ccaaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:25:04 +02:00
Laurent Destailleur
fb0a38d248 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:24:09 +02:00
Laurent Destailleur
694357d48e
Merge pull request #19420 from marc-dll/12.0_FIX_project_activity_default_workingdays 
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
 2022-04-14 23:23:12 +02:00
Laurent Destailleur
110fa251e8
Merge pull request #19425 from marc-dll/13.0_FIX_project_timesheet_offdays_offset 
FIX: project timesheet: public holidays offset by 1 day
 2022-04-14 23:22:05 +02:00
Laurent Destailleur
4feb2c3b83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:02:16 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length 
FIX: user employee tab: offset in open days messes up holiday length calculation
 2022-04-14 22:59:20 +02:00
Laurent Destailleur
e0f8f5d035
Merge pull request #20608 from fmarcet/13.0 
Fix: Direct download don't work with multicompany
 2022-04-14 22:15:16 +02:00
Laurent Destailleur
cb367f7787
Merge pull request #20606 from vold-lu/translate_permission_label 
NEW: ModuileBuilder - Translate permissions label
 2022-04-12 03:02:24 +02:00
Laurent Destailleur
155dfbda94 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-11 20:43:50 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/card.php
 2022-04-11 20:43:20 +02:00
Ferran Marcet
62b7496253 Fix: Direct download don't work with multicompany 2022-04-11 18:26:49 +02:00
Aloïs Micard
89b7c8298b Module builder: Translate permissions label 2022-04-11 17:25:45 +02:00
Laurent Destailleur
7ccbd34c2d
Merge pull request #20587 from marc-dll/13.0_FIX_holiday_mails_in_html 
FIX: holiday/leave requests: write status change emails in HTML
 2022-04-11 16:29:13 +02:00
Marc de Lima Lucio
de737b6b23 FIX: holiday/leave requests: write status change emails in HTML 2022-04-07 18:07:30 +02:00
Laurent Destailleur
ece9f3037a
Merge pull request #19788 from OPEN-DSI/v12-fix-user-card-modify-transverse-rights 
FIX user actions rights when multi-company transverse mode is enabled
 2022-04-02 18:15:50 +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
7bf4fbec41
Merge pull request #20493 from atm-gauthier/13.0_fix_export_resource 
FIX : "WHERE" clause missing on resource export
 2022-03-30 12:03:27 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00