lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,087 Commits 43 Branches 150 Tags 886 MiB
560d401cff
Commit Graph

88087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Laurent Destailleur
d69ce5b917
Merge pull request #15952 from FHenry/12_fix_autofill_date_payment 
12 fix autofill date payment
 2021-01-18 19:20:33 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend 
FIX : missing GETPOST parameters on card_presend.tpl.php
 2021-01-18 18:49:28 +01:00
Laurent Destailleur
a109dd8948 Fix removed unexpected values in stats graph 
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
 2021-01-18 13:55:11 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Laurent Destailleur
440f923b01
Merge pull request #15983 from zuiko/patch-2 
Fix #15820 Bug: Unable to edit the pricing in Sales Order
 2021-01-16 18:34:41 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php 2021-01-16 18:34:25 +01:00
Laurent Destailleur
1d5182adf0
Merge pull request #15973 from frederic34/patch-10 
missing default value
 2021-01-16 17:27:33 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Laurent Destailleur
60ab32c7fb
Merge pull request #15987 from ATM-Consulting/fix/ticket_filter_openall_does_not_include_read_tickets 
FIX 12.0 - "openall" filter on ticket list does not include read tickets
 2021-01-15 12:17:03 +01:00
Florian Mortgat
d3cbcedce3 FIX 12.0 (ticket) - the "openall" filter on the ticket list does not include tickets with status READ 2021-01-15 09:55:42 +01:00
zuiko
fd5948f716
Update functions.lib.php 
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
 2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php 
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
 2021-01-14 14:44:32 +01:00
Florian HENRY
0fa7134bd1 better fix 2021-01-14 13:04:02 +01:00
Laurent Destailleur
ea47a55144 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3 Fix graph of opportunity when a status has been removed. 2021-01-14 12:58:50 +01:00
Frédéric FRANCE
11100b3017
missing default value 2021-01-13 15:16:43 +01:00
Florian HENRY
7e30812529 fix review 2021-01-12 22:01:53 +01:00
Laurent Destailleur
2b9ce6995f
Merge pull request #15951 from FHenry/12_fix_update_groupname 
fix: update group name
 2021-01-12 20:26:17 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Laurent Destailleur
080ffa6a51
Merge pull request #15947 from atm-lena/12.0_FIX_Translation_FR_Permission777 
12.0 FIX Translation Permission777 FR
 2021-01-11 17:10:29 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
788ef257a9 Fix GETPOST for qty 2021-01-11 13:02:05 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
Laurent Destailleur
a3fd6f07e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-08 15:10:05 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Laurent Destailleur
8ca639b79f
Merge pull request #15916 from atm-maxime/fix_commonfieldadd_type 
Fix date and datetime type in commonfield_add.tpl
 2021-01-07 10:28:10 +01:00
Maxime Kohlhaas
1b7d194e18 Finish fix on add form values 2021-01-07 09:03:25 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
Laurent Destailleur
0dc182553e
Merge pull request #15896 from atm-lena/FIX/issue_14197 
FIX balance starting and ending fiscal month #14197
 2021-01-06 21:32:02 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php 2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a Fix date and datetime type in commonfield_add.tpl 2021-01-06 21:14:40 +01:00
Laurent Destailleur
93323f6d61
Merge pull request #15889 from atm-quentin/FIX/issue_15516 
FIX wrong name for search status param issue #15516
 2021-01-06 20:35:52 +01:00
Laurent Destailleur
8f1617884a
Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +01:00
Laurent Destailleur
679948e207
Merge pull request #15893 from atm-lena/FIX_issue_15629 
FIX #15629
 2021-01-06 20:34:31 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b
Merge pull request #15894 from atm-john/11.0_fix_issue_14833 
Fix #14833 A security mecanism generates data loss
 2021-01-06 20:26:19 +01:00
Laurent Destailleur
a955df21bf
Merge pull request #15905 from atm-quentin/FIX/issue_14501 
FIX useless tracking number displayed on pdf if empty issue #14501
 2021-01-06 20:22:43 +01:00