64023 Commits

Author	SHA1	Message	Date
Laurent Destailleur	17a61b3232	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-02 19:34:49 +02:00
Laurent Destailleur	26fbd6e2ec	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-04-02 19:34:16 +02:00
Laurent Destailleur	cb1489e2fa	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-04-02 19:34:10 +02:00
Laurent Destailleur	9b77cc4db8	Translation of currency	2019-04-02 19:33:14 +02:00
Laurent Destailleur	24fef25fd8	Update list.php	2019-03-31 19:07:25 +02:00
Laurent Destailleur	b3f81d2c1a	Update list.php	2019-03-31 19:06:44 +02:00
Laurent Destailleur	48ce60dd17	Update list.php	2019-03-31 19:04:28 +02:00
Laurent Destailleur	2f51221660	Merge pull request #10933 from atm-greg/Add_final_hooks_on_replenish ... Add all missing hooks on replenish	2019-03-31 18:50:34 +02:00
Laurent Destailleur	143cbba09b	Update card.php	2019-03-31 18:49:38 +02:00
Alexandre SPANGARO	5588fe5b81	FIX: Don't show journal:getNomUrl without data ... ErrorBadValueForParamNotAString	2019-03-30 09:42:13 +01:00
Lionel VESSILLER	59c41105a2	Fix project and contract fields in fichinter list	2019-03-29 17:03:23 +01:00
atm-greg	957fae1081	missing params	2019-03-28 11:07:27 +01:00
atm-greg	11343e986c	add all missing hooks on replenish	2019-03-28 10:47:32 +01:00
atm-greg	83d7750274	FIX missing hook completeTabsHead in margins module	2019-03-27 09:33:51 +01:00
Laurent Destailleur	aad3867b9b	Fix translation	2019-03-26 14:00:01 +01:00
Laurent Destailleur	29fe65ed75	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-26 12:37:21 +01:00
Laurent Destailleur	e5f54bd14c	FIX Remane of project	2019-03-26 12:35:44 +01:00
Laurent Destailleur	1787b31932	FIX setup of module export	2019-03-26 12:18:28 +01:00
Laurent Destailleur	524f171168	FIX old export models was not visible	2019-03-26 12:12:16 +01:00
Laurent Destailleur	2034ac61ef	Fix phpcs	2019-03-24 15:05:02 +01:00
Laurent Destailleur	b54b687464	FIX bad check on type of expense report (mandatory status not working)	2019-03-24 11:05:07 +01:00
Laurent Destailleur	79ed4bc80b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/actions_massactions.inc.php	2019-03-23 22:36:04 +01:00
Laurent Destailleur	3ede626932	FIX If we build one invoice for several orders, we must put the ref of ... order on the line to not lose information. Conflicts: htdocs/commande/list.php htdocs/core/actions_massactions.inc.php	2019-03-23 22:34:10 +01:00
Laurent Destailleur	5666fbedac	FIX If we build one invoice for several orders, we must put the ref of ... order on the line to not lose information.	2019-03-23 22:30:52 +01:00
Laurent Destailleur	37cc5b7d35	Merge pull request #10901 from fmarcet/8.0 ... FIX: The minimum amount filter does not work in VAT report by customer	2019-03-22 12:27:30 +01:00
Laurent Destailleur	52d3e89276	FIX function not found	2019-03-22 12:21:31 +01:00
Ferran Marcet	f37c1b9287	FIX: The minimum amount filter does not work in the VAT report per customer	2019-03-22 09:28:50 +01:00
Laurent Destailleur	75b94d373f	Merge pull request #10897 from frederic34/patch-4 ... Update extrafields.class.php	2019-03-21 18:27:04 +01:00
Laurent Destailleur	55d64d441f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-21 18:26:02 +01:00
Laurent Destailleur	1075ef8cf2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-21 18:25:43 +01:00
Mathieu Pellegrin	e0d89101df	#9480 Password link broken if login contains space	2019-03-21 18:25:00 +01:00
Laurent Destailleur	f7f20df323	Merge pull request #10891 from atm-greg/Add_hook_on_replenish ... Add hook on replenish	2019-03-21 18:23:06 +01:00
Laurent Destailleur	2995f9c49d	Merge pull request #10890 from frederic34/patch-2 ... phpcs fix v9	2019-03-21 18:22:36 +01:00
Frédéric FRANCE	d10b94e72b	Update extrafields.class.php	2019-03-21 14:08:49 +01:00
Laurent Destailleur	a1fe1bb58c	FIX when 2 extra fields are mandatory in 2 different entities	2019-03-21 12:33:39 +01:00
Laurent Destailleur	a7fdd34973	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-21 12:17:50 +01:00
Laurent Destailleur	032aa869e4	FIX Can't insert if there is extrafields mandatory on another entity. ... FIX Can't set default value of extrafield of type varchar	2019-03-21 12:14:15 +01:00
Laurent Destailleur	4c85068a85	FIX Can't insert if there is extrafields mandatory on another entity.	2019-03-21 11:53:04 +01:00
Frédéric FRANCE	89e8889c5c	phpcs fix v9	2019-03-19 16:33:34 +01:00
Laurent Destailleur	3c1d7bfbf0	FIX counter of permissions in badge was wrong	2019-03-19 16:30:40 +01:00
Laurent Destailleur	e4e085e332	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-19 13:10:24 +01:00
Laurent Destailleur	dbe15d3685	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-19 13:10:17 +01:00
Laurent Destailleur	b11403103b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:48 +01:00
Laurent Destailleur	8664594fc8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:39 +01:00
Laurent Destailleur	a61ee00a7a	Merge pull request #10877 from ATM-Nicolas/9.0 ... FIX : Duplicate executeHook function	2019-03-19 12:04:46 +01:00
Laurent Destailleur	41c737a213	Fix, Oops, test was inverted	2019-03-18 20:16:19 +01:00
Laurent Destailleur	aa013ff753	Fix do we really must copy notes when creating an object from another ... source object? Add a hack with hidden option to be able to change this.	2019-03-18 20:09:09 +01:00
ATM-Nicolas	1cf42726ff	FIX : Duplicate executeHook function	2019-03-18 15:19:39 +01:00
Laurent Destailleur	0c101f3d1b	Fix translation	2019-03-18 11:21:51 +01:00
Laurent Destailleur	89087c6847	Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice ... Wrong vat if deposit from propal with multiple vat	2019-03-18 11:14:11 +01:00
Regis Houssin	57091f08b0	FIX missing entity filter and wrong var name	2019-03-18 10:53:43 +01:00
Laurent Destailleur	34034787af	FIX problem with sign of various payment in project preview	2019-03-18 10:16:08 +01:00
Laurent Destailleur	227f5f8f92	Code is cleaner	2019-03-18 09:08:53 +01:00
Alexandre SPANGARO	350f77db2b	FIX: Error with various & salary payment on project	2019-03-17 23:00:13 +01:00
Laurent Destailleur	8adc333823	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-16 19:41:50 +01:00
Maxime Kohlhaas	46b39dd6a9	Fix #9961 : deal with supplier credit note refund like with customers	2019-03-16 18:13:43 +01:00
Laurent Destailleur	ae35c982af	Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit ... FIX : need to round with 2 decimals to avoid movements not correctly balanced	2019-03-16 14:27:03 +01:00
Laurent Destailleur	55718cc7da	Merge pull request #10855 from atm-maxime/fix_missing_lang ... Fix #9311	2019-03-16 13:43:35 +01:00
Maxime Kohlhaas	21e2d36421	Fix #9311	2019-03-16 09:28:47 +01:00
Maxime Kohlhaas	68945c7d51	Fix #10177	2019-03-16 09:11:43 +01:00
Laurent Destailleur	04424ed882	FIX Bad label of status for members (must be short version in list) ... Conflicts: htdocs/adherents/class/adherent.class.php	2019-03-15 20:07:42 +01:00
Laurent Destailleur	39e24d30aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-15 19:18:30 +01:00
Laurent Destailleur	681d626284	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-15 19:17:31 +01:00
Laurent Destailleur	4bb45ad1c1	Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero ... FIX : when we create deposit with multi tva, we mustn't add line if a…	2019-03-15 19:16:56 +01:00
Laurent Destailleur	b33c366b02	Update card.php	2019-03-15 19:16:49 +01:00
Laurent Destailleur	6f0fbc42c1	FIX Param keepn must be 1 when dol_escape_htmltag used for textarea ... Conflicts: htdocs/expensereport/card.php htdocs/projet/card.php htdocs/public/members/new.php htdocs/public/opensurvey/studs.php	2019-03-15 15:16:29 +01:00
atm-ph	2da60fb885	Fix var name	2019-03-15 15:15:03 +01:00
Laurent Destailleur	074ba0729a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-15 11:00:52 +01:00
Laurent Destailleur	84bff41543	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-15 11:00:24 +01:00
Laurent Destailleur	6c2cad3d48	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/lib/security.lib.php	2019-03-15 11:00:00 +01:00
gauthier	8375b47e74	FIX : in fact expensereport must be in $check array	2019-03-15 10:21:50 +01:00
Laurent Destailleur	c44d9bf8e2	Fix phpcs	2019-03-14 23:27:50 +01:00
Laurent Destailleur	51de29458f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-14 19:06:31 +01:00
Laurent Destailleur	a35a2faacb	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/expedition/card.php htdocs/livraison/card.php	2019-03-14 19:06:21 +01:00
Laurent Destailleur	a8bd8a2101	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-14 18:49:24 +01:00
Laurent Destailleur	5ec8adb7f5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-03-14 18:48:35 +01:00
Laurent Destailleur	4f84a1614c	Merge pull request #10808 from ATM-Marc/FIX_8.0_shipment_hooks ... FIX: several hooks in shipping/delivery cards	2019-03-14 18:07:57 +01:00
gauthier	3fb6978bc8	FIX : no need to test anything to display documents tabs on expense report	2019-03-14 17:36:49 +01:00
gauthier	885797b748	FIX : useless join	2019-03-14 17:00:51 +01:00
Laurent Destailleur	42de3a0cde	Merge pull request #10838 from atm-john/9.0_missing_hook_export_agenda ... FIX missing hook in agenda export	2019-03-14 16:54:55 +01:00
Frédéric FRANCE	b67429218d	Update html.formmail.class.php ... Conflicts: htdocs/core/class/html.formmail.class.php	2019-03-14 16:52:16 +01:00
Laurent Destailleur	8410d59182	FIX Missing field "In sale" in list	2019-03-14 16:16:50 +01:00
John BOTELLA	31e588dbab	fix hookmanager global	2019-03-14 16:13:32 +01:00
Laurent Destailleur	5ccfba1210	FIX Edit of personalized groups ... Conflicts: htdocs/accountancy/admin/categories.php	2019-03-14 16:06:20 +01:00
John BOTELLA	8bc795c055	Fix missing hook for export agenda	2019-03-14 15:19:38 +01:00
Laurent Destailleur	feaca165ad	Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8 ... Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-14 14:22:31 +01:00
Laurent Destailleur	3073567763	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-14 14:17:52 +01:00
Laurent Destailleur	b65c791043	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-14 14:15:45 +01:00
Laurent Destailleur	d7735ff272	FIX #10822	2019-03-14 14:15:35 +01:00
Laurent Destailleur	7b8b6bb02f	Merge pull request #10804 from hregis/9.0_merge ... FIX possibility to set up payment mode when invoice module is disabled	2019-03-14 14:09:00 +01:00
gauthier	a524bbc5c6	FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)	2019-03-13 15:59:41 +01:00
Laurent Destailleur	9da84f68c7	Bad language file for civility order	2019-03-13 14:23:27 +01:00
Laurent Destailleur	c32551cb62	Fix size of varchar	2019-03-13 13:42:14 +01:00
Laurent Destailleur	88c02143fa	Fix missing fields	2019-03-13 13:40:57 +01:00
Laurent Destailleur	c2063c5d0b	Fix bad translation	2019-03-12 18:24:55 +01:00
Marc de Lima Lucio	36b44b1348	FIX: several hooks in shipping/delivery cards	2019-03-12 11:28:36 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Regis Houssin	47057b431d	FIX translation	2019-03-12 07:56:22 +01:00
Regis Houssin	259fa0ac81	FIX check only if invoice module is enabled (bank is check after)	2019-03-12 07:42:25 +01:00
Regis Houssin	94c58072d7	FIX possibility to set up payment mode when invoice module is disabled	2019-03-12 07:29:29 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
atm-quentin	ab781c32c7	Wrong vat if deposit from propal with multiple vat	2019-03-11 11:28:25 +01:00
Laurent Destailleur	fa4467fb5f	FIX Tooltip on click was ko on smartphone	2019-03-09 18:37:07 +01:00
Laurent Destailleur	441b577599	Add missing trans	2019-03-09 12:58:52 +01:00
Alexandre SPANGARO	49f72b6a9a	Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT	2019-03-09 05:50:16 +01:00
Laurent Destailleur	57b9be53b3	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/contrat/class/contrat.class.php	2019-03-09 00:44:31 +01:00
Laurent Destailleur	4022d5f529	FIX Can not create contract with numbering module without autogen rule	2019-03-08 23:58:04 +01:00
Laurent Destailleur	233bd4374a	Fix phpcs	2019-03-08 19:52:26 +01:00
Laurent Destailleur	1a96a7a88f	FIX More complete auto setup of barcode module ... Add tooltip help on member setup module	2019-03-08 11:31:12 +01:00
Alexandre SPANGARO	d926657534	FIX: Accountancy - Format EBP import ... Add doc	2019-03-08 10:57:14 +01:00
Laurent Destailleur	d88fc8cf91	Fix bad link	2019-03-07 17:32:10 +01:00
Laurent Destailleur	0729a3b571	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:11:12 +01:00
Laurent Destailleur	9a9fd15077	Fix doxygen	2019-03-07 14:10:33 +01:00
Laurent Destailleur	02b8bc94e7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:06:31 +01:00
Laurent Destailleur	d2f1d0cc33	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2019-03-07 14:06:11 +01:00
Laurent Destailleur	e96f84a3d6	Merge pull request #10765 from altatof/sd8 ... FIX : supplier discount was not retrieved when choosing a product	2019-03-07 13:26:44 +01:00
Laurent Destailleur	0349f9bfaa	Update objectline_create.tpl.php	2019-03-07 13:26:25 +01:00
Laurent Destailleur	8685f82a41	Merge pull request #10767 from Toumaniere/9.0 ... Update libelle of user (making Mailman working correctly)	2019-03-07 12:44:40 +01:00
Laurent Destailleur	a0bc6672d8	Try to avoid to make subquery when not necessary	2019-03-07 12:43:17 +01:00
Laurent Destailleur	e3fb228a4d	Update fournisseur.facture.class.php	2019-03-07 12:28:19 +01:00
Laurent Destailleur	96d4e28473	FIX Vat src code lost after editing expense report line	2019-03-07 11:08:01 +01:00
Laurent Destailleur	2cd09aaf09	Prepare version 9.0.2	2019-03-07 10:57:15 +01:00
Laurent Destailleur	c513116717	FIX missing vat_src_code when inserting an expense report line	2019-03-07 10:56:48 +01:00
Timoté Fallais	c31318f29d	Update libelle of user (making Mailman working correctly)	2019-03-07 09:15:43 +01:00
Christophe Battarel	96b8da0d62	fix supllier discount	2019-03-06 22:04:01 +01:00
Laurent Destailleur	b15e00cae7	FIX Autodetect buy price for invoices autogenerated with templates.	2019-03-06 21:39:09 +01:00
Laurent Destailleur	31c296f44b	Fix bad tooltip to rm file	2019-03-06 20:01:21 +01:00
Laurent Destailleur	ddc3478156	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-06 19:14:15 +01:00
Laurent Destailleur	e163849d05	Fix label	2019-03-06 19:13:59 +01:00
gauthier	0ff2905180	FIX : we need to keep originline special_code	2019-03-06 12:10:24 +01:00
Laurent Destailleur	9ad1597fcc	Merge pull request #10747 from atm-gauthier/9.0_fix_extrafields_always_visible_in_view_mode ... FIX : extrafields always visible on view mode	2019-03-05 18:54:51 +01:00
Laurent Destailleur	c06d2f6c3b	Remove warning	2019-03-05 18:22:03 +01:00
gauthier	598d1fc914	FIX : extrafields always visible on view mode	2019-03-05 16:53:36 +01:00
Laurent Destailleur	d18a5853df	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2019-03-05 15:57:31 +01:00
Laurent Destailleur	98f5bb2ed3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-05 15:55:08 +01:00
Laurent Destailleur	f402966eb8	Missing translation	2019-03-05 15:48:12 +01:00
Frédéric FRANCE	1bbf6737ec	add session newtoken	2019-03-05 15:27:31 +01:00
Laurent Destailleur	c95c8b4dcb	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/login/functions_dolibarr.php	2019-03-04 20:17:16 +01:00
Laurent Destailleur	54b9681257	More log to help debug	2019-03-04 20:15:31 +01:00
Laurent Destailleur	15138aa543	FIX error on setup of password if pass generators have a .old file.	2019-03-04 20:00:36 +01:00
gauthier	dada8c8ff5	FIX : wrong redirect link on holiday refuse	2019-03-04 17:23:29 +01:00
Laurent Destailleur	c3b08a604f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-04 16:20:57 +01:00
Laurent Destailleur	07dca25b96	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-04 16:20:49 +01:00
Laurent Destailleur	acaf5cabef	Merge pull request #10332 from ATM-Nicolas/fix_check_picture_name ... FIX : Check for old picture name if the new one was not found	2019-03-04 16:20:29 +01:00
Laurent Destailleur	4446b80a23	Merge pull request #10733 from ptibogxiv/patch-136 ... Fixe date on fetch don.class.php	2019-03-04 16:11:29 +01:00
Laurent Destailleur	63d14b16c9	FIX The notes was also copied on invoice	2019-03-04 14:56:39 +01:00
Laurent Destailleur	1686b7b1db	FIX label of bank account	2019-03-04 14:42:00 +01:00
ptibogxiv	d18b1dd9dc	Update don.class.php	2019-03-03 22:36:34 +01:00
ptibogxiv	ad18077567	Fixe date on fetch don.class.php	2019-03-03 21:38:06 +01:00
Laurent Destailleur	16d13b223a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-03 20:43:35 +01:00
Laurent Destailleur	526bd1d02e	Fix number format	2019-03-03 17:36:43 +01:00
Frédéric FRANCE	3037e4a157	Update DolibarrModules.class.php	2019-03-02 20:49:53 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Laurent Destailleur	aea5abd9a1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-02 19:05:58 +01:00
Laurent Destailleur	8f8aaf1e8c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-02 19:05:51 +01:00
Laurent Destailleur	a2eefab696	Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm ... FIX: actioncomm export: ORDER BY clause / event type filter	2019-03-02 18:44:34 +01:00
Laurent Destailleur	a8f447498b	Fix applying of credit note on invoice	2019-02-28 19:30:44 +01:00
Laurent Destailleur	dddf322264	Fix bad position of parameters when creating supplier credit note	2019-02-28 19:06:51 +01:00
Marc de Lima Lucio	b96ac794e9	FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work	2019-02-28 16:15:32 +01:00
gauthier	786c114026	FIX : project_title for display of getNomUrl()	2019-02-28 16:13:45 +01:00
Laurent Destailleur	429da47d68	Fix default language of reminders	2019-02-28 13:11:14 +01:00
Laurent Destailleur	c9d240cb73	Merge pull request #10671 from hregis/8.0_mc ... FIX could not create several superadmin in transversal mode	2019-02-28 12:24:50 +01:00
Laurent Destailleur	855aaaffd8	Better fix for type of discount	2019-02-28 11:44:10 +01:00
Laurent Destailleur	92259810c1	Merge pull request #10712 from atm-florian/8.0 ... fix relative discount for prospect and supplier	2019-02-28 11:26:50 +01:00
Laurent Destailleur	cefaeb583f	Update xinputfile.modules.php	2019-02-28 11:24:43 +01:00
Laurent Destailleur	85d46a5270	Update xinputfile.modules.php	2019-02-28 11:24:07 +01:00
florian HENRY	4ebf4780c2	fix relative discount for prospect and supplier	2019-02-28 09:09:06 +01:00
gauthier	1237a6d3e9	FIX : same thing here	2019-02-27 14:58:10 +01:00
gauthier	49e03b009f	FIX : if empty error message, we just see "error" displayed	2019-02-27 14:50:01 +01:00
Laurent Destailleur	513fc8f410	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-27 14:46:41 +01:00
Laurent Destailleur	10e3badb0a	Fix closing tr	2019-02-27 14:46:23 +01:00
Laurent Destailleur	0d99bfbf1c	Merge pull request #10686 from hregis/9.0_merge ... FIX wrong feature2 when user rights "group_advance" is used	2019-02-27 13:29:16 +01:00
Laurent Destailleur	cbaa57b1e2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-27 02:25:42 +01:00
Laurent Destailleur	86e2ffe323	Merge pull request #10390 from glu000/8.0 ... Fix #10278	2019-02-27 02:24:55 +01:00
Laurent Destailleur	238894a7e4	Merge pull request #10624 from frederic34/patch-2 ... selectMulticurrency avoid malformed empty value	2019-02-27 02:06:24 +01:00
bomuux	9c5a4e303c	SQL error in box_project.php ... Corrected a bug : for an internal user with no rights to see all projects, the project box on home cause an error in log. Finally a lot of simplification because Project::getProjectsAuthorizedForUser do most of the filtering. Conflicts: htdocs/core/boxes/box_project.php	2019-02-27 01:44:15 +01:00
Laurent Destailleur	6f0d5fcf3f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/variants/combinations.php	2019-02-27 01:25:25 +01:00
Laurent Destailleur	a48e9fdba4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-27 01:23:26 +01:00
Laurent Destailleur	8bdf1cd1b6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-27 01:22:37 +01:00
Laurent Destailleur	da826c4bc7	Fix bad var name	2019-02-27 01:22:26 +01:00
Laurent Destailleur	fb2b7a6c09	Merge pull request #10693 from atm-quentin/NEW_field_tasklist ... add data elem on task list	2019-02-27 01:14:07 +01:00
Laurent Destailleur	e0c7c32fae	Fix preselection when key is '0'	2019-02-26 11:44:44 +01:00
atm-quentin	35762c0d4e	add data elem on task list	2019-02-26 11:25:40 +01:00
Laurent Destailleur	3ba69fc93a	Fix missing ; after sql request	2019-02-25 15:06:55 +01:00
Laurent Destailleur	1be1ee1670	Remove duplicate record	2019-02-25 14:56:28 +01:00
Laurent Destailleur	c0be66b5e5	FXI Remove duplicate record before trying to create unique key	2019-02-25 14:55:29 +01:00
Regis Houssin	6fa016dc85	FIX wrong feature2 when user rights "group_advance" is used	2019-02-25 10:44:22 +01:00
atm-quentin	dc7a2fbb30	FIX placement function	2019-02-25 10:01:26 +01:00
Cristian Torres	c781eeb17d	[FIX] ORDER BY before custom filters for where ... When filtering data "and cac.libelle" would be appended after ORDER BY	2019-02-24 20:55:27 +01:00
ptibogxiv	47f5ff3303	Fix declare functions2.lib.php for donations API	2019-02-24 20:51:00 +01:00
Laurent Destailleur	6fdd0191f4	Merge pull request #10676 from frederic34/patch-5 ... fix #10656	2019-02-24 20:45:13 +01:00
Laurent Destailleur	3f078203b9	Fix phpcs	2019-02-24 20:29:01 +01:00
Laurent Destailleur	5e6797f39d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-24 20:28:18 +01:00
Laurent Destailleur	2f300ae63f	Standardize code with customer invoices	2019-02-24 20:26:54 +01:00
Laurent Destailleur	f41d504ba1	Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note ... FIX positive values IN supplier credit notes creating diff on addline rounding	2019-02-24 20:21:22 +01:00
Frédéric FRANCE	2ad91213b2	Update combinations.php	2019-02-24 12:09:57 +01:00
Frédéric FRANCE	ca2eba866c	Update list.php	2019-02-24 11:56:17 +01:00
Frédéric FRANCE	435b416f93	fix #10656	2019-02-24 11:50:06 +01:00
Regis Houssin	0ea7bf3b0b	FIX could not create several superadmin in transversal mode	2019-02-24 08:21:56 +01:00
Laurent Destailleur	0081d3c25d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-23 16:02:10 +01:00
Laurent Destailleur	4e19a83f1b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-23 16:01:38 +01:00
Laurent Destailleur	af6c482f26	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-23 16:01:30 +01:00
ptibogxiv	d7ffcca59b	FIX fetch module / pos source	2019-02-23 16:00:07 +01:00
Laurent Destailleur	9ba6e3f8f5	FIX #10638	2019-02-23 15:57:57 +01:00
Cristian Torres	8ca6935f8b	[FIX] Variable $i is already declared ... It was preventing displaying of the other accounts	2019-02-23 14:08:11 +01:00
atm-quentin	7850925441	FIX amount opened on thirdparty card dont care of credit note not converted	2019-02-22 15:10:41 +01:00
atm-quentin	57fff10766	Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into FIX_credit_note_used_on_list	2019-02-22 15:10:29 +01:00
Francis Appels	c38b0c4dbe	FIX fk_default_warehouse missing in group by	2019-02-22 12:17:34 +01:00
Laurent Destailleur	6cdf5c5673	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-21 22:28:25 +01:00
gauthier	58d82eb477	FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it	2019-02-21 11:08:55 +01:00
Laurent Destailleur	7fdf4be7dd	Bad return of error	2019-02-19 14:02:17 +01:00
Laurent Destailleur	226b1e2488	Fix error management	2019-02-19 14:01:08 +01:00
Laurent Destailleur	ad7b8371da	FIX Mark credit note as available for credit note in other currency ... Conflicts: htdocs/compta/paiement.php htdocs/core/class/discount.class.php	2019-02-18 18:30:15 +01:00
Laurent Destailleur	07d1559802	FIX Mark credit note as available for credit note in other currency	2019-02-18 18:27:06 +01:00
Laurent Destailleur	75b875ae55	Fix origin currency not visible in absolute discount view	2019-02-18 17:38:15 +01:00
Laurent Destailleur	b2e0b1216e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-18 17:05:03 +01:00
Laurent Destailleur	b2ec340a48	FIX Show button POS Ticket only if invoice was generated by POS	2019-02-18 17:04:53 +01:00
atm-quentin	b6deda1111	FIX credit note used on list	2019-02-18 12:28:18 +01:00
Frédéric FRANCE	b017213131	selectMulticurrency avoid malformed empty value	2019-02-17 20:59:39 +01:00
Laurent Destailleur	d2fc756014	Merge pull request #10618 from frederic34/patch-28 ... Form::select_comptes return void	2019-02-15 15:31:22 +01:00
Laurent Destailleur	b018c5d263	Merge pull request #10614 from andreubisquerra/9.0 ... Update TakePOS in Dolibarr 9	2019-02-15 15:21:35 +01:00
Laurent Destailleur	b1d19fe79a	Removed not used file	2019-02-15 12:21:14 +01:00
gauthier	70f1a9d13d	FIX : we want to be able to reopen fourn credit note	2019-02-15 11:41:02 +01:00
Frédéric FRANCE	67f8942895	Form::select_comptes return void	2019-02-15 10:35:44 +01:00
Laurent Destailleur	7e171c8750	FIX adding css by page if url is externam ... Conflicts: htdocs/main.inc.php	2019-02-15 00:48:31 +01:00
Laurent Destailleur	df5dbd4110	Fix bad ip	2019-02-14 21:10:49 +01:00
andreubisquerra	8cc2662f01	Update TakePOS in Dolibarr 9	2019-02-14 20:59:32 +01:00
Laurent Destailleur	31e9fd46a4	Merge	2019-02-14 20:59:31 +01:00
Regis Houssin	45d05da6ed	FIX missing $ismultientitymanaged for previous/next ref	2019-02-14 16:14:19 +01:00
Laurent Destailleur	89050da856	Merge	2019-02-14 15:27:31 +01:00
Laurent Destailleur	2c2052d113	Update card.php ... Avoid regression on restrictArea	2019-02-14 15:23:34 +01:00
Laurent Destailleur	4ac086ab70	Update info.php	2019-02-14 15:23:07 +01:00
Laurent Destailleur	173d28cf5a	Update mouvement.php ... Avoid regression on restrictArea	2019-02-14 15:22:22 +01:00
Laurent Destailleur	d2ee00d4bb	Update security.lib.php ... Avoid regression on test of restrictArea	2019-02-14 15:21:01 +01:00
Regis Houssin	359318392f	FIX missing entity filter in function "build_filterField()" (export)	2019-02-14 10:47:07 +01:00
Regis Houssin	aa4c5ae839	FIX missing access security checking with multicompany	2019-02-14 10:12:15 +01:00
Laurent Destailleur	fbfb4ce566	FIX creation of new left menu entry	2019-02-14 10:10:31 +01:00
Laurent Destailleur	fabdf05f6f	Fix field date subscription not visible	2019-02-14 09:57:33 +01:00
Laurent Destailleur	a689f8dc3f	Code comment	2019-02-13 23:34:28 +01:00
Frédéric FRANCE	a063c5a35b	Update OLE.php	2019-02-13 22:49:48 +01:00
Laurent Destailleur	f60940a141	Merge pull request #10560 from Toumaniere/9.0 ... Fix #10551 : MailmanSpip & Adherent : add and remove mailman list	2019-02-13 16:31:32 +01:00
Laurent Destailleur	af4d3c5654	Update adherent.class.php	2019-02-13 16:31:05 +01:00
Timoté Fallais	9a28c12781	reform MEMBER_VALIDATE and MEMBER_MODIFY code correctly	2019-02-13 14:57:37 +01:00
Timoté Fallais	a115b1da7f	Fix MailmanSpip bad adherent type after update	2019-02-13 14:45:51 +01:00
Laurent Destailleur	11f48460b2	Fix	2019-02-12 23:26:25 +01:00
Laurent Destailleur	d86017b8ff	Fix create left menu entry	2019-02-12 23:21:53 +01:00
Laurent Destailleur	639dfa09aa	Fix creation of left menu	2019-02-12 23:17:40 +01:00
Laurent Destailleur	d42bf54436	Fix export zip	2019-02-12 23:12:33 +01:00
Laurent Destailleur	036dc52170	Fix test	2019-02-12 19:55:54 +01:00
Laurent Destailleur	5a2161ad09	Debug export of zip	2019-02-12 19:47:46 +01:00
Laurent Destailleur	6a8504e1f8	Fix missing constant	2019-02-12 19:44:12 +01:00
Laurent Destailleur	1f9f335e44	FIX creation of menu entry with parent id not int ... Conflicts: htdocs/admin/menus/edit.php	2019-02-12 19:11:05 +01:00
Laurent Destailleur	affbd20cdb	FIX Bad link in menu manager	2019-02-12 18:56:32 +01:00
Timoté Fallais	6c08cc6b6a	MailmanSpip & Adherent : add and remove mailman list	2019-02-12 17:45:26 +01:00
Laurent Destailleur	f7d183f3ef	Add Kosovo country	2019-02-12 17:43:38 +01:00
Laurent Destailleur	f311d50201	Fix unique key in accounting_account ... Conflicts: htdocs/install/mysql/migration/8.0.0-9.0.0.sql	2019-02-12 15:53:43 +01:00
Laurent Destailleur	00eb95b660	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-12 13:36:32 +01:00
Laurent Destailleur	53a8f1cd3b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-12 13:36:05 +01:00
Laurent Destailleur	04b0216277	Merge pull request #10548 from aspangaro/7.0_accountancy_multicomp_movement ... FIX: Accountancy - Add transaction with multicompany use only the first entity	2019-02-12 13:19:00 +01:00
Laurent Destailleur	d225b1be8b	Merge pull request #10532 from atm-maxime/fix_purchase_journal ... Fix wrong column name in purchase journal	2019-02-12 13:11:45 +01:00
Laurent Destailleur	456a76cb11	Fix suffix	2019-02-12 01:11:37 +01:00
Alexandre SPANGARO	2dc4edb68c	FIX: Accountancy - Add transaction with multicompany use all the time 1st entity	2019-02-11 11:36:12 +01:00
Laurent Destailleur	2d4ccec309	Fix document generation of modulebuilder	2019-02-09 14:12:36 +01:00
Laurent Destailleur	7f4bbcf9a5	Some minor fix in default values and modulebuilder	2019-02-09 13:40:22 +01:00
Laurent Destailleur	a916708068	Fix missing disable dependency	2019-02-08 19:01:47 +01:00
gauthier	2142ccee8a	FIX : better method	2019-02-08 15:17:40 +01:00
Laurent Destailleur	8412a91576	Fix do not send email if approval error	2019-02-08 14:58:46 +01:00
Laurent Destailleur	2e1201b7b0	FIX Transaction on leave approval and decrease ko if setup not complete	2019-02-08 14:47:03 +01:00
Maxime Kohlhaas	da361f0ea5	Fix wrong column name in purchase journal	2019-02-08 12:24:07 +01:00
Laurent Destailleur	1611c613f5	Fix phpcs	2019-02-08 12:19:51 +01:00
Laurent Destailleur	ec686a8f79	Fix phpcs	2019-02-08 11:30:20 +01:00
Laurent Destailleur	512ceae70a	Fix phpcs	2019-02-08 11:27:30 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
Laurent Destailleur	2686062031	Prepare version 9.0.1	2019-02-08 10:30:07 +01:00
Laurent Destailleur	43fbcf7081	Prepare 8.0.5	2019-02-08 10:28:59 +01:00
Laurent Destailleur	1c129a78ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-08 10:22:55 +01:00
Laurent Destailleur	679a13e48c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/expedition/class/expedition.class.php	2019-02-08 10:22:36 +01:00
Laurent Destailleur	3318baa664	Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table ... Fix display payment table on multiple pages	2019-02-08 10:08:46 +01:00
Laurent Destailleur	3d58e93a3c	Merge pull request #10525 from atm-greg/8.0_FIX_supplier_proposal_lines_added_without_unit ... FIX add fk_unit on addline action	2019-02-08 10:01:29 +01:00
Laurent Destailleur	4997b5968f	Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line ... FIX: line edit template: keep fk_parent_line	2019-02-08 09:52:21 +01:00
Laurent Destailleur	92ef0d75cf	Merge pull request #10504 from atm-quentin/FIX_supplier_invoice_paiement_credit_deposit ... FIX supplier invoice payment total doesnnt care about deposit or credit	2019-02-08 09:44:42 +01:00
Laurent Destailleur	ccda5719cf	Merge pull request #10503 from atm-quentin/FIX_product_stat_supplier_invoice ... FIX supplier invoice product stats total ht is line total not invoice…	2019-02-08 09:43:38 +01:00
Laurent Destailleur	471f11dace	Merge pull request #10502 from hregis/9.0_merge ... FIX wrong merged conflict	2019-02-08 09:34:49 +01:00
Laurent Destailleur	8abebb091c	Var no more used	2019-02-08 09:33:01 +01:00
Laurent Destailleur	24955088de	Merge pull request #10501 from hregis/8.0_mc ... FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-08 09:31:26 +01:00
Laurent Destailleur	e5d7a862b4	Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent ... Fix psql search insensitive accent	2019-02-08 09:29:59 +01:00
Laurent Destailleur	bd3f0da19c	Merge pull request #10515 from atm-gauthier/8.0_fix_can_addline_on_invoices ... FIX : can't add lines on invoices	2019-02-08 09:27:51 +01:00
Laurent Destailleur	8d82135033	Fix missing \n	2019-02-07 19:39:23 +01:00
Laurent Destailleur	89af7b0e98	Add doctype to web site	2019-02-07 19:38:36 +01:00
atm-ph	51515a487e	Fix search unaccent from left menu search box	2019-02-07 17:58:25 +01:00
atm-ph	ec7ef265b7	Fix psql search insensitive accent	2019-02-07 17:47:17 +01:00
atm-greg	9d0e0c2798	FIX add fk_unit on addline action	2019-02-07 15:17:52 +01:00
atm-ph	8e6a567b09	Fix display payment table on multiple pages	2019-02-07 12:36:22 +01:00
atm-greg	4624f1b1b8	FIX positive values creating diff on addline rounding	2019-02-06 17:19:16 +01:00
gauthier	29e4fce450	FIX : can't add lines on invoices	2019-02-06 12:35:23 +01:00
florian HENRY	95cc9faf7e	fix php warning	2019-02-06 09:01:24 +01:00
Laurent Destailleur	ce5717a7b7	FIX Default language of company is not set	2019-02-05 20:43:26 +01:00
Laurent Destailleur	82df83cec2	Add log	2019-02-05 20:04:25 +01:00
Laurent Destailleur	27f804a454	Fix currency	2019-02-05 19:59:36 +01:00
Laurent Destailleur	d4e6610722	Fix currency	2019-02-05 19:58:42 +01:00
Laurent Destailleur	5a659bfd90	Fix Missing currency	2019-02-05 19:57:35 +01:00
Laurent Destailleur	7c24847fa3	Typo	2019-02-05 19:38:28 +01:00
Laurent Destailleur	7436a3bc73	Typo	2019-02-05 19:37:58 +01:00
Laurent Destailleur	66998c4873	Fix translation	2019-02-05 19:37:22 +01:00
Laurent Destailleur	44f5223c90	Remove warning	2019-02-05 18:54:38 +01:00
Laurent Destailleur	bb315a6f12	Fix trans	2019-02-05 16:44:10 +01:00
Laurent Destailleur	4097d648ae	Fix search with alias	2019-02-05 15:23:51 +01:00
Laurent Destailleur	b7f2a2b3f3	Fix search alias page if page not found	2019-02-05 15:15:41 +01:00
Laurent Destailleur	fbed22050d	fix syntax error	2019-02-05 14:33:36 +01:00
Laurent Destailleur	4de122d1d4	Fix date format	2019-02-05 14:33:03 +01:00
Laurent Destailleur	e3d0cb1637	Fix css	2019-02-05 14:32:23 +01:00
Laurent Destailleur	541f6e537e	Fix link to pay membership renewal	2019-02-05 14:05:39 +01:00
Laurent Destailleur	e5827f77cb	Fix link to pay membership renewal	2019-02-05 14:03:35 +01:00
Laurent Destailleur	6d09c85231	Fix missing button	2019-02-05 14:01:32 +01:00
Laurent Destailleur	b58c49d0bb	Trans	2019-02-05 13:59:23 +01:00
Laurent Destailleur	8d40440418	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-05 13:57:08 +01:00
Laurent Destailleur	d6501d996c	Missing trans	2019-02-05 13:56:55 +01:00
Marc de Lima Lucio	428efa9227	FIX: line edit template: keep fk_parent_line	2019-02-05 12:02:49 +01:00
Marc de Lima Lucio	64739098ae	FIX: expedition: reset status on rollback + replace hardcoded status with const	2019-02-05 11:58:49 +01:00
atm-quentin	da0c863f45	FIX supplier invoice payment total dont care about deposit or credit	2019-02-05 10:30:38 +01:00
atm-quentin	730a2a90ff	FIX supplier invoice product stats total ht is line total not invoice total	2019-02-05 09:43:14 +01:00
Regis Houssin	8860eab6b1	FIX wrong merged conflict	2019-02-05 07:40:50 +01:00
Regis Houssin	4a19cba257	FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-05 06:34:05 +01:00
Laurent Destailleur	bb8b3d4e5c	Add br	2019-02-05 00:25:42 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	cdfeeafab9	FIX #10381	2019-02-03 21:12:05 +01:00
Laurent Destailleur	72f78ecf3b	FIX #10460 compatibility with MariaDB 10.4	2019-02-03 20:02:05 +01:00
Laurent Destailleur	a520642d97	FIX Price in combo list of service does not use the correct price level	2019-02-03 19:54:55 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	4538d13add	Merge pull request #10450 from atm-gauthier/8.0_fIX_fetch_member ... FIX : wrong tests on fetch	2019-02-03 19:25:25 +01:00
Laurent Destailleur	bd2c7092a4	Update user.class.php	2019-02-03 19:25:11 +01:00
Laurent Destailleur	62d677118d	Update adherent.class.php	2019-02-03 19:24:18 +01:00
Frédéric FRANCE	9c41f41c24	add missing require date.lib.php	2019-02-03 19:06:20 +01:00
Laurent Destailleur	f8b10e9c3d	Doxygen	2019-02-03 18:47:55 +01:00
Laurent Destailleur	456e78b7cf	FIX #10485	2019-02-03 17:45:31 +01:00
Maxime Kohlhaas	bb3225809b	Fix warehouse fetch was not checking parameters. Fixes #10414	2019-02-02 18:43:25 +01:00
Laurent Destailleur	75845a990f	FIX Missing province in export of invoice	2019-02-01 22:55:28 +01:00
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +01:00
Laurent Destailleur	c313ad6195	Fix phpcs	2019-02-01 18:19:39 +01:00
Laurent Destailleur	a2ab6348ed	Fix bad menu leading on a development page	2019-02-01 17:06:34 +01:00
Laurent Destailleur	b83ff06db8	FIX #10416 No need of another option	2019-02-01 17:00:04 +01:00
Laurent Destailleur	35f65a571c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php htdocs/fourn/commande/list.php	2019-02-01 16:05:43 +01:00
Laurent Destailleur	e366ab551c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-01 16:01:26 +01:00
Laurent Destailleur	dee2a373c1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2019-02-01 16:01:18 +01:00
Laurent Destailleur	dbf7ae4c25	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-02-01 15:56:58 +01:00
Laurent Destailleur	452dfafd32	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-02-01 15:56:47 +01:00
Laurent Destailleur	bff2f33022	Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch ... Fix fetch test	2019-02-01 15:56:26 +01:00
Laurent Destailleur	dbab955cbd	Merge pull request #10471 from mapiolca/patch-9 ... #Fix : Error in Total Products/Services	2019-02-01 15:43:47 +01:00
Laurent Destailleur	f00271fee6	Merge pull request #10467 from atm-gauthier/7.0_fix_nextnumref ... FIX : need an order by in case we found other invoice with same number but not same date	2019-02-01 15:38:16 +01:00
Laurent Destailleur	ae81bbac93	Better var name	2019-02-01 13:49:07 +01:00
Laurent Destailleur	b14a16a119	Code comment	2019-02-01 13:48:09 +01:00
Laurent Destailleur	849b3b640b	Code comment	2019-02-01 13:41:23 +01:00
florian HENRY	f7bed44441	FIX : quick search for supplier orders	2019-01-31 21:39:02 +01:00
Laurent Destailleur	c05628c746	Fix edit member module setup	2019-01-31 20:27:55 +01:00
Pierre Ardoin	2d6f5ca8ab	#Fix : Error in Total Products/Services ... Its correct an error in the total of stat Products/Services total.	2019-01-31 20:22:56 +01:00
Laurent Destailleur	0a56069f67	Fix trans	2019-01-31 19:42:55 +01:00
Laurent Destailleur	189323ad58	Fix when using image into description	2019-01-31 18:12:34 +01:00
Laurent Destailleur	4254ad0d33	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-31 15:51:54 +01:00
Laurent Destailleur	14dea53700	FIX Missing field in import/export of users	2019-01-31 15:51:02 +01:00
Laurent Destailleur	57797b1309	Remove image	2019-01-31 12:48:51 +01:00
gauthier	caa937660d	FIX : wrong test enabled	2019-01-31 12:43:39 +01:00
gauthier	bfc7265cbc	FIX : better test on fetch	2019-01-31 11:53:10 +01:00
gauthier	09ba059c21	FIX : need an order by in case we found other invoice with same number but not same date	2019-01-31 11:03:06 +01:00
Laurent Destailleur	484b4371c1	FIX XSS ... Conflicts: htdocs/viewimage.php	2019-01-31 10:19:23 +01:00
Laurent Destailleur	5e46a359e0	FIX XSS	2019-01-31 10:18:06 +01:00
Laurent Destailleur	21c089fee9	FIX XSS	2019-01-31 10:17:29 +01:00
gauthier	0c4e5a6487	FIX : better test	2019-01-31 09:30:07 +01:00
Laurent Destailleur	045b8b13ed	css	2019-01-30 23:20:57 +01:00
Laurent Destailleur	01f1f6162f	Fix phpcs	2019-01-30 20:06:21 +01:00
Laurent Destailleur	c1f3f4c2b5	Fix: text for empty line not visible in select	2019-01-30 20:03:04 +01:00
Laurent Destailleur	f67937c59d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 18:54:29 +01:00
Laurent Destailleur	ae1c4e065b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-30 18:53:56 +01:00
Laurent Destailleur	231395dab8	Merge pull request #10398 from atm-john/fix_trigger ... Fix missing trigger	2019-01-30 18:53:10 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	41e20a9d4f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-30 16:44:08 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 ... Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	97248a830b	FIX #10440	2019-01-30 16:28:37 +01:00
Laurent Destailleur	0fbf578edb	Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images ... FIX css in the case of not showing topmenu images.	2019-01-30 16:15:40 +01:00
Laurent Destailleur	104364ed02	Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled ... FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled	2019-01-30 15:51:09 +01:00
Laurent Destailleur	869159c09f	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:39 +01:00
Laurent Destailleur	1a292839ca	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:18 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Laurent Destailleur	96f46ec261	Merge pull request #10448 from hregis/8.0_mc ... FIX multicompany compatibility	2019-01-30 15:25:16 +01:00
Laurent Destailleur	340412ed00	FIX generation of document for supplie rinvoice	2019-01-30 14:07:50 +01:00
Laurent Destailleur	f955f3f4ee	Fix report error only if return code < 0	2019-01-30 12:23:34 +01:00
gauthier	9490929216	FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled	2019-01-30 10:49:32 +01:00
gauthier	412940b5ca	FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled	2019-01-30 10:19:13 +01:00
Pierre Ardoin	99892c13b0	FIX : Erreur dans le Total ... Corrige l'erreur de calcul dans le total des produits et services	2019-01-29 23:26:08 +01:00
Laurent Destailleur	205b7f2e95	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-29 19:04:40 +01:00
Laurent Destailleur	3d218cadb7	FIX last_main_doc var not saved ... Conflicts: htdocs/core/class/commonobject.class.php	2019-01-29 19:03:45 +01:00
Laurent Destailleur	3215870ae6	FIX Exclude not required field from log	2019-01-29 19:02:34 +01:00
gauthier	3477cf6bd3	FIX : must fetch member in current entity	2019-01-29 18:01:28 +01:00
Laurent Destailleur	c6755b3cf1	Fix formatting of number in quantity field	2019-01-29 15:59:41 +01:00
Pierre Ardoin	80cfe86508	Update objectline_view.tpl.php	2019-01-29 14:26:14 +01:00
Pierre Ardoin	5ea1cf0775	Update objectline_edit.tpl.php	2019-01-29 14:25:34 +01:00
Regis Houssin	9539bea68a	FIX bad sql request	2019-01-29 12:17:51 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Pierre Ardoin	b6df02e795	Correction oubli date de livraison ... Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs	2019-01-29 11:47:39 +01:00
Pierre Ardoin	e75170137e	Correction de la filtration de l'entité ... Corrige pour que la marge réalisée sur d'autres entités n'apparaisse pas sur celle sur laquelle l'utilisateur est connecté.	2019-01-29 11:42:44 +01:00
Pierre Ardoin	f9b8622545	Prise en charge de Multicompany ... Correction pour éviter que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.	2019-01-29 11:33:22 +01:00
Pierre Ardoin	dd0f6b3829	Edition Ligne Travaux Supplémentaires ... Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.	2019-01-29 11:30:14 +01:00
Pierre Ardoin	30548d977f	Prise en charge des Travaux supplémentaires ... Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.	2019-01-29 11:19:11 +01:00
Pierre Ardoin	508fb5c9cb	Prise en charge des Travaux supplémentaires ... Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.	2019-01-29 11:13:11 +01:00
Pierre Ardoin	eca1a2cd64	Update societe.class.php	2019-01-29 11:08:13 +01:00
Laurent Destailleur	08a181bfbf	Fix substitution of REF_CLIENT and REF_SUPPLIER	2019-01-29 11:00:17 +01:00
Laurent Destailleur	43c0a2232c	Fix massaction	2019-01-29 10:51:34 +01:00
Laurent Destailleur	f6be0f7686	Fix duplicate log when using mass action email send	2019-01-29 10:48:45 +01:00
Xebax	b24f5fda68	FIX Fix PHP warning "count(): Parameter must be an array..."	2019-01-29 08:47:46 +01:00
Laurent Destailleur	5cd60f4e26	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-28 16:27:54 +01:00
Laurent Destailleur	9d1a02b0d7	Fix language	2019-01-28 16:25:37 +01:00
Laurent Destailleur	9dbf41d6b2	Fix lang format	2019-01-28 16:25:06 +01:00
Laurent Destailleur	4545c0f13a	Fix lang format of en_ZA	2019-01-28 16:25:01 +01:00
John BOTELLA	6f12cdf236	Fix travis	2019-01-28 11:58:16 +01:00
John BOTELLA	5dbc9ddae0	fix travis	2019-01-28 11:56:20 +01:00
John BOTELLA	9a666b265f	Use an other test	2019-01-28 11:53:19 +01:00
Laurent Destailleur	273c396fb9	Fix bad function	2019-01-28 02:47:03 +01:00
Laurent Destailleur	f7bcd1ef6d	Fix trans	2019-01-28 01:35:12 +01:00
Laurent Destailleur	de0a057b8a	Fix div not closed	2019-01-27 19:41:14 +01:00
Laurent Destailleur	c291450a07	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-27 18:13:28 +01:00
Laurent Destailleur	7a7fd657ed	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-27 18:13:20 +01:00
Laurent Destailleur	a78db45178	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-27 18:12:36 +01:00
Laurent Destailleur	05ba397156	Merge pull request #10421 from frederic34/patch-2 ... correct menu	2019-01-27 17:55:23 +01:00
Laurent Destailleur	3c88816bf8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-27 17:44:13 +01:00
Laurent Destailleur	d59097f65c	Fix upload of module file	2019-01-27 17:40:56 +01:00
Xebax	94d3f038eb	FIX 'statut' is ignored when updating a user with the REST API.	2019-01-27 13:20:33 +01:00
tarrsalah	88da5f25d8	FIX css in the case of not showing topmenu images.	2019-01-27 13:18:50 +01:00
Frédéric FRANCE	46b6d16210	correct menu	2019-01-27 09:17:01 +01:00
Laurent Destailleur	3118e92d2b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-26 14:30:59 +01:00
Laurent Destailleur	ba87284a90	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-26 14:30:44 +01:00
Laurent Destailleur	c6fe94c455	Merge pull request #10388 from hregis/9.0_bug ... FIX JSON.parse not needeed and missing simple quote escaping	2019-01-26 14:13:26 +01:00
Laurent Destailleur	ab6393a939	Merge pull request #10396 from Librethic/9.0-fix-inventory-create ... FIX: wrong permission test for inventory creation	2019-01-26 14:03:03 +01:00
Laurent Destailleur	8d019a2759	Merge pull request #10409 from atm-florian/9.0 ... fix broken link into contact tpl	2019-01-26 13:52:32 +01:00
Laurent Destailleur	3f75bb694c	Fix phpcs	2019-01-26 01:31:22 +01:00
florian HENRY	822706000f	fix broken link into contact tpl	2019-01-24 18:01:40 +01:00
John BOTELLA	15e1d3b456	Fix fetch test	2019-01-24 09:40:58 +01:00
Laurent Destailleur	c95b915db3	Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0	2019-01-24 07:07:31 +01:00
Laurent Destailleur	ecb16cf914	Trans	2019-01-24 07:07:26 +01:00
John BOTELLA	624d17c96a	Fix missing no trigger arg	2019-01-23 17:32:49 +01:00
John BOTELLA	1c51716997	Fix missing trigger	2019-01-23 17:02:20 +01:00
Laurent Destailleur	278b3e0b08	Fix css	2019-01-23 15:30:54 +01:00
gauthier	84e1f92acd	FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;	2019-01-23 15:16:51 +01:00
Laurent Destailleur	ad54a2b8af	Fix website edit of virtualhost	2019-01-23 15:06:28 +01:00
Laurent Destailleur	e33f102dc2	FIX Edit of virtualhost	2019-01-23 14:57:43 +01:00
jfefe	b3dfbaf38c	FIX: wrong permission test for inventory creation	2019-01-23 02:45:46 +01:00
Laurent Destailleur	bb1e7ee0a1	Fix transifex	2019-01-22 19:54:47 +01:00
Laurent Destailleur	c5686df035	Sync transifex	2019-01-22 18:16:08 +01:00
Laurent Destailleur	eefa57bf6b	Sync transifex	2019-01-22 18:15:47 +01:00
Günter Lukas	1cf786acff	Fix #10278 ... Fix #10278	2019-01-22 00:09:36 +01:00
Laurent Destailleur	0ae3aeff12	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-21 20:47:52 +01:00
Laurent Destailleur	3cf81d14e3	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-21 20:47:44 +01:00
Laurent Destailleur	6f553db93d	Remove bad text	2019-01-21 20:47:07 +01:00
Regis Houssin	0a36a487c4	FIX remove unused option	2019-01-21 18:43:12 +01:00
Laurent Destailleur	9c3a0bb14e	Merge pull request #10382 from frederic34/patch-2 ... add missing global $conf in bonprelevement class	2019-01-21 18:03:10 +01:00
Laurent Destailleur	0df1d2e2f7	Merge pull request #10384 from atm-florian/9.0 ... fix php warning	2019-01-21 18:02:50 +01:00
Laurent Destailleur	a928f3a9d7	Update dolresource.class.php	2019-01-21 18:02:43 +01:00
Regis Houssin	406f26b9d2	FIX JSON.parse not needeed and missing simple quote escaping	2019-01-21 16:48:14 +01:00
Laurent Destailleur	0cba7e1613	FIX Hide path into exported filename	2019-01-21 14:31:27 +01:00
florian HENRY	1da29fbed3	fix php warning	2019-01-21 10:12:13 +01:00
Frédéric FRANCE	4ab19c25c8	add missing global $conf in bonprelevement class	2019-01-21 08:23:31 +01:00
Laurent Destailleur	f8b205aae3	Fix missing index	2019-01-21 05:16:23 +01:00
Laurent Destailleur	95bfecdd60	Fix missing index in migration	2019-01-21 05:03:31 +01:00
Laurent Destailleur	9c1339ae06	Fix migration with pgsql	2019-01-21 04:27:30 +01:00
Laurent Destailleur	7f8b710edc	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-21 02:52:24 +01:00
Laurent Destailleur	57c9104f1c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-21 02:43:18 +01:00
Laurent Destailleur	5ab6c41dfa	Fix missing multicurrency fields in export	2019-01-21 02:43:08 +01:00
Laurent Destailleur	b868397902	Fix colspan	2019-01-21 02:27:13 +01:00
Laurent Destailleur	2e9e413e17	Try pgsql fix	2019-01-21 01:51:28 +01:00
Laurent Destailleur	da2ba20653	Try fix for postgresql	2019-01-20 20:31:12 +01:00
Laurent Destailleur	f7c11ec7f4	Fix unit test on accounting	2019-01-20 17:06:24 +01:00
Frédéric FRANCE	077b9f1996	get_codeclient return void ... 1ac55b0800/htdocs/societe/class/societe.class.php (L2421-L2441)	2019-01-20 15:23:48 +01:00
Laurent Destailleur	51b03e358e	Fix phpunit	2019-01-20 13:45:29 +01:00
Laurent Destailleur	616aa1f81c	Fix var not defined	2019-01-19 17:10:14 +01:00
Laurent Destailleur	4ffd7de9f7	doc	2019-01-19 16:15:05 +01:00
Laurent Destailleur	f311deb405	Fix hash for gol_getprefix must not contains special char.	2019-01-19 16:14:45 +01:00
Laurent Destailleur	5c825310a3	Fix bad link and css	2019-01-19 14:49:44 +01:00
Laurent Destailleur	f27f1f9d4a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-19 13:20:46 +01:00
Laurent Destailleur	55c90b0578	Fix #10359 cloning of proposal	2019-01-19 13:17:07 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
ptibogxiv	b3cbbc1b11	FIX lang for dolistore in module.php	2019-01-19 11:41:47 +01:00
wdammak	aaa61254ac	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:36:09 +01:00
wdammak	191900d258	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:35:16 +01:00
wdammak	13e7d18291	Update stats.class.php ... Fix div/0 warnings	2019-01-19 11:33:56 +01:00
Laurent Destailleur	f82c917f13	Better use of email content to init project	2019-01-18 19:39:51 +01:00
Laurent Destailleur	971670da8d	Clean language file	2019-01-18 14:24:49 +01:00
ptibogxiv	1a10d8f702	FIX loadLangs in subscription list.php ... for v9 et develop	2019-01-17 19:19:55 +01:00
Laurent Destailleur	45ea1647d0	Merge pull request #10357 from hregis/8.0_mc ... FIX broken external authentication module feature and avoid warning	2019-01-17 19:15:40 +01:00
Laurent Destailleur	ba34709c36	Merge pull request #10347 from prietojc/patch-4 ... FIX: To add more thirdparties pdf models in custom modules	2019-01-17 19:01:38 +01:00
Laurent Destailleur	cb59c97ef7	Merge pull request #10350 from a-schild/7.0 ... Fix for issue #10333 branch 7.0	2019-01-17 18:59:52 +01:00
Laurent Destailleur	55771bdb3d	Merge pull request #10349 from a-schild/8.0 ... Fix for issue #10333 branch 8.0	2019-01-17 18:59:36 +01:00
Laurent Destailleur	16bb85b7fa	Merge pull request #10348 from a-schild/9.0 ... Fix for issue #10333 branch 9.0	2019-01-17 18:58:49 +01:00
Regis Houssin	1d33b6ccbb	FIX broken external authentication module feature and avoid warning	2019-01-17 16:01:32 +01:00
gauthier	d997309bcb	FIX : if(!method_exists(dol_loginfunction))	2019-01-17 14:49:30 +01:00
JC Prieto	5223b1ee1a	FIX: To add more pdf models in thirdparties	2019-01-16 20:23:16 +01:00
Laurent Destailleur	f8973c9a22	Fix translation Late <> Alert	2019-01-16 17:44:39 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
Laurent Destailleur	688311c761	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-16 16:45:38 +01:00
Laurent Destailleur	698222c769	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/adherents/subscription.php	2019-01-16 16:45:30 +01:00
Laurent Destailleur	476527e71e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-01-16 16:34:46 +01:00
Laurent Destailleur	6becdc8af4	Fix missing substitution of ID	2019-01-16 16:34:36 +01:00
Laurent Destailleur	638be67f96	Fix tooltip	2019-01-16 13:56:13 +01:00
a-schild	7e3bfd332e	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:07:00 +01:00
a-schild	7df86cb630	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:06:12 +01:00
a-schild	2f5db98a5c	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:05:22 +01:00
Laurent Destailleur	f4dd8a4e50	Update myobject_card.php	2019-01-16 12:47:44 +01:00
Bahfir Abbes	66f17ac422	simplification	2019-01-16 12:47:36 +01:00
Abbes Bahfir	6b808acfbb	linl back to list if cancelled on create	2019-01-16 12:47:31 +01:00
atm-quentin	0d384eea00	FIX credit note can have negative value	2019-01-16 09:33:24 +01:00
Laurent Destailleur	1f87b8bb18	FIX Position of price symbol (before) for nl_NL	2019-01-16 01:54:08 +01:00
Laurent Destailleur	f51b4288da	Merge pull request #10336 from hregis/8.0_bug ... FIX avoid php warning	2019-01-15 17:59:09 +01:00
Laurent Destailleur	adc4422323	Update card.php	2019-01-15 17:57:30 +01:00
Regis Houssin	41a38b3a0a	FIX avoid php warning ... Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2019-01-15 15:44:45 +01:00
Regis Houssin	7c9d85d091	FIX problem with multicompany transverse mode ... Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2019-01-15 12:18:04 +01:00
Laurent Destailleur	6159703116	Fix warning and date	2019-01-15 11:14:01 +01:00
Laurent Destailleur	2ec2daa18d	FIX Edit blog meta post	2019-01-15 10:53:28 +01:00
ATM-Nicolas	2a7b3c7d7d	FIX : Check for old picture name if the new one was not found	2019-01-14 10:48:34 +01:00
Frédéric FRANCE	cf55b54cf5	correct list of links	2019-01-14 10:02:48 +01:00
Laurent Destailleur	8c6fde72f8	Several fixes in look and feel of module survey	2019-01-13 19:36:00 +01:00
Laurent Destailleur	e0d11edb6b	FIX Sql error on filter of project preview with date	2019-01-13 14:09:40 +01:00
Laurent Destailleur	1aa2b7a164	FIX SQL injection on rowid of dict.php	2019-01-10 03:26:34 +01:00
Laurent Destailleur	057b606663	Fix tooltip	2019-01-09 15:03:44 +01:00
Laurent Destailleur	d1e062cafa	FIX When changing date of payment, change also record in bank if not ... conciliated yet.	2019-01-09 13:28:12 +01:00
Laurent Destailleur	890abd28d5	Fix look and feel v9	2019-01-09 12:26:49 +01:00
Laurent Destailleur	61e9e8d60c	Fix missing link	2019-01-09 11:41:23 +01:00
Laurent Destailleur	0d9367b09d	Merge pull request #10305 from tuxgasy/8.0_bill_orders ... Fix #10301 mass bill orders	2019-01-08 16:50:48 +01:00
Laurent Destailleur	a1f5ede736	Update actions_massactions.inc.php	2019-01-08 16:50:27 +01:00
Laurent Destailleur	47448b77f0	Update actions_massactions.inc.php	2019-01-08 16:47:30 +01:00
TuxGasy	2c2f86736a	Fix #10301 mass bill orders and replicate extrafields	2019-01-08 15:59:20 +01:00
diversity-co-uk	2dc87509ff	Fix Invoice PUT, remove extra parameter ... The first parameter is expected to be the user. The $id of the invoice is already contained in $this See facture.class.php 1610: function update(User $user, $notrigger=0)	2019-01-08 14:17:33 +01:00
Laurent Destailleur	acc665a9f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php	2019-01-08 14:16:23 +01:00
Laurent Destailleur	1ee0d42408	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 14:08:22 +01:00
Laurent Destailleur	6ca163c68b	Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list ... FIX: action list: add printFieldListSelect and printFieldListWhere hooks	2019-01-08 14:06:24 +01:00
Laurent Destailleur	9a6c3ac3df	FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-08 14:05:07 +01:00
Marc de Lima Lucio	68802c659e	FIX: action list: add printFieldListSelect and printFieldListWhere hooks	2019-01-08 11:41:58 +01:00
Laurent Destailleur	d2f6899346	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/admin/defaultvalues.php htdocs/societe/card.php	2019-01-08 01:53:00 +01:00
Laurent Destailleur	9d8b084115	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: ChangeLog htdocs/core/actions_sendmails.inc.php htdocs/filefunc.inc.php	2019-01-08 01:48:54 +01:00
Laurent Destailleur	8e3df45cbf	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/holiday/define_holiday.php	2019-01-08 01:46:03 +01:00
Laurent Destailleur	f85389ac29	Fix missing td column	2019-01-08 01:11:34 +01:00
Laurent Destailleur	41743056bf	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 01:09:21 +01:00
Laurent Destailleur	087a4400b0	FIX Default value on sales representative on third party creation	2019-01-08 01:05:42 +01:00
Laurent Destailleur	1188540b41	Sync transifex	2019-01-07 19:39:41 +01:00
Laurent Destailleur	8b1455f29e	FIX Cash fence	2019-01-07 19:35:20 +01:00
Laurent Destailleur	527ef8bdc8	Add nb of invoice to help cash fence	2019-01-07 19:02:38 +01:00
Laurent Destailleur	1306918eb0	FIX #10299	2019-01-07 16:03:55 +01:00
Xebax	fbb1b344d1	Merge remote-tracking branch 'upstream/7.0' into 7.0	2019-01-06 13:44:13 +01:00
Xebax	2c496d2ac0	FIX Civility not saved when creating a member.	2019-01-06 13:42:41 +01:00
Laurent Destailleur	38ec05f2f1	Fix search filter lost	2019-01-06 01:17:11 +01:00
Laurent Destailleur	b1559dbc39	Fix perms	2019-01-05 15:22:24 +01:00
Laurent Destailleur	c9e6074551	Code clean	2019-01-05 15:14:06 +01:00
Laurent Destailleur	59d6000e89	Code comment	2019-01-05 15:13:35 +01:00
Juanjo Menent	74442911a7	Change to 7.0.6	2019-01-05 14:45:23 +01:00
Juanjo Menent	7908550937	Merge remote-tracking branch 'upstream/7.0' into 7.0	2019-01-05 13:05:50 +01:00
ldestailleur	0ce514079b	FIX Button journalize grey when mandatroy setup not done	2019-01-05 12:51:08 +01:00
ldestailleur	e47cf24fa1	Try to fix chrome xss protection	2019-01-04 19:10:25 +01:00
ldestailleur	89f24f6fe8	Fix cache not working on css files	2019-01-04 18:58:36 +01:00
ldestailleur	3485d0b4e5	Fix regression when editing html source	2019-01-04 18:39:02 +01:00
ldestailleur	3b6d6eec9a	Fix cach on image for website	2019-01-04 18:06:54 +01:00
ldestailleur	2c474de61e	FIX Update of timespent when date is empty	2019-01-04 15:44:39 +01:00
ldestailleur	5638ac8f4d	FIX title on picto no more visible ... Conflicts: htdocs/core/lib/functions.lib.php	2019-01-04 15:25:14 +01:00
Ferran Marcet	f3dd875fc7	FIX: Can't generate invoice pdf	2019-01-04 12:00:39 +01:00
Ferran Marcet	4694af0488	FIX: Can't generate invoice pdf	2019-01-04 11:45:02 +01:00
Ferran Marcet	3e358c90b3	Merge branch '7.0up' into 7.0	2019-01-04 11:32:19 +01:00
Ferran Marcet	15cc45b8ae	FIX: Can't generate invoice pdf	2019-01-04 10:52:10 +01:00
ldestailleur	082b126c06	FIX Can't switch page when html editing without save or cancel	2019-01-03 22:39:51 +01:00
ldestailleur	1ae11c554b	Fix regression if style	2019-01-03 21:35:25 +01:00
ldestailleur	cf84fdf7c7	Translate option "Simplify interface for blind persons"	2019-01-03 20:07:58 +01:00
ldestailleur	1b19f5153b	Fix cash fence feature	2019-01-03 14:18:02 +01:00
ldestailleur	7c1ed5b913	FIX #9972 #10297	2019-01-03 13:28:35 +01:00
Josep Lluís	60d3cced37	FIX: delete all contact categories ... Delete all contact categories is not necessary on contact card. Current function setCategories will do it when necessary. Conflicts: htdocs/contact/card.php	2019-01-03 13:00:06 +01:00
ldestailleur	aaf5408f08	Fix user/pass not mandatory	2019-01-03 12:57:03 +01:00
ldestailleur	dbbfdd984a	Fix emailcollector can't be used without syntax rules	2019-01-03 11:47:27 +01:00
ldestailleur	ff582a38e1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-03 11:12:27 +01:00
ldestailleur	5f9bbbcdd7	Fix migration	2019-01-03 11:12:14 +01:00
Laurent Destailleur	fad9a0cf32	Merge pull request #10287 from aspangaro/9.0_p3 ... Small fix	2019-01-02 20:02:05 +01:00
Laurent Destailleur	8b380489f2	Update commonobject.class.php ... Conflicts: htdocs/core/class/commonobject.class.php	2019-01-02 19:55:51 +01:00
Laurent Destailleur	c690b92410	Merge pull request #10277 from aspangaro/9.0_accountancy_html ... FIX: #10221 Html codes in accounting export	2019-01-02 19:52:18 +01:00
Laurent Destailleur	752b73cb0d	Merge pull request #10276 from aspangaro/9.0_accountancy ... FIX: Generation of FEC:CompteLib	2019-01-02 19:51:57 +01:00
Laurent Destailleur	1202bb3173	Merge pull request #10274 from fmarcet/8.0 ... FIX: Loan impossible to account	2019-01-02 19:50:46 +01:00
Laurent Destailleur	a39336c80d	Simple join is better than RIGHT JOIN	2019-01-02 19:50:23 +01:00
ldestailleur	a9e8e13bb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: ChangeLog htdocs/user/param_ihm.php	2019-01-02 19:41:39 +01:00
ldestailleur	d8d47763aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-02 19:39:42 +01:00
ldestailleur	3d8479291d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-02 19:39:35 +01:00
JC Prieto	99e2f893fd	Fix: loadBatchInfo()	2019-01-02 19:38:44 +01:00
ldestailleur	8645a7f524	FIX Interface regression for bind people. Fix option ... MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-02 18:58:45 +01:00
Frédéric FRANCE	cad95c7dc2	Update societe.class.php	2019-01-02 15:39:22 +01:00
gauthier	fc3da0f5be	FIX : holidays get natural_search if search params are set only	2019-01-02 10:02:30 +01:00
Alexandre SPANGARO	c4dbf41530	Look & feel	2018-12-30 21:21:40 +01:00
Alexandre SPANGARO	a2075b9d2c	V9 look & Feel, etc	2018-12-30 20:32:44 +01:00
Alexandre SPANGARO	cbcf097ec1	FIX: #10221 Html codes in accounting export	2018-12-29 23:20:30 +01:00
Alexandre SPANGARO	3eb5b06472	FIX: Generation of FEC:CompteLib	2018-12-29 22:26:06 +01:00
Juanjo Menent	cf64053fa5	Merge remote-tracking branch 'upstream/7.0' into 7.0	2018-12-29 15:07:09 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
ldestailleur	0353bd5302	FIX sql error when resetting payment mode / term	2018-12-29 07:48:47 +01:00
ldestailleur	7b91c14cb3	FIX sql error when resetting payment mode / term	2018-12-28 23:14:41 +01:00
ldestailleur	c0eef25b31	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:14:36 +01:00
Ferran Marcet	dc93cccbe1	FIX: Loan impossible to account	2018-12-28 12:57:04 +01:00
Laurent Destailleur	713d71bd95	Fix menu	2018-12-28 12:51:54 +01:00
Laurent Destailleur	e0f94bbb59	Add role=navigation	2018-12-28 12:50:23 +01:00
Laurent Destailleur	3cd91d7c66	Fix look and feel v9 (autofocus)	2018-12-28 00:41:05 +01:00
Laurent Destailleur	9842f50942	Fix substitution for members	2018-12-27 21:16:33 +01:00
Laurent Destailleur	cd53e22d64	FIX Edit description of event	2018-12-27 06:16:54 +01:00
Laurent Destailleur	64de31ef67	Clean log	2018-12-27 06:09:27 +01:00
Laurent Destailleur	deba3249f8	FIX Bad trigger name	2018-12-27 06:09:03 +01:00
Laurent Destailleur	8ab2ef0cf0	Add log	2018-12-27 06:08:48 +01:00
Laurent Destailleur	2b0240a1e2	Add log ... Conflicts: htdocs/core/actions_massactions.inc.php	2018-12-27 06:08:24 +01:00
Laurent Destailleur	294107bba0	FIX vars for substitution must be null if not applicable (and not '')	2018-12-27 05:07:11 +01:00
Laurent Destailleur	0f76279a03	FIX Missing token and style	2018-12-27 03:46:14 +01:00
Laurent Destailleur	63beb50465	Fix missing migration of external site module	2018-12-26 21:22:12 +01:00
Laurent Destailleur	e7b3c91645	Fix dump file	2018-12-26 19:10:22 +01:00
Laurent Destailleur	7b61fc8fd1	Fix setup of dav module	2018-12-23 14:03:19 +01:00
Laurent Destailleur	6557dcfb81	CSS	2018-12-23 00:49:26 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	94ee18a20a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-22 19:00:15 +01:00
Laurent Destailleur	8d39edf430	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/price.php	2018-12-22 18:59:49 +01:00
Laurent Destailleur	b3b7a12a16	FIX Look and feel v9	2018-12-22 18:56:29 +01:00
Laurent Destailleur	0646d4ab7a	Merge pull request #10262 from hregis/8.0_mc ... FIX check if "entity" is already defined in "$param"	2018-12-22 18:25:00 +01:00
Laurent Destailleur	f8b0e535fa	Code comment	2018-12-22 17:30:22 +01:00
Laurent Destailleur	2b088a73c1	FIX CVE-2018-19998	2018-12-22 17:16:08 +01:00
Laurent Destailleur	bacd5110fb	FIX CVE-2018-19995 and CVE-2018-19998	2018-12-22 17:12:38 +01:00
Laurent Destailleur	850b939ffd	FIX CVE-2018-19994	2018-12-22 17:03:50 +01:00
Laurent Destailleur	fc3fcc5455	FIX CVE-2018-19993	2018-12-22 16:59:30 +01:00
Laurent Destailleur	0f06e39d23	FIX CVE-2018-19992	2018-12-22 16:55:31 +01:00
Laurent Destailleur	33564ddafc	Fix css	2018-12-22 16:45:57 +01:00
Regis Houssin	09ce84ca93	FIX avoid Class 'AdherentType' not found	2018-12-21 16:38:02 +01:00
Laurent Destailleur	4859d944d8	Sync transifex	2018-12-21 12:09:03 +01:00
Regis Houssin	9b215e117a	FIX check if "entity" is already defined in "$param"	2018-12-21 11:23:44 +01:00
Laurent Destailleur	391f916bd5	Fix trans	2018-12-21 10:21:56 +01:00
Laurent Destailleur	d9b8a8c8ae	Debug cash fence feature	2018-12-19 16:12:55 +01:00
Laurent Destailleur	b0652494b5	Debug cash fence	2018-12-19 15:40:01 +01:00
Laurent Destailleur	ed13f7b729	Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price ... FIX : Function updatePrice with wrong parameters	2018-12-19 13:02:00 +01:00
Laurent Destailleur	2978522006	Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change ... FIX: contact/address tab issue when changing company	2018-12-19 12:59:32 +01:00
Laurent Destailleur	707af49025	FIX Missing last month on vat report per month	2018-12-19 12:07:26 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Laurent Destailleur	4b7f373802	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-18 21:37:34 +01:00
Laurent Destailleur	fb8c3f01a4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php	2018-12-18 21:35:30 +01:00
Laurent Destailleur	4b6ae9d424	FIX Error reported when creation of thirdparty from member fails ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php	2018-12-18 21:32:41 +01:00
Laurent Destailleur	b8429c607e	FIX Can't create a thirdparty from member if customer code is mandatory.	2018-12-18 21:29:53 +01:00
Laurent Destailleur	6851232314	Fix removing constant no more required	2018-12-18 21:29:36 +01:00
Laurent Destailleur	f2318716ec	FIX Error reported when creation of thirdparty from member fails	2018-12-18 21:27:16 +01:00
Laurent Destailleur	31d032d5d3	FIX Can't create a thirdparty from member if customer code is mandatory.	2018-12-18 21:00:06 +01:00
Laurent Destailleur	2e6a41228f	Fix removing constant no more required	2018-12-18 20:49:48 +01:00
Laurent Destailleur	2d2b95a082	Fix calculation of top menu entry of user	2018-12-18 17:01:57 +01:00
ATM-Nicolas	96144e18f1	FIX : Function updatePrice with wrong parameters	2018-12-18 15:27:32 +01:00
Laurent Destailleur	90e87fc4d9	Fix cache	2018-12-18 15:15:33 +01:00
Laurent Destailleur	57c41bac56	Fix parameter session_cache_limiter	2018-12-18 15:07:32 +01:00
Laurent Destailleur	c3eb131054	Debug ticket module	2018-12-18 13:30:22 +01:00
Laurent Destailleur	16496218d3	css	2018-12-18 13:21:00 +01:00
Laurent Destailleur	dcdfe5c318	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-18 11:03:35 +01:00
Laurent Destailleur	3ae03d619d	Fix tooltip	2018-12-18 11:03:23 +01:00
Marc de Lima Lucio	7e2eca661b	FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account	2018-12-18 09:40:58 +01:00
Laurent Destailleur	4a22640ae9	Merge pull request #10240 from aspangaro/9.0_agiris ... FIX: Accountancy - Missing information on Agiris Export	2018-12-17 21:10:05 +01:00
Laurent Destailleur	48162db33d	FIX Rename of image file lose the thumbs	2018-12-17 20:19:11 +01:00
Laurent Destailleur	c444ef3b4d	FIX wrapper could not download shared files	2018-12-17 19:37:17 +01:00
Laurent Destailleur	1faaed504a	Fix param attachment	2018-12-17 18:48:41 +01:00
Laurent Destailleur	ffaff4dc7f	Debug website module	2018-12-17 17:29:04 +01:00
atm-ph	1aadcc50f1	Fix attached files from user mail form don't work	2018-12-17 15:48:27 +01:00
Laurent Destailleur	4e940ebaf1	FIX Download of files with hashp when files are into user dir	2018-12-17 15:35:20 +01:00
Laurent Destailleur	17b2fd295f	FIX Css of amount on remain to pay on expense report	2018-12-17 13:57:30 +01:00
Laurent Destailleur	6b5c0d1ea1	Save cash fence event into unalterable log	2018-12-17 11:41:59 +01:00
Laurent Destailleur	1979e3238c	Fix rounding	2018-12-17 10:42:30 +01:00
Laurent Destailleur	e06b06c788	Work on cash fence	2018-12-17 10:37:56 +01:00
Alexandre SPANGARO	f728b28a67	FIX: Missing information on Agiris Export	2018-12-17 06:02:29 +01:00
Laurent Destailleur	cbb5e3bbe9	Better translation	2018-12-17 03:31:20 +01:00
Laurent Destailleur	bf9ee18bed	Standardize code.	2018-12-17 03:25:45 +01:00
Laurent Destailleur	af4405c669	FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE	2018-12-16 20:29:08 +01:00
Laurent Destailleur	d8b5cd4bdf	Remove white lines	2018-12-16 19:31:59 +01:00
Laurent Destailleur	efb88292dd	Clean code	2018-12-16 19:30:54 +01:00
Laurent Destailleur	003c463ee4	FIX Can't delete a line of minimal stock per warehouse	2018-12-16 19:23:53 +01:00
Laurent Destailleur	20d24f2feb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-16 18:45:30 +01:00
Laurent Destailleur	2d05b7c790	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-16 18:45:13 +01:00
Laurent Destailleur	9b844df315	FIX Extrafields on shipment module	2018-12-16 18:44:58 +01:00
Laurent Destailleur	72c5943c55	Execute trigger so we can record line into unalterable log table	2018-12-16 17:53:23 +01:00
Laurent Destailleur	ce2d67f225	Fix phpcs	2018-12-16 17:45:51 +01:00
Laurent Destailleur	9558020ea3	Merge pull request #10233 from simnandez/8.0 ... FIX: Vendor translations are in english	2018-12-16 17:40:37 +01:00
Laurent Destailleur	e5e4ef7b8c	Work on cash fence	2018-12-16 16:47:09 +01:00
Laurent Destailleur	e366d7d57c	Work on cash fence	2018-12-16 15:30:31 +01:00
Laurent Destailleur	988ba172ae	Clean code of POS modules	2018-12-16 14:59:51 +01:00
Laurent Destailleur	e14b426985	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/exports/export.php	2018-12-16 13:39:16 +01:00
Laurent Destailleur	cca3b4870a	FIX CVE-2018-19799	2018-12-16 13:36:51 +01:00
Laurent Destailleur	699766223f	Fix phpcs	2018-12-16 13:00:24 +01:00
Juanjo Menent	a61677dcc6	Merge remote-tracking branch 'upstream/7.0' into 7.0	2018-12-16 11:31:06 +01:00
Juanjo Menent	6ce0d3e279	FIX: Vendor translations are in english	2018-12-16 11:16:12 +01:00
Alexandre SPANGARO	6eb9013430	Fix: Accountancy - remove alert on bank account configuration when bank account is closed	2018-12-16 06:36:55 +01:00
Alexandre SPANGARO	8148ea8361	Revert "Fix: Problem with loan integration in general ledger" ... This reverts commit 50da3c2ed2.	2018-12-16 06:16:14 +01:00
Alexandre SPANGARO	df8aaf9c06	Merge branch '9.0' of https://github.com/Dolibarr/dolibarr into 9.0	2018-12-16 06:14:55 +01:00
Alexandre SPANGARO	50da3c2ed2	Fix: Problem with loan integration in general ledger	2018-12-16 06:14:33 +01:00
Laurent Destailleur	a601859985	Work on cash fence	2018-12-15 19:58:43 +01:00
Laurent Destailleur	2bfc5fe235	Work on cash fence	2018-12-15 19:56:08 +01:00
Laurent Destailleur	1c49599a47	Work on cash fence feature	2018-12-15 19:46:51 +01:00
Laurent Destailleur	0451eb741b	Work on legal cash fence	2018-12-15 19:20:30 +01:00
Laurent Destailleur	8ce6f67773	Fix phpcs	2018-12-15 18:27:38 +01:00
Laurent Destailleur	944f9ac894	Typo	2018-12-15 18:14:08 +01:00
Laurent Destailleur	527ad04ae8	FIX Mandatory field feature should works on textarea ... Conflicts: htdocs/core/lib/functions.lib.php	2018-12-15 18:13:30 +01:00
Laurent Destailleur	33a91ff707	Add missing POS closure feature	2018-12-15 16:47:06 +01:00
andreubisquerra	cdaf048766	First CashControl version	2018-12-15 16:45:36 +01:00
Norbert Penel	0f3a063c91	Events are not linked to products ... when created from a product card, the events are not linked to the product	2018-12-15 15:57:15 +01:00
Laurent Destailleur	db46d82de3	Fix position of menu entries	2018-12-15 15:35:59 +01:00
Laurent Destailleur	6846d8821d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/tpl/extrafields_list_search_sql.tpl.php	2018-12-15 14:07:25 +01:00
Laurent Destailleur	2a3b808da6	CSS	2018-12-15 14:05:23 +01:00
Laurent Destailleur	e069da69ba	Revert "Fix screen size fall" ... This reverts commit abb6b41f91.	2018-12-15 12:35:37 +01:00
Laurent Destailleur	dbe5d285e8	Merge pull request #9965 from atm-john/fix_responsive ... FIX screen size fall	2018-12-15 12:33:35 +01:00
Laurent Destailleur	063e589a1b	Merge branch '8.0' into 8.0_fix9964	2018-12-14 19:37:40 +01:00
Laurent Destailleur	45115a9590	Merge pull request #10191 from fappels/7.0_fix_issue#10186 ... Fix issue #10186 no display of stock per batch series.	2018-12-14 19:34:11 +01:00
Laurent Destailleur	ea35e45f76	Merge pull request #10197 from atm-maxime/fix_import_bank ... Fix unexistant fields	2018-12-14 17:40:45 +01:00
Laurent Destailleur	abd09ae631	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-14 17:24:17 +01:00
PMickael	37daface19	[Accounting][VAT] Fix balance should be based on period ... [Accounting][VAT] Fix balance should be based on period	2018-12-14 17:23:45 +01:00
Laurent Destailleur	539e2c55cd	FIX #9629 #9625	2018-12-14 10:33:07 +01:00
Laurent Destailleur	c1ce902f91	FIX #9629 #9625	2018-12-14 10:31:09 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	dcb43214d6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-13 20:46:05 +01:00
Laurent Destailleur	7a3ab13196	FIX #10183 using backport of fix done in 9.0	2018-12-13 20:45:51 +01:00
Laurent Destailleur	603656c7de	Merge pull request #10219 from simnandez/8.0 ... FIX: #10218 Bad redirection after deleting a user or group	2018-12-13 20:02:53 +01:00
Laurent Destailleur	4413b2e886	Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0 ... FIX if qty is 0	2018-12-13 19:56:38 +01:00
Laurent Destailleur	6ad106d14a	Update fournisseur.facture.class.php	2018-12-13 19:56:22 +01:00
florian HENRY	2e57a8be51	better fix	2018-12-13 12:37:40 +01:00
florian HENRY	56923caeec	Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964	2018-12-13 12:34:39 +01:00
Laurent Destailleur	b0941967f0	Fix sort of email templates	2018-12-13 12:13:28 +01:00
Laurent Destailleur	0ecdb0f3bb	Code comment	2018-12-12 13:02:18 +01:00
Laurent Destailleur	61503bdaa9	Fix picto for status of cron task	2018-12-12 13:02:11 +01:00
Laurent Destailleur	ad3c679d28	Fix status in cron task list	2018-12-12 13:02:03 +01:00
Juanjo Menent	22c34bd656	Fix: MenuBankCash Translation is in english in es_ES	2018-12-12 12:09:07 +01:00
Laurent Destailleur	13f5476678	Responsive	2018-12-12 11:50:10 +01:00
Laurent Destailleur	98c14efa78	Fix missing picto	2018-12-11 14:10:20 +01:00
Laurent Destailleur	250725663d	FIX Missing generic css	2018-12-11 13:48:12 +01:00
Juanjo Menent	d1eed14488	FIX: #10218 Bad redirection after deleting a user or group	2018-12-11 13:25:33 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +01:00
Laurent Destailleur	4aff0b6471	Fix opensurvey	2018-12-11 10:52:59 +01:00
Laurent Destailleur	a107d16338	Revert "clean and update code" ... This reverts commit 68de0ba93b.	2018-12-11 09:52:00 +01:00
Laurent Destailleur	3c8aa38bf7	Fix use iframe to embed content	2018-12-10 19:06:34 +01:00
Laurent Destailleur	e2a575e547	Fix use of external url in iframes	2018-12-10 18:44:45 +01:00
Laurent Destailleur	bdb4295379	Fix menu editor	2018-12-10 18:24:05 +01:00
Laurent Destailleur	6105bb2bb6	Fix: difference between text and url into external web site module	2018-12-10 18:10:57 +01:00
Laurent Destailleur	b35a9c0e64	FIX Edition of menu fails (mainmenu required for top menu)	2018-12-10 17:50:58 +01:00
atm-quentin	3da9650003	FIX if qty is 0	2018-12-10 16:06:11 +01:00
Laurent Destailleur	f3a67d6c3f	FIX Show warning when trying to create task on closed project	2018-12-10 15:06:54 +01:00
Laurent Destailleur	853566cc28	Fix bold chars in tooltips	2018-12-10 14:40:42 +01:00
Laurent Destailleur	e2e22f95d1	FIX Workaround for flex bug	2018-12-10 13:18:34 +01:00
Laurent Destailleur	dbee87aa9d	Trans	2018-12-10 13:10:28 +01:00
Laurent Destailleur	af5b63954a	Clean code	2018-12-10 12:49:20 +01:00
Laurent Destailleur	188cda7902	Fix look and feel v9	2018-12-10 12:32:26 +01:00
Laurent Destailleur	3f912ebfff	FIX restore security event login/logout	2018-12-10 11:19:52 +01:00
Laurent Destailleur	42d4cf9992	Fix sql	2018-12-10 10:17:54 +01:00
Laurent Destailleur	cf74e5b9a8	Change order of tabs	2018-12-10 00:25:10 +01:00
Laurent Destailleur	91b190506b	Fix bad path	2018-12-10 00:19:46 +01:00
Laurent Destailleur	bbcb2aa983	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-10 00:15:54 +01:00
Laurent Destailleur	ff8f235b7e	Fix regression when disabling table	2018-12-10 00:15:22 +01:00
Laurent Destailleur	ac48996bd3	FIX Look and feel v8	2018-12-09 23:41:59 +01:00
Laurent Destailleur	be7e424862	FIX thirdparty not set on some events	2018-12-09 00:16:59 +01:00
Laurent Destailleur	25f66bd024	Code comment	2018-12-08 14:44:52 +01:00
Laurent Destailleur	b43c2ce839	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-08 11:52:12 +01:00
Laurent Destailleur	930312b425	FIX Migration do not create not used table	2018-12-08 11:51:46 +01:00
Laurent Destailleur	9ed34e2b35	FIX Can relaunch install on v8	2018-12-08 11:51:01 +01:00
Laurent Destailleur	a915d82883	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-08 11:42:30 +01:00
Laurent Destailleur	eaa7fe5d14	Removed deprecated code	2018-12-08 11:41:55 +01:00
Laurent Destailleur	d2f0c87d8f	FIX Removed not use table	2018-12-08 11:41:08 +01:00
Laurent Destailleur	a44dca7e71	Removed deprecated table	2018-12-08 11:37:47 +01:00
Laurent Destailleur	d0a1c523ca	FIX several critical bugs in migration of directory of users	2018-12-07 19:53:02 +01:00
Laurent Destailleur	3538e9ab3b	Fix migration	2018-12-07 19:05:24 +01:00
Laurent Destailleur	37fe8afea3	Code comment	2018-12-07 14:54:40 +01:00
Laurent Destailleur	f755457236	Test imap available	2018-12-07 14:54:25 +01:00
Laurent Destailleur	d3a6b16021	FIX Show declared progress	2018-12-07 14:54:09 +01:00
Laurent Destailleur	572366c6c2	FIX status of user	2018-12-07 14:54:02 +01:00
Laurent Destailleur	65d492efed	Minor fix	2018-12-07 14:53:49 +01:00
Maxime Kohlhaas	550df138a6	Fix unexistant fields	2018-12-07 12:19:50 +01:00
Juanjo Menent	531cfe791d	Merge remote-tracking branch 'upstream/7.0' into 7.0	2018-12-07 11:34:42 +01:00
fappels	e2727f6d91	Fix issue #10186 no display of stock per batch series.	2018-12-06 21:43:10 +01:00
Laurent Destailleur	163cac5349	Trans lead	2018-12-06 20:25:22 +01:00
Laurent Destailleur	5ce26bae1b	Fix form of bank info for CH	2018-12-04 22:01:35 +01:00
Laurent Destailleur	f142238817	Fix missing field canvas	2018-12-04 21:25:59 +01:00
Philippe GRAND	e9e6d8b9b5	Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>	2018-12-04 16:10:56 +01:00
Laurent Destailleur	b359afd084	Prepare 9.0	2018-12-04 16:08:36 +01:00
Laurent Destailleur	bdc4893aad	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-04 14:58:26 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Laurent Destailleur	779d33cf02	Merge pull request #10085 from fmarcet/7.0 ... FIX Lines are not inserted correctly if VAT have code	2018-12-04 13:55:57 +01:00
Laurent Destailleur	d2e8aeb8c1	Merge pull request #10173 from hregis/develop_upgrade ... FIX wrong path, multidir_output[] for each entity is construct by the multicompany module	2018-12-04 13:39:05 +01:00
Laurent Destailleur	c27c322457	Merge pull request #10172 from hregis/develop_virtualmin ... FIX possibility to force install lock with GET/POST or script	2018-12-04 13:38:23 +01:00
Laurent Destailleur	a87978eca4	Merge pull request #10168 from AurelGDN/develop ... Fix: Apply andreubisquerra's fix to cheque payment	2018-12-04 13:35:42 +01:00
Laurent Destailleur	b67ed87103	Merge pull request #10166 from atm-maxime/fix_pdf_footer ... Fix pdf footer height for all documents	2018-12-04 13:35:11 +01:00
Laurent Destailleur	1d9c0f6b77	Fix look and feel	2018-12-04 13:26:19 +01:00
Laurent Destailleur	d9bb39970f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/barcode.php	2018-12-04 13:20:40 +01:00
Laurent Destailleur	5061a9b0c2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/install/mysql/tables/llx_paiementfourn.sql	2018-12-04 13:17:25 +01:00
Laurent Destailleur	347384734d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/install/mysql/tables/llx_paiementfourn.sql	2018-12-04 13:15:32 +01:00
Laurent Destailleur	275eeca135	Trans	2018-12-04 13:09:58 +01:00
Laurent Destailleur	4a873917ce	Fix import	2018-12-04 12:40:36 +01:00
Regis Houssin	aa3e520725	FIX wrong path, multidir_output[] for each entity is construct by the ... multicompany module	2018-12-04 09:12:36 +01:00
Regis Houssin	dcbb7c49fc	FIX wrong value for instal lock	2018-12-03 13:31:28 +01:00
Regis Houssin	a2f514d4a1	FIX possibility to force install lock with GET/POST or script	2018-12-03 13:12:42 +01:00
Ferran Marcet	602986ced8	Merge remote-tracking branch 'origin/7.0' into 7.0 ... # Conflicts: # htdocs/comm/propal/class/propal.class.php # htdocs/commande/class/commande.class.php # htdocs/expensereport/class/expensereport.class.php # htdocs/fourn/class/fournisseur.commande.class.php	2018-12-03 12:33:18 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Ferran Marcet	135a94dfed	Merge branch '7.0up' into 7.0	2018-12-03 11:59:46 +01:00
Ferran Marcet	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
aurelien goudeneche	1f089d3ee2	Update pay.php	2018-12-03 09:37:45 +01:00
aurelien goudeneche	41ee56c9e9	Apply andreubisquerra's fix to cheque payment ... Apply andreubisquerra's fix (#10147) to cheque payment button	2018-12-03 09:30:47 +01:00
Maxime Kohlhaas	8fea6338e1	Fix #6565 ... Fix pdf footer height for all documents	2018-12-02 18:51:49 +01:00
Maxime Kohlhaas	42c97cf7d5	Fix #6610	2018-12-02 17:59:11 +01:00
Laurent Destailleur	7c46ace042	Merge pull request #10153 from atm-maxime/fix_user_photo ... Fix user photo path	2018-12-02 17:07:14 +01:00
Laurent Destailleur	07425e4e19	Merge pull request #10156 from grandoc/7.0_bug ... FIX #3234	2018-12-02 17:06:06 +01:00
Laurent Destailleur	70f29d9d79	Merge pull request #10155 from frederic34/patch-2 ... GETPOSTISSET has only one param	2018-12-02 17:04:55 +01:00
Laurent Destailleur	7b1aec1e2a	Merge pull request #10157 from frederic34/memberdoc ... doc comment adherent class	2018-12-02 17:04:30 +01:00