Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 10:51:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,485 Commits 36 Branches 191 Tags
3801dd34cdb62b94de22b8ebb934b65e63b052b1
Commit Graph

394 Commits

Author SHA1 Message Date
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +01:00
Frédéric FRANCE
11100b3017 missing default value 2021-01-13 15:16:43 +01:00
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
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
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
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +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
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
9595d56235 Merge pull request #15186 from fappels/13_fix_delete_product_ajax 
Fix delete product using ajax
 2020-10-27 20:03:00 +01:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
cab2c24e27 Merge branch 'develop' into patch-43 2020-10-03 15:51:38 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
baa46cd502 Fix syntax error 2020-09-16 02:53:44 +02:00
stickler-ci
b3f78100bf Fixing style errors. 2020-09-15 23:01:00 +00:00
Laurent Destailleur
9e494d0bb3 Update card.php 2020-09-16 00:59:23 +02:00
stickler-ci
ad84aaacc6 Fixing style errors. 2020-09-14 09:01:11 +00:00
ptibogxiv
de31920f28 NEW add state origin for product 
usefull for food, fruits or vegetables  or regional product

soon in other PR i will push filter by state or country in product list
 2020-09-14 10:57:51 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Christian Foellmann
821e7e2894 set default unit to PRODUCT_USE_UNITS value 2020-08-10 15:39:05 +02:00
florian HENRY
164e3bff2c add formConfirm hook 2020-07-31 15:23:26 +02:00
Laurent Destailleur
a155b20b2f Trans 2020-07-10 16:27:59 +02:00
Anthony Berton
bda4753e41 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
 2020-06-06 11:51:39 +02:00
Laurent Destailleur
2344435416 Fix XSS CWE-ID CWE-79 2020-06-05 23:41:29 +02:00
Frédéric FRANCE
174ddc5fd4 prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041 add new rule 2020-05-21 01:56:06 +02:00
Anthony Berton
485ef522d2 Add option HT TTC créate product 2020-05-03 19:47:10 +02:00
Pierre Ardoin
19c85785f7 Fix 2020-04-16 13:26:55 +02:00
Pierre Ardoin
e85b4a5a20 FIX Directory Issue with Multicompany 
Before : Cannot show documents added entity who created the product/service

Now : show all files. 

Warning : all products must be generated in $object->entity directory and not in $conf->entity.
 2020-04-16 12:15:41 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
 2020-04-05 03:44:06 +02:00
atm-quentin
9a92545d8d FIX missing default accountancy product buy code 2020-03-30 14:28:22 +02:00