dolibarr

Author	SHA1	Message	Date
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
VESSILLER	6e806a5aed	FIX empty cache when we want to load specific warehouses in select	2019-09-16 10:37:55 +02:00
ptibogxiv	ea1baefe9a	NEW: delete purchase price API	2019-09-15 20:50:18 +02:00
Laurent Destailleur	12d67c5f85	Rename api to get all purchase prices	2019-09-15 17:18:10 +02:00
Laurent Destailleur	68a3c5b41c	Merge pull request #11853 from ptibogxiv/patch-259 NEW add supplier's product list	2019-09-15 17:04:17 +02:00
Laurent Destailleur	5d0ba10f34	Update api_products.class.php	2019-09-15 17:04:08 +02:00
Laurent Destailleur	4a815da993	Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order NEW add minimum stock filter in load warehoues for product form	2019-09-14 17:09:27 +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
VESSILLER	6a734ea828	NEW add minimum stock filter in load warehoues for product form	2019-09-09 16:58:20 +02:00
stickler-ci	be66e1bd20	Fixing style errors.	2019-09-09 14:36:02 +00:00
ptibogxiv	f4a565544f	Update api_products.class.php	2019-09-09 16:33:12 +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
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Frédéric FRANCE	a5aedacb7e	Update productbatch.class.php	2019-09-03 16:49:41 +02:00
Laurent Destailleur	ffcea3dfd8	Fix phpcs	2019-09-03 14:48:06 +02:00
ptibogxiv	d7cc76b94a	NEW purchase_prices API	2019-08-26 20:10:00 +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
Francis Appels	a26c868783	Fix scrutinizer bugs	2019-06-12 22:05:10 +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	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +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
Laurent Destailleur	1a8902f23e	Fix migration for compatibility	2019-03-19 12:03:02 +01:00
Laurent Destailleur	1a05cdfaa1	Fix regressions in selecting duration of service	2019-03-19 11:42:50 +01:00
Laurent Destailleur	3c40d5d30c	Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units Fix measure unit id in select options	2019-03-14 14:10:13 +01:00
Frédéric FRANCE	ba749ffc8c	Update product.class.php	2019-03-14 09:14:29 +01:00
Lionel VESSILLER	17dd88d397	Fix measure unit id in select options	2019-03-13 14:05:32 +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
Laurent Destailleur	d99f4c1726	Fix var not used	2019-03-09 01:08:50 +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	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Frédéric FRANCE	27218b7087	wip	2019-02-24 23:32:09 +01:00
Regis Houssin	1c3541295b	FIX wrong class name "CUnits instead CMeasuringUnits"	2019-02-19 09:24:30 +01:00
florian HENRY	37c66c2ece	travis	2019-02-13 12:32:06 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
florian HENRY	5b5f96bafb	NEW : measuring unit dictionnary and product size/unit import	2019-02-12 16:58:11 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +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
Philippe GRAND	621b42e8e3	update with html5 compliant code	2019-01-21 10:02:11 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +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
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Frédéric FRANCE	20acf440a3	Update api_products.class.php	2018-11-10 07:55:01 +01:00
Frédéric FRANCE	b271e1a3b0	The variable $i seems to be never defined.	2018-11-10 07:27:20 +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
Frédéric FRANCE	2a6478a2c4	fix phpcs	2018-10-24 08:15:00 +02:00
Juanjo Menent	e40ee879dc	New: works with variants: - If product is variant disable prices modify - Add function isVariant for knowing if product is a Variant	2018-10-23 13:07:09 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	de4ead2558	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/class/accountancycategory.class.php htdocs/core/actions_massactions.inc.php htdocs/product/reassort.php	2018-10-19 14:16:53 +02:00
Ferran Marcet	ffde353441	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:06:06 +02:00
Ferran Marcet	bdae4e1c4d	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:04:42 +02:00
Ferran Marcet	b462e7b217	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:01:02 +02:00
Laurent Destailleur	d43e1fcef6	Merge pull request #9729 from simnandez/develop New: works with variants	2018-10-16 20:08:17 +02:00
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Juanjo Menent	194b3478f3	Merge remote-tracking branch 'upstream/develop' into develop # Conflicts: # htdocs/product/class/product.class.php	2018-10-15 13:40:42 +02:00
Laurent Destailleur	cca87f3d5a	Fix phpcs	2018-10-15 13:27:17 +02:00
Laurent Destailleur	6ab037c766	Fix code comment	2018-10-15 13:26:18 +02:00
Laurent Destailleur	f59dba66e7	Fix phpcs	2018-10-15 13:23:35 +02:00
Juanjo Menent	58cc9aa918	Fix: found 1 blank lines before brace	2018-10-15 12:45:40 +02:00
Juanjo Menent	e3643c7ab7	Merge remote-tracking branch 'upstream/develop' into develop	2018-10-15 11:44:50 +02:00
Laurent Destailleur	7e68d8df1b	Update product.class.php	2018-10-14 16:47:30 +02:00
Laurent Destailleur	5654492ba8	Update product.class.php	2018-10-14 16:45:45 +02:00
Laurent Destailleur	db2e1e09e7	Merge branch 'develop' into patch-112	2018-10-14 16:44:36 +02:00
Philippe GRAND	849a1a9400	Standardize and update code	2018-10-12 09:26:58 +02:00
Juanjo Menent	0976616401	Fix: Opening brace should be on a new line	2018-10-11 17:13:39 +02:00
Juanjo Menent	ab55ff2e2c	New: works with variants: - Make the checkbox working correctly	2018-10-11 15:44:23 +02:00
Juanjo Menent	2ef0e95586	New: works with variants: - If product is parent showing stock of childs and not itself - Add function hasVariants for know if product has variants	2018-10-11 12:08:50 +02:00
Philippe GRAND	596dba9ce1	Standardize code	2018-10-06 12:14:47 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Frédéric FRANCE	5d87847b65	reduce complexity of libstatut product.class.php	2018-09-15 22:13:54 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	47b6374abc	Standardize and update code	2018-09-04 13:45:20 +02:00
Philippe GRAND	42565e722e	Standardize and update code	2018-09-04 13:37:00 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Frédéric FRANCE	3e723af018	start changing phpcs:ignore	2018-09-01 23:46:13 +02:00
Philippe GRAND	db32d8903e	Standardize and Update code	2018-09-01 23:20:20 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	45cbc36a15	Standardize and update code	2018-09-01 15:27:55 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Laurent Destailleur	26cff9e11f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/blockedlog.lang htdocs/stripe/config.php	2018-09-01 14:13:01 +02:00
Laurent Destailleur	123a66dc2a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/product/class/product.class.php	2018-09-01 14:09:00 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Frédéric FRANCE	ebcf43ec73	function Comment Missing	2018-08-31 21:39:23 +02:00
Philippe GRAND	2f307aae21	Standardize and update code	2018-08-31 18:06:17 +02:00
atm-greg	f8fef61075	remove useless db begin	2018-08-30 09:19:44 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Laurent Destailleur	534eadb7a2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 01:35:43 +02:00
Norbert Penel	f9c1dd8edd	There is a begin transaction without rollback In this Select, there is no need of this Begin Transaction on my understanding. Don't know why this line code is here for.	2018-08-28 01:32:55 +02:00
Philippe GRAND	87067b2bc9	Standardize and update code	2018-08-23 18:35:45 +02:00
Norbert Penel	92b0668e3e	There is a begin transaction without rollback In this Select, there is no need of this Begin Transaction on my understanding. Don't know why this line code is here for.	2018-08-23 17:40:40 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	a36061079b	Update and standardize code	2018-08-22 11:11:59 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
atm-greg	ad5f59822e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:33:30 +02:00
atm-greg	fc705e8510	Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:31:41 +02:00
atm-greg	a8b33a1710	New fields desc_supplier on product_fourn_prices	2018-08-06 16:26:25 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Laurent Destailleur	20e360e918	Start to introduce array fields for products	2018-07-15 18:22:26 +02:00
Laurent Destailleur	d5cb2fc4cd	Update productcustomerprice.class.php	2018-07-09 17:04:50 +02:00
Laurent Destailleur	551e2efe86	Update productcustomerprice.class.php	2018-07-09 17:03:55 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
Laurent Destailleur	7981bd08b7	Fix price+sql error when adding product when no supplier price defined	2018-06-16 14:47:33 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
fappels	a86c90fed1	Fix Wrong error for duplicate ref if barcode enabled but not set.	2018-06-12 16:38:42 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Laurent Destailleur	be2c49d490	Fix log	2018-06-01 17:39:07 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
BENKE Charlene	8ed3b3e49c	Update product.class.php	2018-05-06 22:12:43 +02:00
BENKE Charlene	70c9ed960d	let's play with hook	2018-05-06 22:11:24 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	634e58b7c9	Look and feel v8	2018-05-04 18:24:00 +02:00
fappels	db76fd7895	Fix delete all product variants of a parent product User object missing	2018-05-02 22:33:23 +02:00
BENKE Charlene	5ac0f77d0e	Add trigger for virtual stock Allow to add/sustract some qty for GPAO OF running	2018-05-02 17:29:31 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Frédéric FRANCE	657fa48c3f	Update api_products.class.php	2018-04-23 15:31:55 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	394b988a4e	FIX key in getEntity for supplier proposals	2018-04-21 14:41:31 +02:00
Laurent Destailleur	c30b0da07d	Clean code	2018-04-21 12:12:46 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	eeb2580f32	Fix foreign key error	2018-04-10 22:23:21 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	ff411ed2e5	NEW Add accounting account number on product tooltip	2018-04-08 23:54:04 +02:00
Marc de Lima Lucio	3646374976	NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders	2018-03-28 11:54:21 +02:00
Laurent Destailleur	72cedcf9f3	Removed method fetch_prods() and get_each_prod() not used, keep only get_arbo_each_prod() that is better.	2018-03-22 18:01:06 +01:00
Laurent Destailleur	9980a5fbd0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog	2018-03-22 14:08:43 +01:00
Laurent Destailleur	700c69e127	NEW Can set position of images in module tickets Mutualize code of method show_photo	2018-03-22 11:46:35 +01:00
fappels	9e4a66b1a9	Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION	2018-03-22 10:46:54 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	302fed8646	More fa image to replace png picto	2018-03-14 20:08:44 +01:00
Laurent Destailleur	64f21b8a3c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2018-03-11 00:10:13 +01:00
Laurent Destailleur	6c9e0e1752	Merge branch '7.0' into 7.0	2018-03-10 21:52:57 +01:00
Laurent Destailleur	905cf112e9	Merge pull request #8327 from tiaris/fix7.0 FIX #8289	2018-03-10 18:58:22 +01:00
Laurent Destailleur	6fcc271790	Update product.class.php	2018-03-10 18:57:55 +01:00
BadPixxel	44d18027f2	BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709	2018-03-10 15:48:40 +01:00
jean	6793bfae3a	FIX #8289 add a cofoiguration for correct stopck calculation	2018-03-10 14:17:52 +01:00
Laurent Destailleur	cf45f78d7e	Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency NEW Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-03-07 13:12:23 +01:00
Laurent Destailleur	19ae24f693	Code comment	2018-02-26 21:03:52 +01:00
KHELIFA	54dba24ab5	Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-02-23 11:06:07 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	4f369bd746	NEW Can force usage of shared link for photo of products	2018-02-13 16:34:43 +01:00
Regis Houssin	40fe3849dc	Fix: avoid Warning: A non-numeric value encountered	2018-02-12 08:21:35 +01:00
Laurent Destailleur	fae7616281	Fix update price when updating products	2018-02-01 21:20:54 +01:00
Laurent Destailleur	3c3402bc60	Debug API for prices of products	2018-01-14 15:58:04 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Paul Dermody	a1ac285a25	Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.	2018-01-07 12:42:14 -06:00
Laurent Destailleur	2b056b0177	BUG Fix of old hidden feature price per quantity	2017-12-22 12:53:46 +01:00
Laurent Destailleur	f85e79e250	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php	2017-12-08 13:13:53 +01:00
Laurent Destailleur	8dc3d7323d	Merge pull request #7923 from fmarcet/6.0 FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-08 13:02:07 +01:00
Laurent Destailleur	08abb1490a	Remove code using not defined var	2017-12-08 12:54:08 +01:00
Ferran Marcet	bfc476a118	FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-07 18:44:33 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	4969ae2abb	Fix missing the badge on virtual product tab	2017-12-01 17:48:51 +01:00
Laurent Destailleur	a832bbb348	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture/stats/index.php	2017-12-01 16:18:03 +01:00
Laurent Destailleur	46b015d205	Fix usage of option STOCK_SUPPORTS_SERVICES	2017-12-01 13:40:24 +01:00
root	b7f26ea788	FIX add line bad price and ref	2017-11-30 11:10:01 +01:00
Scrutinizer Auto-Fixer	aab2799981	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-11-27 13:48:36 +00:00
Laurent Destailleur	ae906270f3	Debug module variant	2017-11-26 18:43:43 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	9f235e1ff6	Standardize database: field ref of warehouse was renamed label -> ref	2017-11-24 15:27:00 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	405275693f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/replenishorders.php htdocs/projet/activity/perday.php	2017-11-17 14:20:08 +01:00
florian HENRY	e195cf0b95	fix : return vat code for supplier price	2017-11-14 09:53:06 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Alexandre SPANGARO	2d17e4094c	Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-11-03 06:18:27 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Alexandre SPANGARO	8d3beef161	Add fields in product card	2017-11-01 07:19:36 +01:00
fappels	3f5112ff48	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-31 16:49:54 +01:00
fappels	f7df9e1d1f	Fix travis	2017-10-31 16:49:39 +01:00
fappels	a9ceb46f97	Add parameter to load all lot from lines of object in cache If you want use the lot stock selector in mutiple lines you can add lines array. If you don't give a product id or a lines array, no lot numbers will be loaded.	2017-10-29 20:40:56 +01:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
fappels	7f7e621ea9	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-24 10:53:34 +02:00
fappels	fe2acb2cb6	Add form select for lot numbers	2017-10-23 22:17:24 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	e40bffb0d5	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +02:00
Regis Houssin	45de1ca21e	Fix: check security	2017-10-03 19:09:46 +02:00
Regis Houssin	4537e5472b	Fix: refactorization of "getListForItem" function	2017-10-03 19:01:54 +02:00
Regis Houssin	ed5dca652d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi	2017-10-03 17:32:40 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
Regis Houssin	f8f4ff6d21	Fix: missing include api_categories class	2017-10-03 13:07:07 +02:00
Laurent Destailleur	5482f80c0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 10:30:47 +02:00
Laurent Destailleur	59571b1ce1	FIX #7473 Mass update of vat rates and other bugs on localtax	2017-09-26 10:29:44 +02:00
Laurent Destailleur	934edd9f5a	Merge branch 'develop' into 6.0-api	2017-09-24 22:01:07 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Regis Houssin	77fea1983c	Fix: wrong supplier product price id	2017-09-20 16:57:38 +02:00
Laurent Destailleur	a3c555049d	NEW Add supplier proposals into stats of product page.	2017-09-17 18:08:23 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	8f5206accf	NEW The lot of a product uses the link and picto when shown into list.	2017-09-15 10:45:41 +02:00
Laurent Destailleur	939d33cce7	Fix bug reported by scrutinizer	2017-09-12 19:12:39 +02:00
Laurent Destailleur	47d2350ad4	Fix bugs reported by scrutinizer	2017-09-12 19:03:12 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
Laurent Destailleur	4337001418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/list.php	2017-08-24 14:26:45 +02:00
Laurent Destailleur	bf1f60b31e	Merge	2017-08-23 17:14:29 +02:00
Laurent Destailleur	6b5b10fc94	FIX #7224	2017-08-23 16:28:34 +02:00
Laurent Destailleur	681623c3ab	Merge branch 'develop' into patch-1	2017-08-22 11:43:25 +02:00
Laurent Destailleur	7d57cd6913	Update productcustomerprice.class.php	2017-08-22 11:38:32 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
fappels	78283b6a0b	Ignore rights filter for virtual stock calculation.	2017-06-30 17:02:50 +02:00
Laurent Destailleur	59bd4749a8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php htdocs/product/class/product.class.php	2017-06-24 10:27:10 +02:00
Laurent Destailleur	1211e0d7ab	FIX vat code not saved during product creation.	2017-06-23 12:09:21 +02:00
BENKE Charlene	e98bc90489	introduce OZ : once weight	2017-06-17 10:18:59 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	02781b41ca	Fix several problem with hook printFieldListWhere	2017-06-09 11:02:34 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	1a8884bbbe	NEW Can filter on year and product tags on the product statistic page	2017-05-22 15:20:52 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	c224e2b4f6	Remove table that does not exists	2017-05-17 16:05:26 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	5581e5da72	FIX New vat code not correctly implemented if "1 price per customer".	2017-05-12 13:12:17 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	768df56c07	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	b054ca8267	NEW Introduce mass action on product list ('delete' for the moment)	2017-04-09 15:02:55 +02:00
Laurent Destailleur	ea44e14b60	Start debug the variant module	2017-04-07 11:01:12 +02:00
BENKE Charlie	d8018f7937	add trigger on product price add/update	2017-03-26 19:16:19 +02:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	ee8112dde7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/projet/class/project.class.php	2017-03-21 19:20:14 +01:00
Laurent Destailleur	43e70830ed	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-03-21 17:18:41 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Laurent Destailleur	dfc1ed7d72	FIX #6535	2017-03-16 22:49:02 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	832c91417a	Fix the default_vat_code was not correctly saved and shown on the product price.	2017-03-04 19:16:09 +01:00
fmarcet	e1f459d67a	Fix: Error when references are numeric	2017-03-03 12:57:52 +01:00
Laurent Destailleur	58229907d4	Removed not used class "Service". Reduce nb of request on dashboard.	2017-02-28 12:35:55 +01:00
Laurent Destailleur	170ad1a265	Depreciate a class not really used	2017-02-27 00:56:44 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	fcbc12ce31	Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project New link movement stock to project	2017-02-06 20:45:04 +01:00
Laurent Destailleur	aa1c14e508	Remove change of PMP when we should not	2017-02-06 20:43:44 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
BENKE Charlie	772d862766	Update product.class.php	2017-01-31 23:13:58 +01:00
atm-ph	56d75c552d	New movement stock can be linked to project	2017-01-29 13:04:06 +01:00
Gustavo Novaro	22a815a1b4	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-17 01:21:44 -03:00
Laurent Destailleur	fafe71ec52	Fix autocalculation of surface and volume.	2017-01-16 10:55:33 +01:00
Laurent Destailleur	1b1bab94ca	More complete commit for #6114	2017-01-16 10:43:22 +01:00
Laurent Destailleur	81d76f8600	Merge pull request #6114 from defrance/patch-52 NEW Allow to change heigth and width on product	2017-01-16 10:19:47 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Gustavo Novaro	751aa2a2aa	Improve code style	2017-01-12 12:11:45 -03:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	1f2f03c287	Merge pull request #6222 from gnovaro/patch-4 var to public	2016-12-31 17:27:07 +01:00
Laurent Destailleur	f46ce68d08	NEW Can sort thumbs visible on product card	2016-12-31 16:16:20 +01:00
Marcos García de La Fuente	154425e2bc	Fixed PHP fatal error	2016-12-27 16:13:39 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Gustavo Novaro	191f69ec79	var to public Improve code style	2016-12-23 14:06:11 -03:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Laurent Destailleur	ecab7cb70e	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/class/product.class.php	2016-12-14 12:29:41 +01:00
Laurent Destailleur	43d18cd70c	FIX if a supplier price reference is changed after creating an order, we can't clone order.	2016-12-13 13:22:24 +01:00
Laurent Destailleur	95d8faef04	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/product/class/product.class.php	2016-12-11 10:51:15 +01:00
Laurent Destailleur	7fd75c793a	FIX Regression when deleting product	2016-12-11 10:39:48 +01:00
Laurent Destailleur	9b436ce871	Merge remote-tracking branch 'origin/3.9' into 4.0 Conflicts: htdocs/product/class/product.class.php	2016-12-11 02:51:32 +01:00
Laurent Destailleur	b42a2616bc	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-12-11 02:34:59 +01:00
BENKE Charlie	b7af046147	Add automated compute	2016-12-11 01:53:33 +01:00
Maxime Kohlhaas	3befe1b83f	Fix product photo in tooltip	2016-12-10 23:34:32 +01:00
Laurent Destailleur	cdba7cfa1c	Clean api rest	2016-12-10 19:04:56 +01:00
BENKE Charlie	7c7626e445	allow to change height and width	2016-12-10 13:19:33 +01:00
Maxime Kohlhaas	97e21cb775	Fix : delete product was not possible if batch stock	2016-12-10 13:05:46 +01:00
fappels	bbbc768fa7	Change filter parameter to string with comma seperated values Change warehousefilter from int to string with comma seperated values for selectWarehouses and select_produits form functions.	2016-12-06 20:07:19 +01:00
fappels	c3b43e18d1	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-05 18:15:08 +01:00
fappels	18478eaa31	Add warehouse status filter to load_stock function	2016-12-05 18:08:09 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
fappels	fbdc0c25e3	Add STATUS_OPEN_INTERNAL to stock change/move pages	2016-12-05 11:42:03 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	12350f180a	Merge pull request #5993 from fappels/develop-product-delete-batch Fix Delete from product_batch on product delete	2016-11-22 19:33:07 +01:00
fappels	c09d09b869	Remove hasbatch test Intention is to remove all data linked to product_stock, which will be deleted.	2016-11-20 22:30:40 +01:00
Laurent Destailleur	34b42d5913	Merge pull request #6008 from defrance/patch-44 if supplier have multiple price return it several times	2016-11-19 21:08:59 +01:00
Laurent Destailleur	dd27a52a85	Fix several problems on new REST API on project/tasks	2016-11-19 16:08:27 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
BENKE Charlie	8a37db3f1c	if supplier have multiple price return it several times	2016-11-18 08:23:12 +01:00
fappels	2e6b27f094	Delete from product_batch on product delete	2016-11-15 11:29:12 +01:00
Laurent Destailleur	ecbe719f23	FIX Several problems into shipment management with lot enabled	2016-11-14 13:40:41 +01:00
Laurent Destailleur	381b77850c	Fix do not show cloning of virtual product if option is off	2016-11-14 02:08:41 +01:00
Laurent Destailleur	b79048e6bd	Fix cloning virtual products	2016-11-14 01:46:59 +01:00
Laurent Destailleur	899ba6d90b	NEW Add option to include parent products too in stats of orders	2016-11-11 14:17:11 +01:00
Laurent Destailleur	e2b7773353	Merge pull request #5943 from atm-alexis/FIX_vitual_product_virtual_stock Fix vitual product virtual stock	2016-11-11 14:11:56 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
Laurent Destailleur	e59c2bb61c	Debug accounting menu. Can now edit product account if already set.	2016-11-04 16:15:31 +01:00
Alexis Algoud	8ed13714f7	Merge branch 'develop' into FIX_vitual_product_virtual_stock	2016-10-31 00:04:22 +01:00
Laurent Destailleur	6df4666cf3	Uniformize code	2016-10-30 16:19:31 +01:00
Laurent Destailleur	cc43732c56	Responsive enhancements	2016-10-29 17:02:48 +02:00
BENKE Charlie	632fe49fb9	bad setting on get_entity fournisseur	2016-10-26 16:59:58 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
Laurent Destailleur	aad4380689	Uniformise code	2016-10-24 20:52:21 +02:00
Laurent Destailleur	3c3c5d06a1	Merge branch 'NEW_parent_warehouse' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-NEW_parent_warehouse Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 00:58:02 +02:00
gauthier	59941f9980	FIX : must not get full path with recursive query	2016-10-20 14:29:51 +02:00
Laurent Destailleur	79d376ee12	Debug accountancy module	2016-10-14 13:05:01 +02:00
gauthier	61a3188353	FIX : new parameter documentation	2016-10-14 11:59:07 +02:00
gauthier	1a648cfc89	NEW : getNomUrl displays full path to warehouse # Conflicts: # htdocs/product/stock/class/entrepot.class.php	2016-10-14 11:53:04 +02:00
gauthier	fe1bcb7e0a	NEW : function to display full path to current warehouse	2016-10-14 11:39:46 +02:00
gauthier	416311a7b9	NEW : allow to save a parent warehouse # Conflicts: # htdocs/product/stock/card.php	2016-10-14 11:29:14 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	43da410b95	FIX #5763 Bug: Cannot Create Supplier Price Request	2016-10-01 16:36:01 +02:00
Laurent Destailleur	d39d7d92c9	Uniformize code.	2016-09-26 02:13:58 +02:00
Laurent Destailleur	8fa8bc7d34	Rename table for a better understanding	2016-09-22 11:39:43 +02:00
Laurent Destailleur	cef02a9766	Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse New add limit stock product by warehouse	2016-09-22 09:15:05 +02:00
Laurent Destailleur	d4e324d15a	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/facture.php	2016-09-21 18:38:30 +02:00
Laurent Destailleur	9c12444a03	Fix size of warehouse and height of confirm box	2016-09-21 18:20:18 +02:00
gauthier	2556e59ccf	NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse	2016-09-21 16:21:23 +02:00
Laurent Destailleur	9ff1809f85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php	2016-09-12 02:05:38 +02:00
Laurent Destailleur	1bb278a587	Fix #5712	2016-09-11 23:01:04 +02:00
Laurent Destailleur	25c5f40bf1	Add css on picto status	2016-09-10 19:44:55 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	b107b0644f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-02 22:07:17 +02:00
fappels	aedd813236	Delete product_lot when product deleted	2016-09-02 18:13:25 +02:00
Laurent Destailleur	d6d474f10d	Clean code for category management.	2016-08-29 21:31:27 +02:00
Laurent Destailleur	a9e5668ea4	Fix for jmobile	2016-08-28 16:31:22 +02:00
Laurent Destailleur	661526f822	Fix for jmobile	2016-08-28 16:00:02 +02:00
Laurent Destailleur	e46bda5f9a	Fix for jmobile	2016-08-28 15:58:52 +02:00
Laurent Destailleur	4d4fc87e2b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php	2016-08-09 13:26:08 +02:00
Laurent Destailleur	e168888c59	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
Laurent Destailleur	e1e8254bcf	Fix thumbs are using same extension than original.	2016-08-05 04:31:19 +02:00
Laurent Destailleur	f0c75388cb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php	2016-08-02 17:43:12 +02:00
Laurent Destailleur	dfc38351ef	Fix $i not initialized	2016-08-01 19:48:39 +02:00
Laurent Destailleur	aae2086ada	Move notes on dedicated tabs like other elements. Rename also the note available into translation tab into "other" to avoid confusion because it was not the same usage.	2016-07-28 13:53:17 +02:00
Laurent Destailleur	ee0c77a305	Merge branch 'refactor-rest-api' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-refactor-rest-api Conflicts: htdocs/api/admin/explorer.php	2016-07-27 14:06:14 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
Laurent Destailleur	5a8c08e6cc	Merge pull request #5481 from defrance/patch-12 NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions	2016-07-20 18:23:35 +02:00
BENKE Charlie	8830264c0e	tooltip not present on picto, already present in $link and some case they are conflict	2016-07-20 02:27:40 +02:00
Sof	4d86291527	Fix : syntax error	2016-07-16 19:57:41 +02:00
Sof	4a0668f7ae	Fix : syntax error	2016-07-16 18:33:29 +02:00
Laurent Destailleur	97b03e225b	NEW Add option "Stock can be negative". Off by default.	2016-07-15 19:57:35 +02:00
BENKE Charlie	0ba308a9a5	Update product.class.php	2016-07-15 11:52:59 +02:00
BENKE Charlie	26f27487b9	Add hook for additionnal feature on element tooltip	2016-07-14 18:40:49 +02:00
Xebax	e12e1980fc	REST API: Add comments in the @deprecated tags.	2016-06-22 10:43:35 +02:00
Xebax	70ba8ec78d	REST API: Bring back the existing API (for backward compatibility). Bring back the existing API and mark all the operations as deprecated. Both the existing and the new API are documented and browsable with the Restler API Explorer. The existing API appears under "root".	2016-06-22 10:08:54 +02:00
Xebax	9e9e224c46	REST API: fix deleting a product/service. The global variable $user must be set before calling the Product::delete() method else the check of permissions fails.	2016-06-21 23:08:22 +02:00
Xebax	4a0d554986	Revert "REST API: fix deleting a product/service." This reverts commit `d7c8a466b1`.	2016-06-21 22:54:38 +02:00
Xebax	3b662d6ed8	REST API: improve the API to get/add categories for an item. Move the GET /xxx/{id}/categories requests to the corresponding classes (Contacts, Products, Thirdparties). Move the addCustomerCategory() method to the Thirdparties class. Use the POST verb for the request instead of GET because the request modifies the state of the server.	2016-06-20 17:56:33 +02:00
Xebax	ce6d7046be	REST API: remove getByCategory() from Products because the same feature is available with GET /products/.	2016-06-20 17:56:33 +02:00
Xebax	9a509dd0ee	REST API: add the 'category' filter in /products/ and fix the 'to_sell' and 'to_buy' filters.	2016-06-20 17:56:33 +02:00
Xebax	d7c8a466b1	REST API: fix deleting a product/service. Add a User parameter to the Product::delete() method to explicitly set the user that performs the action instead of using a global variable. In the calls to Product::delete() with a fetched object, remove the deprecated parameter $id.	2016-06-20 17:56:33 +02:00
Xebax	58c25ff665	REST API: fix the error 500 when updating a product.	2016-06-20 17:56:33 +02:00
Xebax	f03d6e1bed	REST API: replace the /product/ API by /products/. Added some FIXME: - the put() method does its job but the API returns an error 500 - delete() does not work.	2016-06-20 17:56:33 +02:00
Laurent Destailleur	59c6c90200	Remove a FIXME.	2016-06-08 11:40:50 +02:00
Laurent Destailleur	f552f3a7d5	Fix missing $notrigger on product delete	2016-06-07 20:51:06 +02:00
Laurent Destailleur	293c8e145a	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/commande/card.php htdocs/imports/import.php htdocs/langs/en_US/admin.lang	2016-06-05 02:20:27 +02:00
Maxime Kohlhaas	3ef9fe2c40	Fix product supplier price modification with multicompany	2016-06-04 18:10:40 +02:00
Laurent Destailleur	0f53993c6f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-02 11:24:24 +02:00
Laurent Destailleur	5106f40a56	Merge branch 'develop_NEW_decrease_stock_expedition_classify' of https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php	2016-06-02 11:23:49 +02:00
Ion Agorria	ade417855b	Fill ref_supplier in product get_buyprice	2016-05-29 13:45:26 +02:00
Laurent Destailleur	b82eabe25f	Code comment	2016-05-19 18:52:12 +02:00
Laurent Destailleur	4e46a01d51	Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-05-17 22:59:46 +02:00
Laurent Destailleur	89d37ccc62	Fix translation	2016-05-17 21:55:39 +02:00
Laurent Destailleur	7bbb3a7da1	Supplier proposal was missing	2016-05-17 19:34:23 +02:00
Laurent Destailleur	e2d3f4e27d	Supplier proposal was missing	2016-05-17 19:15:44 +02:00
Laurent Destailleur	d083ad9382	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/product/class/product.class.php htdocs/resource/class/html.formresource.class.php	2016-05-17 18:21:22 +02:00
Laurent Destailleur	79be93d998	FIX The table llx_product_lot is now filled/used to store eatby/sellby dates.	2016-05-17 18:19:36 +02:00
Laurent Destailleur	0e040b166d	Fix: When we edit a product to use lot/serial number, we initialize records for unknown lots to generic value 'Undefined'.	2016-05-17 17:55:41 +02:00
Laurent Destailleur	1973f67d41	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-17 01:11:14 +02:00
Laurent Destailleur	95ea20eb44	Clean code for stock movement when lot are used. We should not get duplicate records into llx_product_batch	2016-05-17 01:10:11 +02:00
Alexis Algoud	8d0e5479a0	Rename var	2016-05-14 19:22:27 +02:00
Alexis Algoud	e74e70287f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php htdocs/product/stock/replenish.php	2016-05-14 19:14:39 +02:00
Laurent Destailleur	2b6029f5d3	FIX Some fix on stock. Condition to view warehouse as column and protection against infinite loop	2016-05-12 19:44:49 +02:00
Laurent Destailleur	c8d98dbfdc	FIX error reported by scrutinizer	2016-05-08 11:33:46 +02:00
Laurent Destailleur	10c7b167ea	Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status NEW prepare for additional warehouse statuses	2016-05-05 21:27:47 +02:00
Laurent Destailleur	b4e5acbaa9	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/product/class/product.class.php	2016-05-04 14:43:40 +02:00
Laurent Destailleur	568a43214d	Add code comment	2016-05-04 13:51:47 +02:00
Laurent Destailleur	911e862a8e	Fix missing translation and add a TODO to avoid infinite loop.	2016-05-04 13:49:05 +02:00
Laurent Destailleur	7998cefdd2	Fix mark a deprecated function as deprecated	2016-05-04 13:15:00 +02:00
Laurent Destailleur	f324c662c2	Better update of database cleaning non expected records.	2016-04-30 21:58:00 +02:00
Laurent Destailleur	1bfc7e9b70	Merge pull request #5104 from fappels/patch-1 Update product.class.php	2016-04-30 00:28:22 +02:00
BENKE Charlie	49c3c69e30	minor error code	2016-04-29 20:20:47 +02:00
Laurent Destailleur	f5df6488db	Merge pull request #5094 from defrance/patch-2 minor error code	2016-04-29 20:18:55 +02:00
Laurent Destailleur	88842ccd8b	Merge pull request #5111 from nka11/api_improvement Api improvement	2016-04-29 17:13:02 +02:00
Laurent Destailleur	e723966583	FIX: Qty in stock must be float like it is in stock movement. FIX: Can't create a stock transfer from product card Performance enhancement of stock information loading.	2016-04-28 11:01:56 +02:00
nka11	932b9837fe	Merge branch 'fix_5053' into api_improvement	2016-04-28 08:31:10 +02:00
fappels	65ea83fa06	NEW prepare for additional warehouse statuses Add additional warehouse statuses, so you can add extra filter possibility. For example hide warehouses with damaged stock from shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS Still TODO: config all $formproduct->selectWarehouses	2016-04-27 16:51:51 +02:00
Laurent Destailleur	39bc4d5f02	Optimize load_stock and load_stock_virtual	2016-04-27 14:19:06 +02:00
Laurent Destailleur	810a6c2cb4	Better explanation	2016-04-27 13:39:54 +02:00
nka11	98f757a87a	New API methods add user to group get product list by category id	2016-04-27 08:59:12 +02:00
Alexis Algoud	b46c14812c	Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop	2016-04-25 18:37:47 +02:00
Alexis Algoud	b472a244db	NEW decrease stock on expedition closing/classifying	2016-04-25 18:33:39 +02:00
Francis Appels	11c31667b8	Update product.class.php Fix updatePrice syslog. Is travis still running phpunit tests?	2016-04-25 15:04:33 +02:00
BENKE Charlie	dde4f7ed85	minor error code	2016-04-24 02:01:29 +02:00
Laurent Destailleur	f68f5677bb	Start to use the vat code to identify a vat into combo list instead of just "rate" and "npr".	2016-04-18 21:02:14 +02:00
Laurent Destailleur	c2fc9ecf68	Fix scrutinizer warning	2016-04-09 16:12:53 +02:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	7b16482cee	Add comment to show directoves to solve conception error on lot management (add a table to store all lots and their properties: date, note, ...) Removed deprecated field pmp at stock level (pmp is at product level)	2016-04-09 10:01:22 +02:00
Laurent Destailleur	f205b04b39	Merge pull request #4960 from defrance/patch-119 change comment	2016-04-08 21:32:55 +02:00
Laurent Destailleur	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Laurent Destailleur	39b61d6924	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/boxes/box_task.php htdocs/core/lib/files.lib.php	2016-04-07 19:27:53 +02:00
BENKE Charlie	9484dc5b3e	change comment	2016-04-06 11:38:34 +02:00
Laurent Destailleur	c340745b78	FIX Option "showstock" was not effective into warehouse list	2016-04-01 11:05:15 +02:00
Laurent Destailleur	2a19326a3f	FIX Missing database escaping on supplier price insert/update	2016-03-31 21:47:32 +02:00
Laurent Destailleur	a36abd43fd	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-30 16:27:14 +02:00
Laurent Destailleur	07e622a7f8	Introduce () to have code cleaner	2016-03-30 14:04:22 +02:00
Marcos García de La Fuente	362bc106eb	FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes	2016-03-30 11:40:57 +02:00
Laurent Destailleur	2b1f57f01e	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php	2016-03-18 11:54:14 +01:00
philippe grand	d434cee3fa	[Qual] Typo	2016-03-17 09:40:05 +01:00
Laurent Destailleur	2e1a63a1f3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/compta.lang htdocs/societe/class/societe.class.php htdocs/societe/commerciaux.php htdocs/societe/consumption.php	2016-03-10 15:09:30 +01:00
Marcos García de La Fuente	d43d0bfec1	Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation	2016-03-08 12:16:32 +01:00
Laurent Destailleur	9e8fcd19aa	Fix PHPCS	2016-02-24 17:05:34 +01:00
Laurent Destailleur	0f6e88b460	Update css of warehouse list	2016-02-24 12:18:24 +01:00
Laurent Destailleur	28b8258acb	Fix in most cases, we don't need translated value of languages, jsut list of language code. Fix cost price was not updated.	2016-02-23 19:50:33 +01:00
Laurent Destailleur	9c8d69eaa9	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-02-19 04:46:11 +01:00
Laurent Destailleur	4d0b9946f5	FIX Maxi serious problem when updating prices and vat of a product. All mode (one price, price per level, ...) were impacted. Localtax setup were lost.	2016-02-19 02:41:00 +01:00
Laurent Destailleur	e0a0817123	Merge pull request #4623 from IonAgorria/dynamic-price-changes Dynamic price corretions/changes	2016-02-16 15:11:02 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	3bcc7b0f8f	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php	2016-02-15 01:37:23 +01:00
Ion Agorria	89657d0439	Changed Price Parser functions and added testExpression	2016-02-14 17:28:31 +01:00
Ion Agorria	99efbd3464	Check if dynamic price is enabled	2016-02-14 16:09:47 +01:00
gauthier	756b50b9d3	FIX : search product in customer product prices doesn't work	2016-02-12 12:06:23 +01:00
Laurent Destailleur	47e2e33fb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/index.php htdocs/accountancy/admin/productaccount.php htdocs/accountancy/class/html.formventilation.class.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/menus/init_menu_auguria.sql	2016-02-03 03:27:17 +01:00
Laurent Destailleur	165771b652	FIX #4439	2016-02-03 01:46:30 +01:00
Laurent Destailleur	e3a4124a58	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/langs/fr_FR/bills.lang	2016-01-30 16:13:06 +01:00
Laurent Destailleur	5e9fd25a6e	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-30 15:59:40 +01:00
Laurent Destailleur	dfd4d36bdf	Merge remote-tracking branch 'origin/3.7' into 3.8	2016-01-30 15:58:11 +01:00
Laurent Destailleur	c9661ee20e	Merge remote-tracking branch 'origin/3.6' into 3.7	2016-01-30 15:57:09 +01:00
fmarcet	eec8d30625	FIX: Not returning the correct multilevel price	2016-01-27 10:57:04 +01:00
Marcos García de La Fuente	83263e242e	Corrected typo of PR #4444	2016-01-23 20:32:22 +01:00
Laurent Destailleur	4df584e57b	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/files.lib.php	2016-01-23 11:51:56 +01:00
Laurent Destailleur	dbaa43f3be	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/commande/card.php htdocs/holiday/card.php htdocs/holiday/list.php htdocs/user/card.php	2016-01-23 11:45:39 +01:00
Laurent Destailleur	dc438792f4	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/fourn/commande/card.php	2016-01-23 11:39:37 +01:00
Laurent Destailleur	9be246baa5	Merge remote-tracking branch 'origin/3.6' into 3.7	2016-01-23 11:32:06 +01:00
Laurent Destailleur	d2f5f5c01f	Merge pull request #4266 from fappels/develop_multi_warehouse Add shipping and dispatching from/to multiple warehouses	2016-01-22 02:26:25 +01:00
Marcos García de La Fuente	da637db162	FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays	2016-01-18 10:17:59 +01:00
Laurent Destailleur	d396612a7c	NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".	2016-01-13 12:48:59 +01:00
fappels	51b08f579b	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse Fix Conflicts:	2016-01-12 13:56:00 +01:00
Laurent Destailleur	cc4c5873e6	Fix sql error	2016-01-10 12:37:48 +01:00
Laurent Destailleur	0a515ca8c0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/class/facture.class.php	2015-12-21 12:38:23 +01:00
Laurent Destailleur	7e03aaee23	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-21 12:25:47 +01:00
Laurent Destailleur	96b6f0d8fb	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: composer.json htdocs/product/ajax/products.php htdocs/product/class/product.class.php	2015-12-21 12:24:24 +01:00
Laurent Destailleur	9334cf8fd1	FIX #4243 sql injection	2015-12-19 18:03:08 +01:00
fappels	7fc8007571	New add shipping and dispatching from/to multiple warehouses Add select2 to warehouse selectors Ship customer orderline from multiple warehouses Dispatch client orderline to multiple warehouses	2015-12-18 18:00:31 +01:00
Laurent Destailleur	e37fc87cd5	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 17:34:06 +01:00
Laurent Destailleur	1978eebb69	Fix bad merge	2015-12-13 17:33:20 +01:00
Laurent Destailleur	ef13bd43b0	Fix bad merge	2015-12-13 17:27:55 +01:00
Laurent Destailleur	3b595f0247	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/customer/list.php htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/date.lib.php htdocs/core/lib/report.lib.php htdocs/langs/en_US/accountancy.lang	2015-12-13 16:23:33 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
fmarcet	eb98bd1e78	FIX: Not delete a product when have customer price	2015-12-03 14:02:26 +01:00
ricardomm	eb504ffacc	minor fix accessing $db	2015-12-02 11:53:23 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Laurent Destailleur	60724df496	Merge pull request #4038 from atm-maxime/develop NEW add info page on product card	2015-11-21 01:51:32 +01:00
Laurent Destailleur	bf2af33b89	Merge pull request #4015 from ParisLiakos/develop Add a trigger for product translation deletion	2015-11-21 00:19:40 +01:00
Maxime Kohlhaas	826592c480	Fix info and banner on societe	2015-11-19 14:43:00 +01:00
Maxime Kohlhaas	e4125c9802	NEW : info function for product card	2015-11-19 14:26:32 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Paris Liakos	fb6819764d	Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product	2015-11-17 01:20:58 +02:00
Laurent Destailleur	a8bfa1a258	Merge pull request #4011 from ParisLiakos/develop Add triggers for product and category translation changes	2015-11-16 23:50:18 +01:00
Paris Liakos	146aa7815b	Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories	2015-11-16 20:27:51 +02:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Marcos García de La Fuente	04243510f3	Little changes	2015-11-08 14:54:29 +01:00
Juanjo Menent	59b3124d7d	Merge pull request #3938 from marcosgdf/fr-3876 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-08 11:20:36 +01:00
Juanjo Menent	9e11289f5b	Merge pull request #3927 from marcosgdf/fr-3767 NEW #3767 Allow changing multiple prices of a product at once	2015-11-08 11:13:04 +01:00
Laurent Destailleur	24dff1d842	NEW Statistic graphs on products offer a filter on product type (product / service or both)	2015-11-08 00:35:30 +01:00
Laurent Destailleur	57e162d7f8	The component selectAjaxArray can return javascript part into a global "delayed" variable so caller can output it at end of page. This reduce the Flash Over Unstyle Content effect.	2015-11-07 15:46:06 +01:00
Marcos García de La Fuente	75b4cb4727	NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-07 14:37:47 +01:00
Marcos García de La Fuente	45b4122a95	NEW #3767 Allow changing multiple prices of a product at once	2015-11-07 12:29:51 +01:00
Laurent Destailleur	b2d9f21253	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-06 18:57:46 +01:00
Laurent Destailleur	d0e6db7f89	Use the new banner for first tab of products.	2015-11-06 18:57:35 +01:00
Laurent Destailleur	9cb2d046d0	Merge pull request #3919 from marcosgdf/bug-3914 FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared	2015-11-06 12:32:26 +01:00
Marcos García de La Fuente	9969179267	NEW Deprecated Product::setPriceExpression. Use Product::update instead	2015-11-06 11:35:39 +01:00
Marcos García de La Fuente	610ef2359d	FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared Close #3914	2015-11-06 11:26:06 +01:00
Marcos García de La Fuente	f62d6d1950	FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays	2015-11-06 11:08:41 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Laurent Destailleur	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +01:00
Laurent Destailleur	a161e6d47a	Continue debug of PRODUIT_MULTIPRICES option. Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have relative caculation of multiprice not yet visible.	2015-11-02 10:09:09 +01:00
Marcos García de La Fuente	e1f2efee4d	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-31 11:46:14 +01:00
fmarcet	310ecb1e09	FIX: Show product image on getNomUrl()	2015-10-29 12:28:28 +01:00
Laurent Destailleur	4042c6d5cc	Minor fixes	2015-10-28 23:02:02 +01:00
Marcos García de La Fuente	eff1f73950	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql # htdocs/product/price.php	2015-10-27 10:41:50 +01:00
Marcos García de La Fuente	6db09a0d64	Little correction	2015-10-20 11:35:49 +02:00
Frédéric FRANCE	50fe3f6ee9	Update html.formproduct.class.php	2015-10-19 22:06:46 +02:00
Marcos García de La Fuente	e7e152c122	NEW Level multiprice generator based on per cent variations over base price	2015-10-19 15:13:19 +02:00
Laurent Destailleur	ccce974476	Fix #3766	2015-10-18 21:00:19 +02:00
Laurent Destailleur	2ad805912d	Fix #3765	2015-10-18 20:58:39 +02:00
Laurent Destailleur	fc1718c0d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-18 20:57:39 +02:00
Laurent Destailleur	a0e30aa218	Fix #3764	2015-10-18 20:57:28 +02:00
Laurent Destailleur	4dc88406ac	Merge pull request #3737 from frederic34/patch-15 Bad chmod for directory when changing product ref	2015-10-18 20:28:17 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Raphaël Doursenaud	6c2b46f939	Fix #3728 Properly remove last category	2015-10-15 10:15:37 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
Frédéric FRANCE	3638f17d75	Update product.class.php	2015-10-14 22:28:03 +02:00
Frédéric FRANCE	f4cbc81c97	Bad chmod for directory when changing ref When changing product ref, the old document directory is renamed and chmod 0664 in place of 0775	2015-10-14 20:13:14 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Raphaël Doursenaud	f0466ba313	FIX #3607 Better categories setting and unsetting This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.	2015-09-30 18:47:02 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Laurent Destailleur	3ee5920947	Merge pull request #3571 from fmarcet/3.8 FIX: When filter with empty status, by default get canceled status (-1)	2015-09-24 18:40:06 +02:00
Florian HENRY	84fa92045c	FIX : avoid SQL error when no sortfield send to method	2015-09-23 12:10:38 +02:00
fmarcet	3ff8b3e437	FIX: Error retrieving customer prices	2015-09-23 10:23:29 +02:00
Laurent Destailleur	db1d9d6d8e	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/fourn/commande/dispatch.php	2015-09-12 11:50:46 +02:00
Laurent Destailleur	0c3ebe63c2	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/class/html.formproduct.class.php htdocs/product/stock/index.php htdocs/product/stock/liste.php htdocs/product/stock/mouvement.php htdocs/product/stock/product.php htdocs/product/stock/valo.php	2015-09-12 11:44:07 +02:00
Laurent Destailleur	36632593c0	Fix SQL injections #3300	2015-09-12 11:36:19 +02:00
Maxime Kohlhaas	c6081f0fa2	Fix multientity stock management (F.Henry followup)	2015-09-11 20:38:32 +02:00
Florian HENRY	89b723b2a7	FIX : multientity warehouse management	2015-09-08 16:23:00 +02:00
Florian HENRY	52cb9581ff	Fix multientity stock management	2015-09-08 16:00:13 +02:00
Laurent Destailleur	3bdd342df1	Fix #3116	2015-08-14 23:53:59 +02:00
Alexis Algoud	24ae5a0ca6	FIX virtual stock for virtual product	2015-07-24 11:37:15 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Laurent Destailleur	a9289de616	Several fixes. Fix #2927	2015-07-13 11:22:18 +02:00
Laurent Destailleur	11c94a9d3b	Clean code	2015-07-12 16:50:27 +02:00
Laurent Destailleur	276f057acf	Clean trigger codes Better error message when we insert duplicate barcode.	2015-06-30 16:10:03 +02:00
Laurent Destailleur	dc050d39eb	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php	2015-06-29 00:09:28 +02:00
Laurent Destailleur	b5cc7ae1c8	Work on merge tab photos and attached files	2015-06-19 00:52:58 +02:00
Regis Houssin	9c6c3ad65d	Fix: wrong user right	2015-06-17 16:33:18 +02:00
Laurent Destailleur	34468644ef	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-06-16 11:15:16 +02:00
Regis Houssin	5e25c69891	Fix: thumb "mini" not deleted	2015-06-16 09:28:31 +02:00
Marcos García de La Fuente	1215502927	Fix Close bug #2814 JPEG photos are not displayed in Product photos page	2015-06-13 03:11:17 +02:00
Laurent Destailleur	df60754e52	Merge pull request #2708 from GPCsolutions/deprecated Deprecated	2015-06-05 15:44:08 +02:00
Laurent Destailleur	a33241f487	Maxi debug of 3.8. Nearly ready for freeze.	2015-06-05 14:46:30 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Laurent Destailleur	a258370f8a	Prepare code for generic solution where all path are forged using get_exdir.	2015-05-18 22:25:51 +02:00
Francis Appels	28e973331b	Fix: update supplier orderline + rm deprecated prop - Fix SQL error in update supplier orderline - Remove deprecated $libelle from product class, $libelle is removed from code and can not be used anymore, no sense to mark deprecated. - Add missing translation key	2015-05-18 18:42:14 +02:00
Florian HENRY	4bc2d55cb3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-15 17:37:31 +02:00
Laurent Destailleur	bf883e1576	Minor cosmetic changes Fix permissions and CRLF	2015-05-15 02:34:57 +02:00
Laurent Destailleur	74607218ea	Fight against key tva_taux. Removed completely.	2015-05-14 15:59:09 +02:00
Florian HENRY	8e61a03b5c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-12 21:02:36 +02:00
Laurent Destailleur	cb6f23d9b6	Merge pull request #2771 from aternatik/api_rest Add new core module : REST API	2015-05-12 19:39:37 +02:00
Laurent Destailleur	b2fa603f46	Merge pull request #2794 from hregis/develop_origin Fix: add $object for use with triggers	2015-05-11 23:02:41 +02:00
Marcos García de La Fuente	f6616deef3	Removed debugging function	2015-05-10 01:28:40 +02:00
Marcos García de La Fuente	f8e8b39ff2	FIX #2758 Product::update sets product note to "null" when $prod->note is null	2015-05-10 01:27:28 +02:00
Raphaël Doursenaud	5d2f081152	[Qual] Fixed HTML select form selected attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The select form selected attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	a93ba86ce0	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expedition/modules_expedition.php htdocs/core/modules/modContrat.class.php htdocs/expedition/class/expedition.class.php	2015-05-07 13:35:09 +02:00
Regis Houssin	5578151bad	Fix: add $object for use with triggers	2015-05-07 12:08:02 +02:00
Regis Houssin	85244ba8c9	Fix: add $object for use with triggers	2015-05-07 12:06:17 +02:00
Regis Houssin	9a32d7ec2f	Fix: add $object for use with triggers	2015-05-07 12:02:24 +02:00
Laurent Destailleur	f197a94f59	Fix duplicate log	2015-05-07 10:52:41 +02:00
Laurent Destailleur	b71e5a1025	Merge pull request #2673 from aternatik/fix_getentity Fix : missing getEntity calls	2015-05-07 00:48:19 +02:00
jfefe	24bf614061	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-05-06 01:00:11 +02:00
jfefe	dbb9449ee7	Fix PHPCS	2015-05-06 00:55:42 +02:00
jfefe	561d5e82c1	Rename libelle product field into label	2015-05-04 12:33:38 +02:00
jfefe	7e0357dcf9	FIX : remove deprecated property 'libelle' on product object	2015-05-04 03:03:24 +02:00
jfefe	cd37d3eb11	Add API class for product	2015-05-04 01:17:41 +02:00
Laurent Destailleur	333a29683c	uniformize look	2015-05-03 21:15:08 +02:00
fmarcet	1c01e187c1	Fix: Bug in the new photo system	2015-04-27 17:20:10 +02:00
fmarcet	99c4508029	Fix: Bug in the new photo system	2015-04-27 16:44:12 +02:00
Laurent Destailleur	5b3b180c10	NEW Web service to create or update product can correct stock during creation/update.	2015-04-27 01:36:13 +02:00
Frédéric FRANCE	768fdde2d1	Update product.class.php	2015-04-22 10:39:32 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Florian HENRY	72c92557de	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/class/propalmergepdfproduct.class.php	2015-04-19 13:06:59 +02:00
Florian HENRY	37bc7c3f1d	typo	2015-04-19 13:05:40 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Laurent Destailleur	a091a24657	Fix phpcs	2015-04-19 01:52:15 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
Marcos García de La Fuente	e2e6049c7f	Copyright	2015-04-18 20:50:03 +02:00
Marcos García de La Fuente	c07e26dcac	Merge branch 'develop' into fr-2613 Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:42:57 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Florian HENRY	e15d4c045d	NEW : Propal merge product card PDF into azur	2015-04-18 18:44:05 +02:00
Laurent Destailleur	193c080744	PHPCS	2015-04-12 19:20:48 +02:00
Laurent Destailleur	8ebad7a395	A serious rewrite of a lot of code to have the module batch number stable.	2015-04-12 17:08:14 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	1bbecc0912	Restore link to stock for products.	2015-04-08 19:26:36 +02:00
Scrutinizer Auto-Fixer	4da737424e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-04-06 10:25:30 +00:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Laurent Destailleur	9921eb8496	Fix error when upgating price	2015-04-02 19:41:19 +02:00
Laurent Destailleur	c62687d198	Comment	2015-04-02 12:55:00 +02:00
Marcos García de La Fuente	831177ef99	Implemented constants for Product class	2015-03-30 03:14:07 +02:00
aspangaro	2b2b43afb6	Dir "Don"	2015-03-25 22:37:14 +01:00
Laurent Destailleur	55140afde4	Merge branch 'price-global-variables' of https://github.com/IonAgorria/dolibarr into IonAgorria-price-global-variables Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/dynamic_price/editor.php	2015-03-22 12:45:04 +01:00
Laurent Destailleur	c9b569ad1a	Fix calculation of PMP of product. Also add phpunit test to avoid this in future.	2015-03-21 15:31:11 +01:00
Scrutinizer Auto-Fixer	b693ed3f51	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-16 23:21:17 +00:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Ion Agorria	5f9b1fa029	Changes for applying new paths	2015-03-14 16:50:02 +01:00
Ion Agorria	fc5899174b	Relocation of expression files	2015-03-14 16:48:56 +01:00
Laurent Destailleur	10bbf463e7	Several bug fixes from scrutinizer	2015-03-14 14:55:41 +01:00
Laurent Destailleur	50b09fa8a9	Doxygen	2015-03-13 21:39:39 +01:00
Laurent Destailleur	e8e2f65ae5	Debug virtual product interface	2015-03-11 14:55:45 +01:00
Laurent Destailleur	a1567778ab	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/commande/card.php	2015-03-06 18:51:55 +01:00
Laurent Destailleur	a169b3348e	Fix show alays date fields for contract module. Fix select of product were lost.	2015-03-06 14:36:22 +01:00
Laurent Destailleur	77dd07c846	Fix thumbs generation	2015-03-06 13:12:33 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Laurent Destailleur	8a00109baf	Fix: Several bugs int replenishment feature.	2015-03-01 16:05:20 +01:00
Laurent Destailleur	560f1a43cd	Fix: Several bugs int replenishment feature.	2015-03-01 16:04:34 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	41a74c62e2	Fix trigger to insert lines where called when inserting line but also when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:03:17 +01:00
Laurent Destailleur	89684748c5	Debug incdec option.	2015-02-24 19:55:59 +01:00
Alexis Algoud	0c53121553	- use incdec into virtual product definition. - improve screen of virtual product	2015-02-23 12:19:19 +01:00
Laurent Destailleur	6adfc6f6f4	Work on batch module. Add batch, eatby and sellby into movement table. Clean language files for direct print module.	2015-02-12 15:23:31 +01:00
Laurent Destailleur	179cbbd187	Maxi debug and enhancement of module batch.	2015-02-11 22:54:06 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
Laurent Destailleur	011d39105d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/accountancy/admin/export.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/datepicker.php htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/fourn/facture/card.php	2015-02-07 03:28:36 +01:00
Laurent Destailleur	553181a5d9	Fixed: Location for file storage from tab attached files was not at same place than from tab images.	2015-02-06 21:26:41 +01:00
Laurent Destailleur	556c27f834	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/stock/mouvement.php	2015-02-04 15:15:50 +01:00
Laurent Destailleur	9c087e27d0	Fix permissions	2015-02-02 13:45:55 +01:00
Laurent Destailleur	eda2ff7f7b	Fix regression in phpunit	2015-02-02 13:37:19 +01:00
Laurent Destailleur	9285897759	Fix: Load priceparser only if required.	2015-02-01 15:08:56 +01:00

... 12 13 14 15 16 ...

1702 Commits