lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,756 Commits 43 Branches 150 Tags 886 MiB
49faedae6f
Commit Graph

96756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
f1685ba1b1
code syntax 2021-01-16 14:24:47 +01:00
Frédéric FRANCE
2df0acd419
code syntax 2021-01-16 14:12:09 +01:00
Laurent Destailleur
68302d74ba Fix look and feel v14 2021-01-16 14:10:37 +01:00
Frédéric FRANCE
216da52972
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-01-16 14:00:05 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
4864808e4d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29 Fix multicompany compatibility of preview of file in email form 2021-01-16 13:41:27 +01:00
Laurent Destailleur
820ab1a110 Better error message 2021-01-16 13:03:34 +01:00
Laurent Destailleur
c7c74e8ed1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-01-15 19:53:46 +01:00
Laurent Destailleur
2c0f6d2984 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/ticket/list.php
 2021-01-15 19:49:25 +01:00
Laurent Destailleur
7d37183f21 FIX Pb with VAT code when VAT code contains a number 2021-01-15 19:43:02 +01:00
andreubisquerra
2f9f933ea8
FIX Avoid php errors if negative var in Receipt Module 2021-01-15 19:28:12 +01:00
Laurent Destailleur
d36c406074 Code comment 2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e Fix GETPOST 2021-01-15 19:23:56 +01:00
andreubisquerra
b6d8a81ae8
Fix special chars in free text with TakePOS 
Sending the description with the post method avoid chars problems
 2021-01-15 18:12:55 +01:00
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +01:00
Laurent Destailleur
6d455352a3 Restore change for test 2021-01-15 17:47:39 +01:00
Laurent Destailleur
32bd194f8e Sort array 2021-01-15 17:47:14 +01:00
Laurent Destailleur
4b66f6bcd3 Restrict list to customer and supplier only 
Merge 2 sql request in to 1
 2021-01-15 17:43:54 +01:00
Laurent Destailleur
8cef8df33a Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-01-15 17:35:16 +01:00
Laurent Destailleur
0e636031ba Add option 
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
 2021-01-15 16:07:00 +01:00
Laurent Destailleur
9350774808 Add option 
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
 2021-01-15 16:06:22 +01:00
Laurent Destailleur
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
8e1128ef10 FIX Bad balance of begin commit 2021-01-15 15:33:12 +01:00
Laurent Destailleur
2970dc2151 Fix warning 2021-01-15 15:14:23 +01:00
Laurent Destailleur
c778eafc4a Fix very slow effect. 2021-01-15 14:54:23 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
82cedd9fd2 Fix filter 2021-01-15 14:36:02 +01:00
Laurent Destailleur
e8ed6a9f09 Trans 2021-01-15 14:33:26 +01:00
Alexandre SPANGARO
0904212c0b Better works 2021-01-15 14:19:41 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
39b6f2fb6a Revert. restore old behaviour, the picto before the input field lead to 
confusion for some users and break presentation with some pages
 2021-01-15 13:36:24 +01:00
Laurent Destailleur
e5126885fb Fix css 2021-01-15 13:27:45 +01:00
Laurent Destailleur
3e85aec9a5 Fix url 2021-01-15 13:24:37 +01:00
Laurent Destailleur
d7a776ad8a Fix url 2021-01-15 13:23:59 +01:00
Laurent Destailleur
dc9cd28437 Look and feel v14 2021-01-15 13:14:21 +01:00
Laurent Destailleur
c3046326cb Fix help 2021-01-15 12:42:40 +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
Laurent Destailleur
a16fa64596 Fix merge 2021-01-15 11:42:54 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
6db640d0d0 Fix phpcs 2021-01-15 11:41:09 +01:00
Laurent Destailleur
c6c7cbf208 Fix trans 2021-01-15 11:21:47 +01:00
zuiko
dd9031432a
Update functions.lib.php 
Fix #15820
function price2num
add underscore and - 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) for example where underscore or - can be used.

I don't know if other characters have to be added to this pattern.
 2021-01-15 10:29:31 +01:00
atm-lena
e2696d7718 FIX Societe Merge : "unknow column fk_soc" + "Delivery" label 2021-01-15 09:58:04 +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
Florian HENRY
a719640e12 Merge branch '12.0' into 13.0 2021-01-15 08:11:35 +01:00
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Florian HENRY
e960111bb7 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-15 08:10:24 +01:00