lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,602 Commits 43 Branches 150 Tags 886 MiB
44713825e6
Commit Graph

5793 Commits

Author SHA1 Message Date
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +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
70b772cf74 Kit must show details on PDF. 2020-12-08 21:56:48 +01:00
Laurent Destailleur
a0b1bd3eca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
 2020-12-08 18:03:01 +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
Laurent Destailleur
6beba9e351
Merge pull request #15674 from frederic34/patch-14 
fix undefined variable
 2020-12-07 22:34:10 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +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
8b3edd36ea Fix warning 2020-12-07 10:37:55 +01:00
Laurent Destailleur
abadd2b803 Clean phpunit 2020-12-06 19:33:43 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Frédéric FRANCE
758bb20750
fix undefined variable 2020-12-05 18:55:39 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +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
9cbdbc460d Fix multicurrency 2020-12-04 19:10:43 +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
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
d0cb9bc4ed Debug price_rule page. 2020-12-01 02:34:24 +01:00
Laurent Destailleur
3c74e44ce3
Merge pull request #15576 from mkdgs/patch-2 
Fix: undefined measuring_units_squared() on update
 2020-11-30 15:47:47 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
fa8b960520 Clean code 2020-11-30 13:22:48 +01:00
Mickael Desgranges
283c83cae0
FIX: undefined measuring_units_squared() on update 
On update product, by a third party module, measuring_units_squared() and measuring_units_cubed() was undefined
 2020-11-30 09:04:13 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
stickler-ci
89759174dd Fixing style errors. 2020-11-25 09:45:04 +00:00
Regis Houssin
a0dcbb3b79 FIX missing "price_base_type" and refactor to include cache 2020-11-25 10:40:38 +01:00
Laurent Destailleur
e35c745838 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
 2020-11-24 13:41:46 +01:00
Laurent Destailleur
faa33f2d3c FIX #15501 2020-11-24 12:52:39 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev 
Feature : creation of a "button-cancel" class
 2020-11-23 21:53:45 +01:00
Laurent Destailleur
1e70790cd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/price.php
 2020-11-23 19:55:13 +01:00
Laurent Destailleur
9cb5673c36 Fix remove var_dump 2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f FIX formating of prices with foreign languages 2020-11-23 19:08:26 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Laurent Destailleur
fe0764be6e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/class/product.class.php
 2020-11-22 02:32:47 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev 
Feature : creation of a "button-save" class
 2020-11-21 23:44:30 +01:00
Francis Appels
064b5acff5 List supplier barcode 2020-11-20 17:16:49 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop 
Update fork
 2020-11-20 13:53:43 +01:00
Laurent Destailleur
6976471988
Merge pull request #15442 from hregis/develop_bug2 
FIX to preserve order of multiprices fields
 2020-11-20 13:38:19 +01:00
Laurent Destailleur
2368b5199d
Merge pull request #15453 from frederic34/patch-18 
add filters
 2020-11-20 13:35:49 +01:00
Regis Houssin
265d19f563 FIX better method to preserve order 2020-11-20 08:07:44 +01:00
Frédéric FRANCE
19a64a8350
add filters 2020-11-19 21:19:54 +01:00
Frédéric FRANCE
bf535c0dec
remove warnings 2020-11-19 21:12:16 +01:00