lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,290 Commits 43 Branches 150 Tags 886 MiB
2d0f4cab51
Commit Graph

102290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer 
Fix supplier credit transfer
 2022-01-06 16:10:53 +01:00
Laurent Destailleur
aba6aed7d7
Merge pull request #19726 from vdegrandpre/FIX-19725-LDAP-AUTH-500 
FIX - 19725 - Authentification LDAP échoue avec erreur 500
 2022-01-06 16:03:35 +01:00
Laurent Destailleur
aee61cb470
Update ldap.class.php 2022-01-06 16:02:47 +01:00
Laurent Destailleur
623133dd84 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-06 11:07:27 +01:00
Laurent Destailleur
b381f24897 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/mrp/mo_movements.php
 2022-01-06 11:07:05 +01:00
Laurent Destailleur
518b163066 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/movement_list.php
 2022-01-06 11:01:27 +01:00
Laurent Destailleur
8728ad2eff
Merge pull request #19730 from fmarcet/12.0 
Fix: Correctly display product translations
 2022-01-06 10:57:47 +01:00
Laurent Destailleur
bdb6a20c06
Merge pull request #19734 from aspangaro/14p28 
Missing language key on error
 2022-01-06 10:55:03 +01:00
Laurent Destailleur
708f5e5cf1 FIX #19751 2022-01-06 10:54:19 +01:00
Laurent Destailleur
949c154f15 Fix missing html id 2022-01-05 20:21:11 +01:00
Laurent Destailleur
04c42731f7 Doc 2022-01-04 13:54:45 +01:00
Laurent Destailleur
12e5375bd5 Doc 2022-01-04 13:51:43 +01:00
Laurent Destailleur
24c0f93ead Prepare 14.0.5 2022-01-04 13:50:38 +01:00
Alexandre SPANGARO
b719042b09 Missing language key on error 2022-01-04 10:47:59 +01:00
Laurent Destailleur
8d1648426e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-04 09:39:43 +01:00
Laurent Destailleur
b600fe7377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-04 09:38:33 +01:00
Laurent Destailleur
ba6033da8e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2022-01-04 09:38:11 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Ferran Marcet
26c6908f66 Fix: Correctly display product translations 2022-01-03 13:22:07 +01:00
Ferran Marcet
08685cc6b0 Fix: Correctly display product translations 2022-01-03 13:14:40 +01:00
Vincent de Grandpré
6a52b967f4 Permettre de sortir de la fonction de connexion après authentification. 2022-01-02 16:37:07 -05:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85
Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice 
FIX: discounts are applied twice for displaying best supplier price
 2021-12-30 19:47:07 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Laurent Destailleur
76a0caf116
Merge pull request #19717 from OPEN-DSI/fix-company-list-title-on-nature-of 
FIX title for nature of third party in company list
 2021-12-30 17:25:08 +01:00
Laurent Destailleur
c57dc82eaa
Merge pull request #19688 from atm-maxime/fix_modbuilder_numbering_model 
Fix modulebuilder params for updatemask action
 2021-12-30 17:07:27 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
Laurent Destailleur
63f2cd6a30
Merge pull request #19695 from atm-maxime/fix_user_from_candidate 
Fix #19672 : email unicity was checked when email was null
 2021-12-30 13:17:49 +01:00
Laurent Destailleur
ac7d08d3e7
Merge pull request #19696 from atm-maxime/fix_supinv_unpaidboard 
Fix #19404 : only validated invoice must be considered in unpaid indicator
 2021-12-30 13:00:09 +01:00
Laurent Destailleur
b62741b5a0
Merge pull request #19697 from atm-maxime/fix_order_massbilling 
Fix #19249 : wrong payment cond and mode on mass order billing
 2021-12-30 12:59:21 +01:00
Laurent Destailleur
15b34dedac
Merge pull request #19701 from atm-maxime/fix_bankentries_filter 
Fix #19667 : bankentries wrong SQL parenthesis + missing filter
 2021-12-30 12:52:57 +01:00
Laurent Destailleur
30214b7300
Merge pull request #19702 from atm-maxime/fix_skr04_syntax 
Fix #19666 : missing quotes in SQL statement
 2021-12-30 12:49:38 +01:00
stickler-ci
537965c7b7 Fixing style errors. 2021-12-28 17:34:11 +00:00
Maxime Kohlhaas
f9f1c7e3f8 Fix action protection 2021-12-28 18:32:02 +01:00
Maxime Kohlhaas
f27fda33e8 Fix prelevement action right management 2021-12-28 18:26:42 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
2237c09d64 Remove unused set_credit function 2021-12-28 17:59:41 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +01:00
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Maxime Kohlhaas
3ada0a8741 Fix #19672 : email unicity was checked when email was null 2021-12-28 10:40:44 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00