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

1208 Commits

Author SHA1 Message Date
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
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
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
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
BENKE Charlene
c2bd30a7e9 working progress 2020-11-26 11:59:00 +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
772d401a64 FIX Restore a more common behavior. Add a hidden constant to switch to a 
mode when we must enabled load of shippable status.
 2020-11-19 19:56:00 +01:00
Laurent Destailleur
4ae121d870 FIX Can't create shipment for virtual product. Add 
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
 2020-11-16 19:43:45 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
45f834cb15 FIX #15199 2020-11-01 15:20:33 +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
Frédéric FRANCE
f5673fd08a
doxygen 2020-10-28 22:47:29 +01:00
Laurent Destailleur
ef59b71cdf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/stats/card.php
 2020-10-28 17:02:20 +01:00
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
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
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
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
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +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
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge 
NEW : Declinaison price level compatibility
 2020-08-16 23:18:49 +02:00
John Botella
41cbe6db12 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge 2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb Modify int to float for stock limit alert and desired stock 2020-08-12 09:09:59 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
817912ea40 FIX #14291 2020-08-02 01:11:23 +02:00
florian HENRY
e44a1fd33f ->error rather than dol_print_error into product 2020-07-31 16:09:38 +02:00
Laurent Destailleur
e7fedd5c2d FIX Sql error on stat by referring entries of a product 2020-07-30 19:14:40 +02:00
Laurent Destailleur
1d686a0d4c
Update product.class.php 2020-07-29 13:18:49 +02:00
abb
fd6477c054 fetch product model_pdf field 2020-07-27 10:57:39 +01:00
Laurent Destailleur
474860d546 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +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
Langlais115
dc6ae70aa6 Fix #13805 
Add proper type check to "seuil_stock_alerte" parameter.
 2020-05-15 14:00:26 +02:00
Laurent Destailleur
f6ac2d2545
Merge pull request #13866 from Tim-Otte/fix-11948 
FIX #11948
 2020-05-12 03:07:53 +02:00
Laurent Destailleur
a099858385
Update product.class.php 2020-05-12 03:07:23 +02:00
Tim Otte
65011c2877 Fixed the product unit translation 2020-05-11 15:11:23 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
d176840bfb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
18fdf3573f FIX draftordered replenish virtual stock 2020-04-15 16:05:50 +02:00
Laurent Destailleur
dc86f9528d Fix MRP module 2020-04-13 18:10:20 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +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
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
401265d09e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest 
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
 2020-03-30 13:03:13 +02:00
atm-quentin
cef65a3c8f FIX hook name and useless inithook 2020-03-26 09:20:14 +01:00
atm-quentin
e9ee78ab8f NEW hook on product load stats 2020-03-25 11:20:54 +01:00
Alexandre SPANGARO
5528e9ef38 Work on split module fournisseur 2020-03-24 22:02:58 +01:00
Laurent Destailleur
23e06debb7 Popup is smaller 2020-03-22 11:52:02 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
31865d7ae5 Fix doc 2020-03-12 12:39:21 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
dea8525a6c NEW X-Axis on graph are show vertical when there is a lot of values. 2020-02-29 01:26:24 +01:00
Laurent Destailleur
56704e4029 Add stats of products in MO 2020-02-28 19:26:52 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
stickler-ci
102595f6b1 Fixing style errors. 2020-02-06 09:02:15 +00:00
atm-greg
f8ffdea5ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging 2020-02-06 09:59:42 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
17f28189f9 Virtual stock must include Manufacturing Orders 2020-01-24 14:51:45 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
 2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php 2020-01-03 20:53:49 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Regis Houssin
71a2998118 FIX wrong var name and avoid warning 2019-12-30 15:36:09 +01:00
Regis Houssin
c76edb20d7 FIX avoid php warning 2019-12-27 12:20:38 +01:00
VESSILLER
b0edd46494 FIX add product qty in shipment already sent 2019-12-23 15:07:26 +01:00
Laurent Destailleur
03649ea2c8 Fix pb with svg images 2019-12-19 19:10:23 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
650c9c2e57
Update product.class.php 2019-12-03 16:46:50 +01:00
Laurent Destailleur
a00d011f10
Merge pull request #12609 from frederic34/patch-20 
Update product.class.php
 2019-12-03 13:18:29 +01:00
Laurent Destailleur
37cee5840a
Merge pull request #12608 from frederic34/patch-19 
$id parameter was removed long time ago
 2019-12-03 13:17:01 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
ac674aae6a
Update product.class.php 2019-12-02 20:45:28 +01:00
Frédéric FRANCE
579f570abf
$id parameter was removed long time ago 2019-12-02 20:42:48 +01:00
Norbert Penel
89f57d7d3b
add label to combobox 
useful for BOM, etc
 2019-11-30 23:45:24 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
 2019-11-29 11:42:08 +01:00
