4765 Commits

Author	SHA1	Message	Date
Laurent Destailleur	330a1199e4	Look and feel v17	2022-10-21 15:08:54 +02:00
Regis Houssin	9145388301	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_missing_hook_parameters	2022-10-21 11:09:45 +02:00
Regis Houssin	f57412107b	FIX missing hook parameters	2022-10-21 11:09:36 +02:00
Laurent Destailleur	06d94c9a97	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-10-19 17:11:32 +02:00
Noé Courtier	477f5e2890	FIX: Missing return 0 if object not found	2022-10-19 11:53:17 +02:00
mbinformatique68	d30b1b4860	NEW Add the formEditObjectLine hook on commande card	2022-10-18 16:33:30 +02:00
Regis Houssin	0e63591604	FIX avoid warning (php8) missing hook parameters	2022-10-18 10:45:48 +02:00
lvessiller	2d181f01be	NEW rename MAIN_LIST_ALLOW_NOTES by MAIN_LIST_HIDE_NOTES	2022-10-17 11:37:09 +02:00
lvessiller	121ebb671b	NEW resize parent company column in order list	2022-10-14 08:45:24 +02:00
Laurent Destailleur	9fa00c1771	Fix trans in comments	2022-10-12 15:29:30 +02:00
Nicolas	5528dc3843	FIX closed warehouse for shipping	2022-10-11 10:26:03 +02:00
Laurent Destailleur	ae4f8b23d5	Standardize code for action buttons Delete	2022-10-10 11:39:50 +02:00
Laurent Destailleur	63109d2844	Merge pull request #22182 from frederic34/pr/dolibit-ut/22136 ... sample deprecated function	2022-10-06 12:20:15 +02:00
Laurent Destailleur	395312737b	Merge pull request #22406 from aspangaro/17p6 ... Use isModEnabled	2022-10-04 18:01:59 +02:00
lvessiller	ebeafa487a	FIX cache on parent company list	2022-10-03 12:29:12 +02:00
lvessiller	b894136dd9	NEW parent company column and filter in order list	2022-10-03 09:52:46 +02:00
Laurent Destailleur	07966f5e6b	Clean code	2022-10-01 14:00:43 +02:00
Alexandre SPANGARO	51aa7e8027	Merge remote-tracking branch 'upstream/develop' into 17p6	2022-10-01 07:52:48 +02:00
Laurent Destailleur	fb28d14097	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2022-09-28 21:20:37 +02:00
Laurent Destailleur	98ed321514	Merge branch 'develop' into 17p6	2022-09-28 20:55:43 +02:00
Frédéric France	3a3dad6fb8	Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136	2022-09-28 20:23:40 +02:00
Laurent Destailleur	52b12ee47d	Trans	2022-09-27 14:12:37 +02:00
Laurent Destailleur	edaa111461	Replace use of png file for module image with a font awesome image	2022-09-27 12:05:11 +02:00
Laurent Destailleur	41270d585e	css	2022-09-27 11:17:10 +02:00
Alexandre SPANGARO	ef94f2af70	Use isModEnabled	2022-09-25 22:45:10 +02:00
Laurent Destailleur	acaf066d1d	Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references ... Add an option to manage input size for customer / supplier references	2022-09-25 18:48:55 +02:00
Laurent Destailleur	2a98ff313e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-09-25 17:12:25 +02:00
Laurent Destailleur	f5e5de1eba	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2022-09-25 17:12:03 +02:00
Laurent Destailleur	86091c3fde	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0	2022-09-25 17:01:44 +02:00
Alexandre SPANGARO	d06fef47f8	Use isModEnabled	2022-09-25 15:28:36 +02:00
Laurent Destailleur	118b975f91	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-09-25 11:56:05 +02:00
Alexandre SPANGARO	fc9e6c541e	Use isModEnabled	2022-09-25 06:30:33 +02:00
Alexandre SPANGARO	5eaffd64e7	Use isModEnabled	2022-09-25 06:13:22 +02:00
Alexandre SPANGARO	5fc79979bc	Use isModEnabled	2022-09-25 06:02:13 +02:00
Alexandre SPANGARO	58ac8d196c	Use isModEnabled	2022-09-25 06:01:40 +02:00
priojk	33291b7cc7	FIX #21799 inactive companies cannot be selected	2022-09-24 17:19:52 +02:00
Philippe GRAND	fb9db96ecc	update code toward php8 compliance	2022-09-24 14:37:57 +02:00
Laurent Destailleur	e1b5e5033f	Clean code of deprecated field	2022-09-23 09:35:17 +02:00
Laurent Destailleur	6fb9a4713c	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-09-21 01:30:40 +02:00
Regis Houssin	f5fe366525	FIX broken feature, wrong fk_parent_line	2022-09-16 15:03:53 +02:00
Laurent Destailleur	91bdaae898	Look and feel v17	2022-09-15 03:08:33 +02:00
Regis Houssin	a3a973466f	FIX broken feature, wrong fk_parent_line after cloning object	2022-09-13 15:16:17 +02:00
Laurent Destailleur	209bf00b69	Trans	2022-09-13 00:12:57 +02:00
Laurent Destailleur	a11a33a804	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-09-11 22:21:18 +02:00
Frédéric France	e96eee56b0	sample deprecated function	2022-09-10 13:55:40 +02:00
Alexandre SPANGARO	6b4bd6c09e	FIX #21859 - Don't show html balise on list for private/public note	2022-09-09 15:56:17 +02:00
Frédéric France	1c2a89f52d	Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv	2022-09-09 08:09:12 +02:00
Laurent Destailleur	7c7ccc2393	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-09-09 01:45:59 +02:00
Laurent Destailleur	fb60c100e5	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0	2022-09-09 01:39:52 +02:00
Laurent Destailleur	3177a065cd	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-09-09 01:31:43 +02:00
Frédéric France	da8617e3ff	Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv	2022-09-08 18:59:23 +02:00
Laurent Destailleur	ee05abaa27	Clean code	2022-09-08 15:13:16 +02:00
Laurent Destailleur	aa9036a0f5	Clean code	2022-09-08 15:05:51 +02:00
Frédéric France	8d33953142	add comment	2022-09-07 20:08:59 +02:00
Alexandre SPANGARO	9a5927d833	FIX Column label	2022-09-06 05:30:35 +02:00
Laurent Destailleur	760c6e581e	Merge pull request #22060 from grandoc/new_branch_03_09_2022 ... Update code	2022-09-03 11:44:36 +02:00
Philippe GRAND	7997776cbb	Update code	2022-09-03 11:12:52 +02:00
Philippe GRAND	4a8f61838d	Update code	2022-09-03 11:11:38 +02:00
Philippe GRAND	120fb10738	Update code	2022-09-03 11:09:59 +02:00
Frédéric FRANCE	9150f5102e	Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009	2022-09-02 11:44:45 +02:00
Laurent Destailleur	027e597776	Merge branch 'develop' into productbatch	2022-09-02 10:11:47 +02:00
stickler-ci	9a7ad0a7dc	Fixing style errors.	2022-09-01 19:17:42 +00:00
UT from dolibit	33e112eda7	Update list.php	2022-09-01 21:06:30 +02:00
Anthony Berton	c0c12a40b0	Fix inithook	2022-09-01 16:37:13 +02:00
Philippe GRAND	9ba54b502d	update code	2022-09-01 09:41:59 +02:00
Sylvain Legrand	a1bae3453a	Add an option to manage input size for customer / supplier references	2022-09-01 08:34:22 +02:00
Frédéric France	bb58f3a18f	use isModEnabled	2022-08-31 22:38:53 +02:00
Frédéric France	8e66b7207e	replace ! empty by !empty	2022-08-31 22:14:20 +02:00
Philippe GRAND	81c13bcc4c	update code	2022-08-31 22:03:33 +02:00
Frédéric France	e71692e745	fix php8 warnings	2022-08-31 22:02:31 +02:00
Philippe GRAND	52fed85676	update code	2022-08-31 21:59:06 +02:00
Philippe GRAND	b04125f9f9	update code	2022-08-31 21:58:38 +02:00
Philippe GRAND	1b7934062f	update code	2022-08-31 21:57:27 +02:00
Philippe GRAND	18fba7a8e7	update code	2022-08-31 21:56:58 +02:00
Philippe GRAND	c86617c7b1	update code	2022-08-31 21:56:30 +02:00
Frédéric France	fc01cc66cd	fix php8 warnings	2022-08-31 21:55:55 +02:00
Philippe GRAND	f26b1cccdc	update code	2022-08-31 21:55:54 +02:00
Laurent Destailleur	e0b1ad308b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2022-08-30 19:38:35 +02:00
UT from dolibit	2b59e9261b	Update index.php	2022-08-29 18:58:51 +02:00
Laurent Destailleur	5acd2b0702	Merge pull request #21917 from dolibit-ut/patch-444 ... Update card.php	2022-08-29 00:54:53 +02:00
UT from dolibit	c6c5ddd485	Update commande.class.php	2022-08-27 13:55:27 +02:00
stickler-ci	2ee2dfeea2	Fixing style errors.	2022-08-27 10:26:09 +00:00
UT from dolibit	765b8053cf	Update card.php	2022-08-27 12:21:01 +02:00
Laurent Destailleur	bfb01ae928	Clean code	2022-08-26 18:24:42 +02:00
Laurent Destailleur	af69270a0e	NEW Can enter the unit price including the vat	2022-08-26 17:39:41 +02:00
UT from dolibit	1efca018d9	Update list.php	2022-08-24 23:13:27 +02:00
Frédéric France	e78f9a56be	use isModEnabled	2022-08-23 20:16:28 +02:00
Anthony Berton	6d625d6128	Add options for clean list	2022-08-23 20:09:40 +02:00
Frédéric France	86a7a7c8bb	use isModEnabled	2022-08-23 20:05:09 +02:00
Frédéric France	4bef0f5745	use isModEnabled	2022-08-23 20:01:34 +02:00
Anthony Berton	19248016bf	Fix - $generic_commande mount	2022-08-23 15:40:12 +02:00
Anthony Berton	d7387ecd17	optimise	2022-08-23 12:33:03 +02:00
Anthony Berton	b3c903723f	Add menu and clean	2022-08-23 11:37:08 +02:00
Anthony Berton	be2ecf1c3a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596	2022-08-23 10:52:21 +02:00
Anthony Berton	5eb495224b	clean	2022-08-23 10:51:38 +02:00
Anthony Berton	dac8613c39	Add new file	2022-08-23 10:46:09 +02:00
Laurent Destailleur	72c010622b	FIX empty with hasRight and add phpunit to avoid this in future	2022-08-14 16:38:20 +02:00
Laurent Destailleur	24b1085639	Clean code. Prepare for inputing prices with taxes	2022-08-13 19:30:26 +02:00
Laurent Destailleur	95b1b3f990	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/emailcollector/class/emailcollector.class.php htdocs/index.php htdocs/website/index.php	2022-08-10 13:16:02 +02:00
Regis Houssin	b20144c3d0	FIX php8 compatibility	2022-08-08 11:39:43 +02:00
Laurent Destailleur	654e7bf638	Merge branch 'develop' into FIX---php-V8-user-right-order-card	2022-07-28 14:21:20 +02:00
Anthony Berton	a778a5ff78	and order lib	2022-07-28 11:50:42 +02:00
Anthony Berton	03e265b080	FIX - php V8 user right order card	2022-07-28 11:43:00 +02:00
Anthony Berton	d8ae2361a9	NEW - Add user right order generete doc	2022-07-28 11:29:36 +02:00
Anthony Berton	8dfb4288ec	Clean	2022-07-27 17:27:05 +02:00
Anthony Berton	133375157a	Merge branch 'NEW---List-product-in-orders' of https://github.com/bb2a/dolibarr into NEW---List-product-in-orders	2022-07-27 16:52:51 +02:00
Anthony Berton	716adb103f	FIX - Error with MAIN_CHECKBOX_LEFT_COLUMN	2022-07-27 16:52:48 +02:00
stickler-ci	7740c81f3b	Fixing style errors.	2022-07-27 14:38:59 +00:00
Anthony Berton	5f3dc1b01f	Add search in sql	2022-07-27 16:11:16 +02:00
Anthony Berton	7df1f876f5	Add removefilter	2022-07-27 16:02:27 +02:00
Anthony Berton	887d30e1b4	Add option ORDER_ADD_OPTION_SHOW_DETAIL_LIST	2022-07-27 16:01:45 +02:00
Anthony Berton	0e796a2a02	Clean	2022-07-27 15:35:35 +02:00
BB2A Anthony Berton	da7f267df3	[200~Merge branch NEX---List-product-in-orders of https://github.com/bb2a/dolibarr into NEX---List-product-in-	2022-07-27 15:02:37 +02:00
BB2A Anthony Berton	7a8006c0a0	init	2022-07-27 14:40:45 +02:00
Berton Anthony	e77c51eabb	conf	2022-07-25 12:18:07 +02:00
Berton Anthony	eb463341b4	ok	2022-07-25 12:17:02 +02:00
Laurent Destailleur	fb96145b49	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-07-12 02:05:20 +02:00
Laurent Destailleur	204bf2e618	Update card.php	2022-07-11 10:54:23 +02:00
This Charlène	796f718012	Update card.php	2022-07-11 07:14:46 +02:00
This Charlène	8be15e8e27	php v8 fix warning ... missing and bad name variables	2022-07-11 07:11:45 +02:00
Laurent Destailleur	2ce695f939	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-07-10 19:48:20 +02:00
Laurent Destailleur	9a92c7d9b0	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/extrafields.class.php	2022-07-10 19:28:16 +02:00
Laurent Destailleur	a871aa8f85	Merge pull request #21382 from fboitel/NEW#20650 ... NEW #20650 Checkbox column on left for lists	2022-07-07 21:48:51 +02:00
Christian Foellmann	4c5e05e411	fix page titles ... Conflicts: htdocs/compta/bank/annuel.php htdocs/contact/list.php htdocs/product/stock/movement_list.php htdocs/user/list.php	2022-07-06 19:19:08 +02:00
Laurent Destailleur	76e3c10c06	Revert "fix page titles"	2022-07-06 15:56:04 +02:00
Laurent Destailleur	bd28a7e038	Debug v16	2022-07-03 12:54:58 +02:00
Laurent Destailleur	4c4e081997	Debug v16	2022-06-28 13:09:53 +02:00
Christian Foellmann	89d1389e2d	fix page titles	2022-06-27 12:48:04 +02:00
Laurent Destailleur	0d25e3d236	Merge pull request #21392 from bb2a/FIX---php-V8-order-liste ... FIX - php V8 order liste	2022-06-27 12:20:31 +02:00
Laurent Destailleur	bc81f372ac	Merge pull request #21362 from bb2a/FIX---Cancel-order ... FIX - Right close order	2022-06-27 11:46:55 +02:00
Laurent Destailleur	a1f974f356	Merge pull request #21374 from aspangaro/17p2 ... Look & Feel v16 - Align amount to right on card	2022-06-27 11:39:31 +02:00
BB2A Anthony Berton	2208d39b39	FIX - php V8 order liste	2022-06-27 11:29:15 +02:00
Alexandre SPANGARO	11a1273211	PHP8 warning & typo on key	2022-06-25 07:13:15 +02:00
Alexandre SPANGARO	cadf8ebe29	Look & Feel v16 - Align amount to right on card	2022-06-25 06:55:10 +02:00
Faustin	10a9ab5ed1	NEW #20650 enabled checkcolumn on left for commande list	2022-06-24 13:56:24 +02:00
BB2A Anthony Berton	0d00c4b26d	FIX	2022-06-23 15:34:45 +02:00
Laurent Destailleur	4b79d91437	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-06-23 12:35:24 +02:00
BENKE Charlene	710e556845	fix $fk_product instead $this->fk_product ... $fk_product not present on $commande object	2022-06-20 16:07:22 +02:00
GregM	d370571963	FIX class center linkedObjectblock order date	2022-06-20 14:59:13 +02:00
Laurent Destailleur	28234c6f44	Merge pull request #21276 from badre-agtaib/scru4 ... FIX bug :The properties product_tosell & product_tobuy do not exist on OrderLine	2022-06-15 11:05:34 +02:00
bagtaib	22152dd254	declaring the propreties product_tosell & product_tobuy	2022-06-15 00:50:34 +02:00
Laurent Destailleur	2370ff4dfc	Clean code	2022-06-14 21:00:05 +02:00
Laurent Destailleur	dd392143e1	Fix conf->projet conf->project	2022-06-14 17:53:17 +02:00
bagtaib	267a6f908d	The properties product_tosell & product_tobuy do not exist on OrderLine	2022-06-14 17:26:18 +02:00
Laurent Destailleur	f261846990	Fix look and feel v16	2022-06-14 10:21:10 +02:00
Frédéric France	3fdbce7a31	use isModEnabled function	2022-06-11 09:46:28 +02:00
Frédéric France	5dcfc28913	use isModEnabled function	2022-06-09 22:41:59 +02:00
Laurent Destailleur	f5705e89a8	Merge branch 'develop' into patch-195	2022-06-01 22:03:19 +02:00
lmarcouiller	2d13b47441	fix php8.0 warnings	2022-05-31 11:36:54 +02:00
BENKE Charlene	2ad50b77b7	php V8 warning	2022-05-27 16:34:56 +02:00
Laurent Destailleur	4c10c04f9f	Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search ... FIX : regression select extrafield search + fix function name	2022-05-24 21:55:33 +02:00
Laurent Destailleur	259a292704	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-05-24 16:33:24 +02:00
Laurent Destailleur	34199cf0fb	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 ... Conflicts: htdocs/comm/propal/card.php htdocs/core/modules/modRecruitment.class.php	2022-05-24 16:31:45 +02:00
Laurent Destailleur	324721ac1e	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/core/tpl/list_print_total.tpl.php htdocs/fichinter/list.php htdocs/fourn/class/fournisseur.commande.class.php	2022-05-22 12:54:40 +02:00
Eric Seigne	4a222fe5d5	fix potential warning ($conf->ficheinter->enabled)	2022-05-22 01:38:32 +02:00
Regis Houssin	6372bea326	FIX php8 warning	2022-05-22 00:14:01 +02:00
Laurent Destailleur	2c2544d471	Fix scrutinizer	2022-05-21 15:31:08 +02:00
Laurent Destailleur	7c9d360019	Merge pull request #20937 from atm-maxime/fix_date_creation_visible ... Fix : date_creation must have visible=-2	2022-05-21 10:34:01 +02:00
Maxime Kohlhaas	755bce9fe1	Fix : date_creation must have visible=-2	2022-05-21 00:22:47 +02:00
Maxime Kohlhaas	cff5ec8605	Fix : fields must check module enabled	2022-05-21 00:08:18 +02:00
Laurent Destailleur	4162a02cc1	Fix deprecated remise must be remove from insert	2022-05-20 20:10:45 +02:00
Frédéric FRANCE	243dfacb15	Update card.php	2022-05-19 12:46:15 +02:00
Frédéric FRANCE	ad3276b579	Update card.php	2022-05-19 12:42:15 +02:00
Frédéric FRANCE	2114e51b0e	Update card.php	2022-05-19 12:34:54 +02:00
Frédéric FRANCE	e44e9d812a	Update card.php	2022-05-19 12:28:50 +02:00
Laurent Destailleur	7fd3bb0aae	Remove deprecated code	2022-05-19 12:08:03 +02:00
Laurent Destailleur	38aced687b	Fix scrutinizer	2022-05-18 23:52:43 +02:00
Laurent Destailleur	2e15a14c14	css	2022-05-18 00:10:44 +02:00
Laurent Destailleur	a483af70df	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/contrat/index.php	2022-05-17 23:27:11 +02:00
Laurent Destailleur	c475789433	Debug v16	2022-05-17 23:23:50 +02:00
stickler-ci	f70a9ad04c	Fixing style errors.	2022-05-11 13:42:27 +00:00
Gauthier PC portable 024	da2a8a59f3	Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function	2022-05-11 14:38:16 +02:00
Gauthier PC portable 024	b053dee279	NEW : update rank line is possible on API for orders propal and supplier invoice	2022-05-11 14:26:21 +02:00
Laurent Destailleur	720a09dacb	Fix regression	2022-05-09 15:57:10 +02:00
Laurent Destailleur	522c092aeb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2022-05-09 09:26:10 +02:00
Laurent Destailleur	b3b6337c4c	Merge branch 'develop' into NEW_deposit_payment_terms	2022-05-08 23:09:06 +02:00
Laurent Destailleur	6592eb5d73	Debug for php 8.1	2022-05-08 18:25:22 +02:00
Philippe GRAND	2467dd0615	fix : do not display html tags into list	2022-05-04 09:18:46 +02:00
Laurent Destailleur	a99e647348	Merge pull request #20658 from Hystepik/develop#1 ... NEW #20653 edit discount pourcentage for all lines in one shot	2022-05-04 01:20:49 +02:00
Laurent Destailleur	fa7254be9a	Fix picto and perm	2022-05-03 17:05:14 +02:00
Laurent Destailleur	fa8ce6e4fd	Merge pull request #20710 from fappels/develop_confirm_createbills ... Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php	2022-04-29 17:19:18 +02:00
Laurent Destailleur	708d3610a5	Look and feel v16	2022-04-29 13:04:29 +02:00
Francis Appels	e9cfb9b69c	Improve error handling confirm_billcreate	2022-04-25 11:24:09 +02:00
Francis Appels	e6ce81bf8b	Move confirm_createbills mass action to order list	2022-04-25 11:20:00 +02:00
lmarcouiller	1ccf209c47	Close #20653 : edit discount pourcentage	2022-04-15 14:31:44 +02:00
BB2A Anthony Berton	d154696c32	morecss select_compagny	2022-04-13 16:15:07 +02:00
Laurent Destailleur	cb15a21e41	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/tpl/originproductline.tpl.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/14.0.0-15.0.0.sql htdocs/user/card.php	2022-04-11 21:22:27 +02:00
Laurent Destailleur	3ac268c200	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 ... Conflicts: htdocs/core/lib/security.lib.php htdocs/holiday/card.php htdocs/user/card.php	2022-04-11 21:14:51 +02:00
Gauthier PC portable 024	83e8e07416	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-04-08 09:25:08 +02:00
Laurent Destailleur	75b66eace0	Merge pull request #19417 from atm-adrien/FIX_commandeFourn_Stats ... FIX : Supplier order stats	2022-04-07 18:35:10 +02:00
Laurent Destailleur	26c3e235cf	Merge pull request #19459 from frederic34/productmerge ... can merge products	2022-04-07 15:02:03 +02:00
Laurent Destailleur	4693ef42bd	Enhance responsive	2022-04-07 11:18:56 +02:00
Laurent Destailleur	2690f4459f	NEW Enhance the import. Can use 'auto' for the ref (import of orders)	2022-04-04 13:17:45 +02:00
Laurent Destailleur	5b91ae062f	All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for ... code consistency purpose.	2022-04-02 10:31:58 +02:00
Laurent Destailleur	408608ebea	Merge pull request #20430 from atm-GregM/DolGetButtonAction_Commande ... FIX: replacing to dolGetButtonAction on Commande card	2022-04-01 20:10:13 +02:00
Laurent Destailleur	9389b96d1d	Merge pull request #20478 from rycks/develop ... fix #20477: add online_payment_url on orders API requests	2022-04-01 14:47:38 +02:00
Laurent Destailleur	a3dbcd0c27	Clean language files	2022-04-01 13:09:11 +02:00
Eric Seigne	1589afde19	fix #20477 : add online_payment_url as public var	2022-03-30 14:06:15 +02:00
ATM john	c1d9ea95dc	fix function name	2022-03-30 12:16:17 +02:00
Laurent Destailleur	63d9f69732	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2022-03-29 15:55:47 +02:00
Laurent Destailleur	1251e80963	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 ... Conflicts: htdocs/accountancy/index.php htdocs/commande/list.php htdocs/langs/en_US/errors.lang htdocs/projet/class/task.class.php	2022-03-29 15:10:11 +02:00
Eric Seigne	9f2480712b	end of #20477	2022-03-29 10:32:14 +02:00
Eric Seigne	53ff837d0f	fix #20477: add online_payment_url on orders API requests	2022-03-29 09:48:18 +02:00
Laurent Destailleur	95dc25587c	Standardize code of the fetch_lines()	2022-03-28 13:50:47 +02:00
Marc de Lima Lucio	cbba7d7d5f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-25 16:14:53 +01:00
Laurent Destailleur	4a80f35aaa	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/fourn/class/fournisseur.commande.class.php	2022-03-23 17:26:25 +01:00
Ferran Marcet	ccf8b01020	Fix: The origin of the stock movement is not being recorded	2022-03-22 13:46:55 +01:00
GregM	4fb62ee15a	replacing to dolGetButtonAction on Commande card	2022-03-22 12:04:51 +01:00
Laurent Destailleur	8603d493ad	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/install/mysql/tables/llx_partnership.key.sql	2022-03-19 17:34:26 +01:00
Laurent Destailleur	ed631b2b06	Fix doxygen, missing error message	2022-03-18 16:14:20 +01:00
Frédéric FRANCE	7291bbf710	tooltip order date is date not datetime ... from sql table date_commande date, -- date de la commande	2022-03-10 13:52:05 +01:00
Gauthier PC portable 024	5b715978e4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-03-10 10:02:57 +01:00
Marc de Lima Lucio	4efcbe8799	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-08 15:23:52 +01:00
Marc de Lima Lucio	1993a8d7b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-08 15:07:37 +01:00
Laurent Destailleur	88b9123a93	Merge pull request #19989 from iouston/patch-2 ... add target attribute on getNomUrl	2022-03-07 17:10:39 +01:00
Laurent Destailleur	d0ca8af6ee	Update commande.class.php	2022-03-07 17:10:28 +01:00
Laurent Destailleur	660aa7b282	Update commande.class.php	2022-03-07 17:10:00 +01:00
Laurent Destailleur	84b951c2f9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-03-07 15:27:07 +01:00
Laurent Destailleur	54ecf1f98c	# WARNING: head commit changed in the meantime ... Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-03-07 15:24:08 +01:00
Frédéric FRANCE	9d1bcbe55a	Fix wrong upload dir ... introduced here https://github.com/Dolibarr/dolibarr/pull/19165	2022-03-04 18:17:23 +01:00
Noé Cendrier	e4f4a07fc6	correct mass action "classify delivered"	2022-03-04 17:31:04 +01:00
John Livingston	1ece554c92	Fix: typo in template name ... There was a typo in generated HTML comment.	2022-03-01 17:39:38 +01:00
Laurent Destailleur	358f21f06e	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/customreports.php	2022-03-01 16:48:29 +01:00
Laurent Destailleur	bd288f980d	FIX On large proposal or invoice, fix n(n+1) sql into a n sql.	2022-03-01 14:52:47 +01:00
Frédéric FRANCE	018fc53554	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-27 08:40:01 +01:00
Laurent Destailleur	409da7f091	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-02-25 19:17:41 +01:00
Laurent Destailleur	f8a5749fc4	# WARNING: head commit changed in the meantime ... Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-02-25 19:00:10 +01:00
stickler-ci	fa4e6bd93a	Fixing style errors.	2022-02-24 10:10:41 +00:00
Adrien Raze	146b432acf	FIX: PR returns	2022-02-24 11:07:31 +01:00
Laurent Destailleur	73b04deb19	Fix error management.	2022-02-23 00:17:49 +01:00
Laurent Destailleur	e96061dd18	Fix phpunit SecurityTest	2022-02-22 23:46:57 +01:00
Frédéric FRANCE	b277ab9ee3	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-22 21:49:17 +01:00
Laurent Destailleur	cebada1966	Merge pull request #20071 from frederic34/patch-1 ... NEW Hook getNomUrl available everywhere in tooltip of ref links	2022-02-16 20:36:02 +01:00
Laurent Destailleur	aad292b41b	Merge pull request #20074 from altairisfr/fix_parentline_13.0 ... More generic management of parentline	2022-02-16 20:25:04 +01:00
lvessiller	7e17167faf	NEW total mark rate in list	2022-02-16 11:45:29 +01:00
Frédéric FRANCE	eb77f10d7b	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-15 19:11:24 +01:00
Frédéric FRANCE	935482ee22	uniformize	2022-02-15 19:04:18 +01:00
Frédéric FRANCE	0ba912b1e5	add missing global	2022-02-15 18:14:44 +01:00
Frédéric FRANCE	09c9b28b57	Update commande.class.php	2022-02-15 11:02:22 +01:00
Frédéric FRANCE	c90f9b5681	add hook in order tooltip	2022-02-15 10:51:06 +01:00
Christophe Battarel	01ef9b64ee	fix parent line on create with no originid	2022-02-15 10:34:10 +01:00
Christophe Battarel	6c6c854eae	fix parent line on create with origin	2022-02-15 10:23:43 +01:00
iouston	4808442bc8	keep the default value for target in getnomurl to ''	2022-02-15 09:34:51 +01:00
Laurent Destailleur	3b18462a62	# WARNING: head commit changed in the meantime ... Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-02-07 15:51:01 +01:00
Laurent Destailleur	53bac7ae0f	Fix menu	2022-02-07 15:16:11 +01:00
iouston	993e0d852c	fix parameter name	2022-02-04 15:01:32 +01:00
stickler-ci	e8801bd7fc	Fixing style errors.	2022-02-04 13:42:07 +00:00
iouston	95aabd6ae3	add target attribute on getNomUrl	2022-02-04 14:38:34 +01:00
lvessiller	241a65e2ae	NEW add margin info in proposal and order list	2022-02-03 10:39:03 +01:00
Laurent Destailleur	adf8f3886b	Merge	2022-01-28 18:07:56 +01:00
Laurent Destailleur	2686541156	Fix late picto	2022-01-28 17:59:58 +01:00
Gauthier PC portable 024	3abe391f65	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-01-28 15:08:02 +01:00
ptibogxiv	928075bbf6	fix error in commande.class.php	2022-01-26 20:13:10 +01:00
Laurent Destailleur	8dbadc0aa8	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-01-24 14:12:06 +01:00
Laurent Destailleur	6b5c0769b8	FIX #19786	2022-01-24 14:09:53 +01:00
ptibogxiv	b89947ff7c	Update commande.class.php	2022-01-20 19:58:31 +01:00
ptibogxiv	56dd41324c	Update commande.class.php	2022-01-20 19:57:48 +01:00
ptibogxiv	accb0deb29	New support user_modif in order	2022-01-16 00:13:14 +01:00
Laurent Destailleur	91b2d59458	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-01-14 10:37:41 +01:00
Laurent Destailleur	53e65095a7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ... Conflicts: htdocs/commande/card.php htdocs/expedition/card.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php	2022-01-14 10:36:46 +01:00
Laurent Destailleur	9dde80dd52	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/expedition/card.php htdocs/fourn/commande/list.php	2022-01-14 10:30:39 +01:00
Laurent Destailleur	13510b9929	Clean sortfield, sortorder	2022-01-13 11:17:25 +01:00
Gauthier PC portable 024	6799d48944	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-01-11 09:59:25 +01:00
Laurent Destailleur	0387b9922e	FIX error message on sqlfilter in API	2021-12-20 20:49:32 +01:00
Laurent Destailleur	19efa37e4b	Fix default value #19562	2021-12-19 20:55:24 +01:00
Laurent Destailleur	bb1d5daa82	css	2021-12-12 23:47:40 +01:00
Laurent Destailleur	d80f83caf4	Clean code	2021-12-09 17:19:31 +01:00
Laurent Destailleur	69cd7ae2ab	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/card.php htdocs/public/test/badges.php htdocs/public/test/test_exec.php	2021-12-08 18:27:03 +01:00
Laurent Destailleur	6886cca1fa	CSS	2021-12-07 02:35:46 +01:00
atm-greg	db06de0ac2	add printFieldListHaving hook	2021-11-30 16:28:21 +01:00
Laurent Destailleur	8bace4c64e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-11-30 16:24:42 +01:00
Laurent Destailleur	a298a845f1	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/core/actions_massactions.inc.php htdocs/core/lib/functions.lib.php htdocs/core/lib/memory.lib.php htdocs/langs/en_US/holiday.lang htdocs/ticket/card.php	2021-11-30 16:24:18 +01:00
Laurent Destailleur	4189229b84	Merge pull request #19165 from Hystepik/develop#5 ... Fix: php 8.0 warning commercial part	2021-11-30 15:31:51 +01:00
atm-greg	71d4b3f082	add hook // Add from hooks	2021-11-29 17:02:57 +01:00
atm-greg	1dffc1c0fa	add hook to uniformize printFieldListFrom hook	2021-11-29 16:54:26 +01:00
Christian Foellmann	819a76e16a	remove some deprecated html attributes ... https://developer.mozilla.org/en-US/docs/web/html/element/td#attr-align	2021-11-29 15:07:07 +01:00
Adrien Raze	4246cd80f9	FIX : Travis + Update dev	2021-11-24 16:27:01 +01:00
Frédéric FRANCE	d601f62194	can merge products but experimental	2021-11-23 21:38:29 +01:00
Laurent Destailleur	ee14aa2597	Fix: Do not loose data on error when editing a line	2021-11-23 12:11:27 +01:00
Gauthier PC portable 024	2c2f456827	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-23 11:10:01 +01:00
Gauthier PC portable 024	74f5c092dc	FIX : use $linecount = count($this->lines);	2021-11-23 10:44:43 +01:00
Gauthier PC portable 024	9840c1e0fa	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-22 16:17:55 +01:00
Gauthier PC portable 024	e75b6ae0b4	FIX : it's better with an input number	2021-11-22 16:13:46 +01:00
lmarcouiller	d1f5cb9184	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5	2021-11-19 14:01:52 +01:00
lmarcouiller	3bcafb548a	fix errors	2021-11-19 14:01:37 +01:00
Adrien Raze	dc23c7f6a3	FIX : Travis	2021-11-19 10:29:27 +01:00
stickler-ci	c5f6c617c9	Fixing style errors.	2021-11-19 08:34:45 +00:00
Adrien Raze	958be422e2	Merge branch '14.0' of github.com:Dolibarr/dolibarr into FIX_commandeFourn_Stats	2021-11-19 09:26:48 +01:00
Adrien Raze	ea8280af98	FIX : status filter on supplierOrder stats doesn't work	2021-11-17 17:32:17 +01:00
Gauthier PC portable 024	23249751d5	FIX : reorder all lines when delete document line everywhere	2021-11-17 12:10:12 +01:00
Gauthier PC portable 024	72614ecc0d	Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-16 16:43:01 +01:00
Gauthier PC portable 024	375dcf7028	FIX : dev name	2021-11-16 16:42:48 +01:00
stickler-ci	19171d4f8e	Fixing style errors.	2021-11-16 15:15:55 +00:00
Gauthier PC portable 024	9d41c1390d	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-16 14:20:24 +01:00
Gauthier PC portable 024	1e0d7d92a9	NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled	2021-11-16 14:09:18 +01:00
Laurent Destailleur	257fe444af	Merge pull request #19181 from frederic34/commandelist ... fix warnings in commande list	2021-11-05 14:32:17 +01:00
Laurent Destailleur	fe7e1d4118	Look and feel v15	2021-10-29 09:40:38 +02:00
Marc de Lima Lucio	5057ba29b2	FIX: deposit payment terms: removed bad copy/paste	2021-10-28 16:53:53 +02:00
Marc de Lima Lucio	7e059c0a22	NEW: deposit payment terms: futureproof evolutions by storing field as a string	2021-10-28 16:53:28 +02:00
Marc de Lima Lucio	03c24b2274	FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()	2021-10-28 16:51:59 +02:00
Marc de Lima Lucio	668088a63f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2021-10-28 15:54:18 +02:00
Frédéric FRANCE	8db7989aa7	fix warnings in commande list	2021-10-24 14:18:43 +02:00
Lucas Marcouiller	051f6ca717	Fix: php 8.0 warning commercial part	2021-10-23 23:12:42 +02:00
Laurent Destailleur	8604f9b153	Clean DOM (remove ficheaddleft div)	2021-10-23 17:18:35 +02:00
Laurent Destailleur	06bc357409	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-23 14:49:50 +02:00
Laurent Destailleur	3f60cbbedc	Remove the div class="ficheaddleft"	2021-10-23 14:49:35 +02:00
Laurent Destailleur	6ec19bca9d	Merge pull request #19128 from frederic34/warnfixes ... fix warnings	2021-10-23 11:38:03 +02:00
Lucas Marcouiller	d1ec71197a	Fix : scrutinizer errors	2021-10-23 11:10:58 +02:00
Frédéric FRANCE	9bd31d2b85	fix warnings	2021-10-23 07:13:08 +02:00
Frédéric FRANCE	46c4f28478	fix multiple warnings	2021-10-22 22:15:59 +02:00
Laurent Destailleur	6c870bb3d1	Merge pull request #19059 from FHenry/fix_introduced_scrutinizer ... fix: scrutinizer	2021-10-21 22:52:20 +02:00
Florian HENRY	258d0c3a69	fix: scrutinizer	2021-10-21 16:05:37 +02:00
Laurent Destailleur	12d211815b	Debug v15	2021-10-19 21:38:36 +02:00
Laurent Destailleur	c40a73162e	Look and feel v15	2021-10-18 21:20:58 +02:00
Laurent Destailleur	f8010dfcbc	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/reception/list.php htdocs/takepos/pay.php	2021-10-16 13:01:03 +02:00
Marc de Lima Lucio	9a963da77c	FIX: deposit payment terms: adapt Form::form_conditions_reglement() calls to new parameter added in between PRs	2021-10-13 11:39:09 +02:00
lvessiller	be4a00213c	FIX optional visibility on create card	2021-10-08 15:58:08 +02:00
Marc de Lima Lucio	9d92260ec1	FIX: deposit payment terms: fatal error for lack of inclusion on class Facture	2021-10-05 14:57:14 +02:00
Marc de Lima Lucio	47deb64f09	FIX: deposit payment terms: sql syntax error	2021-10-05 14:19:47 +02:00
Marc de Lima Lucio	4059b64288	FIX: deposit payment terms: langs	2021-10-05 13:00:25 +02:00
Marc de Lima Lucio	47b9941203	FIX: deposit payment terms: show correct percentage is proposal/order lists	2021-10-05 11:18:49 +02:00
Marc de Lima Lucio	337531f832	FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices	2021-10-05 10:54:22 +02:00
Marc de Lima Lucio	f5aebc8efd	NEW: deposit payment terms: generate deposit from orders	2021-10-04 18:31:32 +02:00
Marc de Lima Lucio	b0aa502ed4	NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company	2021-09-29 14:51:30 +02:00
Marc de Lima Lucio	004b52f590	NEW: deposit payment terms: add field into CRUD methods	2021-09-29 12:05:38 +02:00
Laurent Destailleur	e15277bb6c	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-28 17:23:07 +02:00
Laurent Destailleur	fc56b88a1f	FIX select list of orders not complete when field type of company is on	2021-09-28 13:44:42 +02:00
Laurent Destailleur	0176ab6057	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php	2021-09-27 11:40:47 +02:00
lmarcouiller	f88d12f55d	Fix #18809 : error on client tooltip	2021-09-24 11:16:34 +02:00
Laurent Destailleur	27c41946b7	Merge pull request #18182 from atm-jpb/NEW_field_in_service_object ... NEW : field and behavior in product object	2021-09-23 12:14:09 +02:00
Laurent Destailleur	d38c3028eb	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/class/expensereport.class.php	2021-09-23 02:41:53 +02:00
Laurent Destailleur	2824c8b8ab	FIX support of localtax on expense report	2021-09-22 15:11:18 +02:00
Laurent Destailleur	5c8fb38426	Fix add del* action into list of sensitive actions	2021-09-19 14:41:46 +02:00
Laurent Destailleur	89e8f24e15	Fix CSRF protection for all massactions	2021-09-18 22:38:25 +02:00
Laurent Destailleur	d760686239	Fix case of newtoken()	2021-09-18 22:24:00 +02:00
Laurent Destailleur	0749d01c5a	Fix add action delete* as sensitive action	2021-09-18 22:04:41 +02:00
Laurent Destailleur	8bdc53f469	Fix Add action classify as sensitive actions	2021-09-18 20:49:24 +02:00
Laurent Destailleur	7dfedd242a	Fix add confirm_deleteline as sensitive action	2021-09-18 19:43:38 +02:00
Laurent Destailleur	62b721a904	Add deletecontact as sentitive action ... Replace dol_buildpath with DOL_URL_ROOT	2021-09-18 19:34:46 +02:00
Laurent Destailleur	11b6259130	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/class/holiday.class.php htdocs/langs/en_US/admin.lang	2021-09-10 11:40:45 +02:00
lainwir3d	63abe2f1ff	FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.	2021-09-09 19:56:28 +04:00
Laurent Destailleur	034c5651c8	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/eventorganization/class/conferenceorbooth.class.php htdocs/langs/en_US/eventorganization.lang htdocs/public/eventorganization/attendee_subscription.php	2021-09-08 22:13:35 +02:00
Laurent Destailleur	30856d5b18	FIX Relative discount with high nb of decimals	2021-09-08 22:09:02 +02:00
Laurent Destailleur	4705d41ed2	FIX Relative discount with high nb of decimals	2021-09-08 22:00:16 +02:00
jpb	65a2486f94	merge conflict	2021-09-06 09:43:52 +02:00
Laurent Destailleur	de8db34f43	Fix filter on status of order	2021-09-05 01:42:15 +02:00
Laurent Destailleur	ee066ad725	Cast sql var	2021-09-03 21:25:43 +02:00
Laurent Destailleur	77e9f15360	Work on #18448	2021-09-02 22:52:17 +02:00
Laurent Destailleur	8600d8d00d	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-01 22:50:06 +02:00
stickler-ci	01a44760a8	Fixing style errors.	2021-08-29 20:14:19 +00:00
lainwir3d	4381f67a64	FIX #18544 Shipment REST API: load thirdparty object into the shipment before validating.	2021-08-30 00:08:43 +04:00
Laurent Destailleur	fb8723d884	Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons ... replace remaining SubmitCancel buttons	2021-08-28 18:39:06 +02:00
Laurent Destailleur	0a468e4ba9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-08-28 17:36:00 +02:00
Laurent Destailleur	4ba6b0059d	Fix travis	2021-08-28 17:35:42 +02:00
Laurent Destailleur	0db67b40a0	Merge pull request #18525 from cfoellmann/PR/thirdparty-links ... change links for thirdparty to target the type customer|supplier tab	2021-08-28 15:27:13 +02:00
Laurent Destailleur	2aa3eb3857	Merge pull request #18521 from Hystepik/develop#2 ... Close #18074 : REST API New /order/{id}/shipment get & post	2021-08-28 14:44:31 +02:00
Laurent Destailleur	049992aed4	Update api_orders.class.php	2021-08-28 14:44:13 +02:00
Laurent Destailleur	3585259b55	Update api_orders.class.php	2021-08-28 14:43:17 +02:00
Laurent Destailleur	d98390e675	Update api_orders.class.php	2021-08-28 14:42:31 +02:00
Laurent Destailleur	2dd91bf312	Clean code	2021-08-27 23:36:06 +02:00
Laurent Destailleur	46d993c9a6	Clean code	2021-08-27 22:42:04 +02:00
Christian Foellmann	9752501ef6	change links for thirdparty to target the type customer|supplier tab	2021-08-27 15:32:53 +02:00
lmarcouiller	b9039eea14	FIx warehouse limit testing	2021-08-27 10:45:04 +02:00
lmarcouiller	eb48566798	Close #18074 : New /order/{id}/shipment get & post	2021-08-27 10:40:33 +02:00
lmarcouiller	c70813d718	New : rest api POST orders shipment	2021-08-26 17:03:00 +02:00
lmarcouiller	f482be84bf	New : rest api GET orders shipements	2021-08-26 12:35:31 +02:00
Christian Foellmann	f094b4c70c	fix up most of the remaining submit inputs	2021-08-24 17:04:17 +02:00
Laurent Destailleur	07ab352877	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php	2021-08-24 16:37:18 +02:00
Laurent Destailleur	22339a3ed3	Merge pull request #18451 from cfoellmann/PR/form-buttons-function ... improve forms - buttonsSaveCreate()	2021-08-24 15:26:03 +02:00
Laurent Destailleur	a6ddc90d5b	Fix responsive	2021-08-23 23:53:58 +02:00
Laurent Destailleur	dc006b0ebb	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2021-08-23 19:44:02 +02:00
Laurent Destailleur	8485fee5f9	Cast numeric into on sql request	2021-08-23 19:33:24 +02:00
Laurent Destailleur	d4b5ee6c85	Fix cast into variable into sql request.	2021-08-23 17:41:11 +02:00
Christian Foellmann	d706c3b1ec	use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination	2021-08-20 14:41:30 +02:00
Gauthier PC portable 024	b2dad4d2ce	Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists	2021-08-12 15:44:20 +02:00
Gauthier PC portable 024	22eda3fd63	NEW : add missing printFieldListFrom hook call on several lists	2021-08-12 15:39:52 +02:00
Laurent Destailleur	f9f1440226	Merge branch 'develop' into salesrepresentativeinorderandinvoicelist	2021-08-11 22:22:26 +02:00
Laurent Destailleur	0d07135027	Update list.php	2021-08-11 22:19:53 +02:00
jpb	f99ba2c1e1	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object	2021-08-04 17:26:23 +02:00
Laurent Destailleur	0de10cea39	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-08-04 15:21:31 +02:00
Laurent Destailleur	58ca982e55	Fix trans	2021-08-04 14:01:57 +02:00
stickler-ci	2f0ba41a53	Fixing style errors.	2021-07-20 13:35:10 +00:00
jpb	1237c5ba55	add msg to formconfirm on propal invoice and commande	2021-07-20 14:46:56 +02:00
Laurent Destailleur	d91051488c	Merge pull request #18125 from fr69400/develop ... NEW add hookmanager on note pages	2021-07-11 20:25:16 +02:00
stickler-ci	a8752bf097	Fixing style errors.	2021-07-11 07:46:34 +00:00
fr69400	a27b0cd797	Update note.php	2021-07-11 09:45:22 +02:00
stickler-ci	4272f93aa4	Fixing style errors.	2021-07-09 16:41:41 +00:00
fr69400	e45d5c1d0d	NEW add hookmanager on note pages	2021-07-09 18:36:21 +02:00
stickler-ci	327481dc78	Fixing style errors.	2021-07-08 14:47:38 +00:00
jpb	4df29292ab	update comment	2021-07-08 16:44:24 +02:00
jpb	2e44acbc81	update comment	2021-07-08 16:43:05 +02:00
stickler-ci	89ffa85290	Fixing style errors.	2021-07-07 06:40:12 +00:00
jpb	73bfeee4e7	fix comment	2021-07-07 08:37:49 +02:00
jpb	1a919c9f2b	change comment	2021-07-07 08:35:31 +02:00
stickler-ci	bcb06d5c90	Fixing style errors.	2021-07-05 07:40:44 +00:00
jpb	ad62062cd5	add filter	2021-07-05 08:55:03 +02:00
Laurent Destailleur	7013f01a41	Fix look and feel v14	2021-07-04 21:14:46 +02:00
Laurent Destailleur	f6efe51032	Fix trouble with product id = -1	2021-07-04 21:02:02 +02:00
Francis Appels	1b7b45d72a	Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2	2021-06-29 16:56:48 +02:00
Francis Appels	b8f5dc74d7	Some order php 8 warning	2021-06-29 16:30:36 +02:00
Laurent Destailleur	25c6b64b1e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ... Conflicts: htdocs/core/modules/delivery/doc/pdf_storm.modules.php htdocs/core/modules/reception/doc/pdf_squille.modules.php htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php	2021-06-29 15:58:26 +02:00
Laurent Destailleur	1cf3408f5b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/contact/class/contact.class.php	2021-06-29 15:52:39 +02:00
Francis Appels	69affc5df5	Fix php 8 warnings	2021-06-28 16:25:16 +02:00
Maxime Kohlhaas	c3cbd29542	Fix #17836 : order delay warning in list was wrong, date_commande is deprecated	2021-06-27 09:04:47 +02:00
stickler-ci	26f72b7fff	Fixing style errors.	2021-06-19 12:58:08 +00:00
Laurent Destailleur	3669600242	Update commande.class.php	2021-06-19 14:55:41 +02:00
Laurent Destailleur	194637cfda	Merge branch 'develop' into oldline	2021-06-19 14:54:44 +02:00
Laurent Destailleur	dfa5c419b3	Update commande.class.php	2021-06-19 14:52:06 +02:00
Laurent Destailleur	f8f951977c	Debug v14	2021-06-14 01:33:01 +02:00
Laurent Destailleur	34cebe6aa3	Look and feel v14	2021-06-14 01:11:39 +02:00
Laurent Destailleur	fb46ece906	Fix yogosha 6347	2021-06-09 15:36:47 +02:00
Laurent Destailleur	fa4786a3f6	Fix permission	2021-06-08 16:19:21 +02:00
Laurent Destailleur	2586fcd1a3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commandestats.class.php htdocs/core/actions_massactions.inc.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/holiday/month_report.php htdocs/product/class/product.class.php htdocs/product/stock/class/mouvementstock.class.php htdocs/societe/list.php	2021-06-04 11:20:38 +02:00
Laurent Destailleur	6f1c49abcc	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/commande/class/commandestats.class.php htdocs/user/class/usergroup.class.php	2021-06-04 11:04:18 +02:00
Florian HENRY	c91b9d613a	FIX: order supplier stats by category now display figures	2021-06-01 15:30:17 +02:00
Laurent Destailleur	91f85abb7e	Fix only comment to understand code are allowed	2021-05-20 14:55:37 +02:00
Sylvain Legrand	a3d1b49c65	Error in list when using alias name of thirdparty	2021-05-19 19:08:58 +02:00
Laurent Destailleur	cf0da5cee7	css	2021-05-19 15:00:44 +02:00
Laurent Destailleur	fdf6dd2d9c	css	2021-05-19 14:50:41 +02:00
Laurent Destailleur	3550fa2be4	Fix css	2021-05-19 14:48:30 +02:00
Anthony Berton	c02e3eed6b	checked	2021-05-18 18:45:07 +02:00
Laurent Destailleur	8e39eff180	Look and feel v14	2021-05-18 18:18:00 +02:00
Laurent Destailleur	2ef713bd5f	Merge branch 'develop' into look_feel_user_author_list	2021-05-18 12:27:30 +02:00
Laurent Destailleur	7b9161ec63	Merge pull request #17644 from bb2a/thirdparty_infos_list ... Add popup thirdparty info in list	2021-05-18 12:15:51 +02:00
Laurent Destailleur	b6dbe45242	Fix permissions on page to move position of file	2021-05-18 01:58:54 +02:00
Anthony Berton	70a062e2c1	change position	2021-05-17 23:59:42 +02:00
Anthony Berton	6fe9fe330d	delete fetch	2021-05-17 23:54:31 +02:00
Anthony Berton	58db723502	thirdparty info popup list	2021-05-17 23:27:33 +02:00
Anthony Berton	31cd71d8a3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list	2021-05-17 18:34:41 +02:00
Anthony Berton	68130ec637	Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist	2021-05-17 18:34:20 +02:00
Anthony Berton	09ab930806	sale_representative_order_invoice_list	2021-05-17 18:31:19 +02:00
Anthony Berton	0b7f474dd3	look_feel user author in list	2021-05-17 18:04:21 +02:00
Laurent Destailleur	4768729c09	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/core/class/rssparser.class.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/extrafields_list_search_sql.tpl.php htdocs/expedition/list.php	2021-05-17 07:57:32 +02:00
Laurent Destailleur	6bf66adff0	Fix remove some $_REQUEST	2021-05-17 07:27:02 +02:00
Ferran Marcet	ce6df0ee4a	FIX: Filter of the dates in the lists is lost	2021-05-14 13:50:12 +02:00
Laurent Destailleur	8cf99448e1	Merge pull request #17523 from bb2a/warhouse_mod_stock_activ ... Warehouse filter if stock activate and not sending	2021-05-11 20:43:28 +02:00
Laurent Destailleur	f87f80b004	Merge pull request #17554 from aspangaro/14b4 ... Fix Title customer order	2021-05-11 18:19:11 +02:00
Laurent Destailleur	200c36836b	v14	2021-05-11 10:44:53 +02:00
Alexandre SPANGARO	e5d0999073	Fix Title customer order info card	2021-05-09 22:37:05 +02:00
Alexandre SPANGARO	7ad4f13036	Fix Title customer order documents card	2021-05-09 22:36:02 +02:00
Alexandre SPANGARO	a908d302b2	Fix Title customer order note card	2021-05-09 22:33:37 +02:00
Alexandre SPANGARO	222c1d9b89	Fix Title customer order contact card	2021-05-09 22:31:46 +02:00
Alexandre SPANGARO	c8e30203f8	Fix Title customer order card	2021-05-09 22:31:33 +02:00
Anthony Berton	d84b0bae9d	init	2021-05-06 23:23:50 +02:00
Laurent Destailleur	1c95e2b7c7	FIX #17453	2021-05-03 14:58:29 +02:00
Laurent Destailleur	d1f11d2e65	Merge pull request #17429 from fr69400/develop ... FIX formAddObjectLine cant be overloaded by hook	2021-05-03 13:16:45 +02:00
Laurent Destailleur	b45ac52311	Clean sql	2021-04-30 12:07:26 +02:00
fr69400	96baa1ef49	wrong variable name	2021-04-29 17:36:45 +02:00
Florian HENRY	fd6eacf022	NEW: add Channel column into order list	2021-04-29 16:15:46 +02:00
fr69400	d9e25c61bb	formAddObjectLine cant be overloaded by hook	2021-04-29 15:32:15 +02:00
Laurent Destailleur	655056ed31	Debug v14	2021-04-29 12:10:55 +02:00
Laurent Destailleur	7b29b283a2	Merge pull request #17260 from bb2a/mass_action_order ... NEW Add Mass action order validate and set to billed	2021-04-28 19:13:09 +02:00
Laurent Destailleur	1e7a778ecc	Debug v14	2021-04-27 22:28:28 +02:00
Laurent Destailleur	d138e7410b	Clean code	2021-04-26 19:12:23 +02:00
Laurent Destailleur	87393cee98	Clean code	2021-04-26 11:59:47 +02:00
Laurent Destailleur	389b71bc7e	Clean API	2021-04-25 19:21:48 +02:00
Laurent Destailleur	fd2d317b4a	Fix #yogosha5881	2021-04-25 15:55:36 +02:00
Laurent Destailleur	d0cc64479d	Fix protect sql	2021-04-24 20:18:11 +02:00
Anthony Berton	d294bd544d	Update list.php	2021-04-19 22:42:38 +02:00
Laurent Destailleur	fbf7b21c29	Update contact.php	2021-04-16 20:15:00 +02:00
fr69400	65b55a79a5	Update contact.php ... action 'deletecontact' may have beeen cancelled by triggers. this is not system error	2021-04-16 10:31:18 +02:00
Laurent Destailleur	db5dcd3e52	NEW When a doc file is shared, link is visible from main page of doc.	2021-04-15 17:56:55 +02:00
stickler-ci	6324879215	Fixing style errors.	2021-04-14 00:25:05 +00:00
Anthony Berton	92ca59d20b	Update list.php	2021-04-14 02:23:23 +02:00
Anthony Berton	25ac8bed68	Update list.php	2021-04-14 01:54:30 +02:00
Anthony Berton	6814488d86	Update list.php	2021-04-14 00:51:19 +02:00
Laurent Destailleur	358bb87ae2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/payments.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/projet/card.php htdocs/public/payment/newpayment.php htdocs/societe/list.php htdocs/ticket/document.php	2021-04-13 20:19:05 +02:00
Laurent Destailleur	8c9cacba4d	Merge branch 'develop' into 14a36	2021-04-13 16:05:57 +02:00
Laurent Destailleur	add6853581	Merge branch 'develop' into filter_warehouse	2021-04-13 15:58:13 +02:00
Laurent Destailleur	91b8ccafbb	Fix empty label	2021-04-13 15:53:05 +02:00
Laurent Destailleur	97336ad417	Fix label of empty value in select of warehouse	2021-04-13 15:51:34 +02:00
Anthony Berton	1b995226b7	add_filter_warehouse_propal	2021-04-13 10:43:36 +02:00
Alexandre SPANGARO	44133166de	Merge remote-tracking branch 'upstream/develop' into 14a36	2021-04-12 21:35:03 +02:00
Alexandre SPANGARO	4b9bf40a8f	move include_once to include when it's a tpl	2021-04-12 21:25:58 +02:00
Laurent Destailleur	8a62d97b89	Remove one thousand of useless files	2021-04-12 15:57:16 +02:00
Laurent Destailleur	81487d76b2	Clean code of ol deprecated option	2021-04-12 15:37:26 +02:00
Alexandre SPANGARO	8d72448f43	Add right supplier_order	2021-04-12 09:47:16 +02:00
Alexandre SPANGARO	80c6458faa	Work on split module fournisseur	2021-04-11 22:25:45 +02:00
Alexandre SPANGARO	ce7c5a0c7b	Work on split module fournisseur	2021-04-11 04:24:21 +02:00
Laurent Destailleur	667481acd5	Fix #yogosha5832 - Missin test on permission for /index routes on APIs	2021-04-08 19:05:28 +02:00
Laurent Destailleur	12e847ade1	Fix color of reports. Fix include_once into include.	2021-04-06 22:18:32 +02:00
Laurent Destailleur	3744bc6a7a	FIX #yogosha5746 - next step (work in progress)	2021-03-30 18:17:13 +02:00
Laurent Destailleur	6e422d26f3	FIX #yogosha5746 - next step (wip)	2021-03-30 16:20:18 +02:00
Laurent Destailleur	fb84608586	Clean sql	2021-03-30 03:37:54 +02:00
Laurent Destailleur	b702d2b534	Fix CSRF for more GET	2021-03-29 22:58:44 +02:00
Laurent Destailleur	3a4bb69c05	FIX #yogosha5749	2021-03-29 15:32:09 +02:00
Laurent Destailleur	ce1f8289a4	FIX #yogosha5746	2021-03-29 15:07:23 +02:00
Laurent Destailleur	85f6a15678	Fix position of users in combo list	2021-03-29 11:58:51 +02:00
Laurent Destailleur	01c1101b29	Look and feel v14	2021-03-26 18:16:12 +01:00
Laurent Destailleur	ca1715df96	Add some protection for SQL injection	2021-03-22 13:31:06 +01:00
Laurent Destailleur	6a0e0f4c06	Fix #ygosha5698	2021-03-22 12:10:51 +01:00
Laurent Destailleur	15440917b1	Fix #ygosha5698	2021-03-22 11:30:18 +01:00
Laurent Destailleur	0e645aefbd	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-16 15:15:50 +01:00
Laurent Destailleur	59174315ae	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-16 15:15:12 +01:00
Laurent Destailleur	a29a9e5435	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-03-16 15:14:46 +01:00
Laurent Destailleur	66bbc7f54f	Merge pull request #16734 from AlexisLaurier/11.0 ... correct nb_expedition count	2021-03-16 15:12:18 +01:00
Alexis LAURIER	971b97d78f	correct nb_expedition count	2021-03-16 15:00:46 +01:00
Laurent Destailleur	3c3bb67e51	Merge pull request #16704 from dolibit-ut/patch-85 ... Update card.php	2021-03-16 10:36:39 +01:00
UT from dolibit	94802346cf	Update card.php ... add DE:Modul_Kundenaufträge	2021-03-15 19:44:00 +01:00
Florian HENRY	cdf5d2399a	fix warning	2021-03-15 19:07:40 +01:00
Frédéric FRANCE	d6f6097f4a	fix php8 warning	2021-03-15 11:54:16 +01:00
Laurent Destailleur	cc10106a21	Fix protection on int	2021-03-14 12:20:23 +01:00
Laurent Destailleur	12f50a76d7	Fix yogosha #5627	2021-03-14 11:48:39 +01:00
Laurent Destailleur	f11a85a3e3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/compta/facture/card.php htdocs/contrat/card.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php	2021-03-03 11:37:34 +01:00
Laurent Destailleur	7eb3e324c7	FIX #16503	2021-03-02 23:09:55 +01:00
Laurent Destailleur	1756d2833c	Merge pull request #16513 from AlexisLaurier/develop ... Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED	2021-03-02 19:15:22 +01:00
Alexis LAURIER	516e7a3955	Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop	2021-03-02 16:04:37 +01:00
Alexis LAURIER	e219972936	avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED	2021-03-02 16:04:26 +01:00
Laurent Destailleur	42329b10c9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: build/generate_filelist_xml.php htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/compta/facture/card.php htdocs/core/class/commonobject.class.php htdocs/core/lib/modulebuilder.lib.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php htdocs/ticket/list.php	2021-03-02 15:27:20 +01:00
Laurent Destailleur	7f209f7cc7	Clean code	2021-03-02 02:55:24 +01:00
Laurent Destailleur	cffea1889f	FIX #16325	2021-03-02 01:17:28 +01:00
Laurent Destailleur	886cbc61c8	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/core/boxes/box_factures_fourn.php htdocs/core/boxes/box_factures_fourn_imp.php htdocs/core/boxes/box_ficheinter.php htdocs/core/boxes/box_members.php htdocs/core/boxes/box_propales.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2021-02-28 13:37:45 +01:00
Laurent Destailleur	2ce76133f4	FIX #16487	2021-02-28 12:59:58 +01:00
Laurent Destailleur	5c0ea476e1	Look and feel v14	2021-02-27 12:45:07 +01:00
Frédéric FRANCE	6dfca9f1f5	code syntax commande directory	2021-02-23 20:46:19 +01:00
Alexandre SPANGARO	3dcfe40e71	Code enhanced - Standardize field name #14697	2021-02-20 08:00:27 +01:00
Laurent Destailleur	2be6992916	Fix include_once into include for inc.php file. See comment in #16338	2021-02-19 16:10:19 +01:00
Frédéric FRANCE	75b378edd3	remove unused code	2021-02-18 22:47:41 +01:00
Laurent Destailleur	bfe71e8509	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-17 14:28:19 +01:00
ptibogxiv	39b29a7d68	Fix set date delivery on create order form	2021-02-16 17:40:00 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Laurent Destailleur	6dfc6c7edf	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/filefunc.inc.php	2021-02-11 18:33:03 +01:00
Laurent Destailleur	c306e8ebe9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-02-11 18:23:47 +01:00
Laurent Destailleur	c2df267858	Merge pull request #16242 from frederic34/patch-4 ... remove deprecated	2021-02-10 01:29:47 +01:00
Frédéric FRANCE	097ff0d7b6	Update commande.class.php	2021-02-09 22:14:46 +01:00
ptibogxiv	e5f6a64846	FIX update order by api ... fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)	2021-02-09 19:24:36 +01:00
Laurent Destailleur	92a19c0caa	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog	2021-02-09 18:34:50 +01:00
Frédéric FRANCE	2c6656b2ad	Update card.php	2021-02-09 18:07:21 +01:00
Laurent Destailleur	1f441deb5d	Merge pull request #16237 from AlexisLaurier/13.0 ... 13.0 - Fix db begin() not closed into commande.class.php	2021-02-09 18:06:36 +01:00
Frédéric FRANCE	fb4aea8223	Update card.php	2021-02-09 18:02:41 +01:00
LAURIER Alexis	abf2875eba	commande.class.php - move db->begin() into cloture ... A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.	2021-02-09 14:25:45 +01:00
Laurent Destailleur	1b129831a9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-09 14:09:46 +01:00
Laurent Destailleur	48a4ed656b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/expensereport/class/expensereport.class.php htdocs/projet/element.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2021-02-09 14:08:49 +01:00
Laurent Destailleur	a84bc05f01	Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES ... FIX: manage price min for PRODUIT_CUSTOMER_PRICES	2021-02-09 13:39:25 +01:00
Laurent Destailleur	89bda722bf	Merge pull request #16232 from frederic34/paymentvat ... use camelCaps name	2021-02-09 13:29:40 +01:00
Frédéric FRANCE	e2d2048522	deprecate non camelCaps functions	2021-02-09 13:25:55 +01:00
Laurent Destailleur	a5386246cd	Merge pull request #16225 from frederic34/facturerec ... clean deprecated modelpdf to model_pdf	2021-02-09 13:23:25 +01:00
Laurent Destailleur	401b4f641d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php	2021-02-08 22:13:50 +01:00
Florian HENRY	dbbebba497	this->errors is set on triggers action must be set by callers	2021-02-08 20:44:40 +01:00
Frédéric FRANCE	898bf55202	Merge remote-tracking branch 'upstream/develop' into facturerec	2021-02-08 20:21:46 +01:00
Frédéric FRANCE	815f3602e3	clean deprecated modelpdf to model_pdf	2021-02-08 18:30:09 +01:00
Laurent Destailleur	6e6b5973b8	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-08 17:35:44 +01:00
Laurent Destailleur	8b3c872f2a	Fix warning	2021-02-08 17:35:21 +01:00
Laurent Destailleur	3b1143df91	Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning ... FIX: warning when adding a line if $remise_percent is an empty string	2021-02-08 17:34:29 +01:00
Florian Mortgat	ff3707b650	FIX: warning when adding a line if $remise_percent is an empty string	2021-02-08 17:24:40 +01:00
Laurent Destailleur	f0e1c02caa	Look and feel v14 - Use placeholder on combolists	2021-02-06 00:05:24 +01:00
Florian HENRY	ec41bf58e5	always ajax now	2021-02-04 09:48:17 +01:00
Laurent Destailleur	2e7de1d137	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php test/phpunit/ExportTest.php	2021-02-02 16:17:53 +01:00
Laurent Destailleur	c5201b95bb	FIX Must not be able to edit vat of all lines if not draft	2021-02-02 16:12:03 +01:00
Florian HENRY	d3d0617996	fix: manage price min for PRODUIT_CUSTOMER_PRICES	2021-02-02 13:43:33 +01:00
Laurent Destailleur	7887d4cc8e	Fix price2num on all GETPOST('remise_percent')	2021-01-31 12:48:40 +01:00
Laurent Destailleur	b24aac1e6b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php	2021-01-31 12:03:39 +01:00
Laurent Destailleur	044b4eee48	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/expedition/list.php	2021-01-31 11:54:45 +01:00
Laurent Destailleur	244ee05a9c	FIX #14290 #15900	2021-01-30 18:09:13 +01:00
Laurent Destailleur	6fae2cfebe	Merge branch '13.0' of https://github.com/dolibarr/dolibarr into develop	2021-01-28 00:29:16 +01:00
Laurent Destailleur	79c68c6132	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 ... Conflicts: htdocs/commande/stats/index.php	2021-01-28 00:23:44 +01:00
Laurent Destailleur	2be157c91f	Trans	2021-01-28 00:18:11 +01:00
Anthony Berton	bb1af10cf1	warehouse thirparty affect on proposal or order	2021-01-17 16:48:51 +01:00
Laurent Destailleur	828f1c8314	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php	2021-01-15 14:04:22 +01:00
Laurent Destailleur	cac7fdd058	Look and feel v13	2021-01-15 14:02:18 +01:00
Laurent Destailleur	dc9cd28437	Look and feel v14	2021-01-15 13:14:21 +01:00
Laurent Destailleur	4c50f25c12	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-15 11:41:45 +01:00
Laurent Destailleur	bcfe03216a	FIX error managent and db transaction balance	2021-01-14 19:15:54 +01:00
Laurent Destailleur	0d704b0714	FIX error managent and db transaction balance	2021-01-14 19:09:57 +01:00
Laurent Destailleur	bad4b14ba5	Fix properties	2021-01-12 10:34:15 +01:00
Laurent Destailleur	de9835ae47	Merge pull request #15936 from bb2a/warhouse_in_propal ... NEW Can ask the warehouse in proposal	2021-01-11 16:23:15 +01:00
Laurent Destailleur	e3a1cabd87	Merge pull request #15942 from bb2a/add_alias_on_lists ... NEW Add column "alias" of company in list of proposal, order, invoice	2021-01-11 15:56:22 +01:00
Laurent Destailleur	5bd59cd6d1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-11 13:37:59 +01:00
Laurent Destailleur	8debb58f7c	Fix rounding of currency unit prices	2021-01-11 13:36:53 +01:00
Laurent Destailleur	16253a79ee	FIX GETPOST of qty with wrong parameters ... Conflicts: htdocs/bom/bom_card.php	2021-01-11 13:11:40 +01:00
Laurent Destailleur	f3e28c2dd0	FIX GETPOST of qty with wrong parameters	2021-01-11 13:00:29 +01:00
Anthony Berton	d6072bae2b	Update list.php	2021-01-10 22:21:18 +01:00
stickler-ci	55e6010d85	Fixing style errors.	2021-01-10 00:15:00 +00:00
Anthony Berton	d3fa8b9f20	20210110	2021-01-10 01:07:27 +01:00
Anthony Berton	bbae40eeea	Update card.php	2021-01-09 17:39:26 +01:00
Anthony Berton	8eaf7b3a3f	1	2021-01-09 17:36:14 +01:00
Anthony Berton	5effd4e897	20210109	2021-01-09 02:45:46 +01:00
Laurent Destailleur	26fa8b45ac	Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product ... NEW: preload product description on selection for customer propal/order/invoice	2021-01-07 11:19:53 +01:00
Florian HENRY	7e34d9e6f9	Merge branch '13_backport' into dev_add_column_propal_order	2021-01-05 23:00:58 +01:00
Florian HENRY	296c998a36	enabled	2021-01-05 23:00:35 +01:00
Florian HENRY	6e7172887a	Merge branch '13_backport' into dev_add_column_propal_order	2021-01-05 22:58:00 +01:00
Florian HENRY	510c619c85	space	2021-01-05 22:56:55 +01:00
Florian HENRY	b9bb48a01f	better place and noadmininfo	2021-01-05 22:50:54 +01:00
Florian HENRY	939fecc611	add column payment mode terms shipping on order list	2021-01-05 20:32:29 +01:00
Laurent Destailleur	ed25b252b9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 11:30:14 +01:00
Laurent Destailleur	5e92ed0dcd	Fix load lang	2021-01-05 10:44:28 +01:00
Florian HENRY	dfaf77b03f	merge develop	2021-01-03 15:14:34 +01:00
Laurent Destailleur	150b338764	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 17:02:08 +01:00
Laurent Destailleur	7b3ed7301d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2021-01-02 17:01:03 +01:00
Laurent Destailleur	fd4dab495f	FIX Bad cleaning of VAT rate when numbers are into code	2021-01-02 16:51:34 +01:00
Laurent Destailleur	1ab459e854	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 16:19:08 +01:00
Laurent Destailleur	ce0abd17fe	Debug v13	2021-01-02 16:18:16 +01:00
Laurent Destailleur	a6eb14f68b	Merge pull request #15585 from cfoellmann/fckeditor-notes ... NEW Can toggle FCKeditor on public/private notes	2020-12-27 15:06:35 +01:00
Laurent Destailleur	bac2ae0d5f	Fix warnings	2020-12-22 17:33:17 +01:00
Laurent Destailleur	2e02f50993	css	2020-12-17 12:29:52 +01:00
Laurent Destailleur	1b69b1c2fe	Fix phpcs	2020-12-16 10:39:10 +01:00
Laurent Destailleur	69061e422b	Removed warning	2020-12-16 02:44:48 +01:00
Laurent Destailleur	b991badb8c	Fix warning	2020-12-14 13:03:43 +01:00
Laurent Destailleur	acb73966f7	Clean code. Removed phpexcel library.	2020-12-13 16:27:44 +01:00
Laurent Destailleur	3d33d3aa3a	Fix warning	2020-12-13 14:36:00 +01:00
Laurent Destailleur	2592344601	Fix missing price2num	2020-12-12 17:27:27 +01:00
Florian HENRY	2a2b372ba9	fix: manage price min for PRICE PER CUSTOMER	2020-12-10 15:08:36 +01:00
Laurent Destailleur	67425abd29	Merge pull request #15602 from c3do/patch-18 ... API orders: Update demand reason on order update	2020-12-04 19:43:43 +01:00
Laurent Destailleur	040d22ef0a	Fix phpcs	2020-12-04 01:59:47 +01:00
Laurent Destailleur	a1428c963b	Fix phpcs	2020-12-03 16:53:26 +01:00
Laurent Destailleur	56d56929ec	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/dolibarr.php	2020-12-03 16:39:22 +01:00
stickler-ci	9875e73ee2	Fixing style errors.	2020-12-03 15:04:48 +00:00
Cédric	2751d5cefd	Update api_orders.class.php	2020-12-03 16:02:49 +01:00
Cédric	dcc3ecf012	Update commande.class.php	2020-12-03 16:01:17 +01:00
Laurent Destailleur	d8d825f615	FIX #15519	2020-12-03 14:40:14 +01:00
Laurent Destailleur	068587fcee	Update card.php	2020-12-03 14:30:07 +01:00
Florian Mortgat	17d5bb5cd4	FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated	2020-12-02 22:25:08 +01:00
Cédric	7788157b19	API orders: Update demand reason on order update	2020-12-01 16:55:43 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
Christian Foellmann	f801dd7d66	PR toggle FCKeditor on public/private notes	2020-11-30 16:39:14 +01:00
Laurent Destailleur	958893228a	Fix combo to add contact and status of contact on popup	2020-11-30 15:18:58 +01:00
Laurent Destailleur	a2ede3573e	Default selected columns	2020-11-30 08:46:58 +01:00
Laurent Destailleur	6ad7cca647	Fix sort columns	2020-11-30 08:45:16 +01:00
Laurent Destailleur	7634212811	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/phpinfo.php htdocs/commande/stats/index.php htdocs/compta/facture/stats/index.php	2020-11-29 21:35:03 +01:00
Laurent Destailleur	d3a2aa664f	FIX #15572	2020-11-29 20:27:40 +01:00
Laurent Destailleur	59b445a103	Clean dead code	2020-11-28 14:47:39 +01:00
Laurent Destailleur	574919de52	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/accountancy/bookkeeping/balance.php htdocs/adherents/class/subscription.class.php htdocs/compta/bank/categ.php htdocs/compta/facture/class/facture.class.php htdocs/core/boxes/box_task.php htdocs/core/class/commondocgenerator.class.php htdocs/core/class/interfaces.class.php htdocs/core/lib/project.lib.php htdocs/core/modules/modCategorie.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/install/repair.php htdocs/main.inc.php htdocs/product/price.php htdocs/projet/tasks/time.php htdocs/reception/card.php	2020-11-27 15:45:12 +01:00
Laurent Destailleur	ac3c129735	Clean code	2020-11-27 14:24:15 +01:00
Laurent Destailleur	187ba94a57	Look and feel v13	2020-11-26 14:24:52 +01:00
Laurent Destailleur	69b06a25e8	Fix code of deletion of objects	2020-11-26 09:16:16 +01:00
Frédéric FRANCE	83f6e9dfc2	doxygen	2020-11-25 18:08:13 +01:00
Laurent Destailleur	81566289cd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php	2020-11-24 11:07:35 +01:00
Laurent Destailleur	890f7a0602	Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to ... FIX Dol print error : conf usage thirdparty propagate extrafields to	2020-11-23 21:43:03 +01:00
Laurent Destailleur	5822fcfbed	FIX several warning with the barcode use in ODT templates	2020-11-23 21:38:45 +01:00
ATM john	fbc911aea1	Fix conf usage thirdparty propagate extrafields to	2020-11-23 16:40:31 +01:00
Givriz	dca4cf5987	Feature : ajout de la class "button-cancel" ... Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.	2020-11-23 15:12:52 +01:00
Laurent Destailleur	2f6f242d99	CSS	2020-11-23 12:29:38 +01:00
lvessiller	e87bdd02bd	FIX date order param not empty	2020-11-20 16:10:11 +01:00
lvessiller	4fef8d80a5	FIX keep dates filters parameters on order list	2020-11-20 16:01:51 +01:00
Laurent Destailleur	772d401a64	FIX Restore a more common behavior. Add a hidden constant to switch to a ... mode when we must enabled load of shippable status.	2020-11-19 19:56:00 +01:00
Laurent Destailleur	06545e005b	Use status constant	2020-11-19 18:55:37 +01:00
lvessiller	7e207e80ae	FIX spaces before IF	2020-11-19 14:29:37 +01:00
lvessiller	73dab143a3	NEW Add an option to hide by default icon shippable order in command list	2020-11-19 14:14:24 +01:00
Florian HENRY	46326d7659	merge from develop	2020-11-19 13:53:34 +01:00
Laurent Destailleur	1dd697767e	Merge branch 'develop' into 13_doc	2020-11-18 18:08:14 +01:00
Laurent Destailleur	6150d3bb2c	Merge pull request #15430 from fappels/13_fix_supplier_barcode ... Improve doc for customer order delivery date	2020-11-18 12:54:34 +01:00
Francis Appels	9936d8c559	Revert "doc for delivery_date" ... This reverts commit aed6afc3bf.	2020-11-16 17:54:52 +01:00
Francis Appels	aed6afc3bf	doc for delivery_date	2020-11-16 17:37:38 +01:00
Laurent Destailleur	6bbeb6d3a0	Fix debug creation of shipment with virtual product.	2020-11-16 16:31:05 +01:00
Laurent Destailleur	96b15420f0	Fix regression	2020-11-16 12:56:13 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Laurent Destailleur	90884d8085	Fix compatibility with date_delivery	2020-11-11 18:08:40 +01:00
Laurent Destailleur	6536208a14	Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile ... NEW include tpl for loading lang file for extra fields in list	2020-11-10 14:42:21 +01:00
Laurent Destailleur	560b8db44a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-09 15:29:17 +01:00
Laurent Destailleur	1d90ee2765	FIX #15336 set_thirdparty was not used anymore. Removed dead code.	2020-11-09 15:28:18 +01:00
Scrutinizer Auto-Fixer	f6e3f58fcb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-11-09 14:18:56 +00:00
Laurent Destailleur	5be634cbd4	Clean code	2020-11-09 11:34:58 +01:00
Laurent Destailleur	a9fbe9dd6c	Fix remove warning	2020-11-08 00:18:41 +01:00
lvessiller	4ddff7173f	NEW include tpl for loading lang file for extra fields in list	2020-11-06 12:19:45 +01:00
Laurent Destailleur	9e967a578e	FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE	2020-11-03 02:17:51 +01:00
Laurent Destailleur	83a7b19333	Look and feel v13	2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
Frédéric FRANCE	8190711342	doxygen	2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Florian HENRY	d77a0b40a8	tested and approuve feaure #15036	2020-10-28 16:37:41 +01:00
Florian HENRY	a3073be8e4	Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product	2020-10-28 08:52:29 +01:00
Laurent Destailleur	1b939ab8f4	Merge pull request #15183 from frederic34/dol_fiche_end ... end of dol_fiche_end	2020-10-27 19:00:32 +01:00
Laurent Destailleur	50cf7704fe	Log	2020-10-27 18:30:03 +01:00
Frédéric FRANCE	5a3780e062	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
Francis Appels	93ab281d81	Fix tab indent	2020-10-26 18:21:47 +01:00
Francis Appels	91496682fb	Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison	2020-10-26 18:13:36 +01:00
Francis Appels	3ff6f6a04a	Move phpcs enable to correct location @frederic34	2020-10-26 18:13:25 +01:00
stickler-ci	d803c7f429	Fixing style errors.	2020-10-26 16:06:05 +00:00
Francis Appels	7fa7f0a390	Re-add set_date_livraison as a deprecated function. ... Use correct naming convention for new method naming.	2020-10-26 16:50:52 +01:00
Florian HENRY	7c2b5b614f	NEW: preload product description on selection for customer propal/order/invoice	2020-10-25 19:13:09 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of ... https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Laurent Destailleur	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve ... retrieve the spelling	2020-10-25 14:48:51 +01:00
Laurent Destailleur	bb147d2599	FIX #15140	2020-10-25 14:12:34 +01:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Laurent Destailleur	58597bc8fe	Merge pull request #15058 from Hystepik/develop ... FIX pb of duplicate event on command	2020-10-23 14:12:42 +02:00
lmarcouiller	42aafeb8b5	FIX pb of duplicate event on command with eldy's recommendations	2020-10-23 09:56:35 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
lmarcouiller	1ee8c34bf5	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 14:20:49 +02:00
lmarcouiller	90b2d41b02	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 14:19:34 +02:00
lmarcouiller	64d8d5334c	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 14:12:32 +02:00
lmarcouiller	edd391da3a	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 14:09:55 +02:00
lmarcouiller	511943c052	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 14:05:32 +02:00
lmarcouiller	71db2603e1	FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed	2020-10-19 13:52:12 +02:00
Laurent Destailleur	7504f92a41	Standardize code and look and feel	2020-10-16 13:30:20 +02:00
Laurent Destailleur	bc1ad96ad1	FIX #14993	2020-10-14 19:28:59 +02:00
Laurent Destailleur	fcd4645509	Standardize code: Property product_libelle renamed into product_label ... Move common vars declaration into parent class.	2020-10-12 19:33:00 +02:00
Rüdiger Hahn	d789aaad7f	Fix for #14239 ... Message: Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before	2020-10-09 11:29:39 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
Laurent Destailleur	70fa262293	CSS	2020-10-08 09:30:15 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Aurélien	f954e8b173	:mod livraison rename user acces right #14697	2020-10-06 16:10:48 +02:00
Aurélien	c8cd55e158	debug access right after rename class #14697	2020-10-06 15:57:50 +02:00
Aurélien	1af42b313c	rename livraison pdf and dependencies #14697	2020-10-06 13:32:02 +02:00
Laurent Destailleur	e3542c6d4f	Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights ... NEW Show category filter on lists only when user have rights to read categories	2020-10-06 12:29:10 +02:00
Aurélien	af7c23b2ac	rename folder admin/livraison.php and dependencies #14697	2020-10-06 12:05:24 +02:00
Aurélien	5571a166c6	change variable #14697	2020-10-06 11:37:55 +02:00
Laurent Destailleur	a6fe03bd14	Fix doc	2020-10-04 23:30:41 +02:00
Laurent Destailleur	c806ae2654	Merge pull request #14792 from c3do/patch-15 ... FIX API Order unlink contact did not work like expected	2020-10-03 15:30:07 +02:00
Laurent Destailleur	5256229089	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-02 13:51:47 +02:00
Laurent Destailleur	10deb1baad	Clean code - Removed no more used files orderstoinvoice.php	2020-10-02 13:51:32 +02:00
Laurent Destailleur	193c9ac803	Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date ... NEW Add search param for close date on order list	2020-10-02 13:42:02 +02:00
Florian HENRY	18c946dc75	add missing translation	2020-10-02 10:37:02 +02:00
Florian HENRY	1bbd4da0fe	add missing translation	2020-10-02 10:36:16 +02:00
stickler-ci	a7b4f0ec49	Fixing style errors.	2020-10-02 07:43:29 +00:00
John Botella	f31e689480	Fix new look and feel	2020-10-02 09:39:54 +02:00
John Botella	ac7a747004	Merge branch '12.0_new_search_param_for_order_close_date' into develop	2020-10-02 09:19:25 +02:00
Laurent Destailleur	d912908aef	NEW Can build vendor invoice from vendor orders	2020-10-01 19:05:20 +02:00
Laurent Destailleur	ece8037f42	The button "Invoice orders" switch to page with lines autoselected.	2020-10-01 18:08:46 +02:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
John Botella	afbe5f6017	Add search param for close date	2020-09-30 15:26:13 +02:00
Laurent Destailleur	a3da2afe7a	Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES	2020-09-30 11:58:40 +02:00
Cédric	3bc9c49307	Update api_orders.class.php	2020-09-28 16:57:30 +02:00
Sekan, Tobias	2bf15b3a92	Show category filter only on rights to read it	2020-09-28 10:42:49 +02:00
Laurent Destailleur	f851ce2f0f	Merge pull request #14741 from Tim-Otte/fix-zero-price-lines ... FIX: Allow product price equal zero in new lines	2020-09-27 20:46:36 +02:00
Tobias Sekan	a72519f353	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-23 09:09:42 +02:00
Laurent Destailleur	6c06d2f0aa	Look and feel v13	2020-09-22 15:26:29 +02:00
Tim Otte	e373de91d9	Fixed a bug where a price equal zero would be replaced with the product price	2020-09-22 14:43:09 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Cédric	68ccbac49c	Update api_orders.class.php	2020-09-19 22:35:33 +02:00
Laurent Destailleur	b6c6473cce	Fix sql injection when forging requests with IN	2020-09-18 17:47:40 +02:00
Tobias Sekan	b2a953ed5b	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-18 12:21:41 +02:00
Sekan, Tobias	ae8c302c19	merge variable declaration	2020-09-18 10:52:17 +02:00
Sekan, Tobias	dc4250aed7	Make button visiblity identical on most lists	2020-09-18 10:46:23 +02:00
Sekan, Tobias	d1f70a37df	Preselect thirparty on new from list (part 1)	2020-09-18 07:56:13 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Laurent Destailleur	e5191cad24	Move code of incoterm into the Incoterm Trait.	2020-09-16 02:50:18 +02:00
Scrutinizer Auto-Fixer	73915d51c8	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-14 02:30:04 +00:00
Laurent Destailleur	1f8278c8ca	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/core/class/html.formmail.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/other.lang htdocs/product/class/product.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-09-12 04:42:59 +02:00
Laurent Destailleur	5ea3f09e17	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php	2020-09-12 04:29:28 +02:00
Laurent Destailleur	990af9d5cf	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/comm/propal/class/propal.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php	2020-09-12 04:25:54 +02:00
Laurent Destailleur	64b28020c8	Look and feel v13	2020-09-11 13:14:14 +02:00
Laurent Destailleur	0d124730a8	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/list.php	2020-09-10 18:05:18 +02:00
Laurent Destailleur	b8fe2188a6	Standardize code around model_pdf	2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer	c263c8a76c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-08 19:27:28 +00:00
Laurent Destailleur	ca6e57b2f7	FIX Filter in "billed" of orders was not saved	2020-09-07 14:25:50 +02:00
stickler-ci	ebb69e9d6e	Fixing style errors.	2020-09-04 19:38:49 +00:00
Cédric	e84a2ab07c	Fix addline commande.class.php	2020-09-04 21:26:57 +02:00
Cédric	c06cb1eff3	NEW ref_ext for order lines	2020-09-04 21:25:20 +02:00
Cédric	1f82fcc1f0	NEW ref_ext field for order lines	2020-09-04 21:11:58 +02:00
Cédric	9141b6b092	NEW endpoint getContacts and Clean results ... NEW Get contacts list of a given order FIX bad function used to unlink a contact FIX Result for link contact and unlink contact	2020-09-04 12:36:03 +02:00
Juanjo Menent	9bd5ed627f	Fix travis issues	2020-09-04 09:55:02 +02:00
Juanjo Menent	bb92e64e43	FIX: #14474 Error when deleting	2020-09-03 12:43:38 +02:00
Laurent Destailleur	ad87e753b4	Clean trim on GETPOST (already included inside GETPOST when not 'none'	2020-08-28 21:27:50 +02:00
Anthony Berton	458bc66327	Update list.php	2020-08-25 17:25:34 +02:00
florian HENRY	0453dd8f09	fix php warning : count parameters must be countable	2020-08-20 16:39:14 +02:00
Laurent Destailleur	7217dc3114	Better perf for phpunit on very large databases	2020-08-19 01:43:48 +02:00
Laurent Destailleur	964c4ef0d2	Standardize code. Use model_pdf.	2020-08-18 14:48:38 +02:00
Laurent Destailleur	4c1aa25b32	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent_emails.php htdocs/core/tpl/extrafields_list_search_title.tpl.php htdocs/product/traduction.php	2020-08-04 13:51:11 +02:00
Laurent Destailleur	2076d18825	FIX Param of fetch_name_optionals_label must be object->table_element	2020-08-04 12:47:09 +02:00
Tim Otte	0e03578e91	Fixed translation of product units in documents	2020-08-04 11:51:40 +02:00
Laurent Destailleur	e455f8afa6	Merge pull request #14369 from Tim-Otte/fix-product-unit-translation ... Fixed translation of product units in documents	2020-08-04 11:50:50 +02:00
Tim Otte	360afccecc	Fixed translation of product units in documents	2020-08-04 11:02:16 +02:00
Laurent Destailleur	42234ba506	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/price.lib.php	2020-07-24 00:07:57 +02:00
Oarces DEV	f3e3c47af3	Add the possibility for the prospect to order ... A prospect can do make order everywhere in Dolibarr, except in order tab... https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7	2020-07-18 23:04:22 +02:00
Laurent Destailleur	4fd970af28	Fix phpcs	2020-07-07 01:29:31 +02:00
Laurent Destailleur	14c98f277b	NEW Can change VAT rate of all lines of a draft object in one step.	2020-07-06 22:48:22 +02:00
Laurent Destailleur	6c01cc16f8	Update commande.class.php	2020-07-03 00:14:22 +02:00
quentin	642e75c3dd	FIX wrong origin	2020-07-02 14:16:31 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	f92426034f	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/index.php	2020-06-03 01:06:27 +02:00
Laurent Destailleur	9e6bb6f784	Sanitize params	2020-06-02 20:19:45 +02:00
Laurent Destailleur	7ceb236a09	Fix look and field v12	2020-05-26 14:45:45 +02:00
Laurent Destailleur	48137f8cad	Fix look and field v12	2020-05-26 14:43:50 +02:00
Frédéric FRANCE	e5402988d9	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-24 17:58:18 +02:00
Laurent Destailleur	fd61214b97	Merge	2020-05-24 01:06:45 +02:00
Laurent Destailleur	127534ef55	Fix common var name seems to be $objref for subdir of doc	2020-05-23 20:09:31 +02:00
Frédéric FRANCE	5aa84c64d0	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:54:33 +02:00
Laurent Destailleur	4913d10724	Merge branch 'develop' into patch-339	2020-05-23 15:14:06 +02:00
Frédéric FRANCE	70995d3499	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-22 15:03:09 +02:00
Laurent Destailleur	2f8b364454	Code comment	2020-05-22 13:18:47 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
ptibogxiv	70ea77ce8f	Update list.php	2020-05-12 15:37:37 +02:00
stickler-ci	83ec39f55a	Fixing style errors.	2020-05-12 11:44:12 +00:00
ptibogxiv	e1ff1bf865	Update card.php	2020-05-12 13:42:43 +02:00
stickler-ci	9e49e02efb	Fixing style errors.	2020-05-12 11:42:18 +00:00
ptibogxiv	014c013f83	Update card.php	2020-05-12 13:40:31 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)	790cffb7ae	Correct select label for categories in stats pages	2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)	1bd9372022	Forgot comments to document news params for the modified methods	2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)	40f1bed8d0	Add possibility to filter stats by ThirdParty type and categorie	2020-04-29 09:17:44 +02:00
Laurent Destailleur	6b1a1e5e58	FIX #13743	2020-04-27 15:09:27 +02:00
Laurent Destailleur	3090eb578b	Look and feel v12	2020-04-25 17:43:12 +02:00
Laurent Destailleur	1121d2c1c6	Look and feel v12	2020-04-25 13:49:44 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Marc Guenneugues	be46b2062e	Clean line extrafields when deleting order	2020-04-23 17:51:06 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708, normalization of code	2020-04-23 13:21:39 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
Laurent Destailleur	fe674f08d9	Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER	2020-04-20 03:00:10 +02:00
Laurent Destailleur	6472f521ac	css	2020-04-20 00:54:38 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
atm-quentin	f7c07640dd	viewstatut to search_status	2020-04-15 15:01:00 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +02:00
Laurent Destailleur	0845f0bcd3	Merge pull request #13523 from bb2a/patch-2 ... add in default search	2020-04-10 12:12:28 +02:00
Laurent Destailleur	5ff981bf61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/perms.php	2020-04-10 12:04:21 +02:00
Laurent Destailleur	874cbcefc7	Fix permission to close a proposal or order was not correctly used ... #13547	2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Anthony Berton	620161f0e7	Update list.php	2020-04-10 10:47:34 +02:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	a27a499727	Merge pull request #13157 from bb2a/patch-17 ... Add search order to assign to a warehouse	2020-04-08 14:54:36 +02:00
Laurent Destailleur	4170580d88	Rename const	2020-04-03 12:54:23 +02:00
Laurent Destailleur	99ddd25ad5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-02 16:51:50 +02:00
Florian Mortgat	4d2b4583d0	FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error	2020-04-02 09:28:56 +02:00
Laurent Destailleur	4207d94f53	FIX Bad position of total in column ... Conflicts: htdocs/fourn/facture/paiement.php	2020-03-27 19:10:01 +01:00
Laurent Destailleur	a4797634d5	FIX Bad position of total in column	2020-03-27 19:08:39 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
Laurent Destailleur	62fefab5ac	Standardize color of status	2020-03-24 19:06:37 +01:00
Laurent Destailleur	a5379c7144	FIX All forms must use newToken() ... Conflicts: htdocs/commande/card.php htdocs/compta/cashcontrol/cashcontrol_card.php htdocs/supplier_proposal/card.php	2020-03-24 13:14:23 +01:00
Laurent Destailleur	1ff15e1fd9	FIX All forms must use newToken()	2020-03-24 13:10:35 +01:00
Laurent Destailleur	2b33ef7e46	Align color of graph of status on status color	2020-03-24 13:06:59 +01:00
Scrutinizer Auto-Fixer	e8083e2a65	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-23 14:54:02 +00:00
Laurent Destailleur	56d6c4691f	FIX #13382 Note will be concat to private note	2020-03-18 21:06:36 +01:00
Laurent Destailleur	8bab245c7e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/tpl/contacts.tpl.php	2020-03-18 18:50:55 +01:00
Laurent Destailleur	9525289488	Fix return code of some API	2020-03-17 13:50:20 +01:00
Anthony Berton	fa2ccf6c44	Merge branch 'develop' into patch-17	2020-03-17 11:22:07 +01:00
Laurent Destailleur	8192e9dc67	FIX Missing token in form	2020-03-14 03:02:49 +01:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
Laurent Destailleur	d380da3f4c	Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink ... NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type	2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer	f413ce6aac	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-12 11:45:44 +00:00
florian HENRY	eaa9d22783	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink	2020-03-12 09:45:04 +01:00
florian HENRY	29b2ea77d5	NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type	2020-03-12 09:44:43 +01:00
Laurent Destailleur	82f0d8a3bc	Fix bad params	2020-03-09 17:38:47 +01:00
Laurent Destailleur	3edc3dd382	Fix fields definition	2020-03-08 20:10:31 +01:00
Laurent Destailleur	343a80fd3d	Fix table fields	2020-03-08 19:25:00 +01:00
Laurent Destailleur	054ffb7547	Depreciate variables not used by Dolibarr.	2020-03-06 14:38:06 +01:00
Laurent Destailleur	ad9d0a3472	Fix graph of product distribution when too much record	2020-03-06 12:45:02 +01:00
Laurent Destailleur	0bd2740779	NEW Can force position of legend of graph on right (instead of top)	2020-03-05 17:23:19 +01:00
Laurent Destailleur	fc31680bd0	Several fix for chart.js graphs	2020-03-05 02:55:06 +01:00
Laurent Destailleur	7d0d0aa75a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2020-03-04 01:56:50 +01:00
Laurent Destailleur	0b37c2c201	FIX #13263	2020-03-04 00:53:07 +01:00
Laurent Destailleur	88059a52d8	Merge branch 'develop' into patch-17	2020-03-03 23:24:14 +01:00
Laurent Destailleur	2b6aaa652d	Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency ... NEW: add multicurrency columns to document lists	2020-03-03 23:12:53 +01:00
Laurent Destailleur	7866f89585	Merge pull request #13260 from atm-quentin/FIX_ecm_files ... FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 23:09:02 +01:00
atm-quentin	9446138951	FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 12:07:18 +01:00
Marc de Lima Lucio	5f5824daaa	FIX: order list: remove useless multicurrency lines	2020-03-03 10:43:23 +01:00
florian HENRY	dbb80aecd1	Fix line origin and Id when create order from	2020-03-02 15:22:35 +01:00
Anthony Berton	5520df4e4f	Update list.php	2020-03-02 08:25:18 +01:00
Marc de Lima Lucio	5d1f91f8ac	FIX: muticurrency columns: remove useless column totals that mix currencies together	2020-02-27 17:37:36 +01:00
Marc de Lima Lucio	341e4ae856	NEW: order list: enable multicurrency columns	2020-02-27 14:49:34 +01:00
Laurent Destailleur	a17fba8321	Merge pull request #13158 from bb2a/patch-18 ... Default warehouse to create order	2020-02-26 16:45:25 +01:00
Anthony Berton	54b23a1e1c	Update card.php	2020-02-21 22:54:12 +01:00
Scrutinizer Auto-Fixer	e44865d8b5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-21 16:53:37 +00:00
Anthony Berton	02a5c1b8d6	Update card.php	2020-02-20 22:40:43 +01:00