Commit Graph

2347 Commits

Author SHA1 Message Date
Laurent Destailleur
1a7f3938f2 FIX Missing language ico 2021-01-28 12:02:16 +01:00
Laurent Destailleur
4fbf2fff6f Merge pull request #16034 from Hystepik/develop#2
Close #16027 New Feature copy Code Client
2021-01-28 11:17:10 +01:00
Laurent Destailleur
4d5cda20e7 Update functions.lib.php 2021-01-28 11:15:11 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
3e4a9b1bfc Merge pull request #16070 from aspangaro/13p3
Fix: Fa-icon on stock movement
2021-01-27 19:24:31 +01:00
Laurent Destailleur
d7bf173f0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
977e4dde86 Fix regression 2021-01-26 12:08:54 +01:00
Alexandre SPANGARO
0ef02880eb Fix: Fa-icon on movement 2021-01-26 08:54:21 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias
Conflicts:
	test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
8bd7ddee6b Clean code 2021-01-23 13:55:56 +01:00
lmarcouiller
cfcd51f291 style errors update 2021-01-22 17:03:39 +01:00
lmarcouiller
7685dee5f6 style changes 2021-01-22 16:59:34 +01:00
lmarcouiller
5a95cc16aa update clipboardcopypaste with jquery 2021-01-22 16:58:47 +01:00
lmarcouiller
76ce77f7ba stickler-ci edit 2021-01-22 09:13:04 +01:00
lmarcouiller
64d08544b2 move of function showValueWithCopyPasteButton in function.lib.php 2021-01-22 09:09:46 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +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
d00eb5b533 Merge pull request #15989 from zuiko/patch-3
Fix #15820 Bug: Unable to edit the pricing in Sales Order
2021-01-16 16:50:49 +01:00
Laurent Destailleur
e5c932d3f4 Update functions.lib.php 2021-01-16 16:50: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
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
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
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
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
f6de607889 Fix warning 2021-01-11 16:07:02 +01:00
Laurent Destailleur
9a5ae77615 Merge pull request #15926 from FHenry/develop
fix : remove php warning on install pages
2021-01-11 16:04:04 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Florian HENRY
c7cddb19be fix stickler 2021-01-10 11:58:22 +01:00
Florian HENRY
7c08e3330c Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-01-07 17:54:49 +01:00
Florian HENRY
04d8a679a7 fix warning message on install 2021-01-07 17:51:45 +01:00
Laurent Destailleur
123bd81721 Trim no more required 2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b FIX #15892 #15017 2021-01-06 20:41:40 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
0a1387e673 Debug v13 2020-12-20 18:41:54 +01:00