Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

7184 Commits

Author SHA1 Message Date
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
9d0945bbe2 FIX #16077 2021-01-28 10:30:09 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
b488bca020 FIX 16084 2021-01-28 08:53:13 +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
1637b6af7d Look and feel v14 2021-01-26 15:16:06 +01:00
Laurent Destailleur
aa2d581b41 Fix rename of alias 2021-01-26 13:38:41 +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
Laurent Destailleur
8db80ff44d Fix reponsive 2021-01-26 11:19:13 +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
c5cda97c19 FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:31:29 +01:00
Laurent Destailleur
d9908efdef Code comment 2021-01-24 13:29:38 +01:00
Laurent Destailleur
15b818da30 Code comment 2021-01-24 13:27:52 +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
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
Laurent Destailleur
8b9287055e Update functions.lib.php 2021-01-16 18:34:25 +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
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
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
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +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
ed00f6bfb9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:46:50 +01:00