77873 Commits

Author	SHA1	Message	Date
Laurent Destailleur	6080e5335f	Minor fix	2020-11-05 12:56:20 +01:00
Laurent Destailleur	9380ea4bc5	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-11-05 09:43:38 +01:00
Laurent Destailleur	a5328f4230	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-11-05 09:43:28 +01:00
Laurent Destailleur	6bb598498e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-11-05 09:42:51 +01:00
Laurent Destailleur	4b7c8a0d1d	Merge pull request #15291 from prietojc/12.0_patch-1 ... FIX force payment mode to withdraw	2020-11-04 20:36:29 +01:00
jcp	1f483d7c28	Fix force payment mode to create withdrawal	2020-11-04 11:43:03 +01:00
jcp	3ce7a23c70	Revert "NEW massaction for BankTransfer" ... This reverts commit a39ff26def.	2020-11-03 20:21:53 +01:00
jcp	a39ff26def	NEW massaction for BankTransfer	2020-11-03 20:16:56 +01:00
jcp	bae05bbe7d	Fix computed import	2020-11-03 18:43:03 +01:00
Laurent Destailleur	f25a6b2e67	Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines ... FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines	2020-11-02 09:41:00 +01:00
Florian Mortgat	400acf9f65	FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account	2020-11-02 08:26:36 +01:00
Laurent Destailleur	2cdbfa2048	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-11-01 17:45:22 +01:00
Laurent Destailleur	72160deef7	FIX #14979	2020-11-01 17:01:26 +01:00
Laurent Destailleur	ad922bfde6	FIX #15074	2020-11-01 16:08:09 +01:00
Laurent Destailleur	49ccf2a3cb	Update doc	2020-11-01 15:55:51 +01:00
Laurent Destailleur	45f834cb15	FIX #15199	2020-11-01 15:20:33 +01:00
Laurent Destailleur	63a03cdad6	FIX #15208	2020-11-01 14:34:29 +01:00
Laurent Destailleur	41b938047d	Fix doc	2020-10-31 14:51:32 +01:00
Laurent Destailleur	9113ecedfa	code comment	2020-10-31 12:55:26 +01:00
Laurent Destailleur	623cb54480	Prepare a more complete fix for #15016	2020-10-31 12:30:47 +01:00
Laurent Destailleur	a4d2927f82	Fix for #15016 ... Conflicts: htdocs/core/actions_linkedfiles.inc.php	2020-10-31 12:18:54 +01:00
Laurent Destailleur	d9ca9fe22d	Fix clean of contract	2020-10-30 14:50:38 +01:00
ATM john	61cb99117a	Add missing lang trans	2020-10-30 09:33:07 +01:00
Laurent Destailleur	5504e3b236	Fix phpcs	2020-10-30 05:58:40 +01:00
Laurent Destailleur	1a02504792	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/class/hookmanager.class.php htdocs/core/lib/security2.lib.php	2020-10-30 04:26:09 +01:00
Laurent Destailleur	f51b02026c	Fix regression	2020-10-30 04:24:06 +01:00
Laurent Destailleur	840ca73464	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/class/hookmanager.class.php htdocs/main.inc.php htdocs/theme/eldy/info-box.inc.php htdocs/theme/eldy/style.css.php	2020-10-30 04:21:07 +01:00
Laurent Destailleur	f5a156ee06	Fix regression	2020-10-30 04:17:02 +01:00
Laurent Destailleur	1b5bcaccc6	Fix remove warnings	2020-10-30 04:13:31 +01:00
Laurent Destailleur	ec0c8e0c79	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/security2.lib.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:35:40 +01:00
Laurent Destailleur	263b679af4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:31:04 +01:00
Laurent Destailleur	925669ee33	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-30 03:25:52 +01:00
Laurent Destailleur	f22017080d	Fix for php8	2020-10-30 03:25:33 +01:00
Laurent Destailleur	e79a061c19	Merge pull request #15204 from frederic34/patch-6 ... Update timeline.inc.php	2020-10-29 17:46:31 +01:00
Laurent Destailleur	ee4a827627	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/list.php htdocs/core/db/DoliDB.class.php	2020-10-29 13:10:10 +01:00
Laurent Destailleur	d7225327e7	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-29 11:13:29 +01:00
Laurent Destailleur	2a386b6fea	Fix set subledger account	2020-10-29 11:13:18 +01:00
Laurent Destailleur	91cf5de54d	Fix bad sort order	2020-10-29 11:06:18 +01:00
Laurent Destailleur	980cb095da	Fix sort order use last sortorder if several fields.	2020-10-29 11:05:43 +01:00
Florian Mortgat	5e2962ef38	FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document	2020-10-29 10:50:13 +01:00
Laurent Destailleur	b1b7a7c725	Fix missing transaction	2020-10-29 10:40:50 +01:00
Laurent Destailleur	c3f0f3cc4a	Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"	2020-10-29 10:36:48 +01:00
Frédéric FRANCE	20c00d0c43	Update timeline.inc.php	2020-10-28 17:54:45 +01:00
Florian Mortgat	a4af2e94a9	FIX 10.0 - make formConfirm an addreplace-type hook	2020-10-28 17:08:09 +01:00
Laurent Destailleur	f02a35d398	Fix bad array when year is not defined into graph stat of products	2020-10-28 16:47:00 +01:00
Laurent Destailleur	6363a6cd60	Fix sanitize	2020-10-28 14:11:46 +01:00
Laurent Destailleur	47dfe633f9	Fix filter on date on statistics of products	2020-10-28 13:19:35 +01:00
Marc de Lima Lucio	a33d34a165	FIX: various payments: bad data handling for subledger account + useless db commit/rollback	2020-10-27 16:48:56 +01:00
Laurent Destailleur	5943e784ec	Remove var_dump	2020-10-27 10:27:44 +01:00
Laurent Destailleur	00b49dba18	Fix label	2020-10-27 10:26:30 +01:00
Laurent Destailleur	ffc961599c	FIX error 500 on cash fence	2020-10-27 10:19:00 +01:00
Frédéric FRANCE	da4f3fab14	dol_print_date called with a bad value	2020-10-27 08:10:19 +01:00
Alfredo Altamirano	214cd2c99b	Update references of MO translation string	2020-10-26 15:44:26 -06:00
Alfredo Altamirano	43fd659d2a	Rename translation string MO for ManufacturingOrder	2020-10-26 15:38:42 -06:00
Laurent Destailleur	12289ceb9e	Merge pull request #15159 from Ahuahuachi/10.0 ... FIX #15111 Fix special characters output in PDF	2020-10-26 19:20:53 +01:00
Laurent Destailleur	e57cd74f22	Merge pull request #15166 from atm-quentin/FIX_select2_extra_witdh_on_advtargetmailing ... FIX table making extrafield input too small on advance target mailing	2020-10-26 19:11:37 +01:00
Laurent Destailleur	f18a13b2d4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/product/class/productcustomerprice.class.php	2020-10-26 19:08:11 +01:00
Laurent Destailleur	78a52eda96	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/main.inc.php htdocs/product/class/productcustomerprice.class.php	2020-10-26 19:05:30 +01:00
Laurent Destailleur	50ede5224a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-10-26 19:02:47 +01:00
Laurent Destailleur	c58d3d0cf7	FIX #15163	2020-10-26 19:02:26 +01:00
Laurent Destailleur	3ee618d736	FIX Clean orphan records in llx_ecm_files into repair script.	2020-10-26 18:31:12 +01:00
Laurent Destailleur	2c2142ddba	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-26 18:13:47 +01:00
Laurent Destailleur	adeddc70ca	FIX Deletion of expensereport + other generated object not complete.	2020-10-26 18:10:58 +01:00
Marc de Lima Lucio	3f839c2a96	FIX: product customer prices: missing triggers in CRUD class	2020-10-26 16:11:21 +01:00
quentin	fd1f5bbe01	FIX table making extrafield too small advtagertmailing	2020-10-26 15:03:32 +01:00
quentin	5694a19c6a	FIX table making extrafield input too small advtargetmailing	2020-10-26 14:51:13 +01:00
Alfredo Altamirano	1b82b6af4d	FIX #15111 Fix special characters output in PDF	2020-10-25 22:17:02 -06:00
Laurent Destailleur	9dfc08d2bd	Fix bad var name	2020-10-25 21:11:05 +01:00
Laurent Destailleur	ec0da6921a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-25 21:10:00 +01:00
Laurent Destailleur	6bc0630c5f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php	2020-10-25 21:09:43 +01:00
Laurent Destailleur	baa86d773b	Fix phpcs	2020-10-25 21:07:37 +01:00
Laurent Destailleur	b80d135fcb	Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage ... fix mail error message	2020-10-25 14:50:23 +01:00
Laurent Destailleur	02ef5ad3b9	Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering ... Fix #15064 : error when supplier invoice numbering module is not configured	2020-10-25 13:58:48 +01:00
Laurent Destailleur	b6db71e5e6	Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation ... Fix #15143 selected lines on invoice creation	2020-10-25 13:57:00 +01:00
Maxime Kohlhaas	309691f1e7	Fix #15143 selected lines on invoice creation	2020-10-25 09:28:41 +01:00
Maxime Kohlhaas	680ae60b6f	Fix #15064 : error when supplier invoice numbering module is not configured	2020-10-25 08:56:34 +01:00
Maxime Kohlhaas	7080c8491d	Fix var name in contract box	2020-10-24 19:46:57 +02:00
Maxime Kohlhaas	bedfb7ac8d	Fix BOM position field	2020-10-24 19:19:06 +02:00
Laurent Destailleur	50da1cd95e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-23 17:33:57 +02:00
Laurent Destailleur	cf4ea4168d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/extrafields.class.php	2020-10-23 17:33:14 +02:00
Laurent Destailleur	377c44eeab	Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required ... FIX no empty value in required extrafield	2020-10-23 17:29:12 +02:00
Florian HENRY	53a76dc01f	fix mail error message	2020-10-23 16:39:45 +02:00
Laurent Destailleur	edbf4dc375	Fix doc	2020-10-23 13:55:14 +02:00
Laurent Destailleur	0e25843baa	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/facture/card.php htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php	2020-10-23 03:59:11 +02:00
Laurent Destailleur	c9a73cc380	Fix phpcs	2020-10-23 03:55:18 +02:00
Laurent Destailleur	62420c5e7b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/fourn/facture/card.php	2020-10-23 03:51:22 +02:00
Laurent Destailleur	e0e4da481a	Fix phpcs	2020-10-23 03:42:54 +02:00
Laurent Destailleur	d9aa83e699	Fix phpcs	2020-10-23 03:41:26 +02:00
Laurent Destailleur	15bbba3f52	Remove warning	2020-10-22 21:55:01 +02:00
Laurent Destailleur	e811a9b13e	Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance ... FIX: supplier invoice: automatically calculate payment term when modifying payment condition	2020-10-22 18:40:07 +02:00
Laurent Destailleur	b4581b6af8	Better error management	2020-10-22 18:39:45 +02:00
Marc de Lima Lucio	594d9e321e	FIX: invoice payment terms edition: error management	2020-10-22 18:28:27 +02:00
Laurent Destailleur	a17c391efe	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php htdocs/product/composition/card.php	2020-10-22 17:38:48 +02:00
Laurent Destailleur	cfcac7e053	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/lib/functions2.lib.php	2020-10-22 17:34:48 +02:00
Laurent Destailleur	a826e328c1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-10-22 17:31:40 +02:00
Laurent Destailleur	31f1ab73b1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-10-22 17:31:29 +02:00
Florian HENRY	10a3786bab	fix MAIN_AUTOFILL_DATE for expense payment date	2020-10-22 16:38:59 +02:00
Laurent Destailleur	3369379ba1	Update card.php	2020-10-22 16:34:23 +02:00
Marc de Lima Lucio	34dd486b6c	FIX: virtual products: displayed value is by unit	2020-10-22 16:18:37 +02:00
Laurent Destailleur	0f435f9901	Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services ... FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…	2020-10-22 16:18:11 +02:00
Laurent Destailleur	a9117fe864	Update interface_20_modWorkflow_WorkflowManager.class.php	2020-10-22 16:18:00 +02:00
Marc de Lima Lucio	1795ec6a9d	FIX: supplier invoice: autoatically calculate payment term when modifying payment condition	2020-10-22 16:11:12 +02:00
Got2be	c2ad40043f	FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty	2020-10-22 16:10:47 +02:00
Laurent Destailleur	648efbc0cb	Merge pull request #15067 from prietojc/12.0 ... FIX: Payment by BankTransfer	2020-10-22 15:59:19 +02:00
Laurent Destailleur	ca93f732c8	Update line.php	2020-10-22 15:59:04 +02:00
Laurent Destailleur	b9e6b188bc	Update rejetprelevement.class.php	2020-10-22 15:58:24 +02:00
Laurent Destailleur	10a8ce82a9	Update bonprelevement.class.php	2020-10-22 15:57:25 +02:00
Laurent Destailleur	5a52534675	Merge pull request #15072 from FHenry/12.0_fix_14649 ... FIX #14649	2020-10-22 15:51:31 +02:00
Laurent Destailleur	37749e8e9c	Merge pull request #15075 from FHenry/12.0_fix_status_receipt_tot ... fix set status on order Receipt when no dispatch	2020-10-22 15:50:30 +02:00
Laurent Destailleur	88df2ef36d	Merge pull request #15076 from FHenry/12.0_fix_margin_token ... fix form token missing	2020-10-22 15:49:56 +02:00
Laurent Destailleur	9775728b7d	Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order ... FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form	2020-10-22 15:43:31 +02:00
Marc de Lima Lucio	a232a19e7d	FIX: virtual products: supplier discount was not applied in component list	2020-10-22 15:16:33 +02:00
Laurent Destailleur	d521ad6db4	Update objectline_edit.tpl.php	2020-10-22 15:11:54 +02:00
Laurent Destailleur	46a31f443d	Update objectline_create.tpl.php	2020-10-22 15:11:01 +02:00
Florian Mortgat	56db7d6c64	FIX: also check if there is a method $object->fetch_thirdparty() before calling it	2020-10-22 15:09:48 +02:00
Florian Mortgat	509819c119	FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order)	2020-10-21 23:19:29 +02:00
Florian HENRY	93a97492ae	review	2020-10-21 20:41:50 +02:00
Florian HENRY	0a9293c9c6	fix token CSRF check for getSupplierPrice ajax call	2020-10-21 20:40:53 +02:00
Laurent Destailleur	a96c193ab0	Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created ... FIX if no PDF default model in admin for expense report, do not create a PDF	2020-10-21 19:55:43 +02:00
Laurent Destailleur	7605cb1871	Update facture_situation.php	2020-10-21 19:54:28 +02:00
John Botella	70790009a9	Fix display warranty fields on page load	2020-10-21 14:49:51 +02:00
Florian HENRY	c9e62845e8	fix is no PDF default model for expense report, no PDF created	2020-10-21 13:41:17 +02:00
John Botella	d9074e70e1	FIX admin conf selected	2020-10-21 13:27:37 +02:00
Florian HENRY	e23a289553	fix form token missing	2020-10-21 13:26:28 +02:00
Florian HENRY	b0641e6d69	better rix	2020-10-21 13:22:32 +02:00
Florian HENRY	a5e195d1c7	better rix	2020-10-21 13:20:17 +02:00
Florian HENRY	13dfa56c2f	fix recipt when no dispatch	2020-10-21 13:18:11 +02:00
Florian HENRY	d4fd71d0b3	fix #14649	2020-10-20 19:58:11 +02:00
Florian Mortgat	529dfb8dfb	FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched	2020-10-20 16:37:15 +02:00
jcp	b09a618f38	Fix Bank Transfer	2020-10-20 13:19:47 +02:00
jcp	a2d242356a	Fix BankTransfer (V12.0.2)	2020-10-20 13:17:14 +02:00
Laurent Destailleur	f2fafe04b6	Update doc	2020-10-17 18:16:03 +02:00
Laurent Destailleur	fb3d18f962	Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load ... FIX load default linked options for linked sellist extra fields	2020-10-17 18:13:13 +02:00
Laurent Destailleur	6bba249935	FIX pdf_getlinetotalwithtax must show total incl tax	2020-10-16 15:50:51 +02:00
Laurent Destailleur	e7992131ec	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2020-10-15 21:00:49 +02:00
Laurent Destailleur	6277422115	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 20:38:32 +02:00
Laurent Destailleur	a9a519e890	Merge pull request #15025 from fmarcet/10.0 ... FIX: Unable to edit extrafields in expense report	2020-10-15 20:30:14 +02:00
Laurent Destailleur	4eddcb7503	Merge pull request #15023 from Ahuahuachi/10.0 ... FIX #14927 Change ContratLigne property type to product_type	2020-10-15 20:29:38 +02:00
Laurent Destailleur	3d68ab4059	Update box_services_contracts.php	2020-10-15 20:28:27 +02:00
Laurent Destailleur	75290d1bd4	Update contrat.class.php	2020-10-15 20:26:12 +02:00
Laurent Destailleur	c3a02d0391	Update contrat.class.php	2020-10-15 20:24:26 +02:00
Ferran Marcet	32d823c739	FIX: Unable to edit extrafields in expense report	2020-10-15 09:40:50 +02:00
ATM john	b9cbd84d4e	Fix page break	2020-10-15 09:30:48 +02:00
Alfredo Altamirano	4a3ffbb6d4	FIX #14927 Change ContratLigne property type to product_type ... This bug is produced because the ContratLigne class gives a property type instead of a product_type	2020-10-14 22:17:50 -05:00
Laurent Destailleur	d283e8f649	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/stats/cabyprodserv.php	2020-10-14 20:15:19 +02:00
Laurent Destailleur	1691fcedfb	Fix phpcs	2020-10-14 20:13:30 +02:00
Laurent Destailleur	d3b6ada4eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/stats/cabyprodserv.php	2020-10-13 15:08:53 +02:00
Laurent Destailleur	f1f1f2b9c8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-13 15:04:34 +02:00
Laurent Destailleur	496d429dcd	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-13 15:04:25 +02:00
Laurent Destailleur	57702a1fb1	Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9	2020-10-12 20:47:32 +02:00
atm-lena	bf7d5b56fb	FIX subcat filter	2020-10-12 11:50:19 +02:00
Florian HENRY	0b9783b7ed	fix #14946	2020-10-12 11:31:09 +02:00
Alexandre SPANGARO	231a866838	FIX Loan - Return on list when you cancel create form or delete a loan	2020-10-10 07:38:29 +02:00
Rüdiger Hahn	3b7b4312cb	Fix for #14957 and probably a lot of other issues ... Convert special characters for a valid use in xml documents	2020-10-09 11:13:11 +02:00
Laurent Destailleur	c7784076c5	Merge pull request #14969 from atm-john/12.0_fix_project_loan_total ... Fix total loan calculation on project summary	2020-10-08 19:23:43 +02:00
Laurent Destailleur	e854cce158	Update element.php	2020-10-08 19:23:35 +02:00
ATM john	3bf12ca193	Fix total loan calculation	2020-10-08 19:10:41 +02:00
atm-lena	74ae9a2618	FIX CA report by product/service : subcategory filter	2020-10-08 10:49:46 +02:00
Laurent Destailleur	84105e996a	Fix for #14940	2020-10-07 01:03:48 +02:00
Laurent Destailleur	04f8de4188	Remove dependency	2020-10-06 17:59:31 +02:00
Laurent Destailleur	b0d20f92dc	FIX autofocus on first setup	2020-10-06 17:32:55 +02:00
Laurent Destailleur	e247b2de61	FIX list of fields in list of recurring invoices was empty	2020-10-06 16:29:29 +02:00
Laurent Destailleur	6933b7ec9c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/agenda.lib.php	2020-10-06 13:15:52 +02:00
Laurent Destailleur	989074f13a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-06 13:13:31 +02:00
lvessiller	496150d747	FIX extrafield required error after submit	2020-10-06 10:21:24 +02:00
Laurent Destailleur	a68ba1704b	Fix phpcs	2020-10-05 02:25:57 +02:00
Laurent Destailleur	63415e9728	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_commandes.php htdocs/core/boxes/box_propales.php htdocs/core/boxes/box_shipments.php htdocs/core/boxes/box_supplier_orders.php htdocs/core/boxes/box_supplier_orders_awaiting_reception.php htdocs/core/tpl/objectline_edit.tpl.php	2020-10-04 23:27:52 +02:00
Laurent Destailleur	ca16606b4f	Fix phpcs	2020-10-04 23:21:24 +02:00
ptibogxiv	dd1904c521	Fix multicompany in last action box	2020-10-04 13:58:46 +02:00
Laurent Destailleur	f217959740	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-03 14:51:30 +02:00
Laurent Destailleur	ca0dcb4db0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/boxes/box_propales.php htdocs/core/boxes/box_supplier_orders.php	2020-10-03 14:51:18 +02:00
Laurent Destailleur	5ed7b43214	phpcs	2020-10-03 14:48:19 +02:00
Laurent Destailleur	9e48920e1d	Merge pull request #14902 from ptibogxiv/patch-368 ... Fix multicompany in order box	2020-10-03 14:15:11 +02:00
Laurent Destailleur	ae16b45a5b	Merge pull request #14900 from frederic34/patch-4 ... use create instead edit on create contract	2020-10-03 14:14:53 +02:00
Laurent Destailleur	08afb586f8	Merge pull request #14903 from ptibogxiv/patch-369 ... Fix multicompany in propal box	2020-10-03 14:13:29 +02:00
Laurent Destailleur	71ab4c4a70	Merge pull request #14905 from ptibogxiv/patch-371 ... Fix multicompany in supplier order awaiting box	2020-10-03 14:12:57 +02:00
ptibogxiv	af2bd76500	Fix multicompany in shipment box	2020-10-03 14:06:33 +02:00
ptibogxiv	69660d1a9d	Update box_supplier_orders.php	2020-10-03 14:02:59 +02:00
ptibogxiv	331db5e367	Fix multicompany in supplier order awaiting box	2020-10-03 14:01:46 +02:00
ptibogxiv	26a2fea8c7	Fix multicompany in supplier order box	2020-10-03 14:00:23 +02:00
ptibogxiv	e9c101349b	Fix multicompany in propal box	2020-10-03 13:57:37 +02:00
ptibogxiv	3840d6c0a7	Fix entity in ordre box	2020-10-03 13:52:52 +02:00
Laurent Destailleur	272b98faab	FIX #14901	2020-10-03 11:31:56 +02:00
Frédéric FRANCE	711339945c	use create instead edit on create contract	2020-10-02 21:41:05 +02:00
Laurent Destailleur	88714cfb18	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-02 14:44:23 +02:00
Laurent Destailleur	cee28d0253	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-02 14:43:54 +02:00
Laurent Destailleur	cdc9d3dd1b	Merge pull request #14480 from OPEN-DSI/v10-fix-objectline-edit-tpl-margins-rates ... FIX update margins rates on object line edit	2020-10-02 14:43:13 +02:00
Laurent Destailleur	8d08290f21	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-01 19:38:11 +02:00
Laurent Destailleur	0fa139f4e3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/takepos/invoice.php	2020-10-01 19:37:56 +02:00
Laurent Destailleur	4d134ade72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/takepos/invoice.php	2020-10-01 19:35:49 +02:00
Florian HENRY	2f5a2d0e28	fix CSRF not provided	2020-10-01 17:42:04 +02:00
Laurent Destailleur	f15ee475f1	Merge pull request #14882 from atm-john/12.0_fix_default_values_and_sended_values ... FIX default accountancy values and posted values	2020-10-01 17:06:08 +02:00
Laurent Destailleur	f5f2ea57e3	Fix compatibility	2020-10-01 16:57:49 +02:00
Laurent Destailleur	a2efdee865	Fix after regression of #14886	2020-10-01 16:49:27 +02:00
Laurent Destailleur	2f89d526eb	Avoid to get a random result.	2020-10-01 16:43:56 +02:00
ptibogxiv	4e16db1e5f	Update paymentmodes.php	2020-10-01 12:22:53 +02:00
ptibogxiv	3f78d8fe25	Update stripe.class.php	2020-10-01 12:19:12 +02:00
ptibogxiv	676d70d86d	FIX stripe for connect mode	2020-10-01 12:14:50 +02:00
stickler-ci	e558dc3f27	Fixing style errors.	2020-10-01 07:48:24 +00:00
John Botella	c16cd91d8e	FIX default accountancy values and posted values	2020-10-01 09:40:11 +02:00
lvessiller	259737f082	FIX set paid on total discount of a product in cash desk	2020-09-30 15:09:45 +02:00
Laurent Destailleur	29414251f5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/files.lib.php	2020-09-29 13:19:03 +02:00
Laurent Destailleur	a6dcf5f1c1	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-09-29 00:51:02 +02:00
Laurent Destailleur	628978be53	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/adherents/card.php	2020-09-28 21:16:25 +02:00
Laurent Destailleur	43c167f0c8	Fix init var	2020-09-28 20:47:36 +02:00
Sekan, Tobias	6c1700d84a	Fix contratcs are always zero on statistics board	2020-09-28 17:22:11 +02:00
lvessiller	1b5a0ce3bf	FIX uses price2numjs	2020-09-28 17:04:20 +02:00
Laurent Destailleur	57b7666bf1	FIX #14326	2020-09-27 22:20:24 +02:00
Laurent Destailleur	e388123a3a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-27 19:32:08 +02:00
Laurent Destailleur	4a7df01339	Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be ... MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD	2020-09-27 19:31:54 +02:00
Laurent Destailleur	5c9ad3ec9b	Update files.lib.php	2020-09-27 18:55:09 +02:00
Florian HENRY	5ff7e37696	review code	2020-09-27 18:05:19 +02:00
Florian HENRY	b6b2553501	Merge branch '11.0' into 11.0_fixmultidiroutput	2020-09-27 18:02:22 +02:00
Laurent Destailleur	10ce4029d7	Merge pull request #14831 from hregis/12.0_ldap ... FIX Can create user but not update user with activedirectory	2020-09-27 16:58:33 +02:00
root	fcbc48fa28	Bug fix last_gen should be date_last_gen	2020-09-25 14:24:26 +02:00
Laurent Destailleur	0dcd85485a	Fix migration	2020-09-25 12:36:32 +02:00
Laurent Destailleur	7a9332815c	Fix migration	2020-09-25 12:22:24 +02:00
Regis Houssin	f92f8d0fc4	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-25 12:11:37 +02:00
Regis Houssin	d38c557fba	FIX Can create user but not update user with activedirectory	2020-09-25 12:11:13 +02:00
Laurent Destailleur	93af72c272	Merge pull request #14805 from hansemschnokeloch/patch-1 ... Fix label inversion	2020-09-23 19:53:35 +02:00
Laurent Destailleur	5a93628611	Merge pull request #14806 from hregis/12_bug ... FIX missing field entity	2020-09-23 19:45:05 +02:00
Laurent Destailleur	80ec1ad69f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-23 19:29:07 +02:00
Laurent Destailleur	905f676c71	Fix 12.0.3	2020-09-23 19:27:55 +02:00
Laurent Destailleur	693a8430a5	Prepare 12.0.4	2020-09-23 19:17:36 +02:00
atm-lena	0fc6e9b84f	FIX - Backtick not work with postgresql	2020-09-23 10:54:49 +02:00
Regis Houssin	fcfe5423f4	FIX missing field entity	2020-09-22 16:34:38 +02:00
Pascal Hubrecht	6d7f5ef0a8	Fix label inversion ... Private and public labels where inverted.	2020-09-22 12:40:26 +02:00
Laurent Destailleur	438e884c01	Fix phpcs	2020-09-21 14:17:05 +02:00
Laurent Destailleur	c4ef21a8f2	Increase timeout delay for install	2020-09-21 14:04:46 +02:00
Laurent Destailleur	3ca379c9e6	FIX Restore multiselect (selection of prospect level) ... Conflicts: htdocs/core/class/html.form.class.php	2020-09-21 12:22:57 +02:00
Alexandre SPANGARO	f8065eb4ed	Merge branch '10.0' into 10.0p46	2020-09-19 03:43:33 +02:00
Laurent Destailleur	4decf20aaa	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-18 14:56:38 +02:00
Laurent Destailleur	5d3168c2a0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-09-18 14:55:58 +02:00
Laurent Destailleur	37c9afebd9	Fix regression	2020-09-18 14:55:32 +02:00
Laurent Destailleur	f09aea90df	Fix bad test	2020-09-18 14:51:04 +02:00
Laurent Destailleur	56a9f5c48b	Fix	2020-09-18 14:49:20 +02:00
Laurent Destailleur	0b2aa2b01d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/functions.lib.php	2020-09-18 14:48:40 +02:00
Laurent Destailleur	07556e061d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contact/card.php htdocs/core/lib/functions.lib.php htdocs/document.php	2020-09-18 14:46:23 +02:00
Alexandre SPANGARO	19c0738b14	Merge branch '10.0' into 10.0p46	2020-09-18 01:41:25 +02:00
Alexandre SPANGARO	f453e43cca	FIX Yogosha report 4425 (backport)	2020-09-18 01:37:15 +02:00
Alexandre SPANGARO	142a27d472	Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0	2020-09-18 01:22:21 +02:00
Laurent Destailleur	5d8b9056b4	Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact ... FIX - Send mail from contact : select mail model	2020-09-17 11:15:58 +02:00
Alexandre SPANGARO	55e3f8365e	FIX Yogosha report 4434 (backport)	2020-09-16 21:36:55 +02:00
Alexandre SPANGARO	6928b6543c	Revert "FIX Yogosha report 4425 (backport)" ... This reverts commit 23c4cfe913.	2020-09-16 21:24:24 +02:00
Alexandre SPANGARO	bc457ebb66	Stickler	2020-09-16 21:22:59 +02:00
Alexandre SPANGARO	23c4cfe913	FIX Yogosha report 4425 (backport)	2020-09-16 20:55:28 +02:00
atm-lena	3182537566	FIX - Send mail from contact : select mail model	2020-09-16 17:19:25 +02:00
Laurent Destailleur	09558d0ce9	Fix MAIN_OPTIMIZEFORTEXTBROWSER	2020-09-16 13:15:57 +02:00
Laurent Destailleur	40acd8a386	Fix missing field canvas	2020-09-16 12:17:33 +02:00
Laurent Destailleur	06a73539fe	Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list ... FIX 12.0 - round value of virtual stock on product stock reassort list	2020-09-16 01:12:34 +02:00
Laurent Destailleur	afc6155783	FIX sign of amount with credit note and multicurrencies	2020-09-15 13:30:59 +02:00
Florian Mortgat	06d31e8b9a	FIX: missing entity check	2020-09-14 16:09:45 +02:00
Florian Mortgat	4c6b0ed5b5	FIX 12.0 - round value of virtual stock on product stock reassort list	2020-09-14 10:49:44 +02:00
Laurent Destailleur	701b83db38	FIX Bad number of subscription (forgotten when member was resiliated)	2020-09-14 02:38:12 +02:00
Laurent Destailleur	b2288ad2d9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-14 02:33:00 +02:00
Laurent Destailleur	a891211f78	Fix bad link	2020-09-14 02:32:30 +02:00
Laurent Destailleur	c40ec37b60	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-14 02:13:43 +02:00
Laurent Destailleur	c3ba8f7843	Better translation	2020-09-14 02:13:27 +02:00
Laurent Destailleur	18b20a5587	Merge pull request #14721 from indelog/12.0 ... Fix: getLabelOfUnit() for Product, CommonObjectline to print long label	2020-09-14 00:16:38 +02:00
Laurent Destailleur	d0698735d6	Update product.class.php	2020-09-14 00:14:25 +02:00
Laurent Destailleur	0d9d9498e2	Update commonobjectline.class.php	2020-09-14 00:13:12 +02:00
Laurent Destailleur	a4fb16b4f3	Add a warning to warn about security leak	2020-09-14 00:03:49 +02:00
DEMAREST Maxime (Indelog)	1c523abbd8	Fix: getLabelOfUnit() for Product, CommonObjectline to print long label ... Also add $type = 'code' for return unit code in form 'unitXX' (where XX is the code of unit). for get return like unitXX where XX is the code of unit	2020-09-13 07:44:30 +02:00
Laurent Destailleur	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	709542e27d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-09-12 04:26:00 +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	ae857e7008	Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron ... FIX Cron load lang	2020-09-12 01:32:17 +02:00
Laurent Destailleur	ec13d3811e	Merge pull request #14706 from aspangaro/12.0p9 ... FIX - Accountancy balance Error SQL on entity	2020-09-12 01:17:04 +02:00
Laurent Destailleur	d44952011f	Update balance.php	2020-09-12 01:16:02 +02:00
Laurent Destailleur	0bdd1c0c17	Merge pull request #14701 from ATM-Nicolas/fix_wrong_redirection ... FIX : Wrong redirection	2020-09-12 01:13:46 +02:00
DEMAREST Maxime (Indelog)	e41afeacf4	Fix: short label of unit in Product::getLabelOfUnit	2020-09-11 15:34:11 +02:00
Alexandre SPANGARO	8fc9b78b47	FIX Problems on FEC format	2020-09-11 06:55:03 +02:00
Alexandre SPANGARO	04329c38b3	FIX - Accountancy balance Error SQL on entity	2020-09-11 06:42:22 +02:00
Laurent Destailleur	05a2fc6186	Fix rate for tunisia	2020-09-10 19:40:03 +02:00
Laurent Destailleur	358f8357f9	FIX #14703	2020-09-10 18:25:38 +02:00
Laurent Destailleur	0cccaa7271	FIX look and feel v12	2020-09-10 18:02:49 +02:00
ATM-Nicolas	7944c21fe5	FIX : Wrong redirection	2020-09-10 12:32:12 +02:00
John Botella	59d5391c2a	Add force reload param to load method	2020-09-10 10:41:16 +02:00
Laurent Destailleur	c3ac446cf2	Merge pull request #14674 from ATM-Consulting/12.0_FIX_stock_is_not_rounded_on_product_list ... FIX: round stock value on product list	2020-09-09 14:54:42 +02:00
Laurent Destailleur	5c34b26f39	FIX Look and feel v12: First tab must be name of object	2020-09-09 13:57:35 +02:00
Florian Mortgat	4a60725f6c	FIX: round stock value on product list	2020-09-08 16:42:41 +02:00
John Botella	87d9dfa009	remove useless comm	2020-09-08 16:17:11 +02:00
John Botella	5a0622c906	FIX cron load lang	2020-09-08 16:14:14 +02:00
ATM-Nicolas	6bd6b285fd	FIX : Static property called as non static	2020-09-08 16:03:18 +02:00
lvessiller	23accef5c2	FIX empty value is needed on filter list	2020-09-08 14:53:40 +02:00
lvessiller	86ce4315be	FIX load default linked options for linked sellist extra fields	2020-09-07 15:19:58 +02:00
Laurent Destailleur	e7e05f47ac	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-07 14:26:07 +02:00
Laurent Destailleur	ca6e57b2f7	FIX Filter in "billed" of orders was not saved	2020-09-07 14:25:50 +02:00
lvessiller	5dee3b5b2f	FIX no empty value in required extrafield	2020-09-07 14:24:09 +02:00
Laurent Destailleur	92e231e121	Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty ... FIX: lang fr retained warranty	2020-09-07 12:46:32 +02:00
John Botella	10d3405219	FIX: lang fr retained warranty	2020-09-07 12:21:00 +02:00
Laurent Destailleur	a2db403abe	Fix phpcs	2020-09-04 22:44:31 +02:00
Laurent Destailleur	2e7f588cac	FIX using decimal on stock correction ... Conflicts: htdocs/product/stock/product.php	2020-09-04 19:38:56 +02:00
Laurent Destailleur	2e609d448c	Fix error message	2020-09-04 16:30:34 +02:00
Laurent Destailleur	e21b3f6681	FIX bad route url to delete subproduct with API	2020-09-04 13:23:11 +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	b0a15f958f	Merge pull request #14619 from atm-john/11.0_fix_missing_param_for_hook ... FIX missing param for hook	2020-09-03 12:24:56 +02:00
John Botella	c17bc8b3c8	Fix missing param for hook	2020-09-03 10:45:03 +02:00
Florian Mortgat	134a47a93f	FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename	2020-09-01 15:36:35 +02:00
Laurent Destailleur	ffb3d810de	Complete fix for #14580 for v10 (backport of change of develop)	2020-08-31 16:21:59 +02:00
Laurent Destailleur	4c0e1d20d6	FIX CSS	2020-08-30 05:28:01 +02:00
Laurent Destailleur	f8bd7946a5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-08-29 05:13:20 +02:00
Laurent Destailleur	e4e5ca3934	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-29 05:09:41 +02:00
Laurent Destailleur	84b2929604	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-29 05:09:34 +02:00
Laurent Destailleur	eb0c76f613	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-08-29 05:08:59 +02:00
Laurent Destailleur	723a263cd3	Fix phpcs	2020-08-29 05:07:23 +02:00
FlorianMortgat	c25463a4ba	+ more parentheses around expression for readability	2020-08-28 21:07:11 +02:00
FlorianMortgat	173ad057f9	+ parentheses around expression for readability	2020-08-28 20:46:35 +02:00
Florian Mortgat	215085e0e6	FIX: unit price divided by quantity when accepting supplier price proposal	2020-08-28 15:51:39 +02:00
Florian Mortgat	7ddf85cd33	Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot	2020-08-28 10:05:00 +02:00
Florian Mortgat	a5d1f1f68f	FIX: expenses lines overlapping the frame for total amounts. ... If there is no room for this frame when printing the last expense line, this line should be on a new page.	2020-08-28 10:02:43 +02:00
Laurent Destailleur	ad63434f3e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/prelevement/index.php	2020-08-27 22:00:10 +02:00
Laurent Destailleur	e52d71a880	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-27 21:58:29 +02:00
Laurent Destailleur	00fce1d18a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-27 21:58:23 +02:00
Laurent Destailleur	57951e1285	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-27 21:52:47 +02:00
Laurent Destailleur	c6bdd27d4c	FIX #14530	2020-08-27 21:52:25 +02:00
Laurent Destailleur	e95361fed4	Merge pull request #14536 from ptibogxiv/patch-347 ... Fix for better code	2020-08-27 19:57:34 +02:00
Laurent Destailleur	84a096e234	Merge pull request #14555 from aspangaro/12.0p8 ... Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink	2020-08-27 19:45:55 +02:00
Laurent Destailleur	243f59b9e9	FIX Missing transaction on PO actions	2020-08-26 17:09:45 +02:00
Florian Mortgat	9b3f13458f	FIX: missing entity check	2020-08-26 16:02:31 +02:00
lvessiller	9268955256	FIX set sales representatives on create company card	2020-08-26 09:40:20 +02:00
Alexandre SPANGARO	0adf267f66	Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink	2020-08-25 21:31:04 +02:00
Laurent Destailleur	05d82a0684	FIX Error management. Do no try to approve PO if validation fails.	2020-08-24 17:07:30 +02:00
ptibogxiv	ff621cb146	Update pay.php	2020-08-24 12:27:19 +02:00
ptibogxiv	9da4946955	Fix for better code	2020-08-24 12:26:40 +02:00
Laurent Destailleur	0944e8b156	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-23 19:25:13 +02:00
Laurent Destailleur	8115acbf82	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-23 19:25:05 +02:00
Laurent Destailleur	f819509442	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:22:27 +02:00
Laurent Destailleur	74eac1d06a	Fix include regression	2020-08-23 19:22:01 +02:00
Laurent Destailleur	38d53cc03d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/lib/pdf.lib.php	2020-08-23 19:20:50 +02:00
Laurent Destailleur	49f8a6e733	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:17:12 +02:00
Laurent Destailleur	4fa6d86127	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:17:01 +02:00
Laurent Destailleur	7a183ea026	Update pdf.lib.php	2020-08-23 19:13:30 +02:00
Laurent Destailleur	b44d6744f9	Update pdf.lib.php	2020-08-23 19:11:40 +02:00
Laurent Destailleur	7eb003c684	Update pdf.lib.php	2020-08-23 19:11:19 +02:00
Laurent Destailleur	e32b99fb21	Merge pull request #14515 from ptibogxiv/patch-346 ... Fix Stripe icon in balance list	2020-08-23 18:10:11 +02:00
Laurent Destailleur	6685cc5bc8	Update admin.lang	2020-08-23 18:07:18 +02:00
Laurent Destailleur	9b7691c8d2	Update admin.lang	2020-08-23 18:04:02 +02:00
Alexandre SPANGARO	bf28201685	Fix Missing language key	2020-08-23 07:13:43 +02:00
Alexandre SPANGARO	015e1a8dab	Merge branch '12.0' into 12.0_p7	2020-08-23 07:07:47 +02:00
Laurent Destailleur	b6af947042	Fix phpcs	2020-08-21 13:06:54 +02:00
Alexandre SPANGARO	065ace5301	Fix Missing language key on rights	2020-08-21 05:26:07 +02:00
Alexandre SPANGARO	76315fa6ac	Fix Missing language key on rights	2020-08-21 05:22:31 +02:00
Alexandre SPANGARO	dd87362ce3	Fix Missing language key on rights	2020-08-21 05:20:53 +02:00
Alexandre SPANGARO	646d5cc9c8	Fix Missing language key on rights	2020-08-21 05:19:57 +02:00
Alexandre SPANGARO	881a9b7c04	Fix Missing language key on rights	2020-08-21 05:10:19 +02:00
Alexandre SPANGARO	bd5e35c15f	Fix Missing language key	2020-08-21 05:00:38 +02:00
Alexandre SPANGARO	142ce7c03f	Fix Missing language key	2020-08-21 04:58:21 +02:00
ptibogxiv	eba4d44c81	Fix Stripe icon in balance list	2020-08-20 20:24:00 +02:00
Laurent Destailleur	95c25bc1b7	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-20 12:21:55 +02:00
Laurent Destailleur	fbb162aa9b	Trans	2020-08-20 12:21:40 +02:00
Frédéric FRANCE	b4d2bf98fa	Use of undefined constant state - assumed 'state'	2020-08-20 12:14:40 +02:00
Alexandre SPANGARO	fbd4323dd8	Fix Accountancy - Show label account in page already bind	2020-08-19 06:01:10 +02:00
Laurent Destailleur	3556004f02	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-18 15:35:43 +02:00
Laurent Destailleur	d4a502629e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/admin/stock.php htdocs/core/lib/ajax.lib.php	2020-08-18 15:35:34 +02:00
Laurent Destailleur	d21bda604d	FIX Setup of stock increase/decrease	2020-08-18 15:27:17 +02:00
Juanjo Menent	e685a96716	FIX: Intervention lose html tags when updating	2020-08-18 13:44:50 +02:00
Laurent Destailleur	e3beec3e1f	Fix css	2020-08-17 20:57:44 +02:00
Laurent Destailleur	c63d54631c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/categories/class/categorie.class.php	2020-08-17 19:59:17 +02:00
Laurent Destailleur	5952ae28b8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-17 19:54:32 +02:00
Laurent Destailleur	487d26c7db	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php	2020-08-17 19:54:23 +02:00
Laurent Destailleur	68b6fdb508	Fix missing tags	2020-08-17 19:48:05 +02:00
Laurent Destailleur	0245eb102c	Fix css on fields that are not mandatory	2020-08-17 19:44:06 +02:00
Laurent Destailleur	69d73ac528	FIX Compatibility with modules without document generation ... Conflicts: htdocs/core/actions_addupdatedelete.inc.php	2020-08-17 16:08:38 +02:00
Laurent Destailleur	8bfa6df1a6	FIX Update extrafields on line only if it is supported ... Conflicts: htdocs/modulebuilder/template/class/myobject.class.php	2020-08-17 16:06:36 +02:00
John Botella	6e1702c1a5	Fix infinite fetch object linked loop	2020-08-17 15:00:31 +02:00
Laurent Destailleur	86a31d17a5	Better test	2020-08-17 04:34:53 +02:00
asolslk	5a6f459db5	Update accounting.lib.php	2020-08-17 04:09:12 +02:00
Laurent Destailleur	a76d4daff8	Merge pull request #14444 from fmarcet/11.0 ... FIX: Visualization rights correction on last modified contacts box	2020-08-16 23:37:23 +02:00
Laurent Destailleur	657e6a2037	No warning	2020-08-16 23:14:53 +02:00
Laurent Destailleur	4c0785e996	FIX #14469	2020-08-16 23:13:27 +02:00
Laurent Destailleur	03e8a0737c	Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity ... FIX param entity in html form file	2020-08-16 21:16:28 +02:00
Laurent Destailleur	65ceaac42e	Better message	2020-08-14 12:56:17 +02:00
lvessiller	d5acc85ef0	FIX param entity in html form file	2020-08-14 12:18:28 +02:00
Laurent Destailleur	6851e24c3b	Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0	2020-08-14 12:02:40 +02:00
Laurent Destailleur	fe0b1c5ee4	Fix travis	2020-08-14 11:53:54 +02:00
Laurent Destailleur	52f20a1047	Fix travis	2020-08-14 11:52:21 +02:00
lvessiller	39a422ef94	FIX update margins rates on object line edit	2020-08-14 11:48:53 +02:00
Laurent Destailleur	056a503200	Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 ... Conflicts: htdocs/product/composition/card.php	2020-08-14 11:06:39 +02:00
Laurent Destailleur	2b393d04e1	Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0	2020-08-14 11:03:48 +02:00
Laurent Destailleur	d35c7ed49b	Fix trans	2020-08-14 11:03:12 +02:00
Laurent Destailleur	9e8ed3bf54	Merge pull request #14445 from atm-john/11.0_fix_lang ... Fix lang fr	2020-08-14 03:28:42 +02:00
lvessiller	f385e02c53	FIX title button attribute id empty	2020-08-13 17:43:18 +02:00
stickler-ci	d784c621c9	Fixing style errors.	2020-08-13 15:07:06 +00:00
Adrien Raze	990217fcb0	FIX : task leftmenu	2020-08-13 16:59:27 +02:00
Laurent Destailleur	7ce1d36b59	FIX Category for suplements not saved	2020-08-13 13:51:08 +02:00
Laurent Destailleur	f22398a9d3	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0	2020-08-12 20:26:01 +02:00
Laurent Destailleur	355d62e7db	FIX Update line of BOM	2020-08-12 20:24:44 +02:00
Juanjo Menent	3eb23d3325	FIX: MySql Strict mode	2020-08-11 10:12:19 +02:00
Juanjo Menent	4e6b7289f2	FIX: MySql Strict mode	2020-08-11 10:07:38 +02:00
Juanjo Menent	b1735b0f80	FIX: MySql Strict mode	2020-08-11 10:02:46 +02:00
florian HENRY	c4d8a25c5a	fix external module multidiroutput	2020-08-10 13:40:55 +02:00
John Botella	f014365b65	Fix lang fr	2020-08-10 10:35:50 +02:00
Ferran Marcet	10df9777b5	FIX: Visualization rights correction on last modified contacts box	2020-08-10 09:53:20 +02:00
Laurent Destailleur	6e01ffd5ac	Prepare for 12.0.3	2020-08-08 13:00:57 +02:00
Laurent Destailleur	deabfcf403	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-08 02:34:36 +02:00
Laurent Destailleur	537b58b446	Introduce workaround to allow integrator to suggest list of modules in ... old style by default instead of kanban style #14075	2020-08-08 02:34:22 +02:00
Laurent Destailleur	b5749af5b4	Merge pull request #14379 from fappels/12_fix_search_stock_list ... FIX filter warehouse list on status	2020-08-08 02:25:54 +02:00
Laurent Destailleur	4855b49698	css	2020-08-07 19:44:49 +02:00
Laurent Destailleur	030df58fea	Fix regression in sending emails	2020-08-07 17:11:23 +02:00
Laurent Destailleur	795754273e	Fix regression in sending emails	2020-08-07 17:06:57 +02:00
Laurent Destailleur	bd5c4603e3	Fix regression in sending emails	2020-08-07 17:06:12 +02:00
Laurent Destailleur	e69616110d	Fix permission on page	2020-08-07 16:59:27 +02:00
Laurent Destailleur	0dda5ca4d6	Fix experimental	2020-08-07 16:27:09 +02:00
Laurent Destailleur	00804c1020	Complete fix for #14146	2020-08-07 15:19:26 +02:00
Francis Appels	dec0e418e3	Convert search key status to class key statut. ... Add comment to refactor class statut to class status	2020-08-07 15:11:36 +02:00
Laurent Destailleur	dd773d33fd	Fix phpcs	2020-08-07 14:57:52 +02:00
Laurent Destailleur	ada7b74ba1	Fix phpcs	2020-08-07 14:56:30 +02:00
Laurent Destailleur	5482a3134a	Merge pull request #14355 from fmarcet/10.0 ... Fix: User can see events that are not assigned to it	2020-08-07 14:54:39 +02:00
Laurent Destailleur	7e629d7ef4	FIX Language visible just after login does not match user choice.	2020-08-07 14:39:49 +02:00
Laurent Destailleur	71a6cf1207	Fix permission on type of email templates must depends on user perms. ... Conflicts: htdocs/admin/mails_templates.php	2020-08-07 14:39:30 +02:00
Laurent Destailleur	f132f272f2	Fix missing translation	2020-08-07 14:38:42 +02:00
Francis Appels	4376ca4c94	Revert "Fix filter warehouse list on status" ... This reverts commit 587ca48312.	2020-08-07 14:16:49 +02:00
Laurent Destailleur	47cf447310	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-07 12:10:08 +02:00
Laurent Destailleur	68a3716fd2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/projet/info.php	2020-08-07 12:09:58 +02:00
bahfir abbes	2cdb17a110	fix: fetch reception on supplier order dispatch fetch	2020-08-07 12:08:14 +02:00
Laurent Destailleur	ed6acfa1e7	Better compatibility	2020-08-07 11:45:15 +02:00
Egils Consulting	c52c4229c5	Update api_supplier_invoices.class.php ... fixes #14831	2020-08-07 11:43:04 +02:00
Laurent Destailleur	284378232b	Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam ... FIX : JS CRASH - bad usage of moreparam	2020-08-07 10:10:09 +02:00
jove@bisquerra.com	022fb23cee	FIX: Get some taxes in TakePOS	2020-08-07 10:01:11 +02:00
Laurent Destailleur	16828b8cec	Merge pull request #14403 from FHenry/12.0 ... fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)	2020-08-07 09:58:49 +02:00
Laurent Destailleur	edd19419ad	Add protection to allow only jpg and png as image file	2020-08-06 17:39:36 +02:00
Laurent Destailleur	61e194bb6d	Add protection to allow only jpg and png as image file	2020-08-06 17:37:00 +02:00
Laurent Destailleur	c2b03e49e1	Fix logo not visible in setup page	2020-08-06 17:28:57 +02:00
Laurent Destailleur	c6ee80eefd	FIX Disable svg as supported image by default. Set ... MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.	2020-08-06 17:16:09 +02:00
florian HENRY	46cafcc445	Merge branch '11.0' into 12.0	2020-08-06 16:54:49 +02:00
florian HENRY	3e6ae9bebf	Merge branch '10.0' into 11.0	2020-08-06 16:34:45 +02:00
florian HENRY	53acd8cffd	FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method	2020-08-06 16:28:17 +02:00
quentin	215242a4a1	fix right project info.php	2020-08-06 14:11:26 +02:00
Laurent Destailleur	da59bb811f	Fix backtopage after creating a bookmark	2020-08-06 12:29:57 +02:00
Laurent Destailleur	37f1b27bd2	Fix phpcs	2020-08-06 03:55:47 +02:00
Laurent Destailleur	01babc452c	More logs	2020-08-06 03:52:49 +02:00
Laurent Destailleur	5b0d04609c	Fix number to string	2020-08-06 03:03:18 +02:00
Laurent Destailleur	b40177a8c8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-06 03:00:16 +02:00
Laurent Destailleur	fbcf95ba02	Fix number to string	2020-08-06 02:59:46 +02:00
Laurent Destailleur	641d9a6565	Fix number to string	2020-08-06 02:58:07 +02:00
Laurent Destailleur	ce960c8d0d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-06 02:53:19 +02:00
Laurent Destailleur	0b7aec1fa0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/lib/functionsnumtoword.lib.php	2020-08-06 02:52:54 +02:00
Laurent Destailleur	73ea5b0e2d	Fix function to convert price to string	2020-08-06 02:50:24 +02:00
Laurent Destailleur	12b9a73ca5	Fix phpcs	2020-08-06 02:18:34 +02:00
Laurent Destailleur	4785e84c43	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php	2020-08-06 02:10:17 +02:00
Laurent Destailleur	2fd430bd2c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-06 02:08:44 +02:00
Laurent Destailleur	ef0f7cfa6f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-06 02:08:15 +02:00
Laurent Destailleur	375fe3f3e8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/fourn/paiement/card.php	2020-08-06 02:08:04 +02:00
Laurent Destailleur	9cb5735165	FIX Bad address used for vendor on PDF standard of supplier payment	2020-08-06 02:05:55 +02:00
Laurent Destailleur	c8bff3a71e	FIX Cannot redeclare class	2020-08-06 02:05:04 +02:00
Laurent Destailleur	1cf3422e05	FIX Bad adress of vendor in PDF for PDF of supplier payment ... FIX dol_convertToWord() Bad conversion of number into a string	2020-08-06 01:56:42 +02:00
Laurent Destailleur	24a9a5ac2d	CSS	2020-08-05 19:42:36 +02:00
Laurent Destailleur	fb5b29a32b	FIX Restore the links on late badge	2020-08-05 19:39:38 +02:00
Laurent Destailleur	76624122dd	Fix regression: Restore filter on "alerte"	2020-08-05 16:05:29 +02:00
Laurent Destailleur	0884678264	Look and feel v12	2020-08-05 11:10:38 +02:00
Laurent Destailleur	eefa2bcaba	FIX List of invoice waiting for direct debit	2020-08-04 21:12:28 +02:00
Laurent Destailleur	9d4e672475	FIX Debug direct debit module and credit transfer module ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/compta/prelevement/create.php	2020-08-04 21:12:03 +02:00
Laurent Destailleur	a3f7cbd63d	css	2020-08-04 21:07:56 +02:00
Francis Appels	587ca48312	Fix filter warehouse list on status	2020-08-04 17:25:35 +02:00
stickler-ci	8d88217434	Fixing style errors.	2020-08-04 14:48:15 +00:00
Ferran Marcet	70ad2fcee0	Fix: User can see events that are not assigned to it	2020-08-04 16:45:57 +02:00
Ferran Marcet	7a077a2d99	Fix: User can see events that are not assigned to it	2020-08-04 16:45:04 +02:00
Ferran Marcet	1a62a36b86	Merge remote-tracking branch 'origin/10.0' into 10.0	2020-08-04 16:40:01 +02:00
Ferran Marcet	7b6ef7aca8	Merge branch '10.0up' into 10.0	2020-08-04 16:39:40 +02:00
Laurent Destailleur	5d20f47473	FIX page for confirmation of payments is empty	2020-08-04 15:00:03 +02:00
Laurent Destailleur	e16fd45972	FIX Label of opportunities in graph with special chars badly encoded	2020-08-04 14:44:52 +02:00
John Botella	11f14b8fe5	Fix bad usage of moreparam	2020-08-04 14:13:52 +02:00
Laurent Destailleur	9a5d0ab0a2	FIX #14236	2020-08-04 13:48:11 +02:00
Laurent Destailleur	30560397e4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/class/commondocgenerator.class.php	2020-08-04 13:43:00 +02:00
Laurent Destailleur	241a97fd19	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-04 13:41:26 +02:00
Laurent Destailleur	83a9be2428	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/lib/pdf.lib.php	2020-08-04 13:41:19 +02:00
Laurent Destailleur	39a5583930	FIX #14146	2020-08-04 13:32:26 +02:00
Laurent Destailleur	bd8e8a4087	Merge pull request #14351 from atm-quentin/FIX_product_label_desc_update ... FIX product label and desc were never updated when modifying trans	2020-08-04 13:07:41 +02:00
Laurent Destailleur	f11accf4c2	Merge pull request #14359 from atm-quentin/FIX_missing_conf_on_supplier_order ... FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order	2020-08-04 12:48:39 +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
Laurent Destailleur	08167b959c	Update actions_addupdatedelete.inc.php	2020-08-04 12:21:38 +02:00
Laurent Destailleur	2aaae47aef	Update actions_addupdatedelete.inc.php	2020-08-04 12:21:32 +02:00
bahfir abbes	13202dfc7c	fix:value of checked option must be the same as in showInputfield function	2020-08-04 12:21:25 +02:00
Tim Otte	0e03578e91	Fixed translation of product units in documents	2020-08-04 11:51:40 +02:00
Laurent Destailleur	96581ef1f4	Merge pull request #14370 from fappels/12_fix_search_stock_list ... FIX search warehouse list	2020-08-04 11:49:20 +02:00
Francis Appels	81467e1d09	FIX search warehouse list	2020-08-04 11:05:12 +02:00
Laurent Destailleur	f62717a16a	FIX Debug module direct debit order. Solve conflict with credit transfer	2020-08-03 20:16:33 +02:00
VERDOL Gauthier	2d192431bc	FIX : wrong element var for fetch_name_optionals_label function with expeditions	2020-08-03 14:59:51 +02:00
Laurent Destailleur	b6a3938921	FIX Size of image on the help popup of modules	2020-08-03 14:32:42 +02:00
Laurent Destailleur	8c34acbf55	FIX Warning if no bank account defined	2020-08-03 14:11:15 +02:00
Laurent Destailleur	defbd26f95	Help to fight errors ErrorBadValueForParamNotAString	2020-08-03 12:33:22 +02:00
Laurent Destailleur	c2bb0431f0	FIX input field of extrafields must keep data if form submit fails.	2020-08-03 12:31:30 +02:00
Laurent Destailleur	576363f353	Fix error message	2020-08-03 12:26:26 +02:00
Laurent Destailleur	d59bcd3f5b	FFIX error creating record when extrafields price exists in other entity	2020-08-03 12:08:33 +02:00
quentin	bbfca90260	FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order	2020-08-03 11:54:26 +02:00
Laurent Destailleur	55f3a8b4f8	Fix col size too large by migrating to dynamic format on tables	2020-08-03 11:37:55 +02:00
stickler-ci	9926eac192	Fixing style errors.	2020-08-03 09:26:36 +00:00
Laurent Destailleur	e64b8eaf40	Fix debug credit transfer module	2020-08-03 11:21:13 +02:00
quentin	72b2fb442b	fix test libelle	2020-08-03 11:17:39 +02:00
Ferran Marcet	63b15dd1b6	Fix: User can see events that are not assigned to it	2020-08-03 11:17:30 +02:00
quentin	b026896a98	FIX product label and desc were never updated when modifying trans	2020-08-03 10:33:48 +02:00
Laurent Destailleur	c35a103694	Fix phpcs	2020-08-02 22:40:17 +02:00
Laurent Destailleur	66d4b7372e	FIX Look and feel v12 ... Conflicts: htdocs/comm/card.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2020-08-02 22:38:20 +02:00
Laurent Destailleur	ecfdb4bbac	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-02 16:02:09 +02:00
Laurent Destailleur	5e6254634f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-02 16:01:13 +02:00
Laurent Destailleur	1edfa4a4fb	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/html.form.class.php	2020-08-02 16:01:03 +02:00
Laurent Destailleur	608656ae89	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-02 01:35:15 +02:00
Laurent Destailleur	9aa9852e85	Fix perms	2020-08-02 01:35:03 +02:00
Laurent Destailleur	8c4b4e233d	Merge pull request #14317 from fappels/12_show_virtual_stock ... Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO	2020-08-02 01:32:18 +02:00
Laurent Destailleur	817912ea40	FIX #14291	2020-08-02 01:11:23 +02:00
Laurent Destailleur	328a25abea	FIX Bad back to link	2020-08-02 00:59:53 +02:00
Laurent Destailleur	3bfd7644a4	Fix return link	2020-08-01 20:17:49 +02:00
Laurent Destailleur	0b46fcb4f8	Debug	2020-07-31 14:02:08 +02:00
Laurent Destailleur	0d71cd4279	Fix td not closed	2020-07-31 13:51:49 +02:00
Laurent Destailleur	f80b54e573	Debug setup of receipt printer module	2020-07-31 13:44:55 +02:00
Laurent Destailleur	d4e21538db	FIX Debug setup of receipt printer module	2020-07-31 13:40:36 +02:00
Laurent Destailleur	255dc71823	Missing translation	2020-07-31 13:20:05 +02:00
altairis	448cd1cd36	Merge branch '10.0' into fixsizewithff	2020-07-31 12:23:57 +02:00
altairis	9a9eef428b	fix duration fields size with firefox	2020-07-31 12:22:21 +02:00
Laurent Destailleur	e7fedd5c2d	FIX Sql error on stat by referring entries of a product	2020-07-30 19:14:40 +02:00
Laurent Destailleur	0bf678e09e	Fix label of extrafields	2020-07-30 14:57:33 +02:00
Laurent Destailleur	618c85ceb1	FIX Filter too large for extrafields with type text or html	2020-07-30 14:49:31 +02:00
Laurent Destailleur	8b879ee23b	FIX Edit extrafield of type long text loose carriage returns	2020-07-30 14:49:00 +02:00
Francis Appels	54410189bc	Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO ... When product ajax search used a dash is show, so virtual stock looks like being negative value.	2020-07-29 17:00:39 +02:00
Laurent Destailleur	d08b3513dc	Merge pull request #14247 from FHenry/11.0_fix_commerce_MenuSupplierORderOnly ... fix display Commerce top menu user only supplier order rights and MAIN_MENU_HIDE_UNAUTHORIZED=1	2020-07-29 14:27:14 +02:00
Laurent Destailleur	6a5427ee4f	Merge pull request #14274 from atm-quentin/FIX_null_required ... FIX null required	2020-07-29 14:13:53 +02:00
Laurent Destailleur	3d79950c27	Update commonobject.class.php	2020-07-29 14:13:29 +02:00
Laurent Destailleur	2c12a761ee	Merge pull request #14283 from atm-john/11.0_fix_mysql_update ... Fix MySQL rank usage for column	2020-07-29 13:56:20 +02:00
Laurent Destailleur	8045cff888	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/expedition/class/expedition.class.php	2020-07-29 13:53:09 +02:00
Laurent Destailleur	930ae84dac	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contact/list.php htdocs/core/lib/pdf.lib.php	2020-07-29 13:50:31 +02:00
Laurent Destailleur	ab4b1b1f29	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-29 13:48:18 +02:00
Laurent Destailleur	4a291f181f	Fix regression	2020-07-29 13:47:04 +02:00
Laurent Destailleur	c93a4c7fc0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-29 13:40:27 +02:00
Laurent Destailleur	566f683c54	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-29 13:40:19 +02:00
Romain DESCHAMPS	eaef99b7af	second approval back in stable feature as is the setting for minimum amount	2020-07-29 13:39:38 +02:00
Laurent Destailleur	f2390e85b9	Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags ... NEW: additional html tags allowed by dol_string_onlythesehtmltags()	2020-07-29 13:34:45 +02:00
Laurent Destailleur	377e331e6a	Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset ... FIX 11.0: DebugBar hides content at page bottom	2020-07-29 13:10:56 +02:00
AXeL	3c6eb5e0e2	Add missing "Default values" menu entry to auguria menu	2020-07-29 13:02:11 +02:00
Laurent Destailleur	d9191c74d8	Update fournisseur.commande.class.php	2020-07-29 12:59:59 +02:00
Laurent Destailleur	cb8c8a1d50	Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create ... FIX: shipping creation: checks not done on weight and sizes	2020-07-29 12:59:23 +02:00
Laurent Destailleur	d2e730f8e5	Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by ... FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total	2020-07-29 12:58:28 +02:00
Tim Otte	85c5f423b1	Added fetch_thirdparty (without the site crashes)	2020-07-29 12:55:58 +02:00
Laurent Destailleur	391fcc799b	FIX #14279	2020-07-29 12:51:18 +02:00
Laurent Destailleur	44cfb77622	FIX #14292	2020-07-29 12:43:53 +02:00
Laurent Destailleur	41483df689	FIX #14076	2020-07-29 12:31:03 +02:00
lvessiller	8ee5b16e89	FIX redirect on contact card from main search	2020-07-29 12:00:22 +02:00
VERDOL Gauthier	d214dbb5fd	FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total	2020-07-28 15:42:54 +02:00
atm-lena	b480fb2dfc	Delete double line	2020-07-28 15:32:58 +02:00
atm-lena	9f0c3b0db1	fetch() command fourn : Same management as commande.class.php of entity	2020-07-28 15:13:56 +02:00
Laurent Destailleur	45eca85bae	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/admin/tools/dolibarr_export.php	2020-07-28 10:29:14 +02:00
Laurent Destailleur	d46d34915e	FIX Checkbox "drop table" was not checked when using php method for dump	2020-07-28 10:23:09 +02:00
Laurent Destailleur	4e4f0a4575	Use same case for all sql files	2020-07-28 09:44:48 +02:00
Laurent Destailleur	98064f7329	FIX Bad param	2020-07-28 03:02:38 +02:00
Marc DLL	ee55b82a8d	FIX: shipping creation: checks not done on weight and sizes	2020-07-27 23:27:44 +02:00
Laurent Destailleur	8c06e3577d	Fix several trouble with diret debit module and credit transfer module	2020-07-27 19:33:24 +02:00
VERDOL Gauthier	25994e61bc	FIX : We need to see unit line on PDF even though it's an option	2020-07-27 16:04:21 +02:00
Laurent Destailleur	6d8060bc50	FIX DO not erase variable $key and $label during output of extrafields ... Conflicts: htdocs/core/tpl/extrafields_view.tpl.php	2020-07-27 14:22:55 +02:00
Laurent Destailleur	19b550009b	Trans	2020-07-27 02:38:31 +02:00
Laurent Destailleur	9798bb1b30	Fix responsive	2020-07-27 02:29:16 +02:00
Laurent Destailleur	0011e09248	FIX Setup of clicktodial hang on smartphone	2020-07-27 02:29:11 +02:00
Laurent Destailleur	26c253113b	Removed not used files	2020-07-26 22:04:19 +02:00
Laurent Destailleur	714481f7e5	FIX Navigation in object fails to find the next ref in some cases	2020-07-26 21:08:31 +02:00
Laurent Destailleur	d945ef67e1	FIX Picto of HRM module ... Conflicts: htdocs/core/lib/functions.lib.php	2020-07-26 20:53:22 +02:00
Laurent Destailleur	353e99c26a	Fix look and feel	2020-07-26 19:43:55 +02:00
Laurent Destailleur	cdf7261c7e	Fix look and feel	2020-07-26 19:27:29 +02:00
Laurent Destailleur	378c45fe5c	Fix look and feel	2020-07-26 19:21:47 +02:00
FlorianMortgat	93348630bf	FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet	2020-07-25 11:05:05 +02:00
Laurent Destailleur	dd86c21382	FIX dolGetElementUrl and agenda page for external modules	2020-07-25 03:01:04 +02:00
Laurent Destailleur	573feed66f	FIX locataxes lost on lines when cloning a vendor invoice	2020-07-25 02:59:49 +02:00
FlorianMortgat	c48a294a2b	FIX: allow more harmless html tags	2020-07-25 00:57:40 +02:00
Laurent Destailleur	e3126ec999	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/tpl/card_presend.tpl.php htdocs/multicurrency/class/multicurrency.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-07-25 00:22:47 +02:00
Laurent Destailleur	1bd00ac775	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-25 00:17:36 +02:00
Laurent Destailleur	960416f9bf	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/card.php	2020-07-25 00:17:28 +02:00
Laurent Destailleur	b82b6736d1	Look and feel	2020-07-24 18:13:01 +02:00
Laurent Destailleur	6d4b113c72	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-24 14:25:59 +02:00
Laurent Destailleur	d6f1a897f6	Fix size of module box	2020-07-24 13:44:32 +02:00
Laurent Destailleur	f68be08c67	Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve ... Improve printStdColumnContent by passing the $pdf object	2020-07-24 13:20:03 +02:00
Laurent Destailleur	a6e728a4d8	Merge pull request #14246 from fappels/11_fix_date_fourn_price_log ... FIX: date in supplier price log tooltip.	2020-07-24 13:18:36 +02:00
Laurent Destailleur	4e4e737ff2	Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link ... FIX : wrong link to third invoice templates	2020-07-24 13:13:15 +02:00
Laurent Destailleur	fb1c226e56	Init var	2020-07-24 13:05:19 +02:00
Laurent Destailleur	ff4ec934e9	Merge pull request #14277 from atm-quentin/fix_warning_total ... FIX warning	2020-07-24 12:55:24 +02:00
Laurent Destailleur	943e7c988f	Update extrafields_list_print_fields.tpl.php	2020-07-24 12:55:12 +02:00
Laurent Destailleur	c699d71abc	Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied ... Fix multicurecy option not applied	2020-07-24 12:54:27 +02:00
stickler-ci	8273dbcd49	Fixing style errors.	2020-07-24 08:39:09 +00:00
Frans Bosman	94498b191b	Update card_presend.tpl.php	2020-07-24 10:37:19 +02:00
Laurent Destailleur	e0d22b739d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/product/stock/class/entrepot.class.php	2020-07-24 01:53:24 +02:00
Laurent Destailleur	db9fc264d9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-24 01:51:20 +02:00
Laurent Destailleur	34a9eee7a6	Minor fix in translation	2020-07-24 01:50:57 +02:00
Laurent Destailleur	0f4e00a2a3	Fix language	2020-07-24 01:43:03 +02:00
Laurent Destailleur	99935ce11f	FIX Should not be able to edit qty on shipment when no stock available	2020-07-24 01:31:07 +02:00
Laurent Destailleur	431b207dab	Fix to solve sql error on some databases	2020-07-24 01:02:07 +02:00
Laurent Destailleur	0890b15077	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-24 00:06:30 +02:00
Laurent Destailleur	c6c1830e70	FIX ClickToDial tab of users has disappeared	2020-07-24 00:06:18 +02:00
Laurent Destailleur	e5a16c530d	FIX Can go on page even when module disabled	2020-07-23 23:57:12 +02:00
ATM john	921e904acc	Fix MySQL rank usage for column	2020-07-23 20:34:11 +02:00
John Botella	55e65bbabf	Fix variable init	2020-07-23 11:12:04 +02:00
John Botella	fc1de5b4f3	Fix multicurecy option not applied	2020-07-23 11:10:18 +02:00
quentin	7bc683b234	FIX warning	2020-07-22 15:13:50 +02:00
quentin	255bd6b26c	FIX null required	2020-07-22 11:54:52 +02:00
Frans Bosman	e2592d9049	Update card_presend.tpl.php ... Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations	2020-07-22 11:44:26 +02:00
VERDOL Gauthier	55298317e3	FIX : wrong link to third invoice templates	2020-07-20 16:22:48 +02:00
florian HENRY	734a6de996	Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly	2020-07-20 09:01:30 +02:00
florian HENRY	2c5e96bb28	better fix	2020-07-20 09:01:21 +02:00
Laurent Dinclaux	3cdabbaaff	Explicitly pass the pdf object by reference in the printStdColumnContent hook call.	2020-07-19 21:53:06 +11:00
Francis Appels	c2030a7db5	jdate already in function listProductFournisseurPriceLog ... So no conversion needed.	2020-07-19 09:43:15 +02:00
Laurent Destailleur	d598039f20	Merge pull request #14218 from Ahuahuachi/12.0 ... Update Mexico City name	2020-07-19 02:01:12 +02:00
Laurent Destailleur	521c4679d9	FIX #14241 Mysql 8 compatibility	2020-07-19 01:52:30 +02:00
Laurent Destailleur	f26a64fb88	FIX If using a rounding step, localtax1+2 not included in total	2020-07-19 01:47:17 +02:00
Laurent Destailleur	48adeb9dd7	FIX #14256	2020-07-19 01:38:38 +02:00
Laurent Destailleur	6fdd5ea73a	Not required	2020-07-19 01:31:51 +02:00
Laurent Destailleur	ee74740384	FIX #14259	2020-07-19 01:29:42 +02:00
Laurent Destailleur	16d486e211	FIX Setup of currency limit and accuracy	2020-07-19 01:03:37 +02:00
Laurent Destailleur	32410b59c4	Code comment	2020-07-19 00:02:02 +02:00
Laurent Destailleur	3069eaa5c0	Merge pull request #14191 from Gecka-Apps/12.0-fix-14181 ... [REGRESSION] Fix #14181. Limits and accuracy form not saving modified values.	2020-07-18 23:59:29 +02:00
Laurent Destailleur	c30491284f	Fix phpcs	2020-07-18 23:16:05 +02:00
Abdessalam@MEGALOGI	1e6273b92d	Update card.php ... La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.	2020-07-18 23:11:17 +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	15cdb3ed79	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0	2020-07-18 23:00:09 +02:00
Laurent Destailleur	ac92a9fa40	Doc more complete	2020-07-18 22:59:47 +02:00
Laurent Destailleur	a252c87c82	Fix comment	2020-07-18 19:41:11 +02:00
Laurent Destailleur	384cb22d3a	Merge pull request #14220 from FHenry/11.0 ... fix missing entity into fetch wharehouse	2020-07-18 19:32:24 +02:00
Laurent Destailleur	cbc8187616	Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering ... Fix extrafields ordering on PDFs	2020-07-18 19:30:34 +02:00
Laurent Destailleur	eef66ae6ed	Fix var not defined	2020-07-18 19:22:03 +02:00
Laurent Destailleur	bb4543167f	FIX #14222	2020-07-18 19:19:12 +02:00
Laurent Destailleur	ecfcbeef26	Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject ... fix extrafields linnktoObject Thirdpary option showAdress	2020-07-18 19:13:52 +02:00
Laurent Destailleur	f07a1a6d1e	FIX for #14253	2020-07-18 18:54:55 +02:00
Laurent Destailleur	6ad8145645	FIX for #14253	2020-07-18 18:52:33 +02:00
florian HENRY	d2e528d8c1	fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1	2020-07-15 17:45:45 +02:00
florian HENRY	3148a181e7	fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1	2020-07-15 17:45:34 +02:00
Francis Appels	1bc1fd4cb4	Fix date in supplier price log tooltip.	2020-07-15 11:24:11 +02:00
florian HENRY	f4074428f8	fix filter wharehouse list on ref	2020-07-14 09:38:52 +02:00
florian HENRY	72e0250117	fix extrafields linnktoObject Thirdpary option showAdress	2020-07-13 17:53:00 +02:00
florian HENRY	1173059e7b	fix extrafields linnktoObject Thirdpary option showAdress	2020-07-13 17:52:41 +02:00
florian HENRY	96d26be1d4	fix extrafields linnktoObject Thirdpary option showAdress	2020-07-13 17:51:58 +02:00
florian HENRY	045fbad616	fix extrafields linnktoObject Thirdpary option showAdress	2020-07-13 17:48:21 +02:00
florian HENRY	32e4635e84	fix missing entity into fetch wharehouse	2020-07-12 21:34:13 +02:00
florian HENRY	7b5072a21b	fix missing entity	2020-07-12 10:10:46 +02:00
florian HENRY	2f8968478d	fix missing entity into fetch wahrehouse	2020-07-12 10:06:04 +02:00
Alfredo Altamirano	6aae68bb07	Change Mexico City name ... Mexico City official name and code changed since 2016	2020-07-11 10:49:05 -05:00
Laurent Destailleur	eede2f9944	Add telangana province for india	2020-07-11 10:39:12 +02:00
Laurent Destailleur	c3375b176d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2020-07-10 05:21:01 +02:00
Laurent Destailleur	ff5a2d459d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-10 05:20:09 +02:00
Laurent Destailleur	071b909d38	FIX Fails to retraive accounting code of social contribution sometimes ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2020-07-10 05:19:21 +02:00
Laurent Destailleur	79a6246666	FIX Fails to retraive accounting code of social contribution sometimes ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2020-07-10 05:18:46 +02:00
Laurent Destailleur	86744a2e0c	FIX Fails to retraive accounting code of social contribution sometimes	2020-07-10 05:14:54 +02:00
Laurent Destailleur	a36c6a8dda	FIX #14209	2020-07-10 02:46:59 +02:00
Laurent Destailleur	2cc7e88f8e	clean code	2020-07-10 02:32:22 +02:00
Laurent Destailleur	7fdccf4eb8	Fix error in stripe payment if no country defined	2020-07-10 02:28:00 +02:00
Laurent Destailleur	e8dd99a9cd	Trans	2020-07-10 01:11:37 +02:00
Laurent Destailleur	d18188d565	Fix missing trans	2020-07-10 00:57:29 +02:00
Laurent Destailleur	fd95551940	Fix upload of file in import module ... Conflicts: htdocs/core/lib/security.lib.php	2020-07-09 21:52:27 +02:00
gauthier	25509e74d3	FIX : order by amount ht uses wrong column	2020-07-09 17:27:14 +02:00
Laurent Destailleur	cb7f78e9d3	Fix tpl	2020-07-09 16:25:51 +02:00
Laurent Destailleur	6b5f46624c	Fix label of AWP	2020-07-09 16:19:40 +02:00
Laurent Destailleur	b8721e0c64	FIX Change position of line in BOM	2020-07-09 16:00:15 +02:00
Laurent Dinclaux	6ed2ae188e	Fix extrafields ordering on PDFs	2020-07-10 00:51:41 +11:00
Laurent Destailleur	f756864670	CSS	2020-07-09 12:44:31 +02:00
Laurent Destailleur	49faaf750f	Trans	2020-07-09 12:39:43 +02:00
Laurent Destailleur	ce1649233d	FIX CSS	2020-07-09 12:39:00 +02:00
Laurent Destailleur	8589e122c6	css	2020-07-09 11:58:44 +02:00
Laurent Destailleur	56c90c289a	Prepare 12.0.2	2020-07-08 18:19:20 +02:00
Laurent Destailleur	1dfd2d565b	FIX Reposition and nav	2020-07-08 18:18:47 +02:00
Laurent Destailleur	edb4aac8d3	CSS	2020-07-08 18:09:35 +02:00
Laurent Dinclaux	37401df106	Improve printStdColumnContent by passing the $pdf object. ... It isn't possible to replace the pdf edition done by this method without the $pdf object.	2020-07-08 14:48:34 +11:00
Laurent Dinclaux	f2adc3de4f	Fix Dolibarr/dolibarr#14181. Limits and accuracy form not saving modified values	2020-07-07 18:03:11 +11:00
Laurent Destailleur	67c164df07	FIX reposition was broken if url end with #anchor	2020-07-06 22:27:19 +02:00
Laurent Destailleur	415398fc66	Better contrast	2020-07-06 21:06:32 +02:00
Laurent Destailleur	e13d3ce657	Trans	2020-07-06 20:57:47 +02:00
Laurent Destailleur	f72a836231	Fix look and feel v12	2020-07-06 16:59:25 +02:00
Laurent Destailleur	4dcc073b3a	Fix param GETPOST	2020-07-06 16:54:30 +02:00
Laurent Destailleur	3939a640e9	Fix note in creation	2020-07-06 16:52:28 +02:00
Laurent Destailleur	61a7f54877	Fix look and field	2020-07-06 15:55:41 +02:00
Laurent Destailleur	7d7ef1e72a	FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY ... Fix setup of product	2020-07-06 15:34:26 +02:00
Laurent Destailleur	471f3e66e6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-06 12:27:43 +02:00
Laurent Destailleur	6a41d5bba8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/compta/resultat/index.php htdocs/projet/tasks/list.php	2020-07-06 12:27:25 +02:00
Laurent Destailleur	21bec139ca	Merge pull request #14183 from FHenry/12.0 ... remove warning when date end contract line empty	2020-07-06 12:06:42 +02:00
Laurent Destailleur	b4cd670b09	Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc ... FIX : soc filter doesn't work on task list	2020-07-06 12:05:40 +02:00
Laurent Destailleur	091fbb2824	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-06 11:55:06 +02:00
Laurent Destailleur	9b1163cfb8	Fix menu organisation.	2020-07-06 11:52:28 +02:00
Laurent Destailleur	1e9ae1bc02	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/compta/resultat/index.php htdocs/fourn/class/fournisseur.commande.class.php	2020-07-06 11:32:04 +02:00
Laurent Destailleur	2629a98851	Fix regression	2020-07-06 11:31:05 +02:00
Laurent Destailleur	1399ac9b41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-06 11:28:17 +02:00
Laurent Destailleur	053a1a2230	Fix duplicate code	2020-07-06 11:22:30 +02:00
Laurent Destailleur	056aa81ed3	Fix responsive	2020-07-06 10:59:23 +02:00
gauthier	466b7e84ef	FIX : soc filter doesn't work on task list	2020-07-06 09:58:44 +02:00
Laurent Destailleur	b76828df9f	Fix use of newtoken()	2020-07-06 09:39:26 +02:00
Laurent Destailleur	9cd8c3738f	Fix trans	2020-07-05 23:18:19 +02:00
Laurent Destailleur	8df431f525	Look and feel v12	2020-07-05 13:30:56 +02:00
Laurent Destailleur	54a77a604c	FIX Missing token	2020-07-05 12:55:08 +02:00
Laurent Destailleur	d18ce3b39e	Look and feel v12 ... Conflicts: htdocs/langs/en_US/cashdesk.lang	2020-07-05 12:54:42 +02:00
Laurent Destailleur	9057559ab5	Trans	2020-07-05 12:47:32 +02:00
Laurent Destailleur	b726e96f4b	FIX Update form erased extrafields that were hidden	2020-07-04 17:09:20 +02:00
florian HENRY	03ae31eced	remove warning when date end contract line empty	2020-07-04 16:37:50 +02:00
florian HENRY	335a767f22	remove warning when date end contract line empty	2020-07-04 16:37:11 +02:00
Laurent Destailleur	1c19c97cf2	FIX missing setup of extrafields for MO ... FIX all extrafields cleared after update of one of them FIX Update of extrafields date FIX Update of extrafiels on draft object FIX Sql type Fix trans on BOM	2020-07-04 16:14:53 +02:00
Laurent Destailleur	9912ffd555	Fix position of button	2020-07-04 13:45:28 +02:00
Laurent Destailleur	4819e58d06	Fix trans	2020-07-04 13:04:53 +02:00
Laurent Destailleur	dd9cb8e781	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-03 19:27:42 +02:00
Laurent Destailleur	e256ce5c4b	Debug credit transfer module	2020-07-03 19:27:23 +02:00
Laurent Destailleur	636f1e642d	Fix param of product id to switch to list of order	2020-07-03 01:31:48 +02:00
Laurent Destailleur	4fba3ec872	Merge pull request #14115 from atm-florian/10.0 ... fix entity on supplier order	2020-07-03 00:50:51 +02:00
Laurent Destailleur	03aa4873d1	Merge pull request #14141 from fappels/12_fix_extrafield_html ... FIX html lost on html extrafield	2020-07-03 00:49:31 +02:00
Laurent Destailleur	b88e159495	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php	2020-07-03 00:46:18 +02:00
Laurent Destailleur	ec98ffb492	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-03 00:41:40 +02:00
Laurent Destailleur	59049cd047	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-03 00:41:32 +02:00
Laurent Destailleur	8d8695ccd7	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-03 00:41:06 +02:00
Laurent Destailleur	53c5ec51b8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-07-03 00:40:59 +02:00
oscim	ca66eac76c	Update project.class.php ... Fix order of delete extra prev table of project	2020-07-03 00:40:15 +02:00
Laurent Destailleur	18fa4c4105	Update card.php	2020-07-03 00:38:31 +02:00
Laurent Destailleur	fd617658ef	Fix syntax	2020-07-03 00:36:56 +02:00
Je2fb	b45bfd258d	fix #14143	2020-07-03 00:34:50 +02:00
Tim Otte	bce0a93227	Hotfix for an error in v12	2020-07-03 00:33:54 +02:00
Laurent Destailleur	836ccfd595	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-07-03 00:32:25 +02:00
Laurent Destailleur	9c504c1b3d	Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields ... FIX change selected fields on company card	2020-07-03 00:30:34 +02:00
Laurent Destailleur	0ea55209ae	Merge pull request #14165 from ptibogxiv/patch-345 ... FIX non numeric value on comm/card.php	2020-07-03 00:24:32 +02:00
ksar	0a13e03792	FIX : Correct ModuleBuilder left menu	2020-07-03 00:21:39 +02:00
Laurent Destailleur	d24c6f7a81	Merge pull request #14164 from ptibogxiv/patch-344 ... FIX takepos 12 hook	2020-07-03 00:20:28 +02:00
Laurent Destailleur	75409e3ed0	Merge pull request #14171 from hregis/12.0_bug ... FIX missing possibility to change entity when propal cloning	2020-07-03 00:18:35 +02:00
Laurent Destailleur	6c01cc16f8	Update commande.class.php	2020-07-03 00:14:22 +02:00
Laurent Destailleur	16b327f106	Debug module credit transfer	2020-07-02 15:45:11 +02:00
quentin	642e75c3dd	FIX wrong origin	2020-07-02 14:16:31 +02:00
Regis Houssin	a5431a40da	FIX missing possibility to change entity when propal cloning	2020-07-02 10:16:20 +02:00
Laurent Destailleur	ae0c738980	FIX Entry from stripe intent were reported into SEPA payments ... FIX Label of popup on thirdparty FIX Missing the tooltip when creating bank account	2020-07-01 19:42:28 +02:00
Laurent Destailleur	d3c23428d5	FIX Use of office365 TLS with SMTPs method. ... Conflicts: htdocs/core/class/smtps.class.php	2020-07-01 17:11:13 +02:00
Laurent Destailleur	324c8e9b54	FIX Use of office365 TLS with SMTPs method. ... Conflicts: htdocs/core/class/smtps.class.php	2020-07-01 17:10:33 +02:00
Laurent Destailleur	92a36dbeee	FIX Use of office365 TLS with SMTPs method.	2020-07-01 17:01:46 +02:00
ptibogxiv	cc132775f3	FIX non numeric value on comm/car.php	2020-07-01 16:18:19 +02:00
stickler-ci	92f4744d11	Fixing style errors.	2020-07-01 13:22:43 +00:00
ptibogxiv	5e259d26ab	FIX takepos hook ... can add more than 1 button within 1 module	2020-07-01 15:20:42 +02:00
Laurent Destailleur	e2a9743dd4	Debug module credit transfer	2020-07-01 14:19:47 +02:00
Laurent Destailleur	5f2486049e	Fix trans	2020-07-01 13:22:15 +02:00
Laurent Destailleur	5f37f54675	Fix warning	2020-07-01 13:16:06 +02:00
lvessiller	918e669c98	FIX change selected fields on company card	2020-06-30 16:33:18 +02:00
Laurent Destailleur	5afd518718	Update vat rate for Congo	2020-06-30 13:06:44 +02:00
Laurent Destailleur	4f1ac84a19	Fix can't find link to edit table plan	2020-06-30 12:07:24 +02:00
gauthier	6553c40bea	FIX : create a deposit with amount using comma didn't work	2020-06-30 11:23:55 +02:00
Laurent Destailleur	9bb0ef04f5	Fix upload of file in import module	2020-06-29 18:07:51 +02:00
Laurent Destailleur	f34a3785f0	FIX CSS	2020-06-29 16:02:50 +02:00
Laurent Destailleur	3d8d55a531	Fix bad path in import section	2020-06-29 14:42:09 +02:00
Laurent Destailleur	b64fc7dc3f	FIX Avoid warning when creating a module with already existing files	2020-06-29 14:37:36 +02:00
Laurent Destailleur	5b3670f300	FIX SQL syntax error when editing extrafields ... Conflicts: htdocs/core/lib/security.lib.php	2020-06-29 14:28:53 +02:00
Laurent Destailleur	8bb11039dc	Clean code	2020-06-29 09:56:04 +02:00
Laurent Destailleur	7c4e737668	Clean code	2020-06-29 09:53:55 +02:00
Laurent Destailleur	68b4866438	Trans	2020-06-29 09:43:39 +02:00
Laurent Destailleur	eb30f6ed1a	Prepare 12.0.1	2020-06-29 09:15:49 +02:00
Francis Appels	5d65b5f660	fix html should not do price2num	2020-06-29 09:07:54 +02:00
Laurent Destailleur	600a24346a	Some people are missing this table	2020-06-28 22:09:17 +02:00
Laurent Destailleur	a5893db106	FIX upload documents into manual ECM was reported a permission error	2020-06-28 22:05:55 +02:00
Laurent Destailleur	70efaa4235	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-06-28 21:48:02 +02:00
Laurent Destailleur	95729e2375	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: ChangeLog htdocs/filefunc.inc.php	2020-06-28 21:47:43 +02:00
Laurent Destailleur	8dee17446d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/core/lib/company.lib.php	2020-06-28 21:46:08 +02:00
Laurent Destailleur	960512acd9	Update fournisseur.commande.class.php ... Action with filter on rowid does not need to have test on entity	2020-06-28 21:21:35 +02:00
Laurent Destailleur	1194c61857	Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2 ... FIX 10.0 - fatal with postgreSQL	2020-06-28 21:20:20 +02:00
Laurent Destailleur	dfb7c3e194	Update fournisseur.commande.class.php	2020-06-28 21:14:49 +02:00
Laurent Destailleur	cf899364f3	Merge pull request #14116 from aspangaro/12p1 ... FIX: SQL Problem in customer invoice list	2020-06-28 21:13:17 +02:00
Laurent Destailleur	d98c54c445	Merge pull request #14132 from aspangaro/12p2 ... FIX: SQL Problem in supplier invoice list	2020-06-28 21:11:56 +02:00
Laurent Destailleur	08b3cc5033	Merge pull request #14133 from aspangaro/12p3 ... FIX: SQL Problem in social contribution list	2020-06-28 21:11:35 +02:00
Laurent Destailleur	a11f7d1070	Update list.php	2020-06-28 21:11:25 +02:00