lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,955 Commits 43 Branches 150 Tags 886 MiB
5164a96aa0
Commit Graph

87955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00
Laurent Destailleur
5f9b53004b Fix warning 2020-12-14 17:40:40 +01:00
Laurent Destailleur
56c32e3c81 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:33 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Laurent Destailleur
04c233c229
Merge pull request #15747 from aspangaro/10_p57 
FIX: Export FEC - Force Carriage Return Line Feed
 2020-12-13 15:06:19 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels 
Fix & sync import/export entity icons/labels translation
 2020-12-13 12:50:30 +01:00
Juanjo Menent
4fc57d096e Fix #15556 2020-12-12 20:37:00 +01:00
Laurent Destailleur
57b3b3db3a Prepare 12.0.4 2020-12-12 19:18:45 +01:00
Laurent Destailleur
2592344601 Fix missing price2num 2020-12-12 17:27:27 +01:00
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability 
reported by Yılmaz Değirmenci
 2020-12-11 15:12:42 +01:00
Laurent Destailleur
ad4a8eac52
Merge pull request #15725 from fmarcet/11.0 
FIX: Bad rigths to send contract
 2020-12-11 14:41:08 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
89854ea137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 22:24:14 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label 
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
 2020-12-08 22:09:27 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Laurent Destailleur
111d6aa621
Merge pull request #15695 from aspangaro/10_p57 
FIX : Export FEC - Remove line at zero
 2020-12-08 17:55:31 +01:00
Laurent Destailleur
996e01fe6a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 17:52:01 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and 
lot module
 2020-12-08 17:51:26 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
ee9c938ea2
Merge pull request #15691 from fbosman/patch-4 
Update product.class.php
 2020-12-07 19:03:28 +01:00
Laurent Destailleur
669205af1c
Update product.class.php 2020-12-07 19:02:49 +01:00
Florian Mortgat
f871ade545 FIX 12.0 - the stringent XSS prodection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise. 2020-12-07 15:15:41 +01:00
Frans Bosman
7ad70c7c21
Update product.class.php 
Added Hidden Option STOCK_DEFAULT_BATCH, in order to replace the default '000000' batchnumber for the existing stock  when batchnumbers are enabled for a product.
 2020-12-07 14:33:44 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-12-06 19:03:46 +01:00
Laurent Destailleur
12b15a3d90
Merge pull request #15634 from aspangaro/10_p57 
FIX: Problem on supplier payment card
 2020-12-04 22:05:06 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
Laurent Destailleur
c1b6e58bbd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-04 19:12:22 +01:00
Laurent Destailleur
49db52134b Fix for negative numbers 2020-12-04 18:19:51 +01:00
Laurent Destailleur
e0b737b622
Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv 
pricetonum() - preg-replace() delete "-" negativ number
 2020-12-04 18:19:22 +01:00
Laurent Destailleur
c69821794e
Merge pull request #15651 from fappels/11_fix_volume_calculation 
FIX product auto volume calculation
 2020-12-04 18:17:38 +01:00
Laurent Destailleur
aeda250df4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/install/mysql/data/llx_c_shipment_mode.sql
 2020-12-04 18:14:57 +01:00
Laurent Destailleur
283d4742f4 Merge branch 'FHenry-12.0_fix_fourn_commande_round' into 12.0 2020-12-04 18:13:29 +01:00
Laurent Destailleur
bc7cb4a148
Merge pull request #15640 from ATM-Consulting/FIX/12.0_Opensurvey_filters_by_entity_but_always_sets_entity_to_1 
FIX 12.0 - on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
 2020-12-04 18:11:24 +01:00
Laurent Destailleur
46bb49c490
Merge pull request #15638 from ptibogxiv/patch-396 
Fix limit product in customer margins
 2020-12-04 18:10:49 +01:00
Laurent Destailleur
628257d771
Merge pull request #15649 from atm-benoit/FIX_SUPPLIER_PROPOSAL 
Fix supplier proposal
 2020-12-04 18:06:08 +01:00
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units 
surface_unit can be 0 for m2
 2020-12-04 16:54:40 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
Laurent Destailleur
2c9e490853
Merge pull request #15643 from atm-benoit/FIX_INSTALL_12_SHIP_MODE 
FIX SHIP MODE install v12 bug insert
 2020-12-04 15:58:44 +01:00
stickler-ci
ddf82f3e7a Fixing style errors. 2020-12-04 14:45:26 +00:00
atm-benoit
b9461322d9 FIX SUPPLIER PROPOSAL v12 bug add 2020-12-04 15:37:00 +01:00
atm-benoit
575bb7d420 FIX SHIP MODE install v12 bug insert 2020-12-04 14:20:25 +01:00
Francis Appels
5218550014 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-04 11:08:21 +01:00
Florian Mortgat
7685ed8295 FIX excess comma 2020-12-04 10:10:44 +01:00