Laurent Destailleur
a4a805f618 Doxygen 2019-11-29 11:32:22 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
VESSILLER
851cf4f3f3 FIX add product qty in shipment already sent only if reel stock was decremented 2019-11-14 09:52:13 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Philippe GRAND
69e1d0480a add some comment 2019-11-10 12:10:13 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties 2019-11-09 13:29:12 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
8485747713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847 FIX #12281 2019-11-02 13:37:30 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019 
add some comment
 2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Philippe GRAND
07cd656a1c add some comment 2019-11-01 10:56:46 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
5999d8a05a
Update product.class.php 2019-10-24 16:11:05 +02:00
Frédéric FRANCE
93a8b1d2a3
Update product.class.php 2019-10-24 16:09:35 +02:00
Laurent Destailleur
2e573fd794 Fix save of units 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/card.php
	htdocs/product/class/product.class.php
 2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057 Debug option PRODUCT_ADD_NET_MEASURE 2019-10-23 02:58:39 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices 
NEW add clone customers prices in clone product or service
 2019-10-20 13:27:50 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
VESSILLER
801092d848 NEW add clone customers prices in clone product or service 2019-10-18 15:10:22 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
4ca9fddfcc
Update product.class.php 2019-10-16 14:26:49 +02:00
Cédric
3429cb7c1d
New: Update product type with update method 2019-10-14 22:42:38 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187 2019-10-09 13:02:47 +02:00
ptibogxiv
10c29887d6
Update product.class.php 2019-10-08 16:15:12 +02:00
ptibogxiv
e2d76f6f24
Update product.class.php 2019-10-08 16:13:59 +02:00
altairis
85bbf1decb Merge branch 'develop' into prodstats 2019-10-04 11:05:36 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
stickler-ci
1e8663b1c8 Fixing style errors. 2019-09-10 18:48:55 +00:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187 2019-09-10 20:46:54 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
ptibogxiv
1b4788c6d0
Update product.class.php 2019-08-24 14:21:41 +02:00
ptibogxiv
0ce22d68ef
Update product.class.php 2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php 2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php 2019-08-10 09:12:15 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note 2019-08-06 16:54:44 +02:00
ptibogxiv
d22c2960b7
Update product.class.php 2019-08-06 00:14:19 +02:00
ptibogxiv
2d77bfd873
Update product.class.php 2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php 2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php 2019-08-04 13:42:50 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Christophe Battarel
face07ece1 new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC 2019-05-01 15:15:20 +02:00
Laurent Destailleur
cb08bf6021 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/class/product.class.php
 2019-04-11 16:23:56 +02:00
gauthier
9a24007c0a FIX : better test 2019-04-11 15:32:50 +02:00
gauthier
524b186959 FIX : Product accountancey sell intra code must be visible if main feature level 1 2019-04-11 15:19:40 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
50395b7dd7 New: Input field to search product always visible with focus so you can 
use a barcode flasher at any time
 2019-03-28 18:51:04 +01:00
Frédéric FRANCE
ba749ffc8c
Update product.class.php 2019-03-14 09:14:29 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status 
Add badge status css part1
 2019-03-11 20:49:31 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
Frédéric FRANCE
86c1694195
update doc in product class 2019-03-09 10:36:39 +01:00
Scrutinizer Auto-Fixer
68188ffda1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-03-09 00:02:05 +00:00
Frédéric FRANCE
e845b96f2b
Update product.class.php 2019-03-07 22:40:16 +01:00
John BOTELLA
ca10b1e403 add new dolGetStatus to LibStatut in product class 2019-03-07 11:37:54 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Frédéric FRANCE
27218b7087
wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Laurent Destailleur
ab262237b2
Merge pull request #10393 from fappels/10_add_product_dimensions 
NEW Show product dimensions in product list tooltip.
 2019-01-26 14:14:03 +01:00
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
Francis Appels
9227d9fe9b Show product dimensions in product list tooltip. 2019-01-22 12:42:02 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
JC Prieto
99e2f893fd Fix: loadBatchInfo() 2019-01-02 19:38:44 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
850b939ffd FIX CVE-2018-19994 2018-12-22 17:03:50 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
BENKE Charlene
946d55a7bb
fk_default_warehouse not defined 2018-12-12 00:41:11 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Bouquet
cb10da4d41 [Core] Add product search from barcode via REST api 2018-11-05 23:06:19 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9 2018-10-24 12:24:00 +02:00
Laurent Destailleur
2e0de15f95 Add public 2018-10-24 11:26:50 +02:00
Laurent Destailleur
f0743c55bb Fix phpcs 2018-10-24 11:24:10 +02:00