lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,597 Commits 43 Branches 150 Tags 886 MiB
dccdfd3a53
Commit Graph

5603 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
ptibogxiv
6f564c1937
NEW filter product list by country and/or state/province 2020-09-16 12:34:07 +02:00
Laurent Destailleur
382a4552eb Fix css 2020-09-16 03:39:03 +02:00
Laurent Destailleur
adeed1464d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:56:09 +02:00
Laurent Destailleur
baa46cd502 Fix syntax error 2020-09-16 02:53:44 +02:00
Laurent Destailleur
d954de2d35
Merge pull request #14732 from ptibogxiv/patch-359 
NEW add State/Province origin for products
 2020-09-16 01:02:00 +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
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product. 
CSS
 2020-09-15 02:41:08 +02:00
Laurent Destailleur
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Laurent Destailleur
7712b277a6 Look and feel v13 2020-09-14 21:55:25 +02:00
stickler-ci
ad84aaacc6 Fixing style errors. 2020-09-14 09:01:11 +00:00
ptibogxiv
92aab677e9
Update product.class.php 2020-09-14 10:59:09 +02: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
Florian Mortgat
4c6b0ed5b5 FIX 12.0 - round value of virtual stock on product stock reassort list 2020-09-14 10:49:44 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
d0698735d6
Update product.class.php 2020-09-14 00:14:25 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
009c7eaf31 Standardize code with module builder 2020-09-11 16:16:04 +02:00
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
f06737097f Look and feel v13 2020-09-10 16:37:42 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
c761b829b4
Merge pull request #14659 from Tim-Otte/feature-filterable-purchase-price-table-columns 
NEW Purchase price table: Added filterable table columns
 2020-09-09 18:55:55 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
stickler-ci
a9a95c8a83 Fixing style errors. 2020-09-07 13:47:26 +00:00
Tim Otte
c6cb179447 Added filterable table columns 2020-09-07 15:43:36 +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
Laurent Destailleur
7e879a8012 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:44:49 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
c8da9f97a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-09-04 19:51:22 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction 
Conflicts:
	htdocs/product/stock/product.php
 2020-09-04 19:38:56 +02:00
Laurent Destailleur
0c1a5d9e25 FIX using decimal on stock correction 2020-09-04 19:34:20 +02:00
Laurent Destailleur
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00