Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +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
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
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
Alexandre SPANGARO
0904212c0b Better works 2021-01-15 14:19:41 +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
dc9cd28437 Look and feel v14 2021-01-15 13:14:21 +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
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
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Alexandre SPANGARO
e812c200c5 Optimize select_auxaccount 2021-01-15 03:37:17 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +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
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Frédéric FRANCE
225c68d5e6 Update box_members.php 2021-01-13 22:00:40 +01:00
Frédéric FRANCE
923a5fe2a5 Merge remote-tracking branch 'upstream/develop' into davadmin 2021-01-13 18:45:29 +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
Laurent Destailleur
7f04307adf Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +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
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
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
1499998a99 Debug 2021-01-13 12:17:45 +01:00
Frédéric FRANCE
e2c57584b7 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a Update html.formmail.class.php 2021-01-12 23:46:29 +01:00
Frédéric FRANCE
cf24fd5d85 code syntax 2021-01-12 23:30:59 +01:00
zuiko
f718a396d5 Update mod_barcode_product_standard.php 
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
 2021-01-12 21:59:09 +01:00
Florian HENRY
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +01:00
Florian HENRY
34b792e9a2 betterfix 2021-01-12 21:44:18 +01:00
zuiko
364158c35b Update mod_barcode_product_standard.php 
Blank line after comment removed...
 2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c Fixing style errors. 2021-01-12 20:16:34 +00:00
zuiko
ff06798660 Update mod_barcode_product_standard.php 
More evolving coding by testing the type of barcode in literal form.
Does not change deeply the #15918 correction principle in order to fix bug #15633.
 2021-01-12 21:14:43 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
a7c78c2f60 Merge pull request #15960 from seblu/fix_ldap_login 
Use login from LDAP attribute
 2021-01-12 20:59:46 +01:00