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

93305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +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
506d809712 FIX #15991 2021-01-16 17:50:02 +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
9426512eaf Fix for #15988 2021-01-16 17:21:52 +01:00
Frédéric FRANCE
3c2bf5d9e9 fix trans 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-01-16 17:18:58 +01:00
Laurent Destailleur
f2488a399e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 17:13:54 +01:00
Laurent Destailleur
ab1e49ab20
Merge pull request #15986 from aspangaro/13a27 
Optimize select_auxaccount
 2021-01-16 16:59:20 +01:00
Laurent Destailleur
8c8ffa3daf Fix default limit 2021-01-16 16:56:49 +01:00
Laurent Destailleur
de6f6c9b5d Update functions.lib.php 2021-01-16 16:51:47 +01:00
zuiko
32b5aa7790 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-16 16:51:27 +01:00
Laurent Destailleur
2cecd449cf Fix phpcs 2021-01-16 16:41:59 +01:00
Laurent Destailleur
992645c13d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 16:35:13 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
Laurent Destailleur
16333b911a Fix phpunit 2021-01-16 15:57:30 +01:00
Laurent Destailleur
61b8a69787 Code comment 2021-01-16 15:40:59 +01:00
Laurent Destailleur
892bd432e4 Fix crop of image on invoices. 2021-01-16 15:35:15 +01:00
Laurent Destailleur
064b00e979 Sync transifex 2021-01-16 15:33:47 +01:00
Laurent Destailleur
4aaf10b4b6 Fix phpunit 2021-01-16 14:25:59 +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
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
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
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +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
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
2970dc2151 Fix warning 2021-01-15 15:14:23 +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
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
3e85aec9a5 Fix url 2021-01-15 13:24:37 +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
6db640d0d0 Fix phpcs 2021-01-15 11:41:09 +01:00
Laurent Destailleur
c6c7cbf208 Fix trans 2021-01-15 11:21:47 +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
Alexandre SPANGARO
e812c200c5 Optimize select_auxaccount 2021-01-15 03:37:17 +01:00
Laurent Destailleur
bcfe03216a FIX error managent and db transaction balance 2021-01-14 19:15:54 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +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