dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	8f65ee2296	Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode	2019-03-14 17:48:44 +01:00
Laurent Destailleur	60db66d2bf	Update fournisseur.product.class.php	2019-03-14 17:41:33 +01:00
Laurent Destailleur	250e0bbaac	Update fournisseur.product.class.php	2019-03-14 17:40:39 +01:00
Laurent Destailleur	dd962fa044	Update fournisseur.product.class.php	2019-03-14 17:39:01 +01:00
Laurent Destailleur	233bd4374a	Fix phpcs	2019-03-08 19:52:26 +01:00
Laurent Destailleur	ddc52b7199	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/exports/export.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2019-03-07 14:13:38 +01:00
Laurent Destailleur	0729a3b571	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:11:12 +01:00
Laurent Destailleur	9a9fd15077	Fix doxygen	2019-03-07 14:10:33 +01:00
Laurent Destailleur	02b8bc94e7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:06:31 +01:00
Laurent Destailleur	d2f1d0cc33	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2019-03-07 14:06:11 +01:00
Laurent Destailleur	e3fb228a4d	Update fournisseur.facture.class.php	2019-03-07 12:28:19 +01:00
gauthier	0ff2905180	FIX : we need to keep originline special_code	2019-03-06 12:10:24 +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	0022c4fe72	add visibility	2019-02-28 22:44:12 +01:00
atm-quentin	394659f84a	missing doc	2019-02-27 09:22:47 +01:00
atm-quentin	f51b89def3	NEW supplier buyprice barcode	2019-02-27 09:22:34 +01:00
Frédéric FRANCE	e6c3eb0ba1	wip	2019-02-26 21:13:07 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
Laurent Destailleur	7b2f4771f0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-24 20:30:21 +01:00
Laurent Destailleur	5e6797f39d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-24 20:28:18 +01:00
Laurent Destailleur	2f300ae63f	Standardize code with customer invoices	2019-02-24 20:26:54 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
atm-quentin	b6deda1111	FIX credit note used on list	2019-02-18 12:28:18 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
atm-greg	4624f1b1b8	FIX positive values creating diff on addline rounding	2019-02-06 17:19:16 +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	af9e2d07d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/paiement.php htdocs/fourn/facture/paiement.php	2019-02-03 20:38:47 +01:00
Laurent Destailleur	4b77b3ff23	NEW Support tag {ccc} on payment ref	2019-02-03 20:36:20 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	3fc49a9de2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-01 16:07:27 +01:00
Laurent Destailleur	6de732d7f8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php	2019-02-01 16:07:18 +01:00
Laurent Destailleur	35f65a571c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php htdocs/fourn/commande/list.php	2019-02-01 16:05:43 +01:00
Laurent Destailleur	dee2a373c1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2019-02-01 16:01:18 +01:00
Laurent Destailleur	452dfafd32	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-02-01 15:56:47 +01:00
Francis Appels	cf9d87df4a	Fix travis	2019-02-01 15:40:56 +01:00
Francis Appels	c4915c679a	Merge develop	2019-02-01 11:47:03 +01:00
Francis Appels	2c5623c53e	check if price already logged, if not first log current price	2019-02-01 11:37:46 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	408609e0ec	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/tpl/objectline_edit.tpl.php	2019-01-30 16:54:38 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
John BOTELLA	9a666b265f	Use an other test	2019-01-28 11:53:19 +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
Laurent Destailleur	d4daa6cebd	Merge pull request #10430 from frederic34/patch-18 typo in fournisseur.product.class.php	2019-01-27 17:51:49 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	0e3efadf59	typo in fournisseur.product.class.php	2019-01-27 14:37:37 +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	4a5d260db5	Update fournisseur.product.class.php	2019-01-26 14:07:37 +01:00
John BOTELLA	15e1d3b456	Fix fetch test	2019-01-24 09:40:58 +01:00
Francis Appels	1d08ccef07	Fix sql error	2019-01-22 16:39:54 +01:00
Francis Appels	7ad48064be	Add code to show in fourn price tooltip.	2019-01-22 16:18:25 +01:00
Francis Appels	946c017937	Fix and clean price log. Key should price id iso product id.	2019-01-22 15:59:47 +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
Laurent Destailleur	b4a6311f64	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-10 01:48:04 +01:00
Laurent Destailleur	057b606663	Fix tooltip	2019-01-09 15:03:44 +01:00
Laurent Destailleur	fbd490da15	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 13:29:47 +01:00
Laurent Destailleur	d1e062cafa	FIX When changing date of payment, change also record in bank if not conciliated yet.	2019-01-09 13:28:12 +01:00
Laurent Destailleur	d9999d61f6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 12:27:25 +01:00
Laurent Destailleur	890abd28d5	Fix look and feel v9	2019-01-09 12:26:49 +01:00
Laurent Destailleur	3d30d8513f	Fix phpcs	2018-12-16 20:36:22 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	6ad106d14a	Update fournisseur.facture.class.php	2018-12-13 19:56:22 +01:00
atm-quentin	3da9650003	FIX if qty is 0	2018-12-10 16:06:11 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Ferran Marcet	135a94dfed	Merge branch '7.0up' into 7.0	2018-12-03 11:59:46 +01:00
Ferran Marcet	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
Frédéric FRANCE	9692e98acf	Update fournisseur.facture.class.php	2018-12-01 22:49:12 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
Laurent Destailleur	cb9ada2119	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.form.class.php htdocs/core/class/html.formmail.class.php htdocs/core/modules/modSociete.class.php htdocs/product/price.php	2018-12-01 18:19:45 +01:00
Maxime Kohlhaas	e8a02a971d	Fix #9074	2018-11-30 23:05:12 +01:00
Frédéric FRANCE	2e4ec1ed10	Update fournisseur.commande.class.php	2018-11-19 23:56:20 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
Laurent Destailleur	f85ab8d0a6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/card.php	2018-11-19 15:55:41 +01:00
tarrsalah	5eb897e049	FIX sql query performance on list_qualified_avoir_supplier_invoices.	2018-11-12 12:11:40 +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 Destailleur	f1193ad3dd	FIX: Missing date creation and modification of supplier price	2018-11-09 10:29:22 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	2c3cd7a668	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modSyslog.class.php	2018-10-30 15:32:09 +01:00
Laurent Destailleur	4dca94480e	Merge pull request #9892 from atm-maxime/fix_supp_inv_clone Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-30 14:59:48 +01:00
Laurent Destailleur	76c3bac777	Merge pull request #9900 from frederic34/patch-21 use strict compare	2018-10-30 14:23:14 +01:00
Laurent Destailleur	a16e7a84e9	Merge pull request #9899 from frederic34/patch-20 use strict compare	2018-10-30 14:23:01 +01:00
John BOTELLA	ca47d1b8b1	Fix clone fourn order and invoice lines special code	2018-10-30 10:26:59 +01:00
Frédéric FRANCE	d7507ac858	use strict compare	2018-10-27 21:00:59 +02:00
Frédéric FRANCE	84219039a2	use strict compare	2018-10-27 20:57:59 +02:00
Frédéric FRANCE	e1625990f2	use strict compare	2018-10-27 20:54:53 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Maxime Kohlhaas	4ec80b5136	Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-27 10:53:01 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
atm-quentin	04eb9ca167	fix dont change num version	2018-10-23 17:06:21 +02:00
atm-quentin	96d0bb8f2e	FIX adapt develop	2018-10-23 14:31:58 +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
atm-quentin	cfff4c7df8	NEW add ref supplier on supplier invoice	2018-10-22 14:32:50 +02:00
atm-quentin	dd0a57d39e	FIX pdf for creating invoice without massaction	2018-10-17 15:36:47 +02:00
atm-quentin	236a61ab55	new manage correctly create bills on reception	2018-10-17 11:56:32 +02:00
atm-quentin	aaace60b0d	FIX stock movement on close reception and set status if too much receive$	2018-10-10 15:33:35 +02:00
Philippe GRAND	9b6367c1ee	Standardize and update code	2018-10-10 12:16:20 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
atm-quentin	6a8092dfae	NEW entete reception card	2018-10-05 16:21:50 +02:00
Philippe GRAND	073ec85208	Standardize code	2018-10-05 15:51:08 +02:00
atm-quentin	752c35d6d1	addline presque fini	2018-10-04 17:32:50 +02:00
atm-quentin	5fe767d7bd	debut card create	2018-10-04 12:27:10 +02:00
Frédéric FRANCE	dae2757b73	remove useless phpcs:disable	2018-10-02 20:39:44 +02:00
Philippe GRAND	574cfad48f	Standardize and update code	2018-09-28 14:49:34 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Frédéric FRANCE	fafa7f18b1	reduce complexity libstatut fournisseur.commande;class.php	2018-09-15 22:24:57 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Maxime Kohlhaas	a5f4a74ecc	FIX : Homepage links were using wrong topmenus	2018-09-06 14:49:48 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	fd6281b364	move phpcs:ignore	2018-09-04 20:00:09 +02:00
Frédéric FRANCE	5f4a922c1d	move phpcs:ignore	2018-09-03 19:00:37 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Philippe GRAND	db32d8903e	Standardize and Update code	2018-09-01 23:20:20 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Philippe GRAND	45cbc36a15	Standardize and update code	2018-09-01 15:27:55 +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	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Philippe GRAND	bb05e80a87	Standardize and update code	2018-08-31 18:47:25 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +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	86d8513138	Merge pull request #9309 from frederic34/trimtrailing2 last trimtrailing	2018-08-29 17:57:05 +02:00
Laurent Destailleur	7bf48b8d77	Fix date_start and date_end not saved on supplier invoice Conflicts: htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2018-08-29 17:26:41 +02:00
Laurent Destailleur	98356c6ed0	Fix date_start and date_end not saved on supplier invoice	2018-08-29 17:03:18 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +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
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Philippe GRAND	87067b2bc9	Standardize and update code	2018-08-23 18:35:45 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	b817517997	Update fournisseur.product.class.php	2018-08-23 10:08:17 +02:00
Philippe Grand	0e3c9ffd51	Update fournisseur.facture.class.php	2018-08-23 10:05:02 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Philippe GRAND	06da7f54a2	Update and standardize code	2018-08-22 18:48:53 +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	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	d30874750f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-14 09:02:12 +02:00
delcroix Patrick	3b9266060c	Fix #9205 quote in Label/number on supplier payment # Fix #9205 #9205 the num_paiement wasn't escaped, not sure it's an real issue but it was reported here https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408	2018-08-13 23:42:18 +02:00
delcroix Patrick	cbdd1949df	Fix #9205 quote in Label/number on supplier payment # Fix #9205 #9205 the num_paiement wasn't escaped, not sure it's an real issue but it was reported here https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408	2018-08-13 20:39:20 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	1b20d6feab	Merge pull request #9214 from atm-greg/Add_supplier_product_description NEW Can record the supplier product description	2018-08-12 18:56:27 +02:00
Frédéric FRANCE	79aaddbb66	test phpcs v3	2018-08-09 14:46:00 +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	c1de7fe8ac	fix update_buyprice	2018-08-07 09:15:30 +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	a0a5d33641	test include	2018-07-26 17:30:53 +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	07c514b85c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.product.class.php htdocs/projet/class/projectstats.class.php	2018-06-20 21:56:10 +02:00
Laurent Destailleur	9f2437fa04	Fix missing field	2018-06-20 17:59:01 +02:00
Laurent Destailleur	9d048281dc	Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument Fix missing params on generateDocument	2018-06-18 11:14:49 +02:00
Laurent Destailleur	4898f10fa2	FIX Adding a product with no supplier price defined yet	2018-06-16 13:49:28 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +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
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	0412264418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:05:54 +02:00
Laurent Destailleur	60321aabd8	Fix regression	2018-05-30 11:59:23 +02:00
Laurent Destailleur	3733169120	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/recap-compta.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 11:09:53 +02:00
Laurent Destailleur	e57ceab5de	Update fournisseur.commande.class.php	2018-05-30 10:45:06 +02:00
ATM-Nicolas	6b0b975ffd	FIX : Keep supplier proposal price for supplier order	2018-05-29 11:21:30 +02:00
jean	eb39e5746e	Merge remote-tracking branch 'origin/develop' into dev_datepricefour	2018-05-25 15:32:15 +02:00
Laurent Destailleur	f58e0d3bcf	Fix scrutinizer errors	2018-05-23 08:24:20 +02:00
jean	1ab5eece6b	Adding code to show update date of supplier price shown	2018-05-22 09:40:49 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Laurent Destailleur	9c68b81f59	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php	2018-05-05 14:34:54 +02:00
atm-greg	942e2f40bf	addline manage rank on its own if not provided	2018-05-02 17:07:27 +02:00
Laurent Destailleur	e5df7e206b	Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal Fix wrong price on supplier order line	2018-04-27 12:20:49 +02:00
Laurent Destailleur	d179cafa9c	Update fournisseur.commande.class.php	2018-04-27 12:19:32 +02:00
Laurent Destailleur	ecd84f6c45	Update fournisseur.commande.class.php	2018-04-27 12:18:45 +02:00
Laurent Destailleur	1cbf5f1c5e	Merge pull request #8687 from dolibarr95/patch-43 NEW : Allow negative quantity for dispatch (supplier order)	2018-04-27 11:41:05 +02:00
Laurent Destailleur	0a4bd14bc3	Merge pull request #8678 from defrance/patch-111 add $user on delete line	2018-04-27 10:31:19 +02:00
Laurent Destailleur	59e5545aa7	Fix phpunit	2018-04-27 09:18:25 +02:00
dolibarr95	14e68ea8f9	Allow qty to be negative	2018-04-26 16:42:08 +02:00
BENKE Charlene	c879232fd7	add $user on delete line possible to hamonize the call function for all line->delete ?	2018-04-24 23:41:12 +02:00
Laurent Destailleur	5eb7c7ffff	FIX Edit of ref_supplier in supplier invoice	2018-04-24 13:22:34 +02:00
Laurent Destailleur	9d070cac87	NEW Can add product in supplier order/invoice even w/o predefined price Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY, SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old behaviour.	2018-04-24 12:57:31 +02:00
Laurent Destailleur	06e51703b1	Clean constructors	2018-04-21 16:01:05 +02:00
Laurent Destailleur	912d5c53f2	Standardize code	2018-04-21 15:54:05 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	2959dc4a3a	Fix regression	2018-04-15 18:20:04 +02:00
florian HENRY	ad403c7045	fix syntax and uniformize code	2018-04-14 17:04:38 +02:00
Laurent Destailleur	b4ef3945d2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php	2018-04-13 23:52:08 +02:00
Laurent Destailleur	6a3c2f9808	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/facture/card.php	2018-04-13 23:27:14 +02:00
Laurent Destailleur	c25e21de4b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-13 23:19:22 +02:00
Laurent Destailleur	8cfcdabcac	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2018-04-13 23:03:46 +02:00
atm-greg	8d4126274a	rang was missing on order_supplier lines	2018-04-13 15:53:49 +02:00
atm-greg	ef2c6a0ed4	fix sql error	2018-04-13 10:31:36 +02:00
atm-greg	58535993c1	use special_code on order_supplier lines	2018-04-13 10:31:27 +02:00
Laurent Destailleur	3078b890d4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/stripe/admin/stripe.php	2018-04-13 00:45:39 +02:00
Laurent Destailleur	f7bb781b42	FIX #8571	2018-04-13 00:43:15 +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	9e89675862	Fix creation of supplier invoice	2018-04-06 20:34:12 +02:00
François J	a78c064461	Fix CommandeFournisseur::getDispachedLines line ID & return quantity	2018-04-06 11:22:15 +02:00
François J	041a21e829	Add tag @since	2018-04-04 14:05:50 +02:00
François J	9b61272bb7	Fix CommandeFournisseur::getDispachedLines line ID & return quantity	2018-04-04 12:32:49 +02: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
Maxime Kohlhaas	d82c62b638	Fix supplier order clone was keeping objectlinked	2018-03-09 21:51:59 +01:00
atm-ph	53ce297ab3	Fix travis - missing documentation of new param	2018-03-09 09:30:11 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +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
atm-ph	5971cd8e59	Fix label goes in desc and lost fourn ref	2018-03-05 17:18:03 +01:00
atm-ph	ebb4da8417	Fix keep supplier proposal price in supplier order	2018-03-05 16:58:35 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Marc de Lima Lucio	239e834913	FIX: supplier credit notes: remove handled TODO	2018-02-27 10:04:02 +01:00
Laurent Destailleur	de89893d57	NEW Show total of time consumed in week in time spent entry page	2018-02-26 14:09:56 +01:00
kkhelifa-opendsi	90f4c985f6	Merge branch 'develop' into product_supplier_buyprice_multicurrency	2018-02-26 09:54:09 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	b52a2b12a5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 14:44:49 +01:00
Laurent Destailleur	2cd5ed65a6	Clean deprecated (field unit_charge in supplier price)	2018-02-25 14:13:09 +01:00
Regis Houssin	703d976b3b	Fix: missing object entity in fetch	2018-02-24 16:21:16 +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
dolibarr95	6793d826b7	Dispatch if more than ordered If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set	2018-02-23 10:14:54 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger _MODIFY must be called when editing a property event extra. Clean duplicate trigggers "_CLONE"	2018-02-20 18:09:38 +01:00
Marc de Lima Lucio	57b8df4008	FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line	2018-02-19 17:32:11 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +01:00
Laurent Destailleur	536eb7e008	Fix label of invoice	2018-02-14 17:25:13 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
Laurent Destailleur	d3a6342034	Fix regeneration of PDF after creation of payment.	2018-02-02 10:37:10 +01:00
Laurent Destailleur	e79f6fda2b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-26 01:23:18 +01:00
Laurent Destailleur	2c0eeaf8de	FIX #8093	2018-01-25 20:57:51 +01:00
Laurent Destailleur	e56d74f5c4	Fix generation of doc for supplier payment	2018-01-11 19:01:47 +01:00
Laurent Destailleur	0b893c11fd	Revert "Fix wrong address used into PDF model of supplier payment" This reverts commit `22d92c0540`.	2018-01-11 18:09:05 +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
atm-ph	22d92c0540	Fix wrong address used into PDF model of supplier payment	2018-01-08 15:25:18 +01:00
Laurent Destailleur	d7837f8800	Try fix for #7778	2018-01-05 01:43:51 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	93311e3817	FIX #7885	2017-12-05 12:31:57 +01:00
fappels	cec490dff5	Fix dispatch not adapted for label to ref change for warehouse	2017-12-01 12:57:56 +01:00
Laurent Destailleur	b63fb1f854	Support of VAT NPR in accounting module	2017-11-27 22:18:10 +01:00
Laurent Destailleur	a9d3e90b70	Big debug of accountancy module	2017-11-27 21:53:22 +01:00
Laurent Destailleur	aaf08ade2f	Fix bug reported by scrutinizer	2017-11-25 11:21:31 +01:00
Laurent Destailleur	6a3dc91414	Standardize code	2017-11-23 15:22:32 +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	a12186a0b8	Use HTTP response code 304 instead of 500 when nothing is done	2017-11-14 01:26:02 +01:00
Laurent Destailleur	bf121f9b3c	Work on saving supplier_ref into database lines	2017-11-12 19:29:03 +01:00
Ion	e95ee4b878	Fix old parseProductSupplier call	2017-11-10 12:32:54 +01:00
Laurent Destailleur	a329f7dc75	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php	2017-11-05 18:50:14 +01:00
Laurent Destailleur	d3a0cff30a	Merge pull request #7755 from frederic34/currency default currency on propal create	2017-11-05 18:28:40 +01:00
Laurent Destailleur	51c705a84b	NEW Reduce size of HTML page by removing duplicate tooltips	2017-11-05 01:00:15 +01:00
Frédéric FRANCE	b58df17545	default currency on propal create	2017-11-02 18:14:55 +01:00
Laurent Destailleur	15272f6555	Return error code	2017-11-02 13:47:53 +01:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	58584d8784	Update fournisseur.commande.class.php	2017-10-24 13:05:12 +02:00
dolibarr95	76aa2df807	Try to fix #7692 `$this->fk_soc` is empty replace by `$this->socid`	2017-10-24 13:05:05 +02:00
Laurent Destailleur	169d454811	Update fournisseur.commande.class.php	2017-10-24 13:01:48 +02:00
dolibarr95	a3dfbf854a	Try to fix #7692 `$this->fk_soc` is empty replace by `$this->socid`	2017-10-24 09:22:13 +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	98674f6d82	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php htdocs/societe/class/api_contacts.class.php htdocs/societe/class/api_thirdparties.class.php	2017-10-22 15:01:35 +02:00
Laurent Destailleur	703d4a6aee	FIX #7648	2017-10-22 14:02:24 +02:00
Laurent Destailleur	c9fceaad3c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/index.php htdocs/fourn/facture/card.php	2017-10-22 04:04:26 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Frédéric FRANCE	8baad70f6c	stock on supplier invoice back to draft	2017-10-21 20:26:32 +02:00
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00
Laurent Destailleur	d4ade7b935	FIX API to get object does not return data o flinked objects	2017-10-19 17:57:16 +02:00
Laurent Destailleur	99239cbb38	Add API close to close an order	2017-10-18 15:34:03 +02:00
Laurent Destailleur	d70c215ab8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/bankentries.php htdocs/fourn/facture/card.php	2017-10-17 11:14:58 +02:00
Laurent Destailleur	5937fba373	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-10-17 10:51:11 +02:00
Laurent Destailleur	e40bffb0d5	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +02:00
Laurent Destailleur	66978a3bb4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2017-10-07 13:44:27 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	74deb05527	Clean code. Use constant for status of supplier order process.	2017-10-07 13:04:31 +02:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	ef3d86333c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/activity/perday.php	2017-10-06 12:38:50 +02:00
Laurent Destailleur	337d6d9f08	Merge pull request #7565 from tarrsalah/fix_supplier_payment_builddoc Fix supplier payment builddoc	2017-10-06 01:55:48 +02:00
tarrsalah	76efc31b00	WIP fix supplier payement modelpath.	2017-10-05 09:51:17 +01:00
Laurent Destailleur	56acb2c08c	Fix: with 5.0 and 6.0, supplier prices are always in main currency. The currency is not yet available in supplier prices. Field to define the currency of supplier prices were added in database but not yet used by screen/code.	2017-10-05 10:38:58 +02:00
Laurent Destailleur	ded55f41fb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2017-10-04 16:08:22 +02:00
Laurent Destailleur	69c47aa7d9	Fix sql error	2017-10-04 15:22:55 +02:00
Laurent Destailleur	d28188d19d	FIX Generation of invoice from bulk action "Bill Orders" Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2017-10-04 14:31:52 +02:00
Laurent Destailleur	a74d6074a3	FIX Generation of invoice from bulk action "Bill Orders"	2017-10-04 14:27:10 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	9d6498f2a4	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Laurent Destailleur	f1a563625b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-09-26 22:11:00 +02:00
Laurent Destailleur	49982b36ac	FIX #7490	2017-09-26 11:55:19 +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	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Laurent Destailleur	270aba99fa	FIX #7471	2017-09-24 23:28:48 +02:00
Regis Houssin	77fea1983c	Fix: wrong supplier product price id	2017-09-20 16:57:38 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +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	6aeeb0bd73	Merge pull request #7388 from reeperbahnause/patch-3 FIX #7349 Change Class from Invoices to SupplierInvoices	2017-09-14 12:16:59 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	f2cd96b9c0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: ChangeLog htdocs/adherents/class/adherent.class.php htdocs/core/lib/price.lib.php htdocs/filefunc.inc.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/supplier_proposal/list.php	2017-09-13 20:55:22 +02:00
reeperbahnause	317c5ace3c	FIX #7349 Change Class from Invoices to SupplierInvoices FIX #7349 Change Class from Invoices to SupplierInvoices	2017-09-12 22:32:07 +02:00
Maxime Kohlhaas	0608778b9c	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0	2017-09-12 11:00:28 +02:00
Juanjo Menent	7648d300b5	FIX: Bad link to unpayed suppliers invoices	2017-09-07 17:13:48 +02:00
Maxime Kohlhaas	c3152a6343	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0	2017-08-28 10:32:04 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Laurent Destailleur	52a8692a85	FIX #7226	2017-08-23 16:07:11 +02:00
Laurent Destailleur	4da49dfc2d	FIX #7239	2017-08-23 15:02:38 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	681623c3ab	Merge branch 'develop' into patch-1	2017-08-22 11:43:25 +02:00
Laurent Destailleur	30c39d246b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-22 11:18:56 +02:00
Laurent Destailleur	206d46cbb7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: scripts/cron/cron_run_jobs.php	2017-08-22 11:18:17 +02:00
Laurent Destailleur	41ce4886fd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-08-22 11:15:30 +02:00
fappels	ca3cdfabec	FIX Best buy price calculation Best buy price also depends on buy discount.	2017-08-09 14:15:26 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	60493d0a47	Several fixes (permission, missing method or class) in REST APIs	2017-07-28 11:03:30 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	a416ec4258	Try to fix travis	2017-07-18 14:25:07 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	3ac85e10c5	NEW Add mass action "validate" on supplier invoices. NEW Add date_valid and date_pointoftax on supplier invoices.	2017-07-14 14:40:09 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
Laurent Destailleur	9f486716c1	Fix phpcs	2017-07-08 14:56:43 +02:00
Laurent Destailleur	de24e93cca	Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list NEW: Add column with nbr suppliers prices and WAP to product list.	2017-07-07 19:42:25 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
Maxime Kohlhaas	f8ad108da6	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0	2017-07-07 12:07:35 +02:00
Laurent Destailleur	d55213286e	Fix missing parameter	2017-06-30 11:40:26 +02:00
fappels	574590a598	Add minimum qty column	2017-06-30 10:55:45 +02:00
fappels	d0599cd952	Revert "WAP alway decimal 2 digits" This reverts commit `7d4a093d9e`.	2017-06-30 10:54:04 +02:00
fappels	7d4a093d9e	WAP alway decimal 2 digits	2017-06-30 10:52:54 +02:00
fappels	e3f7402e07	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list	2017-06-26 22:45:18 +02:00
fappels	13e5c8ff7a	Create patch Add Number of supplier prices and wap columns	2017-06-26 22:44:56 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
atm-ph	039130c694	Fix travis	2017-06-10 16:19:33 +02:00
atm-ph	5dfb988cb1	Fix 6944 compatibility PHP7 and missing parameter to call delete function	2017-06-10 13:34:28 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Maxime Kohlhaas	6ac08c3bee	Fix : Product supplier price is related to supplier's currency	2017-05-29 10:32:17 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	e2a7b0943f	Clean dead code	2017-05-17 14:52:27 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Benoit	23af50ad2a	Add fk_facture_fourn element to fetch lines objects	2017-05-10 22:45:41 +02:00
Benoit	0fbf27895a	Add fk_facture_fourn element to fetch lines objects	2017-05-05 22:33:34 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	2120b9af85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/theme/eldy/style.css.php	2017-05-05 14:14:21 +02:00
Laurent Destailleur	8a37eeea74	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-05 14:02:02 +02:00
Guillaume T. (Arck Consulting)	ef0d395a1a	[FIX] Credit Note for fourn doesn't work, missing filed in create method & attribut	2017-05-05 09:49:44 +02:00
Laurent Destailleur	ce05c74e47	NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT	2017-05-04 17:48:52 +02:00
Laurent Destailleur	ea58fb0b50	Fix triggered error	2017-05-04 15:52:12 +02:00
Marc de Lima Lucio	56e749df9f	FIX: supplier order line were always created with rang = 0	2017-04-26 16:12:27 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	abf87a6946	Merge branch '4.0' into fix_reffourn	2017-04-11 11:00:35 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
altatof	919633b2be	escape supplier ref	2017-04-07 12:10:01 +02:00
altatof	a6ec22d7fe	FIX: dont lose supplier ref if no supplier price in database	2017-04-07 12:06:15 +02:00
florian HENRY	7668702806	fix: missing attribute update	2017-04-07 08:56:10 +02:00
Laurent Destailleur	216bce608d	Work on v6 look and feel	2017-04-06 23:28:06 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +02:00
BENKE Charlie	3299e5f889	PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored they are inversion @eldy maybe add more field in this table	2017-03-26 19:13:10 +02:00
Laurent Destailleur	106d19a8af	FIX #6468 + Fix missing translation	2017-03-25 03:53:11 +01:00
Laurent Destailleur	f241bfefd0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 20:20:59 +01:00
Laurent Destailleur	2062047dea	Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder FIX : origin & origin id on supplier order line	2017-03-23 20:03:58 +01: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	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
gauthier	a790ef9f7c	FIX : origin & origin id on supplier order line	2017-03-23 12:35:43 +01:00
Laurent Destailleur	b7442a0c1a	Fix bad vat rate used into sql request	2017-03-19 15:38:07 +01:00
Laurent Destailleur	75d73b188c	Fix bad vat rate used into sql request	2017-03-19 14:51:25 +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
fappels	c1b21db407	Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class	2017-03-16 10:06:20 +01:00
fappels	f9c2bb0410	Fix create supplier order line label Fix create line label Fix read line rang, special_code and fk_parent_line Remove create line rang, done by table default and $this->rang is invalid, supplier order has no rang property.	2017-03-16 10:05:50 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
Laurent Destailleur	427f656bac	Merge pull request #6500 from atm-florian/4.0 FIX : Can use quote into supplier ref on order line add	2017-03-10 12:49:36 +01:00
Laurent Destailleur	a4b6388ba1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2017-03-10 12:35:33 +01:00
Laurent Destailleur	6977daf76a	Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…	2017-03-10 12:31:20 +01:00
florian HENRY	9b10c9f6d1	FIX : Can use quote into supplier ref on order line add	2017-03-10 09:19:42 +01:00
gauthier	9eb3975803	FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object	2017-03-07 15:18:20 +01:00
gauthier	b192b6cd50	FIX : multicurrency_subprice	2017-03-07 11:33:18 +01:00
gauthier	6e0589ce2c	FIX : load multicurrency informations on supplier order and bill lines fetch	2017-03-07 10:55:17 +01:00
fappels	e83122be41	Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0	2017-02-27 17:57:07 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	1dca3471db	Merge pull request #6409 from IonAgorria/supplierorder-oldline FIX: Fill oldline in supplier order updateline	2017-02-12 20:45:20 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Ion	2418754d71	Fill oldline in supplier order updateline	2017-02-08 23:27:58 +01:00
Laurent Destailleur	e0850b29cd	Merge pull request #6399 from fappels/5.0 Qual reputation for price supplier	2017-02-08 16:42:20 +01:00
fappels	a84c6f9b45	Qual reputation for price supplier Move available reputation constants from view-controller to class	2017-02-08 13:35:34 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Paris Liakos	eb452397bd	Wrong trigger when setting supplier invoice back to draft	2017-02-08 10:56:28 +01:00
Laurent Destailleur	64da0e77d5	Merge pull request #6358 from defrance/patch-71 FIX : fill fourn remise percent with select product mode	2017-02-02 02:27:35 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	f6144b9ecb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-02 02:24:57 +01:00
BENKE Charlie	d84e50d15c	get remisepercent of product if select list when we use the select list of product instead of free search we don't fill the remise	2017-01-31 23:11:16 +01:00
Maxime Kohlhaas	7b6488b1c7	Fix numbering was disaplying technical error instead of error message	2017-01-27 10:05:57 +01:00
Marcos García de La Fuente	e0cbcadd98	In case Model for document generation is not defined, the criteria to select the model is now: 1. Model for the object 2. Custom default module 3. Hardcoded default module	2017-01-16 21:16:05 +01:00
Laurent Destailleur	febd23fe41	Clean dead code	2017-01-03 11:22:03 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01: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
Jean-Pierre Morfin	a4e424ee0e	FIX updating supplier order line	2016-12-11 11:59:49 +01:00
Maxime Kohlhaas	a4a47a064c	fix missing commit and return	2016-12-11 02:50:31 +01:00
Maxime Kohlhaas	3d2143809b	Multicurrency on supplier order and invoice	2016-12-11 02:09:57 +01:00
Laurent Destailleur	49f5ec6b52	Fix bugs reported by scrutinizer	2016-12-07 19:12:25 +01:00
Laurent Destailleur	1838670e31	Fix several security holes on api when used by external users	2016-12-07 19:02:39 +01:00
Laurent Destailleur	5edf215b74	Add missing api file	2016-12-05 13:32:08 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
Ion Agorria	f7a07f2491	Supplier order statut is not reverted on RECEIVE trigger fail	2016-11-26 22:13:31 +01:00
Laurent Destailleur	f9f1f92d86	FIX #6025	2016-11-22 19:45:06 +01:00
Laurent Destailleur	b4c20f1b1a	Fix regression in creation of invoice Uniformize code	2016-11-08 11:23:40 +01:00
Laurent Destailleur	5b2a44f16f	Fix phpunit regression	2016-11-03 20:10:01 +01:00
Laurent Destailleur	b4fbbe7391	Merge pull request #5947 from aspangaro/5.0-p34 Work on supplier credit/deposit/replacement invoice	2016-11-03 11:27:10 +01:00
aspangaro	de8ed22448	Work on supplier credit/deposit/replacement invoice	2016-11-02 07:13:17 +01:00
Laurent Destailleur	e9edbba093	NEW Usage of vat code seems ok everywhere.	2016-10-29 21:02:08 +02:00
Laurent Destailleur	03b882d095	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php	2016-10-29 19:12:58 +02:00
Laurent Destailleur	17c1b3f1d2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-10-29 19:00:43 +02:00
Laurent Destailleur	78eaeab168	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-10-29 18:44:55 +02:00
Maxime Kohlhaas	3dbab863a7	Fix : vars were not set after commande function	2016-10-28 10:24:31 +02:00
Juanjo Menent	94a884cea8	Fix: Use undeclared variable	2016-10-25 09:45:53 +02:00
Juanjo Menent	9ab25d4472	Fix: Use undeclared variable	2016-10-24 18:51:46 +02:00
Laurent Destailleur	39bc78909b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-24 03:35:43 +02:00
Laurent Destailleur	33a7b7037d	Save information of vat code into database	2016-10-24 03:23:40 +02:00
Laurent Destailleur	b5b76dfaf7	Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal	2016-10-24 01:06:15 +02:00
Laurent Destailleur	e388feee07	Merge pull request #5771 from defrance/patch-28 Add update_total function (like on other element)	2016-10-24 00:41:27 +02:00
Laurent Destailleur	9ab8f76777	Fix insert supplier invoice line	2016-10-22 18:40:21 +02:00
gauthier	7d63925118	NEW : param socid find_min_price_product_fournisseur() function	2016-10-18 15:35:48 +02:00
Laurent Destailleur	ee1ee1eee7	Management of the "Copy of" when cloning projects.	2016-10-16 12:12:45 +02:00
aspangaro	a328e673a3	Work on supplier type (Replacement / deposit / credit note) invoice	2016-10-02 21:39:24 +02:00
Laurent Destailleur	fe7e600dd3	Merge pull request #5820 from IonAgorria/fixcloneline FIX: cloned supplier order lines not having all parameters	2016-10-01 18:59:57 +02:00
aspangaro	cf883e0eeb	Update fournisseur.facture.class.php	2016-10-01 06:19:22 +02:00
Ion Agorria	0816cc87c3	Fix cloned supplier order lines not having all parameters	2016-09-30 20:09:59 +02:00
Laurent Destailleur	b2307f9b90	Uniformize code	2016-09-28 21:08:25 +02:00
Laurent Destailleur	86d86f8442	NEW #5801 More complete change to allow to disable supplier invoice document generation	2016-09-28 18:59:44 +02:00
aspangaro	922495d72d	Correct travis & typo "Execuete"	2016-09-24 07:18:38 +02:00
BENKE Charlie	f826013cb3	Update fournisseur.facture.class.php	2016-09-21 12:07:43 +02:00
BENKE Charlie	c713eb987e	Update fournisseur.facture.class.php	2016-09-21 12:06:39 +02:00
BENKE Charlie	cb736f5b93	Add update_total function (like on other element) the goal is to have and use the same function in all the native standard element (proposal, order, bill / customer and fournish)	2016-09-21 12:05:18 +02:00
Laurent Destailleur	4f842fd2cb	Uniformize look and feel	2016-09-19 13:57:50 +02:00
Laurent Destailleur	81590e3833	Merge pull request #5757 from IonAgorria/fix-sorder-insert FIX: Wrong line insert trigger in supplier order	2016-09-17 17:47:16 +02:00
Ion Agorria	7fe0c4211c	Move order supplier deleteline code to line class	2016-09-17 02:35:02 +02:00
Ion Agorria	54756ef729	Fix wrong trigger in supplier order	2016-09-15 23:45:13 +02:00
Ion Agorria	2bc41a1fd0	Fix ref supplier not recorded in addline	2016-09-13 18:41:13 +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	c71fc18942	NEW Checkbox 'close order to "Everything received" automatically if all products are received' is visible on supplier orders.	2016-09-12 01:05:45 +02:00
Laurent Destailleur	1bb278a587	Fix #5712	2016-09-11 23:01:04 +02:00
Laurent Destailleur	4d9abbd710	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-09-09 18:35:26 +02:00
Juanjo Menent	6e39d83480	Merge remote-tracking branch 'upstream/3.9' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-09-09 16:51:41 +02:00
Juanjo Menent	d8f50f9acd	Merge remote-tracking branch 'upstream/3.9' into 4.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-09-09 16:34:02 +02:00
Juanjo Menent	e3c2299c67	Merge remote-tracking branch 'upstream/3.8' into 3.9 Conflicts: htdocs/admin/dict.php htdocs/fourn/class/fournisseur.commande.class.php	2016-09-08 18:52:44 +02:00
Philippe	972a2db3a3	No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted	2016-09-08 11:40:39 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
florian HENRY	ba422615dd	better trigger management on supplier order	2016-08-25 14:38:16 +02:00
Laurent Destailleur	e22e243bc5	NEW Can set to paid automaically social or fiscal contributions after a payment was recorded.	2016-08-22 14:31:15 +02:00
fappels	b6f9aa4592	Fix SQL error insert supplier order line $this->fk_multicurrency not set gives SQL error	2016-08-11 21:10:56 +02:00
florian HENRY	0176acd08f	fix travis	2016-08-05 16:15:30 +02:00
florian HENRY	1e929e647d	better management of dispatch status	2016-08-05 10:02:36 +02:00
florian HENRY	0780188f4e	taking account @eldy remarks	2016-08-05 09:46:17 +02:00
florian HENRY	a39290022f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_NEW_ClassOrderDeliverStatusOnStockVentil Conflicts: htdocs/langs/en_US/workflow.lang	2016-08-05 09:34:27 +02:00
Laurent Destailleur	33d12a4492	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/admin.lang	2016-08-05 01:15:19 +02:00
Laurent Destailleur	5126786d60	NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED	2016-08-04 15:48:34 +02:00
florian HENRY	4001bc474e	NEW : Add workflow to calculated supplier order status on stock dispatch	2016-08-04 11:37:32 +02:00
Laurent Destailleur	abbe204c97	Fix design of option PROJECT_ADD_SUBTOTAL_LINES	2016-08-03 01:42:05 +02:00
Laurent Destailleur	801da08c76	FIX syntax error sql due to multicurrency	2016-07-28 14:10:43 +02:00
Laurent Destailleur	3639d30389	FIX Error is not returned	2016-07-28 14:07:59 +02:00
Laurent Destailleur	209bb213c0	Merge pull request #5475 from IonAgorria/ordersup-trigger New: Trigger for set status in supplier order	2016-07-28 09:48:04 +02:00
Ion Agorria	078439cf18	Use different trigger name per status	2016-07-26 19:53:29 +02:00
Sergio Sanchis Climent	c101a6c483	update camel caps to update_total()	2016-07-19 13:56:48 +02:00
Sergio Sanchis Climent	76f17737be	change dolsyslog	2016-07-19 13:50:32 +02:00
Sergio Sanchis Climent	07b6c991ff	Create CommandeFournisseurLigne->insert Create SupplierInvoiceLine->insert	2016-07-19 12:57:23 +02:00
Laurent Destailleur	73f574b649	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/repair.php	2016-07-12 19:30:01 +02:00
Ion Agorria	c596f8d9bd	New: Trigger for set status in supplier order	2016-07-10 23:05:51 +02:00
Laurent Destailleur	0f23cef46c	Fix warning of the repair tool.	2016-07-08 18:59:36 +02:00
Laurent Destailleur	b529a53501	Fix var not initialized	2016-06-28 02:36:40 +02:00
Frédéric FRANCE	7004dfbc15	typo	2016-06-25 09:57:46 +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
Laurent Destailleur	c09dbe05b3	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/class/ldap.class.php htdocs/expensereport/card.php htdocs/langs/en_US/admin.lang	2016-06-05 00:25:08 +02:00
Maxime Kohlhaas	3ef9fe2c40	Fix product supplier price modification with multicompany	2016-06-04 18:10:40 +02:00
Maxime Kohlhaas	bd2fe75d08	Fix menus in dashboard links	2016-06-04 14:45:03 +02:00
Laurent Destailleur	ff6daebee6	FIX #5203	2016-06-04 01:19:27 +02:00
Laurent Destailleur	5c36aa3802	Merge pull request #5271 from aschio/develop FIX #5192	2016-06-04 00:17:45 +02:00
cla	18424812db	closes #5192 . I deleted the line and moved last_insert_id() functions 3 lines under	2016-06-03 23:49:08 +02:00
Laurent Destailleur	149c6916f8	FIX ##5263	2016-06-03 22:20:58 +02:00
Ion Agorria	6ba86e9d03	Fill ref_supplier in product supplier price	2016-05-26 20:53:01 +02:00
Laurent Destailleur	a587ba496c	NEW Can select fields on supplier orders	2016-05-24 18:43:35 +02:00
Laurent Destailleur	4e46a01d51	Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-05-17 22:59:46 +02:00
Laurent Destailleur	06d0c261ad	Add TODO comment	2016-05-05 23:19:21 +02:00
Laurent Destailleur	c795803da1	FIX ref_supplier was not set. We also refered to old var names.	2016-05-05 20:19:56 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Laurent Destailleur	3d9456b202	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/facture/list.php	2016-04-29 20:42:35 +02:00
Laurent Destailleur	8a4871323d	Merge pull request #5022 from marcosgdf/bug-5008 FIX #5008 SQL error when editing the reference of a supplier invoice that already exists	2016-04-29 17:01:01 +02:00
Laurent Destailleur	3d4ddcb29e	Merge pull request #5065 from atm-maxime/fix_supplier_order_log Fix log function was removed in `1b6fa8ec34`	2016-04-22 19:45:36 +02:00
Laurent Destailleur	1de36d6501	Merge pull request #5011 from altatof/supplierorder_noprice NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-04-22 18:27:42 +02:00
Maxime Kohlhaas	bea8b49d8c	Fix log function was removed in `1b6fa8ec34`	2016-04-22 09:02:40 +02:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
Marcos García de La Fuente	aa64266c2f	FIX #5008 SQL error when editing the reference of a supplier invoice that already exists Close #5008	2016-04-16 18:44:31 +02:00
Christophe Battarel	c3d4cd85f1	NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined	2016-04-15 12:28:35 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	e61c83d708	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:03:19 +02:00
Laurent Destailleur	8342a61ea9	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php	2016-04-12 15:00:02 +02:00
Christophe Battarel	791df0c9ea	FIX: correct display of minimum buying price	2016-04-11 17:27:34 +02:00
Marcos García de La Fuente	b2f922291f	FIX #4851 Project selector in supplier invoices shows the project label twice Close #4851	2016-04-09 22:38:58 +02:00
Laurent Destailleur	f8b39ab50e	Fix errors reported by scrutinizer	2016-04-09 19:04:23 +02:00
Laurent Destailleur	1b6fa8ec34	Clean dead code	2016-04-09 19:04:04 +02:00
Laurent Destailleur	27217ccccd	Maxi debug of supplier order workflow. Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED Parameter user is added so it is defined into triggers.	2016-04-09 18:51:09 +02:00
Laurent Destailleur	c2fc9ecf68	Fix scrutinizer warning	2016-04-09 16:12:53 +02:00
Laurent Destailleur	3827a06796	Debug the supplier ref reputation feature.	2016-04-08 22:18:36 +02:00
Laurent Destailleur	448758bbf4	Merge branch 'develop_NEW_supplier_price_reputation' of https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_supplier_price_reputation Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-08 22:01:55 +02:00
Laurent Destailleur	b9ffc18c27	Uniformize log of supplier order. Now use the generic log feature.	2016-04-08 17:28:48 +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
Alexis Algoud	61a077b0ee	NEW reputation for price supplier	2016-04-06 09:58:03 +02:00
fmarcet	d3794bb145	FIX: Not removing code into vatrate.	2016-04-05 16:49:50 +02:00
BENKE Charlie	e455a2c9a8	only enabled society is used for product select	2016-03-07 08:25:21 +01:00
Laurent Destailleur	d1777a6783	Replace function rand with mt_rand (prepare php 8)	2016-03-05 15:01:25 +01:00
Marcos García de La Fuente	123d6fb6e5	FIX #4425 Missing "VAT" translation in supplier order popup Close #4425	2016-03-02 11:29:42 +01:00
Laurent Destailleur	8807222f24	Fix a lot of fixes to have the french vat npr working better	2016-02-27 12:22:39 +01:00
Laurent Destailleur	c86a1a30d5	Fix a lot of fixes to have the french vat npr working better	2016-02-27 11:46:16 +01:00
Laurent Destailleur	ff9a82c96f	Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment New add multicurrency supplier invoice payment	2016-02-22 16:26:31 +01:00
Laurent Destailleur	f6d1913bb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-02-22 13:35:46 +01:00
phf	fd4cda819c	New add supplier payment	2016-02-21 22:47:52 +01:00
philippe grand	6f6f2a0574	enhance code help translation	2016-02-20 11:18:02 +01:00
phf	d320aebe82	Fix muticurrency attributs not declared in class PropalLine Fix fetch_lines of FactureFournisseur with multicurrency fields	2016-02-19 22:41:47 +01:00
phf	b7d99271f8	New add multicurrency on supplier order	2016-02-19 22:25:59 +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
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
philippe grand	03b9b65d93	[quality] : better help	2016-02-16 16:45:19 +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	71a12824c9	Merge branch 'new_numbering_module_supplier_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_numbering_module_supplier_payment Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:31:33 +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
Ion Agorria	1f99ce8ae9	Fix var typo	2016-02-14 01:21:56 +01:00
Ion Agorria	1a45ab9d50	Fix missing vars in fetch_product_fournisseur_price	2016-02-11 20:29:45 +01:00
phf	d66bc6f1b3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-02-06 12:57:30 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
Laurent Destailleur	8e882b4cc2	NEW Add warning on tasks when they are late (add also the warning tolerance parameter)	2016-01-18 15:56:51 +01:00
Sof	c04eef35d5	FIX: Field cost_price does not exist and typos	2015-12-28 19:07:25 +01:00
Laurent Destailleur	18fdb75c98	Missing global	2015-12-23 20:02:15 +01:00
Laurent Destailleur	559e621fd2	Fix conflict with trigger to delete payment customer and supplier.	2015-12-23 19:54:56 +01:00
Laurent Destailleur	f0802eb36b	FIX #4245 PHP 7	2015-12-19 19:48:36 +01:00
Laurent Destailleur	3517b64031	FIX #4228 PHP7 error	2015-12-19 18:18:24 +01:00
Laurent Destailleur	f25a9030eb	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang	2015-12-18 22:12:03 +01:00
Sof	011f0fbb0b	FIX : Typo error	2015-12-15 14:04:52 +01:00
Laurent Destailleur	84ee18a11b	Fix bad management of second level approvement	2015-12-14 10:33:18 +01:00
Laurent Léonard	7e31c8f38f	Fix decimals in payments of supplier invoices	2015-12-07 01:27:08 +01:00
Laurent Destailleur	055e650adf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-02 23:23:38 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Laurent Destailleur	c55d11869b	Billing of supplier or customer order is a process that can be done in parallel with shipment or reception, so we show the status on another field into lists.	2015-11-29 15:54:32 +01:00
Laurent Destailleur	b47dbc7a5f	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/install/pgsql/functions/functions.sql htdocs/projet/element.php	2015-11-26 01:32:21 +01:00
Marcos García	a30f7d543a	Corrected fix	2015-11-25 10:19:11 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
Marcos García de La Fuente	e8fc5f0d3a	FIX #3987 Undefined variable $newref in CommandeFournisseur::approve	2015-11-21 11:00:56 +01:00
Laurent Destailleur	835700bb25	Merge pull request #4006 from marcosgdf/bug-3989 FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 23:42:38 +01:00
Laurent Destailleur	04ffe1c7f0	Merge pull request #4005 from marcosgdf/bug-3988 FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 23:42:04 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
Marcos García de La Fuente	53fb085766	Corrected indent	2015-11-16 13:29:37 +01:00
Marcos García de La Fuente	ec7e4cb3d4	FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 13:25:00 +01:00
Marcos García de La Fuente	0880b13142	FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 13:24:11 +01:00
Marcos García de La Fuente	be460b6cbf	FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be	2015-11-16 13:20:56 +01: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
Laurent Destailleur	388748055a	Fix missing translation for VAT	2015-11-15 15:08:54 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
frederic34	7349862b64	translations	2015-11-07 11:19:31 +01:00
frederic34	a597d6c379	allow chaining	2015-11-07 10:23:56 +01:00
frederic34	becce332dd	allow chaining and remove header exit	2015-11-07 09:52:00 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	df4f09e72f	FIX #3240	2015-11-03 14:02:36 +01:00
Laurent Destailleur	72915aa16d	Merge pull request #3784 from All-3kcis/develop-patch-11 NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"	2015-11-02 11:23:49 +01:00
All-3kcis	a658ff7e90	add commit or rollback if error	2015-11-02 10:26:07 +01:00
Laurent Destailleur	1f1e72f2b6	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/main.inc.php	2015-10-25 19:54:41 +01:00
All-3kcis	00c2b1a32a	move db->begin() before trigger	2015-10-22 14:30:11 +02:00
All-3kcis	ceae04b76e	move trigger before query	2015-10-22 12:03:01 +02:00
Frédéric FRANCE	4689b0cc11	Update fournisseur.commande.class.php	2015-10-21 17:31:51 +02:00
All-3kcis	ca8c1adf55	Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()	2015-10-21 10:07:53 +02:00
All-3kcis	3cb2637f25	Correct return value	2015-10-20 09:42:02 +02:00
Laurent Destailleur	81580f75b9	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture.php	2015-10-18 21:22:42 +02:00
Laurent Destailleur	3d94e3d80e	FIX Editing a supplier price should keep the vat.	2015-10-17 12:01:17 +02:00
Frédéric FRANCE	d68db2a844	Update fournisseur.commande.class.php	2015-10-17 08:48:53 +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
Laurent Destailleur	1f742c7464	FIX Add a test to save life when ref of object (invoice ref, order ref, ...) was empty. The was no way to go back to a clean situation, even after vaidating again the object.	2015-10-06 16:38:27 +02:00
Juanjo Menent	31230d296d	Merge remote-tracking branch 'upstream/3.8' into develop	2015-10-03 23:51:38 +02:00
Juanjo Menent	8febf25c23	Fix: #3566	2015-10-03 23:34:10 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	9f2545b95d	[Qual] Replaced deprecated dol_clone by native clone	2015-09-24 17:24:40 +02:00
Laurent Destailleur	b94fb9e1f3	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-12 18:22:10 +02:00
Laurent Destailleur	db3c544e21	Fix #3240 [Supplier orders] Dashboard links to unuseful page	2015-09-12 18:14:08 +02:00
Laurent Destailleur	94723a9b83	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/langs/en_US/accountancy.lang	2015-09-12 15:23:02 +02:00
Laurent Destailleur	1966d75ced	FIX #3490	2015-09-12 12:50:55 +02:00
Laurent Destailleur	36632593c0	Fix SQL injections #3300	2015-09-12 11:36:19 +02:00
Laurent Destailleur	5bc74ad6ea	Fix SQL injections #3300	2015-09-12 11:23:44 +02:00
Marcos García de La Fuente	c58b5a5117	Created CommandeFournisseur::hasDelay function	2015-09-06 19:23:46 +02:00
Marcos García de La Fuente	9ce8024f1e	Merge remote-tracking branch 'upstream/develop' into refactor	2015-09-06 18:57:38 +02:00
Marcos García de La Fuente	47e62f2270	Created FactureFournisseur::hasDelay function	2015-09-06 18:47:26 +02:00
Laurent Destailleur	9a6e13d253	Fix test if empty was inverted	2015-08-19 19:45:24 +02:00
Laurent Destailleur	fcc6ce8c31	Fix Option for second level approbation was visible when it should not.	2015-07-29 15:39:34 +02:00
Marcos García de La Fuente	670596685f	Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties Related to #2670	2015-07-05 13:34:06 +02:00
aspangaro	56831ecd16	Correct travis	2015-07-04 16:13:44 +02:00
Marcos García de La Fuente	9415bdd828	Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete	2015-07-03 19:17:45 +02:00
Laurent Destailleur	43ed48896a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-06-05 18:31:53 +02:00
Laurent Destailleur	1252a500ce	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/class/fournisseur.product.class.php	2015-06-05 16:50:46 +02:00
Maxime Kohlhaas	f7493de50c	Fix : supplier order clone was buggy if notes contains apostrophe	2015-06-05 13:42:29 +02:00
jfefe	195a1b2708	FIX #2957 : missing $langs object for trigger	2015-06-04 18:10:29 +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
abb	ebf2edf019	added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function	2015-05-23 15:35:19 +01: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
Laurent Destailleur	bf883e1576	Minor cosmetic changes Fix permissions and CRLF	2015-05-15 02:34:57 +02:00
Raphaël Doursenaud	7b538d8842	Fix missing unit parameter Prevented the input of supplier invoices lines from working	2015-04-30 15:59:20 +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	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +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
Laurent Destailleur	8be83cd043	Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop Conflicts: htdocs/langs/en_US/sendings.lang	2015-04-18 20:29:25 +02:00
Francis Appels	c5599efe62	Don't show 'undifined' when no max delivery time	2015-04-18 18:56:25 +02:00
Laurent Destailleur	ce81f58986	Fix several bugs into edit of supplier lines	2015-04-18 16:54:00 +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	d76c1a9f42	Can filter on serial number into movement list	2015-04-10 12:59:33 +02:00
Laurent Destailleur	e01e0faeef	Can reopen to edit supplier order once ordered	2015-04-09 16:15:52 +02:00
Laurent Destailleur	ed6f2e9386	Fix error management	2015-04-09 15:14:50 +02:00
Laurent Destailleur	b3355df3bf	Fix delivery delay could not be set to unknown	2015-04-08 13:00:03 +02:00
Laurent Destailleur	1efa5bcabd	Fix: Avoid duplicate tooltip	2015-04-08 12:44:11 +02:00
Laurent Destailleur	1d6a8a46f1	To clean an int we must use (int) and not trim()	2015-04-07 02:44:30 +02:00
Laurent Destailleur	b49705d5d0	Status and amount of object should always be visible.	2015-04-06 16:13:23 +02:00
Laurent Destailleur	e2508287bd	Merge pull request #2537 from marcosgdf/cq Created Propal, FactureFourniseur, and Commande constants for status	2015-04-06 12:37:52 +02:00
Laurent Destailleur	f38bf5a7d2	Fix extrafields were not saved when creating a supplier order Fix removed hooks where we must use trigger	2015-04-03 11:00:52 +02:00
Marcos García de La Fuente	6fe803cd86	Created Propal, FactureFourniseur, and Commande constants for status	2015-04-03 05:18:47 +02:00
Laurent Destailleur	cf0f458a51	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php htdocs/langs/el_GR/projects.lang htdocs/langs/en_GB/bills.lang htdocs/langs/en_GB/main.lang htdocs/langs/en_GB/orders.lang htdocs/langs/es_AR/bills.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/main.lang htdocs/langs/es_ES/bills.lang htdocs/langs/es_ES/projects.lang htdocs/langs/fa_IR/categories.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/other.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/lv_LV/bills.lang htdocs/langs/nb_NO/bills.lang htdocs/langs/pl_PL/bills.lang htdocs/langs/pl_PL/mails.lang htdocs/langs/pl_PL/projects.lang htdocs/langs/ro_RO/bills.lang htdocs/langs/ro_RO/products.lang htdocs/langs/ro_RO/projects.lang htdocs/langs/ru_RU/bills.lang htdocs/langs/ru_RU/projects.lang htdocs/langs/sl_SI/main.lang htdocs/langs/tr_TR/bills.lang htdocs/langs/tr_TR/projects.lang htdocs/langs/vi_VN/bills.lang	2015-04-02 13:57:20 +02:00
Laurent Destailleur	d8db32a99c	NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.	2015-04-01 21:00:51 +02:00
Francis Appels	bba8b206a1	FIX: dispatch batch products Fix dispatching batch products and add error message. Make DispatchProduct method backwards comp and add missing $trigger. Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.	2015-03-31 15:48:08 +02:00
Marcos García de La Fuente	3d50b41b8e	Reverted $rowid instead of $id property	2015-03-23 01:40:33 +01:00
Marcos García de La Fuente	4349f27299	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
Laurent Destailleur	2d90256640	Revert "Refactor 1"	2015-03-22 12:51:29 +01:00
Laurent Destailleur	a79a779b04	Merge pull request #2456 from marcosgdf/refactor-1 Refactor 1	2015-03-22 12:47:05 +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	a55af4387b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: .travis.yml htdocs/core/class/notify.class.php htdocs/product/stock/class/mouvementstock.class.php test/phpunit/AllTests.php test/phpunit/MouvementStockTest.php	2015-03-22 12:10:39 +01:00
jean	9e9a8894ea	Add global $langs to method, necessary for triggers to function correctly	2015-03-17 14:20:08 +01:00
Laurent Destailleur	daf853d040	Merge pull request #2455 from aspangaro/develop-ReviewER QUAL: Traduce terms + remove <center>	2015-03-16 02:11:29 +01:00
Laurent Destailleur	79ca1fe147	Clean code.	2015-03-15 23:32:43 +01:00
Marcos García de La Fuente	efb9f7f4fd	Merge branch 'develop' into refactor-1 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/includes/tcpdi/fpdf_tpl.php	2015-03-15 18:07:30 +01: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
Laurent Destailleur	56b5bfd25b	NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.	2015-03-08 02:08:26 +01:00
Laurent Destailleur	7b7b5090c7	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 23:03:29 +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
Marcos García de La Fuente	6ec8a38e4a	Removed duplicated code	2015-03-04 10:46:39 +01:00
Marcos García de La Fuente	a7741350fe	Revert unwanted change	2015-03-04 10:41:40 +01:00
Marcos García de La Fuente	54b6b199c7	Documented missing properties and removed redundant documentation (cherry picked from commit 6124f6a)	2015-03-04 10:37:48 +01:00
Marcos García de La Fuente	e1982c54d9	Moved duplicated code to common class	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	f82df1e634	Refactorred supplier order to match with objectline templates	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	47a151f157	Created supplier invoice line	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	b84cf4afac	Renamed FactureFournisseurLine to SupplierInvoiceLine	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	c7919a8d08	Removed duplicated code	2015-03-04 10:37:45 +01:00
Laurent Destailleur	4d226885cb	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 18:10:31 +01:00
Laurent Destailleur	8e26c71fa7	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 04:59:27 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
Laurent Destailleur	8f378b4480	Fix no error returned when contact already exists	2015-02-26 15:52:14 +01:00
Laurent Destailleur	d6438a51ab	Add log to help track bug	2015-02-26 15:24:15 +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	eb4eededbd	Add class to manage table commande_fournisseur_dispatch	2015-02-24 11:19:47 +01:00
Laurent Destailleur	bbc82e829b	Fix bad sql request	2015-02-23 23:28:55 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
phf	127868899d	Merge branch 'develop' into incoterm Conflicts: htdocs/commande/class/commande.class.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-02-23 10:42:01 +01:00
phf	81130634d3	[CORE] intégration de incoterm sur les différentes class (#incoterm).	2015-02-23 09:16:14 +01:00
Laurent Destailleur	b04682db4c	Fix Edit of extrafield on supplier invoice or order was deleteing other fields. Fix Missing escapment Fix new field delivery date was only into edit page	2015-02-22 17:41:02 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	316e5c2f19	Merge pull request #2358 from marcosgdf/board-refactor Refactored dashboard indicator	2015-02-18 23:39:15 +01:00
Laurent Destailleur	d7dcf28c61	Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-3.7 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-02-18 23:15:40 +01:00
Laurent Destailleur	b6947dbe2c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/modules/DolibarrModules.class.php	2015-02-18 22:04:26 +01:00
Laurent Destailleur	1e1543403b	New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set user approving as contact following supplier order.	2015-02-17 19:49:17 +01:00
Laurent Destailleur	ad67fe50a3	Correct management when delivery date is universal time format.	2015-02-17 17:21:41 +01:00
Marcos García de La Fuente	fa55c60c35	Renamed WorkBoardResponse to WorkboardResponse	2015-02-16 23:52:49 +01:00
Marcos García de La Fuente	d5fd20e911	Renamed BoardResponse to WorkBoardResponse	2015-02-15 15:10:51 +01:00
Marcos García de La Fuente	bab0163c44	Missing Copyright info	2015-02-15 15:07:24 +01:00
Marcos García de La Fuente	d1f73499e9	Refactored dashboard indicator	2015-02-15 15:01:28 +01:00
Gauthier	105e024c48	@param desc	2015-02-12 13:20:03 +01:00
Gauthier	be56f76743	FIX : Display error on dispatched quantity when we have several times same product in a supplier order	2015-02-12 12:56:21 +01:00
Laurent Destailleur	179cbbd187	Maxi debug and enhancement of module batch.	2015-02-11 22:54:06 +01:00
Laurent Destailleur	fb3cf4da1e	New: The comment of the stock movement when making a supplier order receiving is also stored into the tracking dispatch table (not only into stock movement table).	2015-02-11 15:03:33 +01:00
Laurent Destailleur	b9d2de99e1	Translation	2015-02-11 14:46:16 +01:00
phf	a1d2f426b8	[CORE] correction mineurs pour travis (#new_ask_price).	2015-02-09 10:17:28 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
Laurent Destailleur	3f807a09b4	Doxygen	2015-02-08 00:39:51 +01:00
phf	1d9a3e0ce2	[CORE] Fix : renommage d'une fonction (#deliverytime).	2015-02-06 16:39:54 +01:00
phf	12c7e52b7e	[CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime).	2015-02-06 16:33:58 +01:00
phf	35d41d6f7c	[CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime).	2015-02-06 16:07:22 +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
phf	296fae058c	[CORE] ajout de la liaison entre une demande de prix et une commande fournisseur (#new_ask_price).	2015-02-03 16:54:04 +01:00
phf	1e71b01016	[CORE] ajout d'une fonction pour mettre à jour l'id de projet lors de la création d'une commande depuis la demande de prix (#new_ask_price).	2015-02-03 15:22:03 +01:00
Laurent Destailleur	9c087e27d0	Fix permissions	2015-02-02 13:45:55 +01:00
Laurent Destailleur	d66d4f53a5	Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into frederic34-tooltip Conflicts: htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/product/index.php	2015-01-31 15:41:33 +01:00
Laurent Destailleur	1c7feb67ea	Merge branch 'dinamic-prices-product' of https://github.com/IonAgorria/dolibarr into IonAgorria-dinamic-prices-product Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/fournisseurs.php	2015-01-31 14:53:14 +01:00
frederic34	6a1865adb6	Merge remote branch 'upstream/develop' into tooltip Conflicts: htdocs/fourn/commande/list.php	2015-01-31 09:58:41 +01:00
Laurent Destailleur	29d399ba79	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-31 00:09:37 +01:00
Laurent Destailleur	0ea4a5db7d	Fixed: Error management on triggers	2015-01-31 00:08:45 +01:00
frederic34	b850b7b448	Merge remote branch 'upstream/develop' into tooltip Conflicts: htdocs/langs/en_US/sendings.lang	2015-01-30 16:45:24 +01:00
frederic34	736bee565c	Tooltip everywhere	2015-01-30 16:40:33 +01:00
Laurent Destailleur	4fdc287717	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php	2015-01-30 15:53:06 +01:00
Laurent Destailleur	43702cf662	New: Enhance stock management: Introduce tag to define if a subproduct must have stock decreased and add inventory code on stock movements.	2015-01-30 01:51:28 +01:00
Laurent Destailleur	b61c475aa8	Clean code for validate permissions. "validate" is a status to say, "now it exists, it is no more a draft", so by default we don't need this permissions (it is same than create). We keep "validate" permissions as an "advanced" permission only.	2015-01-25 21:32:40 +01:00
Laurent Destailleur	ad68b3ca6c	Fixed approve during validation if user has permission Fixed error management Fixed rendering country must be same for all tabs.	2015-01-25 00:59:46 +01:00
frederic34	e18577aa62	Tooltip and lib for file cache	2015-01-24 21:46:05 +01:00
frederic34	f4161b457b	Add dol_escape_htmltag and start to adapt boxes	2015-01-22 00:23:55 +01:00
Ion Agorria	2c01370ce6	Reimplemented 'find_min_price_product_fournisseur()'	2015-01-21 05:22:46 +01:00
frederic34	1b0dd671b3	Add tooltip in getNomUrl link	2015-01-20 21:40:33 +01:00
Laurent Destailleur	e220ce5a82	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php	2015-01-18 18:44:22 +01:00
Laurent Destailleur	5c5ff72ecd	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php	2015-01-18 17:13:42 +01:00
Marcos García de La Fuente	41e01a22a3	Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code	2015-01-17 18:58:05 +01:00
Marcos García de La Fuente	ed839114ab	Fixed loading of external numeration modules in FactureFournisseur and Propal	2015-01-17 18:42:19 +01:00
Laurent Destailleur	007f18bcf7	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-review Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/comm/action/peruser.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/report.lib.php	2015-01-17 15:11:12 +01:00
Laurent Destailleur	033e77c04a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/product/stock/product.php	2015-01-13 15:41:45 +01:00
Laurent Destailleur	dda12003d4	Fixed: User of creation was not visible.	2015-01-10 12:23:15 +01:00
frederic34	60661ae948	Add some "classfortooltip"	2015-01-09 00:07:54 +01:00
Ion Agorria	5bbcb58b44	Added expressions for product/service prices	2014-12-28 01:26:41 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Marcos García de La Fuente	1f00794c98	Fixed bug which didn't show documents in auto GED when an object had '/' in its ref	2014-12-25 21:47:39 +01:00
Laurent Destailleur	2a3bb96c34	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php	2014-12-22 03:14:22 +01:00
Laurent Destailleur	8996953077	Fix: error reported by scrutinizer	2014-12-20 15:42:03 +01:00
Laurent Destailleur	4769e26d8e	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-18 12:34:41 +01:00
Laurent Destailleur	38ba6ac75b	Fixed: pgsql to make order	2014-12-18 11:48:30 +01:00
Laurent Destailleur	475d749a97	Fix: phpcheckstyle	2014-12-04 01:11:13 +01:00
Laurent Destailleur	1e8e4e7fda	Prepare 3.8 dev Fix bad test. Renamed table for dynamic prices.	2014-12-03 17:06:44 +01:00
Ion Agorria	fac46b3b46	Code for dinamic prices funcionality	2014-11-29 06:31:35 +01:00
Laurent Destailleur	c186f13218	Fix: Param $action was not defined. A better fix must be done later be removing useless hooks that are duplicate with triggers.	2014-11-15 19:04:21 +01:00
Laurent Destailleur	445f696d28	Fix: Pb of object with wrong type.	2014-11-15 18:24:38 +01:00
Laurent Destailleur	e3f4db85af	Fix divers	2014-11-07 23:07:15 +01:00
Juanjo Menent	3880013940	Fix hooks from supplierorder to supplierinvoice	2014-11-06 23:10:21 +01:00
Juanjo Menent	2f30e769f6	Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown	2014-11-06 22:16:27 +01:00
Laurent Destailleur	28c0c55780	Merge pull request #1977 from atm-maxime/develop Add : statistics on supplier orders and invoices on home page	2014-10-30 17:59:07 +01:00

... 13 14 15 16 17 ...

1807 Commits