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

1345 Commits

Author SHA1 Message Date
Frédéric FRANCE
ae1adfb2d7
Update product.class.php 2020-10-22 22:33:35 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php 2020-10-22 21:11:49 +02:00
kamel
134994882c NEW : Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') ) 2020-10-20 15:52:29 +02:00
Florian HENRY
6a4e01de1d fix review 2020-10-15 08:36:04 +02:00
stickler-ci
ee631e629f Fixing style errors. 2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c add show empty 2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Florian HENRY
a2ef7bc61e add select 2020-10-14 14:26:40 +02:00
Florian HENRY
ca37827e72 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270 fix travis 2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
08379cbfc6 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 10:32:07 +02:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02:00
stickler-ci
7abb0caf91 Fixing style errors. 2020-10-14 06:47:16 +00:00
Florian HENRY
74155a49be finish BOM stat referent object 2020-10-14 08:42:57 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +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
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
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
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
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
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
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
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
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Laurent Destailleur
f06737097f Look and feel v13 2020-09-10 16:37:42 +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
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
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
stickler-ci
d743cb6ac2 Fixing style errors. 2020-09-04 11:22:22 +00:00
Laurent Destailleur
35c0bc81e2
Update api_products.class.php 2020-09-04 13:21:10 +02:00
Laurent Destailleur
8e2001a09b
Update api_products.class.php 2020-09-04 13:20:03 +02:00
Laurent Destailleur
9cafd3b97f
Update api_products.class.php 2020-09-04 13:10:30 +02:00
stickler-ci
52c057b9dd Fixing style errors. 2020-09-04 11:06:43 +00:00
Laurent Destailleur
a98c5b9841
Update api_products.class.php 2020-09-04 13:05:30 +02:00