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

95094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frédéric FRANCE
5fe5a7c888
add pre-commit sample 2021-01-14 15:44:31 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +01:00
Frédéric FRANCE
7e55a71db0
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-14 15:16:27 +01:00
Frédéric FRANCE
b1a1cd4be6
code syntax 2021-01-14 15:09:08 +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
Frédéric FRANCE
4f67f840bf
fix merge 2021-01-14 14:48:41 +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
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 13:43:48 +01:00
Laurent Destailleur
446e3b9a9d css 2021-01-14 13:26:54 +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
Laurent Destailleur
ea60a824ee Comment 2021-01-14 11:07:48 +01:00
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen 
Fix error message
Make position of columns more friendly
 2021-01-14 10:34:32 +01:00
Anthony Berton
df5e6a2519 picto 2021-01-14 08:56:38 +01:00
Anthony Berton
6726d5781d Update list.php 2021-01-14 08:41:04 +01:00
Anthony Berton
2c31e0989d Update list.php 2021-01-14 08:25:57 +01:00
Frédéric FRANCE
225c68d5e6
Update box_members.php 2021-01-13 22:00:40 +01:00
Frédéric FRANCE
ceff964ad5
member has ref now 2021-01-13 21:56:51 +01:00
Anthony Berton
b143fb6b9e Update list.php 2021-01-13 18:52:27 +01:00
Frédéric FRANCE
923a5fe2a5
Merge remote-tracking branch 'upstream/develop' into davadmin 2021-01-13 18:45:29 +01:00
Frédéric FRANCE
271378fb87
add translation 2021-01-13 18:09:57 +01:00
Laurent Destailleur
43161be711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91 Fix phpcs 2021-01-13 17:45:17 +01:00
Anthony Berton
45d91d8251 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into HEAD 2021-01-13 17:43:54 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +01:00
Frédéric FRANCE
a5678147dd
add missing translation 2021-01-13 16:52:32 +01:00
Frédéric FRANCE
40a45efb63
fix code 2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261
fix trans 2021-01-13 16:18:23 +01:00
Frédéric FRANCE
11100b3017
missing default value 2021-01-13 15:16:43 +01:00
Laurent Destailleur
ce15b31a53
Merge pull request #15972 from dolibit-ut/patch-63 
Update ChangeLog
 2021-01-13 14:23:42 +01:00
Laurent Destailleur
df9f2cdca4
Merge pull request #15164 from marc-dll/NEW_product_customer_price_ref 
NEW: customer ref for product customer prices
 2021-01-13 14:22:55 +01:00
UT from dolibit
933367a4a2
Update ChangeLog 
- changed  "Nature of product is now a dictionay" to   "Products - Nature of product is now a dictionary   #13287"
- sortings
 2021-01-13 13:56:01 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
5f396a372d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-13 12:37:02 +01:00
Laurent Destailleur
2ea5b331b4 README 2021-01-13 12:36:33 +01:00
Laurent Destailleur
93a2edd8d9 Fix property not used 2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7 Fix version 2021-01-13 12:20:32 +01:00
stickler-ci
432d45b289 Fixing style errors. 2021-01-13 11:19:39 +00:00
Laurent Destailleur
1571b0496c
Merge pull request #15794 from atm-gauthier/develop_new_workstation 
NEW : Workstations management
 2021-01-13 12:19:38 +01:00
Laurent Destailleur
114b52ef00
Merge pull request #15969 from aspangaro/13a26 
FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice ref
 2021-01-13 12:18:14 +01:00
Laurent Destailleur
1499998a99
Debug 2021-01-13 12:17:45 +01:00
Laurent Destailleur
30caa78f33
Merge pull request #15968 from frederic34/patch-8 
code syntax
 2021-01-13 12:01:10 +01:00
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00