Commit Graph

5659 Commits

Author SHA1 Message Date
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
e3542c6d4f Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02: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
50ca9f4145 Clean code 2020-10-02 19:10:30 +02:00
Laurent Destailleur
b15d862f36 Merge pull request #14870 from atm-john/12.0_add_filters_on_tab_soc_price
ADD : Filters more filters on customer price tab
2020-10-02 15:40:52 +02:00
stickler-ci
2ea6c092a4 Fixing style errors. 2020-10-02 13:05:50 +00:00
Laurent Destailleur
bede4040f6 Update productcustomerprice.class.php 2020-10-02 15:04:03 +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
f79bce638a Merge pull request #14872 from FHenry/develop
fix remove php warning non-numeric value
2020-10-01 19:18:11 +02:00
Laurent Destailleur
89dfb9baf8 Merge pull request #14887 from cfoellmann/fix-origin-user
handle fk_origin for stock movement for users the core way
2020-10-01 19:15:01 +02:00
Christian Foellmann
a890b2d7ad handle fk_origin for stock movement for users the core way 2020-10-01 12:31:00 +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
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Florian HENRY
6b539dfad0 fix remove php warning non-numeric value 2020-09-30 13:53:27 +02:00
geoffrey.girard
8c017ad422 ADD : Filters more filters on customer price tab 2020-09-30 13:33:05 +02:00
Cédric
572b012344 Fix API $includeparentid when get product 2020-09-28 22:06:15 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Laurent Destailleur
c659379307 Try a more complete fix than #14821 2020-09-27 17:21:49 +02:00
Laurent Destailleur
ca8d9613ce Merge pull request #14821 from cfoellmann/fix-pricestable
fix selectbox for table columns supplier prices
2020-09-27 17:12:37 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Christian Foellmann
be05a44860 fix selectbox for table columns supplier prices 2020-09-24 11:49:59 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
Laurent Destailleur
ece46511f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-23 23:02:52 +02:00
Laurent Destailleur
95cf3d2f51 NEW Can use desired stock of a given warehouse for replenishment 2020-09-23 23:02:31 +02:00
Laurent Destailleur
6f919f1dd0 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
d5d187c793 Fix phpunit 2020-09-21 01:31:35 +02:00
Laurent Destailleur
19141b3eb9 Merge pull request #14633 from c3do/patch-6
NEW Improve Product API for variant products
2020-09-20 19:34:12 +02:00
Laurent Destailleur
9522b12da1 Update api_products.class.php 2020-09-20 19:33:18 +02:00
Laurent Destailleur
dccdfd3a53 Merge pull request #14766 from ptibogxiv/patch-361
FIx  product list
2020-09-20 17:18:29 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b fix more different button visibility 2020-09-18 11:48:53 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
ptibogxiv
08d7973b4a Update list.php 2020-09-17 22:10:22 +02:00
ptibogxiv
cbd511fbb4 Update list.php 2020-09-17 16:16:35 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Cédric
75b46dd535 Update api_products.class.php 2020-09-17 12:45:20 +02:00
Cédric
2b6a6e12e3 Update api_products.class.php 2020-09-17 12:43:04 +02:00
Laurent Destailleur
0bf0312d50 FIX #yogosha4448 2020-09-17 12:30:14 +02:00
ptibogxiv
8284d0ee06 FIx product list
fix mistake if fk_state empty
2020-09-17 11:41:53 +02:00
Laurent Destailleur
5daba4b0ed Merge pull request #14752 from ptibogxiv/patch-360
NEW filter product list by country and/or state/province
2020-09-17 11:21:23 +02:00